aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-12-10 12:02:10 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-12-10 17:51:07 +0000
commite43bb09d9aecb027eeb7e94f85ba9955b70b592e (patch)
tree346e9f80b6a6a80cfb2dfd92ea003f0e0be8ac9d
parent0e758a647463dc71b0fe6517a57bc90bb5ff5330 (diff)
downloadaports-e43bb09d9aecb027eeb7e94f85ba9955b70b592e.tar.gz
aports-e43bb09d9aecb027eeb7e94f85ba9955b70b592e.tar.bz2
aports-e43bb09d9aecb027eeb7e94f85ba9955b70b592e.tar.xz
community/rpm: upgrade to 4.16.1
-rw-r--r--community/rpm/APKBUILD8
-rw-r--r--community/rpm/include-fcntl.patch15
2 files changed, 3 insertions, 20 deletions
diff --git a/community/rpm/APKBUILD b/community/rpm/APKBUILD
index 57f226f583..2c5183df6c 100644
--- a/community/rpm/APKBUILD
+++ b/community/rpm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor:
# Maintainer:
pkgname=rpm
-pkgver=4.16.0
+pkgver=4.16.1
pkgrel=0
pkgdesc="Redhat Package Management utilities (RPM)"
url="https://www.rpm.org/"
@@ -14,7 +14,6 @@ makedepends="$depends_dev gettext-dev graphviz py3-setuptools python3-dev
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-rpm:py_rpm"
source="http://ftp.rpm.org/releases/rpm-${pkgver%.*}.x/rpm-$pkgver.tar.bz2
musl.patch
- include-fcntl.patch
"
prepare() {
@@ -60,6 +59,5 @@ py_rpm() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib
}
-sha512sums="177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d rpm-4.16.0.tar.bz2
-212a4265abc8d002e16bed106b8b773cf65564f95e6074bc1378c4745420202a476373b49b660bdfe82cc2470c35fff4f184168a698abfa2a4bf30c8f91e64ad musl.patch
-6424005c78aaebcd3565debbdc1ca14fb16ef8f4aa79748eca3403115a31c77afbb8929add1a8450afbd0496e303c915c6ad6d60cde41a89caf553a10256ace5 include-fcntl.patch"
+sha512sums="cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367 rpm-4.16.1.tar.bz2
+212a4265abc8d002e16bed106b8b773cf65564f95e6074bc1378c4745420202a476373b49b660bdfe82cc2470c35fff4f184168a698abfa2a4bf30c8f91e64ad musl.patch"
diff --git a/community/rpm/include-fcntl.patch b/community/rpm/include-fcntl.patch
deleted file mode 100644
index 611b92935e..0000000000
--- a/community/rpm/include-fcntl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream: Yes, https://github.com/rpm-software-management/rpm/pull/1379
-Reason: Fixes compilation with musl
-
-diff --git a/lib/rpmdb.c b/lib/rpmdb.c
-index 4c10156..7318763 100644
---- a/lib/rpmdb.c
-+++ b/lib/rpmdb.c
-@@ -8,6 +8,7 @@
- #include <utime.h>
- #include <errno.h>
- #include <dirent.h>
-+#include <fcntl.h>
-
- #ifndef DYING /* XXX already in "system.h" */
- #include <fnmatch.h>