rpm: update to 4.14.1.
Closes #14144. Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
parent
aaa1a8657a
commit
177b49f906
|
@ -3058,10 +3058,10 @@ libtecla_r.so.1 libtecla-1.6.3_1
|
||||||
libzim.so.3 libzim-3.0.0_1
|
libzim.so.3 libzim-3.0.0_1
|
||||||
libkiwix.so.1 kiwix-lib-1.0.1_1
|
libkiwix.so.1 kiwix-lib-1.0.1_1
|
||||||
libctpp2.so.2 ctpp2-2.8.3_1
|
libctpp2.so.2 ctpp2-2.8.3_1
|
||||||
librpm.so.7 rpm-4.13.0.2_1
|
librpm.so.8 rpm-4.14.1_1
|
||||||
librpmsign.so.7 rpm-4.13.0.2_1
|
librpmsign.so.8 rpm-4.14.1_1
|
||||||
librpmbuild.so.7 rpm-4.13.0.2_1
|
librpmbuild.so.8 rpm-4.14.1_1
|
||||||
librpmio.so.7 rpm-4.13.0.2_1
|
librpmio.so.8 rpm-4.14.1_1
|
||||||
libsquirrel.so.0 squirrel-libs-3.1_1
|
libsquirrel.so.0 squirrel-libs-3.1_1
|
||||||
libsqstdlib.so.0 squirrel-libs-3.1_1
|
libsqstdlib.so.0 squirrel-libs-3.1_1
|
||||||
libexecinfo.so.1 libexecinfo-1.1_1
|
libexecinfo.so.1 libexecinfo-1.1_1
|
||||||
|
|
|
@ -17,3 +17,15 @@
|
||||||
|
|
||||||
AC_CHECK_HEADERS([dwarf.h], [
|
AC_CHECK_HEADERS([dwarf.h], [
|
||||||
WITH_LIBDWARF=yes
|
WITH_LIBDWARF=yes
|
||||||
|
diff --git rpmio/digest_nss.c rpmio/digest_nss.c
|
||||||
|
index 992d9ac..5f43b57 100644
|
||||||
|
--- rpmio/digest_nss.c
|
||||||
|
+++ rpmio/digest_nss.c
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
#include <keyhi.h>
|
||||||
|
#include <cryptohi.h>
|
||||||
|
#include <blapit.h>
|
||||||
|
+#include <signal.h>
|
||||||
|
|
||||||
|
#include <rpm/rpmlog.h>
|
||||||
|
#include "rpmio/digest.h"
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
--- tools/sepdebugcrcfix.c
|
|
||||||
+++ tools/sepdebugcrcfix.c
|
|
||||||
@@ -28,7 +28,19 @@
|
|
||||||
#include <error.h>
|
|
||||||
#include <libelf.h>
|
|
||||||
#include <gelf.h>
|
|
||||||
+#ifndef PACKAGE
|
|
||||||
+#define PACKAGE
|
|
||||||
+#ifndef PACKAGE_VERSION
|
|
||||||
+#define PACKAGE_VERSION
|
|
||||||
#include <bfd.h>
|
|
||||||
+#undef PACKAGE_VERSION
|
|
||||||
+#else
|
|
||||||
+#include <bfd.h>
|
|
||||||
+#endif
|
|
||||||
+#undef PACKAGE
|
|
||||||
+#else
|
|
||||||
+#include <bfd.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#define _(x) x
|
|
||||||
#define static_assert(expr) \
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'rpm'
|
# Template file for 'rpm'
|
||||||
pkgname=rpm
|
pkgname=rpm
|
||||||
version=4.13.1
|
version=4.14.1
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python2"
|
configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python2"
|
||||||
|
@ -14,7 +14,7 @@ maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="http://rpm.org"
|
homepage="http://rpm.org"
|
||||||
distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
|
distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
|
||||||
checksum=81e5bc8e46baa0710a19c7d9bb34c24baceefeeafd86a9033e1e4d9613bb5b60
|
checksum=43f40e2ccc3ca65bd3238f8c9f8399d4957be0878c2e83cba2746d2d0d96793b
|
||||||
conflicts="rpmextract>=0" # Both provide rpm2cpio
|
conflicts="rpmextract>=0" # Both provide rpm2cpio
|
||||||
|
|
||||||
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
|
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
|
||||||
|
@ -34,11 +34,6 @@ pre_configure() {
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
|
||||||
mv "${DESTDIR}"/bin/rpm "${DESTDIR}"/usr/bin/rpm
|
|
||||||
rm -r "${DESTDIR}"/bin
|
|
||||||
}
|
|
||||||
|
|
||||||
rpm-devel_package() {
|
rpm-devel_package() {
|
||||||
depends="${sourcepkg}>=${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
site="${distfiles%/*/*}
|
||||||
|
${distfiles%/*}"
|
||||||
|
pattern="${pkgname}-\K[\d.]*\d"
|
Loading…
Reference in New Issue