From e1018e59eae058684985f958fc5b9bb5449909d9 Mon Sep 17 00:00:00 2001 From: glaulher Date: Fri, 27 Nov 2020 18:21:44 -0300 Subject: [PATCH 1/2] rpm: update to 4.16.0. --- srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 11 +++++++++++ srcpkgs/rpm/template | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/rpm/patches/fix-musl-rpmdb.patch diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch new file mode 100644 index 00000000000000..2c0317ee5a1527 --- /dev/null +++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch @@ -0,0 +1,11 @@ +--- lib/rpmdb.c ++++ lib/rpmdb.c +@@ -8,6 +8,8 @@ + #include + #include + #include ++#include ++#include + + #ifndef DYING /* XXX already in "system.h" */ + #include diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index d39c374678164f..3388d116a3022c 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,22 +1,22 @@ # Template file for 'rpm' pkgname=rpm -version=4.15.1 -revision=4 +version=4.16.0 +revision=2 build_style=gnu-configure configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python3 --sharedstatedir=/var/lib" hostmakedepends="automake gettext-devel libtool nss-devel pkg-config python3-setuptools" -makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel +makedepends="libgcrypt-devel binutils-devel db-devel elfutils-devel file-devel libarchive-devel libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel" short_desc="Red Hat Package Management Utils" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://rpm.org" changelog="https://rpm.org/wiki/Releases/${version}.html" -distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2" -checksum=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230 -python_version=2 #unverified +distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2" +checksum=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411 +python_version=3 conflicts="rpmextract>=0" # Both provide rpm2cpio CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" From 845668562f8d8a09f17504a980bf9dfc5dddfcae Mon Sep 17 00:00:00 2001 From: glaulher Date: Sun, 29 Nov 2020 20:50:39 -0300 Subject: [PATCH 2/2] rpm: update to 4.16.0. --- srcpkgs/rpm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 3388d116a3022c..eaccdaeffe09ab 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,7 +1,7 @@ # Template file for 'rpm' pkgname=rpm version=4.16.0 -revision=2 +revision=1 build_style=gnu-configure configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python3 --sharedstatedir=/var/lib"