From patchwork Sat Mar 30 14:49:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070876 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OpZuBinL"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNR1g2qz9sRx for ; Sun, 31 Mar 2019 01:50:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6BC4225B01; Sat, 30 Mar 2019 14:50:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id akKjbuWK70hg; Sat, 30 Mar 2019 14:50:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B648B22128; Sat, 30 Mar 2019 14:50:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id AF0D11BF83A for ; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id ACC0A875DA for ; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E8HNa-4yDySV for ; Sat, 30 Mar 2019 14:49:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5F0D287540 for ; Sat, 30 Mar 2019 14:49:56 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id k11so6138050wro.5 for ; Sat, 30 Mar 2019 07:49:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NfJ1S1hrwgdfsv/4QXk8aHuP0AZKta42rJyyRmLoXDI=; b=OpZuBinL+63BQ80Z5pj2ZoATB9ZwT5heZ1rX/6dhpjGGUulSaG6xz5xtRsw+ys5woa czqAueinYnWK/z0eRt1u5/VG+gypKHoEReaMkKw948jHu4RUVl3A5Jit1r1fbpFtLcxu p7byBqkWOuojYj+6voQqInjXPDwkunXHwoKeiqHv8fPIJAkwUarCDnQB5BKSjVeTlGfs N681qag+HL5IjVNq11ogBAp0oY3FbIi3Spyuyz839wds2C4r6tFdeFV5Lin0NsIf7+l/ tnxoea+O4mryD0TVziza3M/LUfUEEj8pLxE4/B142Lmi9TjMOZC+XLAC8QtBQMvIpEt6 nCQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NfJ1S1hrwgdfsv/4QXk8aHuP0AZKta42rJyyRmLoXDI=; b=cL3NT9qT3VTnxRjpZE/DoZMfltBqNdS09u8c0ha7EdfsbdeBFw5vki3MgJe1lK914t cUqMimP6WYuXv9wcvXFczKnN1blq9Gecumtp6PmLeu5l+bD4wwqHPAr+YQ3jYZMNXzbK JwdgGhOXUtJ0Hh7b9a9Dz0HemgwgrG82txk+1hboU1DO4DkWRH/1mgxMxE1SRwpjs8Zw ZuIwHUpw+W6GiLiO7WA2iF71wLOldfyjC6f3yfHrABVDaffTHN+lgA5CuKNEvcaY1l3J 1wtjfzMvaowfD3kkCBJfv/BX02qOg4EHKOLIEyhYdFFLTuSJcfGfHCGamQEfLHmJsUXT /+5w== X-Gm-Message-State: APjAAAXRjxn51zkEPAfhYvGMKoLufoU8OIYKNeMh1C7tSpXd25HDJj9u kC33ieTs/V2h9pzJrhWGXxrQQbtZXxM= X-Google-Smtp-Source: APXvYqyjqCeCINW6l5NVlJaJC2y8siE7aNAMF3COdelNxM3jYDOK3TxqjH3USfzwRmb9fbK22C3j9Q== X-Received: by 2002:a5d:5310:: with SMTP id e16mr14865368wrv.142.1553957394485; Sat, 30 Mar 2019 07:49:54 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.49.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:49:53 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:40 +0100 Message-Id: <20190330144947.27638-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2,1/8] package/rpm: security bump to 4.14.2.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , James Knight , Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - 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) Signed-off-by: Fabrice Fontaine --- 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 diff --git a/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch b/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch deleted file mode 100644 index 6f6a2aba51..0000000000 --- a/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b5f1895aae096836d6e8e155ee289e1b10fcabcb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -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 -Signed-off-by: James Knight ---- - 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" - ],[]) diff --git a/package/rpm/0002-configure-ac-correct-stack-protector-check.patch b/package/rpm/0002-configure-ac-correct-stack-protector-check.patch deleted file mode 100644 index 9d2942b4fa..0000000000 --- a/package/rpm/0002-configure-ac-correct-stack-protector-check.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c810a0aca3f1148d2072d44b91b8cc9caeb4cf19 Mon Sep 17 00:00:00 2001 -From: James Knight -Date: Wed, 16 Nov 2016 15:54:46 -0500 -Subject: [PATCH] configure.ac: correct stack protector check - -If a used toolchain accepts the `-fstack-protector` option but does not -provide a stack smashing protector implementation (ex. libssp), linking -will fail: - - .libs/rpmio.o: In function `Fdescr': - rpmio.c:(.text+0x672): undefined reference to `__stack_chk_fail_local' - .libs/rpmio.o: In function `Fdopen': - rpmio.c:(.text+0xce9): undefined reference to `__stack_chk_fail_local' - .libs/rpmio.o: In function `ufdCopy': - rpmio.c:(.text+0x10f7): undefined reference to `__stack_chk_fail_local' - ... - -This is a result of testing for `-fstack-protector` support using a main -that GCC does not inject guards. GCC's manual notes that stack protector -code is only added when "[functions] that call alloca, and functions -with buffers larger than 8 bytes" [1]. This commit adjusts the stack -protector check to allocate memory on the stack (via `alloca`). - -[1]: https://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.html - -Signed-off-by: James Knight -[Upstream commit: https://github.com/rpm-software-management/rpm/commit/c810a0aca3f1148d2072d44b91b8cc9caeb4cf19] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a9730d3bc..b4b3fe8fb 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_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])],[ - echo " $flag" - RPMCFLAGS="$RPMCFLAGS $flag" - ],[]) diff --git a/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch b/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch deleted file mode 100644 index e1fd0697e6..0000000000 --- a/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch +++ /dev/null @@ -1,55 +0,0 @@ -From edadcf67980764c104c25c7c1a0ba91257b89698 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 8 Dec 2016 23:33:30 +0100 -Subject: [PATCH 1/2] Detect bfd.h to enable/disable sepdebugcrcfix building - -tools/sepdebugcrcfix includes , but this header from binutils -is not checked in the configure script. Due to this, sepdebugcrcfix is -attempted to be built even when is not available. This commit -addresses that by adding the appropriate configure check. - -This fixes the following build error: - -tools/sepdebugcrcfix.c:31:17: fatal error: bfd.h: No such file or directory -compilation terminated. -make[3]: *** [tools/sepdebugcrcfix.o] Error 1 - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 2 ++ - configure.ac | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 863138c..d8a68f0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -168,9 +168,11 @@ elfdeps_SOURCES = tools/elfdeps.c - elfdeps_LDADD = rpmio/librpmio.la - elfdeps_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@ - -+if HAS_BFD_H - rpmlibexec_PROGRAMS += sepdebugcrcfix - sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c - sepdebugcrcfix_LDADD = @WITH_LIBELF_LIB@ -+endif # HAS_BFD_H - endif - endif - -diff --git a/configure.ac b/configure.ac -index c5ae701..b99ecb8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -242,6 +242,9 @@ AC_CHECK_HEADERS([dwarf.h], [ - ]) - AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) - -+AC_CHECK_HEADERS([bfd.h]) -+AM_CONDITIONAL(HAS_BFD_H, [test "${ac_cv_header_bfd_h}" = "yes"]) -+ - #================= - # Check for beecrypt library if requested. - AC_ARG_WITH(beecrypt, [ --with-beecrypt build with beecrypt support ],,[with_beecrypt=no]) --- -2.7.4 - diff --git a/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch b/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch deleted file mode 100644 index bebe94511d..0000000000 --- a/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 65afab91444d4996a8e61d1e2d27d52e18417ef5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 8 Dec 2016 23:45:55 +0100 -Subject: [PATCH 2/2] tools/sepdebugcrcfix.c: fix build with recent binutils - -Moderately recent binutils versions install a header that -checks if config.h is included. While this makes sense in binutils -itself, it does not outside. So the binutils developers have added a -check: if PACKAGE or PACKAGE_VERSION are defined, they assume you're -re-using bfd.h outside of binutils, and therefore including it without -including config.h is legit. - -So we take the same approch as numerous users of bfd.h: fake a PACKAGE -definition. See for example tools/perf/util/srcline.c in the Linux -kernel source tree. - -This fixes the following build error: - -In file included from tools/sepdebugcrcfix.c:31:0: -/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/bfd.h:35:2: error: #error config.h must be included before this header - #error config.h must be included before this header - -Signed-off-by: Thomas Petazzoni ---- - tools/sepdebugcrcfix.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c -index cd7fa02..e7b480f 100644 ---- a/tools/sepdebugcrcfix.c -+++ b/tools/sepdebugcrcfix.c -@@ -28,6 +28,8 @@ - #include - #include - #include -+/* Needed to please */ -+#define PACKAGE "rpm" - #include - - #define _(x) x --- -2.7.4 - diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index 7ae9ec73d9..b550e12721 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -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 diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 87c2059e71..eb9a4a5a51 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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 From patchwork Sat Mar 30 14:49:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070873 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LnBPh3e+"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNC4kz3z9sRx for ; Sun, 31 Mar 2019 01:50:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E35186995; Sat, 30 Mar 2019 14:50:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c7qjqXi4-Sa8; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BF26F869F8; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 93FA61BF83A for ; Sat, 30 Mar 2019 14:49:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 912F286388 for ; Sat, 30 Mar 2019 14:49:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nmM1eE6dugmj for ; Sat, 30 Mar 2019 14:49:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C4D0D85FD0 for ; Sat, 30 Mar 2019 14:49:57 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id r4so6120818wrq.8 for ; Sat, 30 Mar 2019 07:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7mzarcVxtFawHV5AKsj0DIlARk5ElzGXHCjo+NThzOA=; b=LnBPh3e+d8VGw312M0rnEeeA1c1cjgceLVWA8KuMrBnNwMZ4t+dntJ+/Jyq3bCXtMG WW4BxqZ1eiJLRANyrsbJ70/WV86nrQbZXzVYhQsHj/nHOGkKazD+bob28PmEpDkFhy3j jC5YYT8uxeahv7/bFe5qGJtJ6YBouwt1uapDzmVYH72sa7pc+Ih22ZlxQmBoS4P031A0 cDeKx67PmouP7y/QST3n+STxZqrIbHfyQ8aLD4Rm+8IKD90wnNF3hDYiFPLJN0ufWhTS vciDglRsljLn6YsOPHJNNvw8h6zvT90oLE+QT7G8fyNdd2AxA++m+zKj6bTR6KMCHJQj ErZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7mzarcVxtFawHV5AKsj0DIlARk5ElzGXHCjo+NThzOA=; b=qAXBANz8KKNNFJYEip6OXNOLTxRe0oSdcFCDZ7pzzw/G//9rp0s0oQPXSRmk8XeUlJ pgh99O90JayxeXYYUgO5wVuDr4JIvJfE4mHWyqVZ30vHj1r7Os63wTdJdrgW6Rf7Z2mh S/ShnSNE+TZZgArLE/9NvGzCF4L4YOJaru8hVEPUqnFaU/9CiKMby3t3RDgJnk1mBwbc VRKQ0maTr45p+kQ8PSrh+jK6nkHWBqirNDcmU71ePqHUyCxmZRVD2Y2xSS5WbJRM+eSQ iBzLwQSBzebWMOGmI0KKR0HMxPDzk1DR+oe0+6nO+rfj5hx2/ZzPWYT7ksLSOk1ChdUk HTAg== X-Gm-Message-State: APjAAAWFpfB2KtSKKpcGsl2DY4XNgp8Nq/pBJrZFucVXEuBkcEIuJfBx /vstCpyuJd0IEzhDbXECdSwBL9Wb X-Google-Smtp-Source: APXvYqz445jzw74+7l3rcOS2gpK0O4kkMIGqThzeEs1q7CKEn2PFUe/fYXJjW8VD3lf/fzrQjv3Quw== X-Received: by 2002:adf:fa47:: with SMTP id y7mr6053297wrr.27.1553957396090; Sat, 30 Mar 2019 07:49:56 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.49.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:49:55 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:41 +0100 Message-Id: <20190330144947.27638-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 2/8] package/rpm: add optional bzip2 dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" There is no --{disable,enable}-bzip2 option Signed-off-by: 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(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index eb9a4a5a51..e076d2a17f 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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 From patchwork Sat Mar 30 14:49:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070874 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Pwahginv"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNK0qPBz9sRQ for ; Sun, 31 Mar 2019 01:50:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1C23987286; Sat, 30 Mar 2019 14:50:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XmZ5EtwXW9X5; Sat, 30 Mar 2019 14:50:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BFA6887232; Sat, 30 Mar 2019 14:50:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E08FD1BF83A for ; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DE70C87540 for ; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ewykUSWOmKXU for ; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by hemlock.osuosl.org (Postfix) with ESMTPS id 472C38757C for ; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id h18so6083560wml.1 for ; Sat, 30 Mar 2019 07:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dLzjgiJipGK/wccnlJLRvzya2bLcvEoQ8NPa/d7AgFg=; b=PwahginvT75bOHA9YT+KHyUFAtQQjIOqBbLRKjMnIeGqVHIz77pzHcrJ3KSoFfQ+No zmfZONxb9nNybPwpmFUHoKSANjd3r8SjL2snbkbumxpPwGE7+J0J0LL+wvE16rq0d3Rz ZzgIiEMnUJ2fe6fydEUtXh3F3YhASfQ7RK0gnN2Oxj3besiV1eVRgBbCNlw5nPL06Leu FUdnfNEYYHpjqLamGr8MUwl9sZ42PRau6xIks5W8ES9Ad/0bXlibl85lPZ3TasuDxgOJ KSo4yyYR5ixdX8d3vgRQzQxwhArwRdmCsz+k3mLhAu7AoBA+Q6lDXABu1gjWRlvpFNVS Dsyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dLzjgiJipGK/wccnlJLRvzya2bLcvEoQ8NPa/d7AgFg=; b=swywqZLDFn9EXbONyq5XDt71JeNDTCNtbo27p2S519bkdcXk808appeCwTyJuODwST byGhl3bLK45huDTtHog1/3xTjPxLMTR2qQ4EJ2eTVp/TBYzN01z/CQI5edzVus5RcTPH cLs/Pt0sqaLq2nii4B6MszBHZq6kElrbNBiGSh1aZrp1QbyurCaGngcrUJIiJ2lukSeY kxpYqsiXvDQbqgD241wSLKwllgCFK9qlhQi8cVOjy6dg+YdHD2sAm7URuU6vfmKbUq89 Q7MvUeTLfiLXgFowbvLil1pY0uXOVuhb7bpjV+zAmir3ScoL3aR8a3M35Q/KejdcZ0/Z MlCQ== X-Gm-Message-State: APjAAAVnuEvbjdl3N2MMzliRIfd4+NDwugAPUXCH4U80CADuGjaPluVJ /SjdDHyoldaeNT7RzCPT4Ff+0REx X-Google-Smtp-Source: APXvYqwLBzwyjGYVfAASU0gnudQ3ALCWVH2wTlVE7We6f9NPx9fZwhQkQbVWAEVNRJyY+YPXmB67kA== X-Received: by 2002:a1c:c504:: with SMTP id v4mr7335192wmf.45.1553957397627; Sat, 30 Mar 2019 07:49:57 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.49.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:49:56 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:42 +0100 Message-Id: <20190330144947.27638-3-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 3/8] package/rpm: add optional xz dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" There is not --{disable,enable}-lzma option Signed-off-by: Fabrice Fontaine --- 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(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index e076d2a17f..78f429f8b6 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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) From patchwork Sat Mar 30 14:49:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070875 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FcisJU+W"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNQ3C58z9sRQ for ; Sun, 31 Mar 2019 01:50:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 07742872D1; Sat, 30 Mar 2019 14:50:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CsV7vI1LwwVp; Sat, 30 Mar 2019 14:50:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0435487296; Sat, 30 Mar 2019 14:50:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9EC0D1BF83A for ; Sat, 30 Mar 2019 14:50:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BEC086388 for ; Sat, 30 Mar 2019 14:50:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z8xKIBa4kKO2 for ; Sat, 30 Mar 2019 14:50:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D6D0485FD0 for ; Sat, 30 Mar 2019 14:50:00 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id y197so6070401wmd.0 for ; Sat, 30 Mar 2019 07:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VVAUcc5O5vE9HYtyJCfUFmQcL7ZOMJg+zCS0CUz9iLI=; b=FcisJU+WrG5JbPFjC6FvpBeIeMfoviSclywBlZtpXRUg1ngl4wRkb7U+lWqAWaeynu vWRqrj5lVoFk5JVgiWtSBq2vxNkMIGgay+T1gfFhlF9/1ljw0l6x0+mI1Qg/RocVohsc 5UrN0n2otxkV0b1q/KKGgaHOATXCQ7HY4CKKTUvv6xhbV2sGDa+9uepMb3vOiAuXHunN RKx8gh5Bckv2M2djqBK1wYeVbt3f29Rae0hooXXCaLwfsfVtSClxK8u66S9U+a+RYwFF fZ6DbwUmRr4QEQOcWM7dg+nwD6oLCAMq9Bc122QLBY1e8HqpGCBUUH5TUpwvfwdJnVsh D/rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VVAUcc5O5vE9HYtyJCfUFmQcL7ZOMJg+zCS0CUz9iLI=; b=SJeQI0J9eJQnGXprSB17ne0SwcE2p96uRXkC1LorMQo/3HFlV8MggIH+5JMiL5Sg5Y YumIyNzuoyhHePRAxPK9yQEU6WJTOu9myTRZttj7wy1SCDwXKOxd4Tm6joJPbE4HWQJu 7JuhL0RhGCGtTgNGagXxJXPu2abvoyhTfRTbaGNPYxuy5TxEiXzCE/v2tXkg4o+1h5LU kxEB9V78NN/GGeSqGmQ5cGSNrp5EWYPZTuGKMWtY8Yj5bY9ULVRjlt7Rt3yeQRpCbZdi surFN7Qh9zQQ1lI/FfSWvFdLtFE2nV5/FWmKEZK940l9SJCivhRNs2quecJdOvHoFE0+ Ylcw== X-Gm-Message-State: APjAAAWCcqDxl9dDLXANsmO6/Q2MdpjHD6iAFZMGmO36TpWSf9IGxds2 uST08lGnrTJZmHXZ+MqDnxZ/lJCi X-Google-Smtp-Source: APXvYqypRWT+coHcEIApI/hNpOi6Hj37+672l0ZfVKflKbNluVwyf9m/7ozhR67Nr11qFZZFc0FcRA== X-Received: by 2002:a1c:20c1:: with SMTP id g184mr7323672wmg.137.1553957399010; Sat, 30 Mar 2019 07:49:59 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.49.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:49:58 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:43 +0100 Message-Id: <20190330144947.27638-4-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 4/8] package/rpm: add optional libcap dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: 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(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 78f429f8b6..0eb6e7f3c7 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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 From patchwork Sat Mar 30 14:49:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070877 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Qp8gjrI2"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNT6b0pz9sRQ for ; Sun, 31 Mar 2019 01:50:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2852423018; Sat, 30 Mar 2019 14:50:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a9wy+zAGoU4p; Sat, 30 Mar 2019 14:50:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4FB822326C; Sat, 30 Mar 2019 14:50:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 181351BF83A for ; Sat, 30 Mar 2019 14:50:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C5D48721D for ; Sat, 30 Mar 2019 14:50:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5ttmrMtKJeU2 for ; Sat, 30 Mar 2019 14:50:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2A917870C3 for ; Sat, 30 Mar 2019 14:50:02 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id q16so5444939wmj.3 for ; Sat, 30 Mar 2019 07:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AEDxSfelSwXLKr+EaxSS8PhEhjNmOgFbalaVb9V30tQ=; b=Qp8gjrI24SlK1wiU0Gvqx3EzS9tGAZokMXWppFtzh/1NPNJhUmAcrn/wW41N/lAsIJ I4hHoKfELDF0bv8M8NEzOXIf1wI+fuSuilCGVworhc/L3GTcL4/rej5iN3MWxwINpJRG bhiLdVJj+6YKWeVmLi0B8mfr3SXHZRWTMDHyk2QgdKK/BMUiQ/cKhP8buqahohsWHbjg EXvgNr1n5568c86aEi+CB7xSNyGD3Io++WSjjBdRSiq06giAgESlMdSmCh5GTTyYjF2I 0xmHaoIA9nT9gNNTiisZFEmj4AtRfdJANvR0OsRaob8BwLyJQvhq9bMTqGa3ZDp97yPf R90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AEDxSfelSwXLKr+EaxSS8PhEhjNmOgFbalaVb9V30tQ=; b=Idvd9QQCrEbI9A+BSsdGyRI4Z6fG7jDf2s/Yy/o19LN01RHt/W9VAN/UaKlt2VSxAx Tn8zFhuQpX7gcVtTuKxpQQOJoSUS+mM2AaHhDwz1+U925TIAiDfqM0arKDjBqpPmxdtx dFZ/VFOLbB0RMgTQDFB66wDSyxBpTqAo51Y+G0OL9zNA397L8PBzu4em65KMEd0FB0gK CxrPSSrykIAnCOD70xX/s7rwB6Gi/Ou80dJBtSqPpDLhzcqq3AO9Am+PV74yipCMinuM Jl5FpQo+kdxlYP/NKquH+LFXLgAnLFRACgau/3VtuHnB8946uElV2F9n2FjFtWNBhH4m EfNA== X-Gm-Message-State: APjAAAXnPUCHmFBJr9v+oX4Xz14hIrEYVhcVcSV5DM/cfKa7ijqRUINm XAOdMMqI58TpcUPzvR3HZmoQAE2b X-Google-Smtp-Source: APXvYqzK0Gvk3o7AjbB6V5gfZ1KNeknycVnktqF+iKCM9gFuUTREy2uCE7vz8sXLJPtkyts/tNUfiw== X-Received: by 2002:a1c:f10f:: with SMTP id p15mr7134708wmh.27.1553957400430; Sat, 30 Mar 2019 07:50:00 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.49.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:49:59 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:44 +0100 Message-Id: <20190330144947.27638-5-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 5/8] package/rpm: add optional dbus dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" It should be noted that dbus is enabled by default Signed-off-by: Fabrice Fontaine --- 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(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 0eb6e7f3c7..fe9f898bd3 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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 From patchwork Sat Mar 30 14:49:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070880 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XOS/yZwl"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhPF5HK5z9sRQ for ; Sun, 31 Mar 2019 01:50:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 28DEE3059A; Sat, 30 Mar 2019 14:50:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eFHKq39Ho8eu; Sat, 30 Mar 2019 14:50:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0047A22C31; Sat, 30 Mar 2019 14:50:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 330F11BF847 for ; Sat, 30 Mar 2019 14:50:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1E4BF22D44 for ; Sat, 30 Mar 2019 14:50:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fGBMIHq+YlzI for ; Sat, 30 Mar 2019 14:50:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id E09E122C31 for ; Sat, 30 Mar 2019 14:50:03 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id q16so5444993wmj.3 for ; Sat, 30 Mar 2019 07:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=biFznLH0Oh4/0gGQFUtPhfPVbSjAKGYVoHOzpB2RO+c=; b=XOS/yZwl5KximZAnlXvpLIFTBvjCtFQrTXcPRRLh/9iSzDExUc1cP+NUJ9xRVFwTTa 7k1slLT0pC7pPMhR8nRdU+YoVZYBlPDsGQnPiCxifENGbwwD45/N5pv3juGrSpCT3E0X 2se7YT2MueUvnCrynOYeEGGY0Q9QXoWIJ/PFwxVyKfwctxVn11iDzIwYMafFhIiRSMEq CcR4xWg2LxQmOKAs2txXIcV8fcWdYPEzcxIEyRxN1NUID7i/4q9+Ot/p7K1wr3cnwxDv za0ki2tEyiiVWf1X9YtgxufUsQerZoFk9eKufBAIFj2b6kUEzeR5+BBHTCSQxKKgvRiN lTmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=biFznLH0Oh4/0gGQFUtPhfPVbSjAKGYVoHOzpB2RO+c=; b=E51OBNE3FMmGCOa62spwns8vMQNZDW6y8rjC13Jm43ldmMehexJcGbQ7fKPUUaL52W mgTs+Wm7LhLcWzLVRrKjiZYzMX0wLN8UbdyPA2Yqog06A5M63DQPN5SMgHDsTl6eL5cD iuCLwSlwfhP2J2ahXISyuzTqBzTg8oCXwUrh5i1f/RWoACoutOinR2y17TxJvU6r9aTO FQ0+xJkXVuJXmFV6JgH4XAtATOMADdLv74s8zjX3hpEgu9m48c0qd5Sy5BrJJHd7XkJw 81Dt/9qMJZNZrt3T08kEhZc+gWTNSF2P1NTI3WGfz2Q/E5n/7YaAiSh3psE8OShxR/r3 ap1A== X-Gm-Message-State: APjAAAUFaHMZro1QE6YtsZgvKM+MyIE/Li4Dd+wBduNwbASJrU1e4KtT GaNCcCpXo9xwrDdQDSJDh/xQjtd3 X-Google-Smtp-Source: APXvYqyOKPs5kwvSqkKZafVQb1Idue4rkjeQMVvEWPIH1IwGGT+sz32KF9yzXHlvakL/VJichAMFLQ== X-Received: by 2002:a1c:38b:: with SMTP id 133mr7147670wmd.26.1553957402099; Sat, 30 Mar 2019 07:50:02 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.50.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:50:01 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:45 +0100 Message-Id: <20190330144947.27638-6-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2,6/8] package/rpm: fix threads comment X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" rpm depends on pthreads because it uses it, not because of beecrypt Signed-off-by: Fabrice Fontaine --- 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(-) diff --git a/package/rpm/Config.in b/package/rpm/Config.in index aa857ef2be..58451a9fcc 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -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 From patchwork Sat Mar 30 14:49:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070878 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q4FR90u8"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNh1XWQz9sRQ for ; Sun, 31 Mar 2019 01:50:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 127218721D; Sat, 30 Mar 2019 14:50:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kxcHMSByAtre; Sat, 30 Mar 2019 14:50:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 39BD887277; Sat, 30 Mar 2019 14:50:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 585D51BF83A for ; Sat, 30 Mar 2019 14:50:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5527B8757C for ; Sat, 30 Mar 2019 14:50:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q+k0IU0JZRRD for ; Sat, 30 Mar 2019 14:50:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 38A1487540 for ; Sat, 30 Mar 2019 14:50:05 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id o25so5440283wmf.5 for ; Sat, 30 Mar 2019 07:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wjl4PDZkciA9WXQSZcy/6FrzSGIusUqgpq76/PAgEtE=; b=Q4FR90u8jBfFdRe4UoI6+GP48g7zZWnH9hJ/Rj0rMxu1aaEU/E0cxRheiTk0vHZ/7+ UzpTIG/4gLWcwndppJzllW+mV2CWkhK9TldBbdoE8IlVe6AQXMTEqDy8Aw3MEyzseEpU TPIpnIY39bIXAS8SVuFL0C8IejQnMV3423OBfXN07oyXKgZjC1DMW818jQRw05TDNtrd 7lkkkZEtHliIDKrqALYG7uuhtRj3CHTKLmwbMY0GBCPlB7JLgFevTWmTLCa1kEkVPlPh ZeGiZTHOp20y+AKd+Uz315jo5zN7dbOYZ674s9t+uk482SgXoo1CKTcKiavdL4QBsYa9 cCKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wjl4PDZkciA9WXQSZcy/6FrzSGIusUqgpq76/PAgEtE=; b=JVKah27yNhndDxbZalUrlMzKf2ymHUKGWuLiugOzCkOHKlpQ1ksERvZMO+3SEJ+KUk 8KEzWuzko5XYHaaF6+BZggKJO5OEPiEmH7BVyLRkpxh3TtepqNcRxnci2isTegF+YpYy 58xLlkeGRUttjk3PARSmHydvt+J3b0UiuRIRwJaMGlRMdXzL1Cm5/2ttcNt2KXNhxVce axIGJcOLWZI5qoCiPExx2bY6I/ieUhYRTrZXYbg8eiPTFIb6Zbf5+pc+uZmMzakjVfse ZsJ1i9ZykQqEQgNJqY+H2vYGmxsZE2lroRTMdFdo45+n+GCk1RY9S7OgR6Jv3AA6xhx0 o60w== X-Gm-Message-State: APjAAAXvlrAH+YOxOlxkETZNcw5Zb04ritUhd2BUZha6IoTMrlmhiXHQ 2z6uyp9gwkpz1JCYxDYCp0cjE9Jo X-Google-Smtp-Source: APXvYqwkDK1tgJ2xvPupgzOk1DUd0UwTEzD3EyW15ZbFiymDp1sgu1pU30HWF7PXM07J9R16vNd6lg== X-Received: by 2002:a1c:21c1:: with SMTP id h184mr7235856wmh.128.1553957403467; Sat, 30 Mar 2019 07:50:03 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.50.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:50:02 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:46 +0100 Message-Id: <20190330144947.27638-7-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 7/8] package/rpm: add optional openssl dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" openssl 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 Signed-off-by: Fabrice Fontaine --- 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 diff --git a/package/rpm/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160-digests.patch b/package/rpm/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160-digests.patch new file mode 100644 index 0000000000..e080d98fe8 --- /dev/null +++ b/package/rpm/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160-digests.patch @@ -0,0 +1,82 @@ +From ff4b9111aeba01dd025dd133ce617fb80f7398a0 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen +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 +[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(); + diff --git a/package/rpm/Config.in b/package/rpm/Config.in index 58451a9fcc..555ad12eff 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -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 diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index fe9f898bd3..626e6bf94c 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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) From patchwork Sat Mar 30 14:49:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070879 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="km0ZsAu8"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNw1T1Yz9sRQ for ; Sun, 31 Mar 2019 01:50:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 59C7E872A1; Sat, 30 Mar 2019 14:50:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L6vD38rMoKjx; Sat, 30 Mar 2019 14:50:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1ED5487125; Sat, 30 Mar 2019 14:50:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8A26C1BF83A for ; Sat, 30 Mar 2019 14:50:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 87BD986388 for ; Sat, 30 Mar 2019 14:50:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zfG8WwiF4vlq for ; Sat, 30 Mar 2019 14:50:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8349985FD0 for ; Sat, 30 Mar 2019 14:50:06 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id o25so5440327wmf.5 for ; Sat, 30 Mar 2019 07:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c0PQyj0ODvKviAXMhqK0X5ZbmUmF2ZmhwZLwZmH7Zng=; b=km0ZsAu8XJ/gMR0PZjqFLXW3ltnnCTfxSr4pBLEGbSyfHUk9Am+/6mp+ZBgNXlVi8H 5zHe+9+3Yra8INam8zuXP5P+rLSgabibqIM0j19yEtOq0C1b42OXscupRukzQoWgkCQR AGSrGdxCsI/3JUDCbjx9UPlZGSlsCQUpPN1/wPN7/O2qTLY3uN03ytqsVBRVc0NQNyNi blnk+D5UqO7AtX1bKaAxGt/hPfxyiGuPSuGCpfKUC4Ve7x6q55jijfgTztKDx0NTFOXN Si5uK8n0bcJKqqUTLEKon+AzkMxs0oeLZgPmQI6kPD8QpIuxT4cu4W4jhlujjq9QAzXB ja1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c0PQyj0ODvKviAXMhqK0X5ZbmUmF2ZmhwZLwZmH7Zng=; b=oH2VaAStYYpnwhqpLGNOYmE+Sp04Zl8lSKNV1Uw67W80uvNJY2F6uMJDsoUWjaQuN4 ZbODwrFU+9xJLC9ABEoq0+wFBdezFapq67EWqOp7rUigHTqQmQ7hnSJvyMYD71OSTx/6 82ZHG+f1x/PFVacI56W43scySPMQ/kJ9h4ms8tf0ItBDg8juKfIRrGI+MGwWxUIzrgV0 9JzSKpWvdZNR4exAx3sc20/DWg6h6yCagsaf+mf2XIvWLQs6mW63zxPKtF6hC96yWu7R 0vlKhj1UbHYY7A1DdSHqvtpyehzz0GfdCGOG56eesoqcVodczsiXOeFQqKctjIwMR6DQ yeWQ== X-Gm-Message-State: APjAAAX8sBqNaPe81vwKLGWRhE6HKdYisA7AaYe7Rnf+awebeMK2QTBP dObBuECzhnoJ6MN6Ur9ZEd81SCSX X-Google-Smtp-Source: APXvYqy9tFEjBypR+Yh+kmhr1ukuwaFdkcCPQvnjXSQ9sA44bk289fj38V3oc6gtwVjinYb1wVYooQ== X-Received: by 2002:a1c:e185:: with SMTP id y127mr7437480wmg.76.1553957404876; Sat, 30 Mar 2019 07:50:04 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.50.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:50:04 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:47 +0100 Message-Id: <20190330144947.27638-8-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 8/8] package/rpm: add optional zstd dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" zstd support has been in version 4.14.0 and https://github.com/rpm-software-management/rpm/commit/3684424fe297c996bb05bb64631336fa2903df12 Signed-off-by: Fabrice Fontaine --- 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(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 626e6bf94c..5fd7256618 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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' \