package/rpm: security bump to 4.14.2.1
PATCH v2 1/8 package/rpm: security bump to 4.14.2.1
- Remove first and second patches (already in version)
- Remove third and fourth patches (not needed since:
https://github.com/rpm-software-management/rpm/commit/245b5a3b4b6d616adf47361137987e90f8dab22c)
- Add hash for license file
- Drop autoreconf (as configure.ac is not patched anymore)
- Use new --with-crypto option
- Restrict symlink following on installation (CVE-2017-7500, CVE-2017-7501)
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
...nstead-of-compile-for-gcc-flags-test.patch | 33 ----------- ...ure-ac-correct-stack-protector-check.patch | 45 --------------- ...enable-disable-sepdebugcrcfix-buildi.patch | 55 ------------------- ...cfix.c-fix-build-with-recent-binutil.patch | 43 --------------- package/rpm/rpm.hash | 7 ++- package/rpm/rpm.mk | 12 ++-- 6 files changed, 9 insertions(+), 186 deletions(-) delete mode 100644 package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch delete mode 100644 package/rpm/0002-configure-ac-correct-stack-protector-check.patch delete mode 100644 package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch delete mode 100644 package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch
package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From b5f1895aae096836d6e8e155ee289e1b10fcabcb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Sat, 10 Oct 2015 23:17:44 +0200 -Subject: [PATCH] configure.ac: use link instead of compile for gcc flags test - -The logic that tests whether gcc supports or not certain flags uses -AC_COMPILE_IFELSE(). However, when checking for stack smashing -protection support, an AC_LINK_IFELSE() test is needed, since the -build might work but not the link stage if certain libraries are -missing for proper stack smashing protection support. - -Therefore, this commit switches to use AC_LINK_IFELSE(). - -[Upstream commit: https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb] -Signed-off-by: Thomas Petazzoni <[email protected]> -Signed-off-by: James Knight <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6ece8c9fd..822294c3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,7 +43,7 @@ if test "$GCC" = yes; then - echo - for flag in $cflags_to_try; do - CFLAGS="$CFLAGS $flag -Werror" -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[ - echo " $flag" - RPMCFLAGS="$RPMCFLAGS $flag" - ],[])
package/rpm/0002-configure-ac-correct-stack-protector-check.patch deleted +0 -45
45 lines not on this page · raw message
package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch deleted +0 -55
55 lines not on this page · raw message
package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch deleted +0 -43
43 lines not on this page · raw message
package/rpm/rpm.hash +5 -2
@@ -1,2 +1,5 @@ -# From http://rpm.org/wiki/Releases/4.13.0.1 -sha1 9566f95f38fcb214e439c552f378c2f64ba0aff9 rpm-4.13.0.1.tar.bz2 +# From https://rpm.org/wiki/Releases/4.14.2.1.html +sha256 1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda rpm-4.14.2.1.tar.bz2 + +#?Hash for license file +sha256 d56f4f1f290f6920cb053aef0dbcd0b853cda289e2568b364ddbfce220a6f3e0 COPYING
package/rpm/rpm.mk +4 -8
@@ -4,8 +4,8 @@ # ################################################################################ -RPM_VERSION_MAJOR = 4.13 -RPM_VERSION = $(RPM_VERSION_MAJOR).0.1 +RPM_VERSION_MAJOR = 4.14 +RPM_VERSION = $(RPM_VERSION_MAJOR).2.1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \
@@ -13,10 +13,6 @@ RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \ RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING -# 0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch -# 0002-configure-ac-correct-stack-protector-check.patch -RPM_AUTORECONF = YES - RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \
@@ -35,11 +31,11 @@ endif ifeq ($(BR2_PACKAGE_LIBNSS),y) RPM_DEPENDENCIES += libnss -RPM_CONF_OPTS += --without-beecrypt +RPM_CONF_OPTS += --with-crypto=nss RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr else RPM_DEPENDENCIES += beecrypt -RPM_CONF_OPTS += --with-beecrypt +RPM_CONF_OPTS += --with-crypto=beecrypt RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt endif
Signature · 1 line
2.20.1
PATCH v2 2/8 package/rpm: add optional bzip2 dependency
There is no --{disable,enable}-bzip2 option
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
package/rpm/rpm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/rpm/rpm.mk +7 -1
@@ -8,7 +8,13 @@ RPM_VERSION_MAJOR = 4.14 RPM_VERSION = $(RPM_VERSION_MAJOR).2.1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x -RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \ +RPM_DEPENDENCIES = \ + host-pkgconf \ + berkeleydb \ + $(if $(BR2_PACKAGE_BZIP2),bzip2) \ + file \ + popt \ + zlib \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING
Signature · 1 line
2.20.1
PATCH v2 3/8 package/rpm: add optional xz dependency
In reply to Fabrice FontaineThere is not --{disable,enable}-lzma option
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
package/rpm/rpm.mk | 1 + 1 file changed, 1 insertion(+)
package/rpm/rpm.mk +1 -0
@@ -14,6 +14,7 @@ RPM_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BZIP2),bzip2) \ file \ popt \ + $(if $(BR2_PACKAGE_XZ),xz) \ zlib \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
Signature · 1 line
2.20.1
PATCH v2 4/8 package/rpm: add optional libcap dependency
In reply to Fabrice Fontaine---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
package/rpm/rpm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/rpm/rpm.mk +7 -1
@@ -25,7 +25,6 @@ RPM_CONF_OPTS = \ --disable-rpath \ --with-external-db \ --with-gnu-ld \ - --without-cap \ --without-hackingdocs \ --without-lua
@@ -36,6 +35,13 @@ else RPM_CONF_OPTS += --without-acl endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +RPM_DEPENDENCIES += libcap +RPM_CONF_OPTS += --with-cap +else +RPM_CONF_OPTS += --without-cap +endif + ifeq ($(BR2_PACKAGE_LIBNSS),y) RPM_DEPENDENCIES += libnss RPM_CONF_OPTS += --with-crypto=nss
Signature · 1 line
2.20.1
PATCH v2 5/8 package/rpm: add optional dbus dependency
In reply to Fabrice FontaineIt should be noted that dbus is enabled by default
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
package/rpm/rpm.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/rpm/rpm.mk +7 -0
@@ -35,6 +35,13 @@ else RPM_CONF_OPTS += --without-acl endif +ifeq ($(BR2_PACKAGE_DBUS),y) +RPM_DEPENDENCIES += dbus +RPM_CONF_OPTS += --enable-plugins +else +RPM_CONF_OPTS += --disable-plugins +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) RPM_DEPENDENCIES += libcap RPM_CONF_OPTS += --with-cap
Signature · 1 line
2.20.1
PATCH v2 6/8 package/rpm: fix threads comment
In reply to Fabrice Fontainerpm depends on pthreads because it uses it, not because of beecrypt
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
package/rpm/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpm/Config.in +1 -1
@@ -7,7 +7,7 @@ config BR2_PACKAGE_RPM bool "rpm" depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS select BR2_PACKAGE_BERKELEYDB
Signature · 1 line
2.20.1
PATCH v2 7/8 package/rpm: add optional openssl dependency
In reply to Fabrice Fontaineopenssl support has been added in version 4.14.0 with
https://github.com/rpm-software-management/rpm/commit/64028f9a1c25ada8ffc7a48775f526600edcbf85
Add a patch from upstream to fix build with openssl ad MD2 is disabled by default:
https://github.com/rpm-software-management/rpm/pull/453
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
...for-unused-MD2-and-RIPEMD160-digests.patch | 82 +++++++++++++++++++ package/rpm/Config.in | 2 +- package/rpm/rpm.mk | 5 +- 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 package/rpm/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160-digests.patch
package/rpm/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160-digests.patch new file +82 -0
@@ -0,0 +1,82 @@ +From ff4b9111aeba01dd025dd133ce617fb80f7398a0 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen <[email protected]> +Date: Tue, 26 Jun 2018 10:46:14 +0300 +Subject: [PATCH] Rip out partial support for unused MD2 and RIPEMD160 digests + +Inspired by #453, adding configure-checks for unused digests algorithms +seems nonsensical, at no point in rpm history have these algorithms been +used for anything in rpm so there's not even backward compatibility to +care about. So the question becomes why do we appear to have (some) +support for those unused algorithms? So lets don't, problem solved... + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Retrieved from: +https://github.com/rpm-software-management/rpm/commit/ff4b9111aeba01dd025dd133ce617fb80f7398a0] +--- + rpmio/digest_beecrypt.c | 7 ------- + rpmio/digest_nss.c | 2 -- + rpmio/digest_openssl.c | 6 ------ + 3 files changed, 15 deletions(-) + +diff --git a/rpmio/digest_beecrypt.c b/rpmio/digest_beecrypt.c +index 597027e25..653a39491 100644 +--- a/rpmio/digest_beecrypt.c ++++ b/rpmio/digest_beecrypt.c +@@ -132,10 +132,6 @@ DIGEST_CTX rpmDigestInit(int hashalgo, rpmDigestFlags flags) + ctx->Digest = (void *) sha512Digest; + break; + #endif +- case PGPHASHALGO_RIPEMD160: +- case PGPHASHALGO_MD2: +- case PGPHASHALGO_TIGER192: +- case PGPHASHALGO_HAVAL_5_160: + default: + free(ctx); + return NULL; +@@ -292,9 +288,6 @@ static int pgpVerifySigRSA(pgpDigAlg pgpkey, pgpDigAlg pgpsig, uint8_t *hash, si + case PGPHASHALGO_SHA1: + prefix = "3021300906052b0e03021a05000414"; + break; +- case PGPHASHALGO_MD2: +- prefix = "3020300c06082a864886f70d020205000410"; +- break; + case PGPHASHALGO_SHA256: + prefix = "3031300d060960864801650304020105000420"; + break; +diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c +index 992d9acf6..50f8c8e90 100644 +--- a/rpmio/digest_nss.c ++++ b/rpmio/digest_nss.c +@@ -116,7 +116,6 @@ static HASH_HashType getHashType(int hashalgo) + { + switch (hashalgo) { + case PGPHASHALGO_MD5: return HASH_AlgMD5; +- case PGPHASHALGO_MD2: return HASH_AlgMD2; + case PGPHASHALGO_SHA1: return HASH_AlgSHA1; + #ifdef SHA224_LENGTH + case PGPHASHALGO_SHA224: return HASH_AlgSHA224; +@@ -216,7 +215,6 @@ static SECOidTag getHashAlg(unsigned int hashalgo) + { + switch (hashalgo) { + case PGPHASHALGO_MD5: return SEC_OID_MD5; +- case PGPHASHALGO_MD2: return SEC_OID_MD2; + case PGPHASHALGO_SHA1: return SEC_OID_SHA1; + #ifdef SHA224_LENGTH + case PGPHASHALGO_SHA224: return SEC_OID_SHA224; +diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.c +index 18e52a724..0ae48dd1d 100644 +--- a/rpmio/digest_openssl.c ++++ b/rpmio/digest_openssl.c +@@ -172,12 +172,6 @@ static const EVP_MD *getEVPMD(int hashalgo) + case PGPHASHALGO_SHA1: + return EVP_sha1(); + +- case PGPHASHALGO_RIPEMD160: +- return EVP_ripemd160(); +- +- case PGPHASHALGO_MD2: +- return EVP_md2(); +- + case PGPHASHALGO_SHA256: + return EVP_sha256(); +
package/rpm/Config.in +1 -1
@@ -9,7 +9,7 @@ config BR2_PACKAGE_RPM depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS + select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS && !BR2_PACKAGE_OPENSSL select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_FILE select BR2_PACKAGE_POPT
package/rpm/rpm.mk +4 -1
@@ -53,10 +53,13 @@ ifeq ($(BR2_PACKAGE_LIBNSS),y) RPM_DEPENDENCIES += libnss RPM_CONF_OPTS += --with-crypto=nss RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr -else +else ifeq ($(BR2_PACKAGE_BEECRYPT),y) RPM_DEPENDENCIES += beecrypt RPM_CONF_OPTS += --with-crypto=beecrypt RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt +else +RPM_DEPENDENCIES += openssl +RPM_CONF_OPTS += --with-crypto=openssl endif ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
Signature · 1 line
2.20.1
PATCH v2 8/8 package/rpm: add optional zstd dependency
In reply to Fabrice Fontainezstd support has been in version 4.14.0 and
https://github.com/rpm-software-management/rpm/commit/3684424fe297c996bb05bb64631336fa2903df12
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
package/rpm/rpm.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/rpm/rpm.mk +7 -0
@@ -92,6 +92,13 @@ ifeq ($(BR2_PACKAGE_BINUTILS),y) RPM_DEPENDENCIES += binutils endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +RPM_DEPENDENCIES += zstd +RPM_CONF_OPTS += --enable-zstd +else +RPM_CONF_OPTS += --disable-zstd +endif + # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \
Signature · 1 line
2.20.1
PATCH v2 1/8 package/rpm: security bump to 4.14.2.1
In reply to Fabrice FontaineQuoted 9 lines · On Sat, 30 Mar 2019 15:49:40 +0100 Fabrice Fontaine…
- Remove first and second patches (already in version)
- Remove third and fourth patches (not needed since:
https://github.com/rpm-software-management/rpm/commit/245b5a3b4b6d616adf47361137987e90f8dab22c)
- Add hash for license file
- Drop autoreconf (as configure.ac is not patched anymore)
- Use new --with-crypto option
- Restrict symlink following on installation (CVE-2017-7500, CVE-2017-7501)
Quoted 4 lines
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
Applied to master, thanks. However, it seems like since bfd.h is no longer needed, there is no longer any optional dependency on binutils. Could you check this ? If it's the case, then it should be removed from rpm.mk.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/8 package/rpm: security bump to 4.14.2.1
In reply to Fabrice FontaineQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Remove first and second patches (already in version)
- Remove third and fourth patches (not needed since:
https://github.com/rpm-software-management/rpm/commit/245b5a3b4b6d616adf47361137987e90f8dab22c)
- Add hash for license file
- Drop autoreconf (as configure.ac is not patched anymore)
- Use new --with-crypto option
- Restrict symlink following on installation (CVE-2017-7500, CVE-2017-7501)
Quoted 4 lines
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Put bump as the first patch in the serie
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard