summaryrefslogtreecommitdiff
path: root/app-arch/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch/rpm')
-rw-r--r--app-arch/rpm/Manifest6
-rw-r--r--app-arch/rpm/files/rpm-4.19.1-musl-compat.patch59
-rw-r--r--app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch17
-rw-r--r--app-arch/rpm/rpm-4.19.1.1.ebuild (renamed from app-arch/rpm/rpm-4.19.1.ebuild)16
4 files changed, 28 insertions, 70 deletions
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 5a1aeec5be3a..4fc220aa094c 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,11 +1,11 @@
AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
AUX rpm-4.18.1-musl-nls.patch 1605 BLAKE2B 6a1cf248e7c464795edf630aa367b55c8026bdbdcd43cb192f4c96dd96f119720d4f3a59fd019841d45b6e2bf54fce59e64e10e3e320a8b9cddff6e7cf864a50 SHA512 fb1071ba5db5d1b9ac631c2977ceebfaa3421655202cda8c088bcc0561f4d89216eca5e10e3c53787d9e160ee2358c588fc2459b128bf74cf576883fe739d06c
AUX rpm-4.19.0-libdir.patch 578 BLAKE2B 643e4869b5770e98814a4787c66c3de516c0675648598164c4fe6e076e5a5c497ba897353260e5fb780af2d8b9b31693b4189704a145245cc0ee22ae3a6759a7 SHA512 b241e014c642ea70fdec4e12b3af512a00b5c408d9ecdd1c5bcd4aca9bd60f9af49ec8a599fbeb9f4d5a66c24450e082a0f199c27c15554855f3195d394de228
-AUX rpm-4.19.1-musl-compat.patch 1880 BLAKE2B e29fb10d9406bd05cca92642cd3024d97bed15c4b97a44e002bd593007d204484405f66f0412f25b64167005e761da6d252f6bf7a00e604043f59431e0e210c2 SHA512 75ecbcbfe5143be3437d43344a8372c4104ace65239ce7302c4cb1796a347e689450cc23b3a797af7d4e9ffc2ee576d4181a84364e022782165d7c8389677cf4
+AUX rpm-4.19.1.1-musl-compat.patch 401 BLAKE2B f1d77f167d0270602394cc145c288cc5c622892044c5f38df803649f9ca300f5dab7e0850e239362652142818c152f54e4de5f718ed42d51928329b0599abe34 SHA512 325d2b417619fd26ed9a2e2036854da5ed0118420640ef843e31add082d4ab3527fe3a6a7ee2d35c5939c75a7b5e17318973cd242e8ba008c54b8a1ad7ede0b8
AUX rpm-4.8.1-clang.patch 1519 BLAKE2B 7338b739782296e8be1d4a0ce9cdbeae558831897585d9b0d3fee935a82ed68e4066e7bbb1e722f212277dd3ede8be2ebad65f4a3f1286911c64263034c8b766 SHA512 7e6400f1782d536a26f322338be798c675ca69e755df0cacb3af1c56b3dc6487ae1c813f3579cba007cefa5b62c5e474576a4b8fd9230bb29536d246db860795
AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c
-DIST rpm-4.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642
+DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d
EBUILD rpm-4.18.1.ebuild 4163 BLAKE2B 1f74a64a7b34bd4e2c84b0c9b980ebc6f2da6d436efcd50d163c4383adbd01a590a29305d6a71b7cc3856198d858704bcc2dc6cf82b5b0cf669317cc662084c1 SHA512 100f19f15e0db915aa7f8fc6351ab2db2b4fe4e38cd3038529f4a278daaf56d6a066fbb0fa529f79233548ff7eaa1be51fe7aab3fa25882dacba45c883302116
-EBUILD rpm-4.19.1.ebuild 3238 BLAKE2B c2d001f1afe59c2772d768a6027e3b2ac2763b2e4926defdd2fdff2f5a935e770a51aee1a183698de4f6751a6469cb013c657bdcd3cb34f133e4ec46232edbfe SHA512 ddedd97a067ec2cb5757a3994d126aa6def7f6f6ad82ff87b581401da5c2115ece2b11eec3606f6533de8d3cd525f3994a4f5cf1f175829300d0e4f904e86685
+EBUILD rpm-4.19.1.1.ebuild 3242 BLAKE2B 7f32bf808693bddf7260fd57d20ee0e8dd40993b03c17ab99a840826db6e3af5bbe2827a22c9fd75145cb32551af96749ddf1d8e4944df1419565051dd1906fc SHA512 2cea8daa766ba073ec73f21970c9ba9a38c88dfbee68c2d018d47138d112a866d6bc57bb87fb8b946cbdbf47c1c5f7d792eb2af48b6cb74e04fddd9ba8b2b85f
MISC metadata.xml 616 BLAKE2B f0df64810f4eaf6b3fa7cdb09a892677404fa2d6d3bd36abb9c5f638be56200d1c83dfec4b6a3bd18ad9ae9b56eeaabdbce243eafad366f366c9157ddfb00ad8 SHA512 792c6c2476c7e928b1e1515b56e19ec83e3855aaaebd17aa66407f6a232f4680ba5d90da54c0a5af7d3db829124fa062015070a1ab82ebe91f5f8f2d1ebaff29
diff --git a/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch
deleted file mode 100644
index ca9f97257c70..000000000000
--- a/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-musl doesn't implement GLOB_BRACE, simply disable it.
-
-https://bugs.gentoo.org/922286
-https://github.com/rpm-software-management/rpm/issues/2844
---- a/rpmio/rpmglob.c
-+++ b/rpmio/rpmglob.c
-@@ -33,6 +33,10 @@
-
- #include "debug.h"
-
-+#ifndef GLOB_BRACE
-+#define GLOB_BRACE 0
-+#endif
-+
- /* Return 1 if pattern contains a magic char, see glob(7) for a list */
- static int ismagic(const char *pattern)
- {
-
-From 57f3711846f44da0f37cbc5dd66e8fba80a3bee1 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@redhat.com>
-Date: Mon, 18 Dec 2023 12:25:04 +0200
-Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag
-
-This regressed when we axed our internal glob copy in commit
-66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only
-an optimization so we can just skip it if not available.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -350,6 +350,7 @@ if (LIBDW_FOUND)
- set(HAVE_LIBDW 1)
- endif()
-
-+check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR)
- check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS)
- if (NOT MAJOR_IN_SYSMACROS)
- check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV)
---- a/config.h.in
-+++ b/config.h.in
-@@ -100,6 +100,7 @@
- #cmakedefine HAVE_ZSTD @HAVE_ZSTD@
- #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@
- #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@
-+#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@
- #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@
- #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@
- #cmakedefine RUNDIR @rundir@
---- a/rpmio/rpmglob.c
-+++ b/rpmio/rpmglob.c
-@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags,
- gflags |= GLOB_BRACE;
- if (home != NULL && strlen(home) > 0)
- gflags |= GLOB_TILDE;
-+#if HAVE_GLOB_ONLYDIR
- if (dir_only)
- gflags |= GLOB_ONLYDIR;
-+#endif
- if (flags & RPMGLOB_NOCHECK)
- gflags |= GLOB_NOCHECK;
-
diff --git a/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch
new file mode 100644
index 000000000000..441689febd5d
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch
@@ -0,0 +1,17 @@
+musl doesn't implement GLOB_BRACE, simply disable it.
+
+https://bugs.gentoo.org/922286
+https://github.com/rpm-software-management/rpm/issues/2844
+--- a/rpmio/rpmglob.c
++++ b/rpmio/rpmglob.c
+@@ -33,6 +33,10 @@
+
+ #include "debug.h"
+
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
++
+ /* Return 1 if pattern contains a magic char, see glob(7) for a list */
+ static int ismagic(const char *pattern)
+ {
diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild
index bac0276f3d5c..d57cff0ff5c7 100644
--- a/app-arch/rpm/rpm-4.19.1.ebuild
+++ b/app-arch/rpm/rpm-4.19.1.1.ebuild
@@ -18,8 +18,8 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~loong ~riscv ~sparc ~x86"
-IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite"
+KEYWORDS="~alpha ~amd64 ~loong ~riscv ~x86"
+IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite"
REQUIRED_USE="
${LUA_REQUIRED_USE}
python? ( ${PYTHON_REQUIRED_USE} )
@@ -29,8 +29,8 @@ RESTRICT="test"
DEPEND="
${LUA_DEPS}
- app-arch/libarchive:=
>=app-arch/bzip2-1.0.1
+ app-arch/libarchive:=
app-arch/xz-utils
app-arch/zstd:=
>=app-crypt/gnupg-1.2
@@ -40,16 +40,16 @@ DEPEND="
sys-apps/file
sys-libs/readline:=
>=sys-libs/zlib-1.2.3-r1
- virtual/libintl
acl? ( virtual/acl )
audit? ( sys-process/audit )
caps? ( >=sys-libs/libcap-2.0 )
dbus? ( sys-apps/dbus )
- sqlite? ( dev-db/sqlite:3 )
- python? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:= )
sequoia? ( app-crypt/rpm-sequoia )
!sequoia? ( dev-libs/libgcrypt:= )
+ sqlite? ( dev-db/sqlite:3 )
"
BDEPEND="
virtual/pkgconfig
@@ -62,9 +62,8 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-4.18.1-musl-nls.patch
"${FILESDIR}"/${PN}-4.19.0-libdir.patch
- "${FILESDIR}"/${PN}-4.19.1-musl-compat.patch
+ "${FILESDIR}"/${P}-musl-compat.patch
)
pkg_pretend() {
@@ -101,6 +100,7 @@ src_configure() {
-DWITH_CAP=$(usex caps)
-DWITH_DBUS=$(usex dbus)
-DWITH_INTERNAL_OPENPGP=$(usex sequoia OFF ON)
+ -DWITH_READLINE=$(usex readline)
$(cmake_use_find_package doc Doxygen)
)
cmake_src_configure
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 00:02:12 +0000