From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
Date: Sat, 23 Nov 2024 16:10:07 +0000 (UTC) [thread overview]
Message-ID: <1732378127.4badd741e4c98b6be38bde1f3f4779ab9a477724.sam@gentoo> (raw)
commit: 4badd741e4c98b6be38bde1f3f4779ab9a477724
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Oct 12 08:17:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:08:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4badd741
app-arch/rpm: drop 4.18.1
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-arch/rpm/Manifest | 1 -
app-arch/rpm/files/rpm-4.17.0-libdir.patch | 32 -----
app-arch/rpm/files/rpm-4.18.1-musl-nls.patch | 42 -------
app-arch/rpm/files/rpm-4.8.1-clang.patch | 52 --------
app-arch/rpm/files/rpm-4.8.1-db-path.patch | 26 ----
app-arch/rpm/rpm-4.18.1.ebuild | 172 ---------------------------
6 files changed, 325 deletions(-)
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 48bbf8c2c64e..0cef50dbf2f4 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,3 +1,2 @@
-DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c
DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d
DIST rpm-4.20.0.tar.bz2 5984513 BLAKE2B c809e933cf7eb9ab63fa7693e634f7fcf744f94130199f674c5e76e77ead4de25b583daefdf651bbf0475012d262d1bdca605f19a520e160e90e3deb68c74f18 SHA512 b340c66cfda3abed38e81f91c4a789f2c6c0d3ce408de71d861fef27e180b607ae698e046b6925c7781a7177cde9df4075943714ed2aad7c62645eca348f5544
diff --git a/app-arch/rpm/files/rpm-4.17.0-libdir.patch b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
deleted file mode 100644
index 5bff26b71290..000000000000
--- a/app-arch/rpm/files/rpm-4.17.0-libdir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir],
- AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
- AC_SUBST(RUNDIR)
-
--if test X"$prefix" = XNONE ; then
-- usrprefix="$ac_default_prefix"
--else
-- usrprefix=$prefix
--fi
--
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
- AC_SUBST(RPMCONFIGDIR)
-
- AC_SUBST(OBJDUMP)
---- a/rpm.am
-+++ b/rpm.am
-@@ -1,10 +1,10 @@
- # Internal binaries
- ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
--rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(pkglibexecdir)
-
- # Host independent config files
- ## HACK: it probably should be $(datadir)/rpm
--rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(pkglibexecdir)
-
- # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 11:0:2
diff --git a/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch
deleted file mode 100644
index 7d1fde28bacf..000000000000
--- a/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/888954
-https://github.com/rpm-software-management/rpm/commit/f401979a4c4829d68e9614860644bdb74b6dda66
-
-From da222f0d82721d17e57d491d2749a4bc44754b9d Mon Sep 17 00:00:00 2001
-From: Takuya Wakazono <pastalian46@gmail.com>
-Date: Thu, 18 Jan 2024 18:41:11 +0900
-Subject: [PATCH] Don't use _nl_msg_cat_cntr if __GLIC__ is not defined
-
-musl doesn't need to use libintl from GNU gettext because it has its
-own NLS implementation. Assuming _nl_msg_cat_cntr exists breaks the
-build against the musl system.
---- a/lib/tagexts.c
-+++ b/lib/tagexts.c
-@@ -532,7 +532,7 @@ static int filerequireTag(Header h, rpmtd td, headerGetFlags hgflags)
-
- /* I18N look aside diversions */
-
--#if defined(ENABLE_NLS)
-+#if defined(ENABLE_NLS) && (defined(__GLIBC__) || !defined(__linux__))
- extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */
- #endif
- static const char * const language = "LANGUAGE";
-@@ -569,7 +569,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags)
- /* change to en_US for msgkey -> msgid resolution */
- langval = getenv(language);
- (void) setenv(language, "en_US", 1);
-+#if defined(__GLIBC__) || !defined(__linux__)
- ++_nl_msg_cat_cntr;
-+#endif
-
- msgid = NULL;
- for (domain = dstring; domain != NULL; domain = de) {
-@@ -584,7 +586,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags)
- (void) setenv(language, langval, 1);
- else
- unsetenv(language);
-+#if defined(__GLIBC__) || !defined(__linux__)
- ++_nl_msg_cat_cntr;
-+#endif
-
- if (domain && msgid) {
- td->data = dgettext(domain, msgid);
diff --git a/app-arch/rpm/files/rpm-4.8.1-clang.patch b/app-arch/rpm/files/rpm-4.8.1-clang.patch
deleted file mode 100644
index 714fbc09b534..000000000000
--- a/app-arch/rpm/files/rpm-4.8.1-clang.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://github.com/rpm-software-management/rpm/commit/6ad8a71407b173b6c50d389f01edd8a4aecd6807
---- a/lib/fsm.c
-+++ b/lib/fsm.c
-@@ -1015,27 +1015,28 @@
- }
-
- setmeta:
-- /* Special files require path-based ops */
-- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
-- if (!rc && fd == -1 && mayopen) {
-- int flags = O_RDONLY;
-- /* Only follow safe symlinks, and never on temporary files */
-- if (fp->suffix)
-- flags |= AT_SYMLINK_NOFOLLOW;
-- fd = fsmOpenat(di.dirfd, fp->fpath, flags,
-- S_ISDIR(fp->sb.st_mode));
-- if (fd < 0)
-- rc = RPMERR_OPEN_FAILED;
-- }
-+ {
-+ /* Special files require path-based ops */
-+ int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
-+ if (!rc && fd == -1 && mayopen) {
-+ int flags = O_RDONLY;
-+ /* Only follow safe symlinks, and never on temporary files */
-+ if (fp->suffix)
-+ flags |= AT_SYMLINK_NOFOLLOW;
-+ fd = fsmOpenat(di.dirfd, fp->fpath, flags,
-+ S_ISDIR(fp->sb.st_mode));
-+ if (fd < 0)
-+ rc = RPMERR_OPEN_FAILED;
-+ }
-+ if (!rc && fp->setmeta) {
-+ rc = fsmSetmeta(fd, di.dirfd, fp->fpath,
-+ fi, plugins, fp->action,
-+ &fp->sb, nofcaps);
-+ }
-
-- if (!rc && fp->setmeta) {
-- rc = fsmSetmeta(fd, di.dirfd, fp->fpath,
-- fi, plugins, fp->action,
-- &fp->sb, nofcaps);
-- }
--
-- if (fd != firstlinkfile)
-- fsmClose(&fd);
-+ if (fd != firstlinkfile)
-+ fsmClose(&fd);
-+ }
- }
-
- /* Notify on success. */
diff --git a/app-arch/rpm/files/rpm-4.8.1-db-path.patch b/app-arch/rpm/files/rpm-4.8.1-db-path.patch
deleted file mode 100644
index 634dd2373ab8..000000000000
--- a/app-arch/rpm/files/rpm-4.8.1-db-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 587cfa7..498abfb 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
-
- usrsrcdir = $(prefix)/src
-
--rpmvardir = $(localstatedir)/lib/rpm
-+rpmvardir = $(localstatedir)/rpm
- rpmvar_DATA =
-
- install-exec-hook:
-diff --git a/macros.in b/macros.in
-index ae46fcb..213b53c 100644
---- a/macros.in
-+++ b/macros.in
-@@ -155,7 +155,7 @@
- %_bzip2bin %{__bzip2}
-
- # The location of the rpm database file(s).
--%_dbpath %{_var}/lib/rpm
-+%_dbpath %{_var}/rpm
-
- # The location of the rpm database file(s) after "rpm --rebuilddb".
- %_dbpath_rebuild %{_dbpath}
diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild
deleted file mode 100644
index 99b425069dfb..000000000000
--- a/app-arch/rpm/rpm-4.18.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3,4} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"
-SRC_URI="
- https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
- http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd"
-REQUIRED_USE="
- ${LUA_REQUIRED_USE}
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Tests are broken. See bug #657500
-RESTRICT="test"
-
-DEPEND="
- ${LUA_DEPS}
- !app-arch/rpm5
- app-arch/libarchive:=
- >=app-arch/bzip2-1.0.1
- app-arch/xz-utils
- >=app-crypt/gnupg-1.2
- >=dev-lang/perl-5.8.8
- dev-libs/elfutils
- dev-libs/libgcrypt:=
- >=dev-libs/popt-1.7
- sys-apps/file
- >=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 )
- readline? ( sys-libs/readline:= )
- sqlite? ( dev-db/sqlite:3 )
- python? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- zstd? ( app-arch/zstd:= )
-"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-text/doxygen )
- nls? ( sys-devel/gettext )
- test? ( sys-apps/fakechroot )
-"
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-rpm )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.8.1-db-path.patch
- "${FILESDIR}"/${PN}-4.8.1-clang.patch
- "${FILESDIR}"/${PN}-4.17.0-libdir.patch
- "${FILESDIR}"/${PN}-4.18.1-musl-nls.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- lua-single_pkg_setup
-
- use python && python-single-r1_pkg_setup
-
- # bug #779769
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
-
- # bug #356769
- sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
- # bug #492642
- sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
- # Prevent automake maintainer mode from kicking in (bug #450448).
- #touch -r Makefile.am preinstall.am || die
-
- eautoreconf
-}
-
-src_configure() {
- # rpm no longer supports berkdb, but has readonly support.
- # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
- local myeconfargs=(
- --enable-libelf
- --without-selinux
- --disable-inhibit-plugin
- --with-crypto=libgcrypt
- $(use_enable berkdb bdb-ro)
- $(use_enable python)
- $(use_enable nls)
- $(use_enable openmp)
- $(use_enable dbus inhibit-plugin)
- $(use_enable sqlite)
- $(use_with caps cap)
- $(use_with acl)
- $(use_with audit)
- $(use_with readline)
- $(use_enable zstd zstd $(usex zstd yes no))
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Known to fail with FEATURES=usersandbox (bug #657500)
- if has usersandbox ${FEATURES} ; then
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
- fi
-
- emake check
-}
-
-src_install() {
- default
-
- # Remove la files
- find "${ED}" -name '*.la' -delete || die
-
- # Fix symlinks to /bin/rpm (bug #349840)
- for binary in rpmquery rpmverify; do
- ln -sf rpm "${ED}"/usr/bin/${binary} || die
- done
-
- if ! use nls; then
- rm -rf "${ED}"/usr/share/man/?? || die
- fi
-
- keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
- dodoc CREDITS README*
- if use doc; then
- local docname
- for docname in librpm; do
- docinto "html/${docname}"
- dodoc -r "docs/${docname}/html/."
- done
- fi
-
- # Fix perllocal.pod file collision
- perl_delete_localpod
-
- use python && python_optimize
-}
-
-pkg_postinst() {
- if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
- einfo "RPM database found... Rebuilding database (may take a while)..."
- "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
- else
- einfo "No RPM database found... Creating database..."
- "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
- fi
-}
next reply other threads:[~2024-11-23 16:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 16:10 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-10 2:25 [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/ Sam James
2024-03-04 7:53 Joonas Niilola
2024-03-04 7:53 Joonas Niilola
2024-02-02 3:58 Sam James
2023-12-15 6:24 Sam James
2022-04-10 10:11 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1732378127.4badd741e4c98b6be38bde1f3f4779ab9a477724.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox