public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2022-04-10 10:11 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-04-10 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     477d77eb969cdf4d11077c4d484d504078b048b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 10:05:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 10:11:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477d77eb

app-arch/rpm: drop 4.16.1.3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/rpm/Manifest                         |   1 -
 app-arch/rpm/files/rpm-4.16.0-autotools.patch |  13 ---
 app-arch/rpm/files/rpm-4.16.1.3-libdir.patch  |  34 ------
 app-arch/rpm/rpm-4.16.1.3.ebuild              | 148 --------------------------
 4 files changed, 196 deletions(-)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 9473074a2a09..949c468c6cc6 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,2 +1 @@
-DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8

diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
deleted file mode 100644
index 9b1f71ad86e5..000000000000
--- a/app-arch/rpm/files/rpm-4.16.0-autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
---- rpm-4.16.0.ORIG/configure.ac	2020-10-01 11:02:21.605485875 +0100
-+++ rpm-4.16.0/configure.ac	2020-10-01 11:05:34.077157904 +0100
-@@ -552,9 +552,6 @@
- 
- AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"])
- AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"])
--if test "x$have_bdb" = "xinternal"; then
--    AC_CONFIG_SUBDIRS(db3)
--fi
- 
- 
- #=================

diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
deleted file mode 100644
index a2c95ff064e2..000000000000
--- a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac
---- rpm-4.16.1.3.ORIG/configure.ac	2021-04-13 19:32:35.630955569 +0100
-+++ rpm-4.16.1.3/configure.ac	2021-04-13 19:32:54.939623251 +0100
-@@ -957,13 +957,7 @@
- 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)
-diff -uNr rpm-4.16.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am
---- rpm-4.16.1.3.ORIG/rpm.am	2021-04-13 19:32:35.584956361 +0100
-+++ rpm-4.16.1.3/rpm.am	2021-04-13 19:32:54.940623234 +0100
-@@ -1,10 +1,8 @@
- # 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 = 10:3:1

diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
deleted file mode 100644
index 2603c2191f03..000000000000
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{2..4} )
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools flag-o-matic 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="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 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dbus? ( sys-apps/dbus )
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/libgcrypt
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( ${LUA_DEPS} )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	# Added USE=openmp and this check for bug #779769
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-4.16.0-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${P}-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	econf \
-		--without-selinux \
-		--with-crypto=libgcrypt \
-		$(use_enable python) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#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
-		for docname in librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-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
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2023-12-15  6:24 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-12-15  6:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8634659b0403f663819078f71936e259f0e7e159
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon Nov 20 15:46:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 06:20:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8634659b

app-arch/rpm: add 4.19.1

- switch from autotools to cmake
- add rpm-sequoia as a new dependency
- remove USE flags that do not have proper compile options
- remove old patches and workarounds

Closes: https://bugs.gentoo.org/917034
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33742
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/rpm/Manifest                      |   1 +
 app-arch/rpm/files/rpm-4.19.0-libdir.patch |  13 +++
 app-arch/rpm/metadata.xml                  |  12 ++-
 app-arch/rpm/rpm-4.19.1.ebuild             | 132 +++++++++++++++++++++++++++++
 4 files changed, 157 insertions(+), 1 deletion(-)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index fe632121d059..dfd3723ff544 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,2 +1,3 @@
 DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec
 DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c
+DIST rpm-4.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642

diff --git a/app-arch/rpm/files/rpm-4.19.0-libdir.patch b/app-arch/rpm/files/rpm-4.19.0-libdir.patch
new file mode 100644
index 000000000000..9899827c985e
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.19.0-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c164e9c52..5738c821f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF)
+ option(WITH_IMAEVM "Build with IMA support" OFF)
+ option(WITH_FAPOLICYD "Build with fapolicyd support" ON)
+ 
+-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/libexec/rpm" CACHE PATH "rpm home")
+ set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
+ 
+ # Emulate libtool versioning. Before a public release:

diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index 43a5b10a145b..8e808eda79fe 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>pastalian46@gmail.com</email>
+		<name>Takuya Wakazono</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">rpm-software-management/rpm</remote-id>
 	</upstream>
