From patchwork Thu Mar 28 20:28: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: 1068669 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="RoLC8bv+"; 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 44Vc0Z3Ngdz9sPZ for ; Fri, 29 Mar 2019 07:29:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C3360220D6; Thu, 28 Mar 2019 20:29:13 +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 tCGgMHmk5vF7; Thu, 28 Mar 2019 20:29:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9EA0B214EC; Thu, 28 Mar 2019 20:29:10 +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 0EC591BF2C3 for ; Thu, 28 Mar 2019 20:29:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0A7B1855B1 for ; Thu, 28 Mar 2019 20:29:09 +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 fjmVPp-SUAjr for ; Thu, 28 Mar 2019 20:29:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8BACA81645 for ; Thu, 28 Mar 2019 20:29:07 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id a184so204409wma.2 for ; Thu, 28 Mar 2019 13:29:07 -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=/4zED6nt9h3bPpb+wPb+A7AyCxqNZhg37HvUjNyjMCw=; b=RoLC8bv+O+CPLVniOr+sXKFin2Y1UWrdrXvPsd7WBXmP1znXkkdx8lZBFSCqXb7KIW gekt4WTNpJFxcKrE2zbx+oBZjKQWwBIgJ2CnfDEZGqMV2nSOVfUJqy8wrsvZ8ajBLiyE UeAdgX1Oq0oubAEgrudA2dMHcDrfp2f8ZXCeo6XutAFRtu5488u+RILNxm8QNAmbnF7W BG1kdJXB1B1YGJhlBrArNBdV/NQp9I4mGqnWFt/UlSbqjdbV0Bdj2fftxnYOvFh+LScE VzwFHsADPojvtRRw2lov2TPORExSZk9rL/WEgJUnszbOuO0R66bEPYBVcvV8/j+706C5 x8Pg== 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=/4zED6nt9h3bPpb+wPb+A7AyCxqNZhg37HvUjNyjMCw=; b=nSPIG9Pesl8lCo7fJimMQFR3gv4/wppFSZzIJHntWXEpFK752YX4CMpztxdyYdiEVZ 2nZS1PlsZ+UajEvy7N19zoJAUmSlPaRzLOoTwxnJXaNzNjKXSQSzihaVt09P2wUNqSrQ 9c5PaMDH0o7BpQGPFt1v8obaiJcm0TJuAtdx2hDWJSSNJu0N7I4qFV3XtVWsVUiA+o42 TCHMOcj8Kb7T2G0SxDXJNHPJqi0N0+kk6I4YL+7jPTB9UiUOJltNotcgmJQ0w8H2gpCd AI0VGO2oet4Tt1cdrfAA2FzNhkwf1AjXNZ59bOVuHoX3afJzFFmfIFolNC0AB4+Ob6RT KYqg== X-Gm-Message-State: APjAAAV80rZveDasc0YytL4DaN+MQuUZedaXCHow0lsrsFxtonwYuqkd t7vF1rJD1+f6MAygMUFCiEZ4GzAL X-Google-Smtp-Source: APXvYqzHc+t6cI9oeK+tjTalgwydW68EU2Vvvp5XXQNdzbn+aeY31A5lrd6PU/+k8b2K3uuYZ+SmAQ== X-Received: by 2002:a1c:6c17:: with SMTP id h23mr1201192wmc.122.1553804945700; Thu, 28 Mar 2019 13:29:05 -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 61sm205583wre.50.2019.03.28.13.29.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:04 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:47 +0100 Message-Id: <20190328202854.26337-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/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 --- 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 87c2059e71..d5a808aaed 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -8,7 +8,13 @@ RPM_VERSION_MAJOR = 4.13 RPM_VERSION = $(RPM_VERSION_MAJOR).0.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 Thu Mar 28 20:28:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068668 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.137; helo=fraxinus.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="Uc6LBiL+"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Vc0X4Zq8z9sPZ for ; Fri, 29 Mar 2019 07:29:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DA21583EFE; Thu, 28 Mar 2019 20:29:13 +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 BmwUfLkCbzJ2; Thu, 28 Mar 2019 20:29:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6147F85E79; Thu, 28 Mar 2019 20:29:13 +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 982991BF2C3 for ; Thu, 28 Mar 2019 20:29:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9581083EFE for ; Thu, 28 Mar 2019 20:29:10 +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 9fKJM7mRwpJ1 for ; Thu, 28 Mar 2019 20:29:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4448585E79 for ; Thu, 28 Mar 2019 20:29:09 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id f3so195957wmj.4 for ; Thu, 28 Mar 2019 13:29:09 -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=5kdnyP2Wh9hLHoU2neNrLyHx96oiQawUrRL7ZkwbLcU=; b=Uc6LBiL+pUaGCf/IDrooDVlPkVlSY/dHN6YeVgkngqYY/Qh0U34rK3lrdEI/2KMbOJ b9HvVAjMBHUpKDLLOeRSY83ZensQSDoyyyEqrAUDh1zHjbSF3G1wy7nSkAqGK9zf4rSV gJaWcA66qZDC8gLKWVaxVmQNZVLJgbRWZ5EQ23IgZQLdP37qg0ZdkISbSPXhsj6gSuo5 YVOKbZFqMYrtq0H1DcXZdDr8U2KgO4MKOlESnztWBPftudhVCiGvlcphNm94/W8V5AHz YJtaS/u5lw1lM82pd6sbjrTYr66bhrEktMpYvDS49muI6p4I7qMAiwtqZAZNYUaJelDX VEXg== 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=5kdnyP2Wh9hLHoU2neNrLyHx96oiQawUrRL7ZkwbLcU=; b=USM3sd6EHgOBdhPmIvygo+6gAKcQkU/SIdIyPBS6z5i+pDBqUe1SRnXAfbxTHkFoUL WBBYMNqCh8JJedVo/Ob9vgC3OmY4jLja7KV4K9/ePaLZ4UmXXaxNgWrlsgTrr/LcpHp+ pFyU4EqAivUJwJ5ssXLbiFF+b0ebL4kvrgly/pOe0+xiLbMOrpMXxOOVgvHwDUkkS2zW enJIhXQ1maq3S31uBF8BLs9Z9VUD75QhOZyFsPHbi4nrzgYWTxMsRxl1EaZ71RoLpXIh /8WGpYlcLo11feCPJ4iwGZmfDyOhNebGkbkQMcenJFLRPVZemwQZi3pXMes6JiK5nWw+ ZXPQ== X-Gm-Message-State: APjAAAXrX6xsI9PKrdxO1ocSq+F9bEar5Y2o+AkwqC87nXNHNINmhVrt 1qbRrYzmXHoVR6R0J7td0n9k8Nyw X-Google-Smtp-Source: APXvYqxpo/W4/s4FbfR0VuCfJQHHV4R/05RrD85XONgOTXco4sZ5PpjuA5OOlmaKDogyLvaF5VTEJQ== X-Received: by 2002:a1c:9991:: with SMTP id b139mr1269132wme.53.1553804947603; Thu, 28 Mar 2019 13:29:07 -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 61sm205583wre.50.2019.03.28.13.29.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:06 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:48 +0100 Message-Id: <20190328202854.26337-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/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 --- package/rpm/rpm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index d5a808aaed..8bf08b47a1 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 Thu Mar 28 20:28:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068670 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.137; helo=fraxinus.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="iMwmZ7ew"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Vc0q4tTsz9sPZ for ; Fri, 29 Mar 2019 07:29:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1054F83EFE; Thu, 28 Mar 2019 20:29:30 +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 PxqzTyQNEfJ1; Thu, 28 Mar 2019 20:29:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8651985E79; Thu, 28 Mar 2019 20:29:29 +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 152251BF2C3 for ; Thu, 28 Mar 2019 20:29:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E6F692375C for ; Thu, 28 Mar 2019 20:29: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 pljjKSPM7wTT for ; Thu, 28 Mar 2019 20:29:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by silver.osuosl.org (Postfix) with ESMTPS id E6418220D6 for ; Thu, 28 Mar 2019 20:29:10 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id y197so249934wmd.0 for ; Thu, 28 Mar 2019 13:29:10 -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=+HPUAwVsoM4xgVMcnwETZKtXF69NdQ9SgBHYvap8WaU=; b=iMwmZ7ewj6srJ9dWB5gbNJIoe5KWEoTtqJ4HWswSPhKMLRLhhzb+lF0Bex1NvACiqH UdggChFlbk+oyMgjTFqJhM2lgREK1OaL8atq0goW9am26hKEiVIca9F6IZzYOT0OSA4x JanpgxHlacVuRYGMDy7oTavf5+uUDcTyonfhbudPL4l0hD0VwcbClO8DIunMEGRCCh56 hZo7dktjTshI0goNlRhcgAwltmnoVNlM8NpOaOtQI9hzBhdrhwIhjXw7/liNdlaj7t3j KaLHPn4XsFjSp1TJogNd+hyVSsBrV7iSGqig3kliOKymcjpY0Mh9D8ZkFX5nT/9jmajP cjrQ== 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=+HPUAwVsoM4xgVMcnwETZKtXF69NdQ9SgBHYvap8WaU=; b=uM7ETlcksKB125PAu3ihxy+GUJl+jjPYz6faNnm9ciNLS/q/gp7n41REM9qtom2dBz I79/hBd4jO3hfwszAqLwxdt56YRhK5JVpNiVwN/wHqlcOwY0duprH0p+oqK3LJTRyVOX akoMII2ceiXWLmtSCMNDQiixvK2MfT5PX194+vH+CY3Pre6rTbI4o4OK/qOJWi2BS0VB AYb6h1Pq8mT3GjwuR1ZlMXrb7UFsyS2QUzVpP78n7L7ZATZIflpcK6QOFGAI1ru/lh5z gPL1zdLfivJi7IbJzzHJ+/GxnAz8hXLFZW1QCxrE5ZR8IAo0KaglwSfHHMXhMK2i1FJY DA3w== X-Gm-Message-State: APjAAAXQzJO4KPPaWf9B4bdL+5KQogCm7ergQcY8I0tx6g9WX/VZehSr nXaAcoGMilX1sJG049N02NNdfHM5 X-Google-Smtp-Source: APXvYqxEqdKl+adssAGIs2jcmcLhn6/F1wGvtNEknfbnFqYIljHA6HuSXtG2X7SQHrcxIko79BgWCw== X-Received: by 2002:a1c:e90f:: with SMTP id q15mr1183473wmc.112.1553804949192; Thu, 28 Mar 2019 13:29:09 -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 61sm205583wre.50.2019.03.28.13.29.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:08 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:49 +0100 Message-Id: <20190328202854.26337-3-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/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 --- 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 8bf08b47a1..d6009e124f 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -29,7 +29,6 @@ RPM_CONF_OPTS = \ --disable-rpath \ --with-external-db \ --with-gnu-ld \ - --without-cap \ --without-hackingdocs \ --without-lua @@ -40,6 +39,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 += --without-beecrypt From patchwork Thu Mar 28 20:28:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068672 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.133; helo=hemlock.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="duEuk3Er"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Vc0w0V9hz9sRQ for ; Fri, 29 Mar 2019 07:29:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F371A87B5D; Thu, 28 Mar 2019 20:29:32 +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 D7gODSnbZQXm; Thu, 28 Mar 2019 20:29:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7CC85878A0; Thu, 28 Mar 2019 20:29:30 +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 D3CEC1BF2C3 for ; Thu, 28 Mar 2019 20:29:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1EC2221514 for ; Thu, 28 Mar 2019 20:29:16 +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 mor0xnncxccK for ; Thu, 28 Mar 2019 20:29:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by silver.osuosl.org (Postfix) with ESMTPS id 5DA492083F for ; Thu, 28 Mar 2019 20:29:12 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id o25so191140wmf.5 for ; Thu, 28 Mar 2019 13:29:12 -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=Lb7TgrCDN/PK6v+63aAgeiJamTEryaRB5RovfJZoPt8=; b=duEuk3ErY/509lAdKw6u4teaiFaFMm6nuSPuAyLZIsdYC6nIOvksLprHZ0g0OMahJU JKuTsal9dCm8IGaJ3H818tkH/Br1gcP/jp6DlSKKU0ZCK1W+1bdrLGJFxOO6jk14iCW9 MgWm61D9opWVuEyTCISSJ66r16tc/w74a9C4jCrNOicbxj97WaycJPq/aXuwQlAfIww/ UzZZkyeHAPKi3G8g8FkGktk8ktun4+tv7UcSRMDdzgjr9DpVRrudYDihCWIXDYfY3kBx oUI17RYk8YZ7u6OjvG03TmHY2p1foseLKTGe56Ni1hhmpTXJBfhciUbTHBro6+NKmSPc EGBg== 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=Lb7TgrCDN/PK6v+63aAgeiJamTEryaRB5RovfJZoPt8=; b=XKxtoptTIobzlNU0E53UZW74HroFq89vCPtbG5dd8oYkEJuwADyf/DGZ7leqazFP34 ieR3xkDaj2qe7zQK4Gfac4Q6adEpqp3XoUe/ONBEAIvtHRYgqmD9sns8QhZkMhhWRjk7 YR8SNGIeai9Bz2D9AFo3e49OALpARteE0eke/CPnLvvJyhH7wtsat7WZXIL96Lv5FrpG uv8403xN3B0F0AFZJxKYPoaezmnYuy0rvfBd0GIjHoMHFRpT0/cRjuNYGtHprbPIWwuL M8bvVson4QS8nP3fOvRYUF/nvLkmeOZD0X3WNUFteX1LCt0ZoWqI5VJzkRNGdEPwfT4n 4LKA== X-Gm-Message-State: APjAAAWoTI30bah4CYjcDo5eTSz1FlavNhZPjf46SbcXYVEBWE88xmbN Z/hnWN6FvRjqPHbeUkZpvcSJwnQ8 X-Google-Smtp-Source: APXvYqwvpaYIUi/7m2LPAhDuR20jyVjoUDLebCX3vf5nhW6gX9AWakZa6fgg2dDnk7fK5hOpe694CA== X-Received: by 2002:a1c:a64d:: with SMTP id p74mr1141923wme.89.1553804950712; Thu, 28 Mar 2019 13:29:10 -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 61sm205583wre.50.2019.03.28.13.29.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:10 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:50 +0100 Message-Id: <20190328202854.26337-4-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/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 --- package/rpm/rpm.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index d6009e124f..103fd7630f 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -39,6 +39,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 Thu Mar 28 20:28:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068671 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="PkETmR7q"; 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 44Vc0v2dgVz9sPZ for ; Fri, 29 Mar 2019 07:29:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A8BB02288E; Thu, 28 Mar 2019 20:29:33 +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 Xsz0YQe55zvY; Thu, 28 Mar 2019 20:29:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5B4D6214EC; Thu, 28 Mar 2019 20:29:31 +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 1C6901BF2C3 for ; Thu, 28 Mar 2019 20:29:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1854F81645 for ; Thu, 28 Mar 2019 20:29:17 +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 2hZW1Qjmypnh for ; Thu, 28 Mar 2019 20:29:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 37342865C7 for ; Thu, 28 Mar 2019 20:29:14 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id g3so21075907wrx.9 for ; Thu, 28 Mar 2019 13:29:14 -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=irG5ad7TUgatFEwXg5zwig3CCuZASn41v6NENukDCL0=; b=PkETmR7qo3lZTjLHO22I+kY4TRlNz9VcIHWi6HHdt3xIqsY9r6yhslXtmiWfIxIrME VssK3/VtQM92tceYU7QTPiWcZplBOa+vK52vt0CuF84mIYQMdM0UhH+rD2k81ue4g47X ZW/w5j+8dNBGFwJYHSgkzXFe1fdLzDkIsV4If0pN1ahr+K9xo15a8aZR5PGeAfIoZWqW tPSYW2lJDzLPTr5nEspEq8wk+sdk2LmNRhZvWsUDWnkPVOYkaYXzgkNru8+7b14/a4Da nda7o5K82QbyGsIuP1Mhu9ZD0/jppqmwrdX+cTK9sT+kUYylfdjBiG3p7OIXzjNbbUi0 ZNhw== 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=irG5ad7TUgatFEwXg5zwig3CCuZASn41v6NENukDCL0=; b=JN7JzRkb4x/NPQhds6KqI6uQ1/LgQeT4EDphwP+aYfEM56mRWZoTIERwoiDCjwZtRE EJUFMDQJeCaXV7/6qDdJ1vKxkvZaSWAUzq3Y9G4u8H0w5AgjhD8vyJP/r5IkIzUohXa2 4so9jwsk9fniO2Rh+nqKAAlrVKONQriBRxvpfobEF33mqWHMZWVtqJDgjU5mAtTGYtP4 kToaFQojKEJmXIU513TqvY1RO4V/Adu16MGdAqpoUroOR7iyzD829PXkWtPcGD6KoyvY NMYosT6hZ0Duaj3qy1xMTJs3L5AR7ypdK4dnjiUNY0IVbSWzAWZsqONo2NLDV2Q47CgK MJCA== X-Gm-Message-State: APjAAAWOUMkKzD/ecP/lvq6bPBCPmjP8uXk4qMikfDSoYPCIfCzqqUkG LUoMSHV/c5r3x/W0sDN/liNOW2DP X-Google-Smtp-Source: APXvYqy/hkACxwJIZYT7C28YIKOqPVrQAaZfV0IDGKeKJO3DrvuypK3BSxe0d1ARx7sSikhpahqIvA== X-Received: by 2002:adf:c002:: with SMTP id z2mr29958046wre.177.1553804952450; Thu, 28 Mar 2019 13:29:12 -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 61sm205583wre.50.2019.03.28.13.29.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:11 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:51 +0100 Message-Id: <20190328202854.26337-5-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/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 --- 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 Thu Mar 28 20:28:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068674 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.133; helo=hemlock.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="lVy+SBMP"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Vc0w3dtRz9sPZ for ; Fri, 29 Mar 2019 07:29:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15F7D87ADB; Thu, 28 Mar 2019 20:29:35 +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 Edqzr1FjU1Bw; Thu, 28 Mar 2019 20:29:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 25E4687B36; Thu, 28 Mar 2019 20:29:32 +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 8F79F1BF2C3 for ; Thu, 28 Mar 2019 20:29:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8663C21514 for ; Thu, 28 Mar 2019 20:29:20 +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 vp62KIg03rYj for ; Thu, 28 Mar 2019 20:29:18 +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 4375A2083F for ; Thu, 28 Mar 2019 20:29:18 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id 4so214231wmf.1 for ; Thu, 28 Mar 2019 13:29:18 -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=ZNJDmHcpBLOUPstnviIJfrJ72NWwnHxrUY+9ohCf6uM=; b=lVy+SBMPeLDMawdo8nGLN9RYm2PIcCl5OssuSTer8j9O/0ufWAIiWLzb0535TgTaeL syvi/T212wdZt94Kj2guJ8fxQ9FiQvO1Bf/KnIrqBTmDAODFV0S5InYxJloOXJsce9aP GdH+W2SpUBeQ51fd3ufV18+zCm2XtD5vrJR1S3Q0LOaghZeOngpzcQ3cQ9BpsWHR9jBs LSh/lCf92FkRQ+/3BOfDZV8777UXyZ4scSwH8hq9wAE/1OPmkNvUHJPJ6fYHdOF1T1Q9 tbjXPpZAWhxWdhc+00ECeTewU7NxhGslgu4FPEAyiHwB4v7ipsZ0QYkCJLZqHvcqBsSy 7i8Q== 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=ZNJDmHcpBLOUPstnviIJfrJ72NWwnHxrUY+9ohCf6uM=; b=hw66s+RkqtpXV7nwDkCPn2UKgY3TQraz5Pro3AQm2qxPIZWbpPWjAauQCQSrNObxRN xA4kPP9ndNu5xXQfbGk5k4W2BYQFXKeQgC/EVri6sctZ7SG5OZPPZORevTNQ7sPDmbHo kY9Qx5jnTarBXlyk1uiTnjBUEMhkfqTpIZIp7p/tw6KrqiWVRG6zh+5PXvrx1I3caO22 bCjtJTU3gy591Ku4436O6ZydYf76F6gg+jlc0phXa9DScIAiPGOuBfT6dmqeQWXV/tK2 6OajBS+TXqAKs+brwRqm5QKl+JsOOc2lxbpL4tDwey2fSjqC+mx6sgZCLBgYG9l+IF4s FEIQ== X-Gm-Message-State: APjAAAVO49zR0SfaLSwXQAiq0YCk86dN3e1Ry8WduF7AkPA6fc1xrEBx IS62pwd/hDfTjK3q/Qj9C5+RI60k X-Google-Smtp-Source: APXvYqzsvMrFxCTkPOWmKkx8jXZBZ0FcHHJUJJF+LHvG43uWgIGm9VHBXG7nt96azRIIINOAVyXHww== X-Received: by 2002:a1c:f61a:: with SMTP id w26mr1286253wmc.70.1553804956378; Thu, 28 Mar 2019 13:29:16 -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 61sm205583wre.50.2019.03.28.13.29.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:15 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:52 +0100 Message-Id: <20190328202854.26337-6-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/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 --- ...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 103fd7630f..fe9f898bd3 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 = \ @@ -20,10 +20,6 @@ RPM_DEPENDENCIES = \ 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 \ @@ -55,11 +51,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 Thu Mar 28 20:28:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068675 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="QS8WaSsN"; 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 44Vc13307Hz9sPZ for ; Fri, 29 Mar 2019 07:29:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AD7A3250E3; Thu, 28 Mar 2019 20:29:41 +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 TsOMBpnEqZAb; Thu, 28 Mar 2019 20:29:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 15B082283A; Thu, 28 Mar 2019 20:29:33 +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 B793E1BF2C3 for ; Thu, 28 Mar 2019 20:29:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B5101878A0 for ; Thu, 28 Mar 2019 20:29:20 +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 OcauF0wt+HMc for ; Thu, 28 Mar 2019 20:29:20 +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 CA0638788E for ; Thu, 28 Mar 2019 20:29:19 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id h18so247192wml.1 for ; Thu, 28 Mar 2019 13:29:19 -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=oDC0/6gPlyjEmiXdKagUVC69dEvBjzne1RcnHnjrIto=; b=QS8WaSsNAKhSaASeiRE2nNosXoPc448yVy3viRaEeaz0Cn4OXDlReuVgncVEQzdHoZ 9EmR368jiwTn9AcLLqR2BOvd2FfaHx07Cd+DbgJLgM+JP/NW4hXOqWD+4EPSZusD435r FBW905RvxXlIkQGKDxg7c5M+hqkQlGZXQWGeyPG9CDO+wV8cqzlZEFy4Lau6Uo9Gw05K uwu5qZaRtlngIbtcCNRxBUVxC9STXIHZY4ypoMMwbXj16fabjwM2wD+ZItwA19ddTs5n ND8vA4FCgkg4L/SJrGNslK6vRCIKVHNwrpVwxfLmQSnwUGpZ76V+5jItg+H39VJgPyqB 9exQ== 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=oDC0/6gPlyjEmiXdKagUVC69dEvBjzne1RcnHnjrIto=; b=fCGNjuTLXKsEe06AxcUq0PY3ulRcyoDf8F9r39MG68L7kYJiVCZ8/ZnxtZG7NNNufS H9Ar5Xyl0m/PmS0W8ZyyUuML9I4z+jq1ht1p2XBmgiqC9je3GvIQcxP5GMqn1PFXbrPE fZm9/tUnHnLeRvKdFAmeIN+frfcC+PJlFRp3mncmbAySkKh+xzG0ztQkWUl2F5AsKGCl vGQ6kTRj3LT2zHIKa13J5JuFHLxYObBKptT/AQxniqac5s1SD2A4g9dqFbgGNVufnDUT 9KkkP9lauoy1TCTmRvlHKEzdNYHm6g61U6rW4O+xpAG56OSa177vil1g8HRWeTxEC9GC b8Dw== X-Gm-Message-State: APjAAAXlY5uYZ7y5LtiEXs8keMKoZPQakxVWhWzrORIYm/UjnmjGhdk7 kkpfmRjmyfytJvEgYQwMoMpxR0CJ X-Google-Smtp-Source: APXvYqzw4xI5+UPE6C9NH/unZJ5SEy2UL8hk8bIkVORVXOUJgGkAu4dM7fBeW3SK0a3X72DI6Vk5Mw== X-Received: by 2002:a1c:2087:: with SMTP id g129mr1293777wmg.114.1553804958116; Thu, 28 Mar 2019 13:29:18 -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 61sm205583wre.50.2019.03.28.13.29.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:17 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:53 +0100 Message-Id: <20190328202854.26337-7-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 --- ...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 Thu Mar 28 20:28:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1068673 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.137; helo=fraxinus.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="jIgxrwFn"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Vc0w1hdzz9sRR for ; Fri, 29 Mar 2019 07:29:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BD20F85E79; Thu, 28 Mar 2019 20:29:34 +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 dBBRg0BXSFT4; Thu, 28 Mar 2019 20:29:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3B70785EA4; Thu, 28 Mar 2019 20:29:34 +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 34E001BF2C3 for ; Thu, 28 Mar 2019 20:29:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3264E21514 for ; Thu, 28 Mar 2019 20:29:22 +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 eLjhR-ru6o+Q for ; Thu, 28 Mar 2019 20:29:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by silver.osuosl.org (Postfix) with ESMTPS id 732AD2083F for ; Thu, 28 Mar 2019 20:29:21 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id o10so8099300wmc.1 for ; Thu, 28 Mar 2019 13:29:21 -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=P7e23Up4mEh6/t2KwKRv8EhexPJ/2Q3kXf3i3Wxa42Y=; b=jIgxrwFnWqjxyAzIrjtw/cuJ9Huudph6zWyfYKj5JjOCKkNreUwZ4UJaF5hYr36AgB LHzUXDBx4zEX36gR5iEM62dDV+RfE6dl2xXg22XHyX4i/RVbxSEPf9rxjrThf/zgnzaz iWY0MNPZ/VkMfTVTYOeOBQXX7XXa/1c052ONpZ4TxohEGR33Uexvt639zsfZ/d5H/6zW q4AYckFgbafVNFHS9SBbHIQfxcaJDa8Xg3pUsuSZz+5nHAb4VZ8y69lCA2oU2TwCAaHL U7S6UM6gChx5Garcwhfv+Z7uRGOp1EfG84gGDvBtBwii8mn7xqSE81FY/U6gTgcpeK4Z hS3A== 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=P7e23Up4mEh6/t2KwKRv8EhexPJ/2Q3kXf3i3Wxa42Y=; b=b5EkFkdeg4WbwmevDUVQgMYnMy7oOW9LPDS2njat+Z+vBkGC7EISkol/DejedLAj+e D/pZSeOMQ795ldxTyX5xsYgYGIj4nL8JdNDL6bs8nyBqhdETCMCgRhF9d/jgDPL3UDO6 SEs24+XH0hD2ppOygqtOB+NiLU87qd7G2GbCXgf1jCdccQ3ABmjox9WFU0X+pd15OWOF AGhApdwT148yvROpVHrsadEEhomYKbAWpjtU7EsLjZSpQu+RZ0MgmhLjvnS3Hw9BJDOg sDHR8wyExmLqTR94ZT4fagK2QaFFDUOFKOfEZL72RDjDqsytwvkJ99MuNloiGJnPchzp ZtjQ== X-Gm-Message-State: APjAAAVtJYJv8qT92R6q/MZtSDzpy7PpMv4SQl6R4dUb4sKfIANa3LwX P6KTSYuha/k1IyjicQYBE6bhPyAn X-Google-Smtp-Source: APXvYqzJIfRHaMBFwxeceBNkZkhL47ZNU43YEJ/Nl6cZIxUgQPMcI053vih/ccH+ReNnWE15WV+2dw== X-Received: by 2002:a1c:b455:: with SMTP id d82mr1263255wmf.153.1553804959751; Thu, 28 Mar 2019 13:29:19 -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 61sm205583wre.50.2019.03.28.13.29.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:29:19 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 28 Mar 2019 21:28:54 +0100 Message-Id: <20190328202854.26337-8-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328202854.26337-1-fontaine.fabrice@gmail.com> References: <20190328202854.26337-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 --- 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' \