From 63acccd447e0fd99b7df67f4b00fd3c49d53a1fc Mon Sep 17 00:00:00 2001 From: glaulher Date: Mon, 23 Nov 2020 11:33:02 -0300 Subject: [PATCH 1/3] rpm: update to 4.16.0. --- srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++ srcpkgs/rpm/patches/fix-musl.patch | 1 + srcpkgs/rpm/template | 12 ++++++------ 3 files changed, 19 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 00000000000..e1e48b3b0d4 --- /dev/null +++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch @@ -0,0 +1,12 @@ +--- rpmdb.c ++++ rpmdb.c +@@ -1,7 +1,9 @@ +#include "system.h" + ++#include ++#include +#include +#include +#include +#include "cliutils.h" +#include "debug.h" diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch index b4f6f7b5ba4..1716584b8c8 100644 --- a/srcpkgs/rpm/patches/fix-musl.patch +++ b/srcpkgs/rpm/patches/fix-musl.patch @@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644 #include #include "rpmio/digest.h" + diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index d39c3746781..48f954d1172 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=1 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=2 conflicts="rpmextract>=0" # Both provide rpm2cpio CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" From e6b0dec6e4235cc87afb9b7f96cfd3d9a4a3cdbf Mon Sep 17 00:00:00 2001 From: glaulher Date: Mon, 23 Nov 2020 11:33:02 -0300 Subject: [PATCH 2/3] rpm: update to 4.16.0. --- srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 12 ++++++++++++ srcpkgs/rpm/template | 12 ++++++------ 2 files changed, 18 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 00000000000..e1e48b3b0d4 --- /dev/null +++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch @@ -0,0 +1,12 @@ +--- rpmdb.c ++++ rpmdb.c +@@ -1,7 +1,9 @@ +#include "system.h" + ++#include ++#include +#include +#include +#include +#include "cliutils.h" +#include "debug.h" diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index d39c3746781..48f954d1172 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=1 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=2 conflicts="rpmextract>=0" # Both provide rpm2cpio CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" From 0a8e714a46969d805692e155bc054ccc79e95be8 Mon Sep 17 00:00:00 2001 From: glaulher Date: Mon, 23 Nov 2020 11:33:02 -0300 Subject: [PATCH 3/3] rpm: update to 4.16.0. --- srcpkgs/rpm/patches/fix-musl-rpmdb.patch | 21 ++++++++++----------- srcpkgs/rpm/patches/fix-musl.patch | 1 + srcpkgs/rpm/template | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch index e1e48b3b0d4..2c0317ee5a1 100644 --- a/srcpkgs/rpm/patches/fix-musl-rpmdb.patch +++ b/srcpkgs/rpm/patches/fix-musl-rpmdb.patch @@ -1,12 +1,11 @@ ---- rpmdb.c -+++ rpmdb.c -@@ -1,7 +1,9 @@ -#include "system.h" - +--- lib/rpmdb.c ++++ lib/rpmdb.c +@@ -8,6 +8,8 @@ + #include + #include + #include ++#include +#include -+#include -#include -#include -#include -#include "cliutils.h" -#include "debug.h" + + #ifndef DYING /* XXX already in "system.h" */ + #include diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch index b4f6f7b5ba4..1716584b8c8 100644 --- a/srcpkgs/rpm/patches/fix-musl.patch +++ b/srcpkgs/rpm/patches/fix-musl.patch @@ -29,3 +29,4 @@ index 992d9ac..5f43b57 100644 #include #include "rpmio/digest.h" + diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 48f954d1172..6a8aa5f6d4b 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,7 +1,7 @@ # Template file for 'rpm' pkgname=rpm version=4.16.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python3 --sharedstatedir=/var/lib"