+	<use>
+		<flag name="sequoia">Use <pkg>app-crypt/rpm-sequoia</pkg> instead of the deprecated internal parser</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild
new file mode 100644
index 000000000000..a63e0576b9a7
--- /dev/null
+++ b/app-arch/rpm/rpm-4.19.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+DESCRIPTION="The RPM Package Manager"
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+# Tests run against a Fedora container image, which needs to be pulled.
+RESTRICT="test"
+
+DEPEND="
+	${LUA_DEPS}
+	app-arch/libarchive:=
+	>=app-arch/bzip2-1.0.1
+	app-arch/xz-utils
+	app-arch/zstd:=
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	>=dev-libs/popt-1.7
+	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 )
+	sequoia? ( app-crypt/rpm-sequoia )
+	!sequoia? ( dev-libs/libgcrypt:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.19.0-libdir.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() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	local mycmakeargs=(
+		-DENABLE_TESTSUITE=OFF
+		-DWITH_FAPOLICYD=OFF
+		-DWITH_SELINUX=OFF
+		-DENABLE_BDB_RO=$(usex berkdb)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_SQLITE=$(usex sqlite)
+		-DWITH_ACL=$(usex acl)
+		-DWITH_AUDIT=$(usex audit)
+		-DWITH_CAP=$(usex caps)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_INTERNAL_OPENPGP=$(usex sequoia OFF ON)
+		$(cmake_use_find_package doc Doxygen)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove pre-built API docs.
+	use doc || rm -rf "${ED}/usr/share/doc/${PF}" || die
+
+	dodoc CREDITS README
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; 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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2024-02-02  3:58 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-02-02  3:58 UTC (permalink / raw
  To: gentoo-commits

commit:     191bd72e6913e1c56736e801e0fb9e1f7262cfb2
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 18 15:00:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 03:56:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=191bd72e

app-arch/rpm: fix musl build

Closes: https://bugs.gentoo.org/888954
Closes: https://bugs.gentoo.org/922286
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/rpm/files/rpm-4.18.1-musl-nls.patch    | 42 ++++++++++++++++++
 app-arch/rpm/files/rpm-4.19.1-musl-compat.patch | 59 +++++++++++++++++++++++++
 app-arch/rpm/rpm-4.18.1.ebuild                  |  1 +
 app-arch/rpm/rpm-4.19.1.ebuild                  |  2 +
 4 files changed, 104 insertions(+)

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
new file mode 100644
index 000000000000..7d1fde28bacf
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch
@@ -0,0 +1,42 @@
+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.19.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch
new file mode 100644
index 000000000000..ca9f97257c70
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch
@@ -0,0 +1,59 @@
+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/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild
index 8695d7cf06c8..5054bab122a8 100644
--- a/app-arch/rpm/rpm-4.18.1.ebuild
+++ b/app-arch/rpm/rpm-4.18.1.ebuild
@@ -65,6 +65,7 @@ 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() {

diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild
index 3459be5ac5f3..a011006febb8 100644
--- a/app-arch/rpm/rpm-4.19.1.ebuild
+++ b/app-arch/rpm/rpm-4.19.1.ebuild
@@ -62,7 +62,9 @@ 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
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2024-03-04  7:53 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2024-03-04  7:53 UTC (permalink / raw
  To: gentoo-commits

commit:     07d89f7bad0ec7c412402314f5aa0e53bf7a967f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 07:47:42 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 07:53:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d89f7b

app-arch/rpm: drop 4.19.1

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-arch/rpm/Manifest                           |   1 -
 app-arch/rpm/files/rpm-4.19.1-musl-compat.patch |  59 -----------
 app-arch/rpm/rpm-4.19.1.ebuild                  | 134 ------------------------
 3 files changed, 194 deletions(-)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 21df9682d6aa..1598162f1521 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.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642

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/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild
deleted file mode 100644
index bac0276f3d5c..000000000000
--- a/app-arch/rpm/rpm-4.19.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR=emake
-LUA_COMPAT=( lua5-{3,4} )
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-DESCRIPTION="The RPM Package Manager"
-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 ~loong ~riscv ~sparc ~x86"
-IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite"
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Tests run against a Fedora container image, which needs to be pulled.
-RESTRICT="test"
-
-DEPEND="
-	${LUA_DEPS}
-	app-arch/libarchive:=
-	>=app-arch/bzip2-1.0.1
-	app-arch/xz-utils
-	app-arch/zstd:=
-	>=app-crypt/gnupg-1.2
-	>=dev-lang/perl-5.8.8
-	dev-libs/elfutils
-	>=dev-libs/popt-1.7
-	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 )
-	sequoia? ( app-crypt/rpm-sequoia )
-	!sequoia? ( dev-libs/libgcrypt:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.18.1-musl-nls.patch
-	"${FILESDIR}"/${PN}-4.19.0-libdir.patch
-	"${FILESDIR}"/${PN}-4.19.1-musl-compat.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() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	# rpm no longer supports berkdb, but has readonly support.
-	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
-	local mycmakeargs=(
-		-DENABLE_TESTSUITE=OFF
-		-DWITH_FAPOLICYD=OFF
-		-DWITH_SELINUX=OFF
-		-DENABLE_BDB_RO=$(usex berkdb)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_SQLITE=$(usex sqlite)
-		-DWITH_ACL=$(usex acl)
-		-DWITH_AUDIT=$(usex audit)
-		-DWITH_CAP=$(usex caps)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_INTERNAL_OPENPGP=$(usex sequoia OFF ON)
-		$(cmake_use_find_package doc Doxygen)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	cmake_src_install
-
-	# Remove pre-built API docs.
-	use doc || rm -rf "${ED}/usr/share/doc/${PF}" || die
-
-	dodoc CREDITS README
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; 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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2024-03-04  7:53 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2024-03-04  7:53 UTC (permalink / raw
  To: gentoo-commits

commit:     cbddeb9984d61e08cff7c7b5f2e416251d84a5a7
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Thu Feb  8 12:33:02 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 07:53:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbddeb99

app-arch/rpm: add 4.19.1.1

bump + fix DEPEND ordering

Closes: https://github.com/gentoo/gentoo/pull/35227
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-arch/rpm/Manifest                             |   1 +
 app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch |  17 +++
 app-arch/rpm/rpm-4.19.1.1.ebuild                  | 134 ++++++++++++++++++++++
 3 files changed, 152 insertions(+)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 9a58e89006b0..21df9682d6aa 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,2 +1,3 @@
 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.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642

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.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild
new file mode 100644
index 000000000000..d57cff0ff5c7
--- /dev/null
+++ b/app-arch/rpm/rpm-4.19.1.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+DESCRIPTION="The RPM Package Manager"
+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 ~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} )
+"
+# Tests run against a Fedora container image, which needs to be pulled.
+RESTRICT="test"
+
+DEPEND="
+	${LUA_DEPS}
+	>=app-arch/bzip2-1.0.1
+	app-arch/libarchive:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	sys-libs/readline:=
+	>=sys-libs/zlib-1.2.3-r1
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	caps? ( >=sys-libs/libcap-2.0 )
+	dbus? ( sys-apps/dbus )
+	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
+	doc? ( app-text/doxygen )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.19.0-libdir.patch
+	"${FILESDIR}"/${P}-musl-compat.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() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	local mycmakeargs=(
+		-DENABLE_TESTSUITE=OFF
+		-DWITH_FAPOLICYD=OFF
+		-DWITH_SELINUX=OFF
+		-DENABLE_BDB_RO=$(usex berkdb)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_SQLITE=$(usex sqlite)
+		-DWITH_ACL=$(usex acl)
+		-DWITH_AUDIT=$(usex audit)
+		-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
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove pre-built API docs.
+	use doc || rm -rf "${ED}/usr/share/doc/${PF}" || die
+
+	dodoc CREDITS README
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; 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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2024-11-23 16:10 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-11-23 16:10 UTC (permalink / raw
  To: gentoo-commits

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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
@ 2025-03-10  2:25 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-03-10  2:25 UTC (permalink / raw
  To: gentoo-commits

commit:     c89217ee931b707c09c2bc0162239bd60b4cadde
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 28 16:38:04 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:23:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89217ee

app-arch/rpm: add 4.20.1

- ninja build was fixed upstream
- removed -fhardened to avoid overriding _FORTIFY_SOURCE

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.20.1-no-hardened.patch |  12 ++
 app-arch/rpm/rpm-4.20.1.ebuild                  | 144 ++++++++++++++++++++++++
 3 files changed, 157 insertions(+)

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 0cef50dbf2f4..630af384126a 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,2 +1,3 @@
 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
+DIST rpm-4.20.1.tar.bz2 4534720 BLAKE2B 0d2c553be4cdb5c511c94c5d70a6f5d8ab350fbc7e29b91ea8ce7dd4c1d3f5f2db3a8d46305adc53083c8367b771588db185338cd04a769c54856a425f71bad5 SHA512 77979cb49dec5a8816fc5019cf5d0c817adddec10c0018c8ad9487db8ffc58613557fa21f8e2163b747197b55a6de202c29c88e19b70d1fa6b4c18d3a84bf681

diff --git a/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch b/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch
new file mode 100644
index 000000000000..ea5135c1dccd
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch
@@ -0,0 +1,12 @@
+Don't override Gentoo's default _FORTIFY_SOURCE.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,7 +426,7 @@ if (ENABLE_ASAN OR ENABLE_UBSAN)
+ endif()
+ 
+ # try to ensure some compiler sanity and hardening options where supported
+-foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
++foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks)
+ 	check_c_compiler_flag(${flag} found)
+ 	if (found)
+ 		add_compile_options(${flag})

diff --git a/app-arch/rpm/rpm-4.20.1.ebuild b/app-arch/rpm/rpm-4.20.1.ebuild
new file mode 100644
index 000000000000..5e8409c59759
--- /dev/null
+++ b/app-arch/rpm/rpm-4.20.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic lua-single python-single-r1 toolchain-funcs
+
+DESCRIPTION="The RPM Package Manager"
+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"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit bzip2 caps berkdb doc dbus iconv lzma nls openmp python
+	readline selinux +sequoia +sqlite +zstd"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+# Tests run against a Fedora container.
+RESTRICT="test"
+
+DEPEND="
+	${LUA_DEPS}
+	app-arch/libarchive:=
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	>=sys-libs/zlib-1.2.3-r1
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	bzip2? ( >=app-arch/bzip2-1.0.1 )
+	caps? ( >=sys-libs/libcap-2.0 )
+	dbus? ( sys-apps/dbus )
+	iconv? ( virtual/libiconv )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	selinux? ( sys-libs/libselinux )
+	sequoia? ( app-crypt/rpm-sequoia )
+	!sequoia? ( dev-libs/libgcrypt:= )
+	sqlite? ( dev-db/sqlite:3 )
+	zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.19.1.1-musl-compat.patch
+	"${FILESDIR}"/${PN}-4.20.0-libdir.patch
+	"${FILESDIR}"/${P}-no-hardened.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_configure() {
+	local mycmakeargs=(
+		-DENABLE_NDB=ON
+		-DENABLE_TESTSUITE=OFF
+		-DWITH_FSVERITY=OFF
+		-DWITH_IMAEVM=OFF
+		-DWITH_FAPOLICYD=OFF
+		-DWITH_OPENSSL=OFF
+		-DWITH_LIBDW=ON
+		-DWITH_LIBELF=ON
+		-DENABLE_BDB_RO=$(usex berkdb)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_SQLITE=$(usex sqlite)
+		-DWITH_CAP=$(usex caps)
+		-DWITH_ACL=$(usex acl)
+		-DWITH_SELINUX=$(usex selinux)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_AUDIT=$(usex audit)
+		-DWITH_SEQUOIA=$(usex sequoia)
+		-DWITH_READLINE=$(usex readline)
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_ICONV=$(usex iconv)
+		-DWITH_ZSTD=$(usex zstd)
+		-DWITH_LIBLZMA=$(usex lzma)
+		-DWITH_DOXYGEN=$(usex doc)
+	)
+
+	# special handling for ASAN
+	# https://github.com/rpm-software-management/rpm/commit/ca8d1cf3f401d89ad3507aed8d7a70ad37026ca7
+	if is-flagq -fsanitize=address; then
+		mycmakeargs+=( -DENABLE_ASAN=ON )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use doc; then
+		# Remove pre-built API docs.
+		rm -r "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc CREDITS README
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; 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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-03-10  2:25 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-15  6:24 [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-03-10  2:25 Sam James
2024-11-23 16:10 Sam James
2024-03-04  7:53 Joonas Niilola
2024-03-04  7:53 Joonas Niilola
2024-02-02  3:58 Sam James
2022-04-10 10:11 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox