diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-06-26 08:27:44 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-06-26 14:39:23 -0300 |
| commit | 65f830a08ce70c40ccee9b0a241551be5d736b92 (patch) | |
| tree | 6ee4ddf881a5ce101d40fc3c2b5d01f65f1f814b /community/rpm | |
| parent | 0955c4f2a2eb4ec91f5ee4b0dfe85d9b3a971fc1 (diff) | |
| download | aports-65f830a08ce70c40ccee9b0a241551be5d736b92.tar.bz2 aports-65f830a08ce70c40ccee9b0a241551be5d736b92.tar.xz | |
community/rpm: upgrade to 4.14.2.1
Diffstat (limited to 'community/rpm')
| -rw-r--r-- | community/rpm/APKBUILD | 30 | ||||
| -rw-r--r-- | community/rpm/musl.patch | 30 |
2 files changed, 50 insertions, 10 deletions
diff --git a/community/rpm/APKBUILD b/community/rpm/APKBUILD index fbbf14b57d..d627e3c096 100644 --- a/community/rpm/APKBUILD +++ b/community/rpm/APKBUILD @@ -1,22 +1,27 @@ # Contributor: # Maintainer: pkgname=rpm -pkgver=4.13.1 -pkgrel=2 +pkgver=4.14.2.1 +pkgrel=0 pkgdesc="Redhat Package Management utilities (RPM)" url="http://www.rpm.org" arch="all" license="GPL-2.0-or-later LGPL-2.0-or-later" depends_dev="acl-dev binutils-dev bzip2-dev db-dev file-dev libarchive-dev libcap-dev elfutils-dev lua-dev nspr-dev nss-dev popt-dev xz-dev zlib-dev" -makedepends="$depends_dev gettext-dev graphviz python2-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-rpm:py_rpm" -source="http://ftp.rpm.org/releases/$pkgname-${pkgver%.*}.x/$pkgname-$pkgver.tar.bz2" +makedepends="$depends_dev gettext-dev graphviz py3-setuptools automake autoconf + libtool xz python3-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-rpm:py_rpm" +source="http://ftp.rpm.org/releases/$pkgname-${pkgver%.*.*}.x/$pkgname-$pkgver.tar.bz2 + musl.patch + " -builddir="$srcdir/$pkgname-$pkgver" +prepare() { + default_prepare + autoreconf -fi +} build() { - cd "$builddir" _EXT_CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss" \ CFLAGS="$CFLAGS $_EXT_CPPFLAGS" CPPFLAGS="$CPPFLAGS $_EXT_CPPFLAGS" \ LIBS="$LIBS -lintl" \ @@ -27,18 +32,23 @@ build() { --localstatedir=/var \ --with-external-db \ --with-cap --with-acl \ - --enable-python + --enable-python PYTHON=python3 make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } py_rpm() { + pkgdesc="Python3 bindings for RPM" + + replaces="py-rpm" # Backwards compatibility + provides="py-rpm=$pkgver-r$pkgrel" # Backwards compatibility + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib } -sha512sums="3aa3fc6ec0c2199058708f24b42672db831a96c89981bca1669b2e39c2427f0afb7ec36075e47aebecf4ff3627434f4ca47ba617b6f552c85e7bfde5c6f5c647 rpm-4.13.1.tar.bz2" +sha512sums="0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990 rpm-4.14.2.1.tar.bz2 +7972e9b129749b69b1c3b795cdc9981ff77e47954fe05f4885ce4d1b970eff4c0ad0393fa47ab43086dbfe7c0b7660b00860a978593da484aae514097e940868 musl.patch" diff --git a/community/rpm/musl.patch b/community/rpm/musl.patch new file mode 100644 index 0000000000..7c894b7022 --- /dev/null +++ b/community/rpm/musl.patch @@ -0,0 +1,30 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl]) + # Check for libelf library. Prefer external, otherwise none. + WITH_LIBELF_LIB= + AC_CHECK_HEADER([libelf.h]) ++AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes]) + AC_CHECK_HEADERS([gelf.h], [ + AC_CHECK_LIB(elf, gelf_getvernaux, [ + AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) +@@ -237,7 +238,7 @@ AC_CHECK_HEADERS([gelf.h], [ + ]) + ]) + AC_SUBST(WITH_LIBELF_LIB) +-AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes]) ++AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes]) + + AC_CHECK_HEADERS([dwarf.h], [ + WITH_LIBDWARF=yes +--- a/rpmio/digest_nss.c ++++ b/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" + |