Revbumps to update to neon 0.28 API, patch by Honza Machacek <Hloupy.Honza@centrum.cz>, fixes bug #214799. Dropped ~ppc and ~mips which don't have neon 0.28 keyworded. 4.4.6-r5 is based on -r4. 4.4.7-r4 on -r2 - the p.masked -r3 was skipped.

Package-Manager: portage-2.1.5

5 files changed, 292 insertions, 12 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 784b1ab85ecf..ff60ca1db919 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.89 2008/03/30 03:49:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.90 2008/05/20 07:44:25 caster Exp $
+
+*rpm-4.4.7-r4 (20 May 2008)
+*rpm-4.4.6-r5 (20 May 2008)
+
+  20 May 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/rpm-4.4.6-neon-0.28.patch, +rpm-4.4.6-r5.ebuild,
+  +rpm-4.4.7-r4.ebuild:
+  Revbumps to update to neon 0.28 API, patch by Honza Machacek
+  <Hloupy.Honza@centrum.cz>, fixes bug #214799. Dropped ~ppc and ~mips which
+  don't have neon 0.28 keyworded. 4.4.6-r5 is based on -r4. 4.4.7-r4 on -r2
+  - the p.masked -r3 was skipped.
 
 *rpm-5.0.3 (30 Mar 2008)
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 0e4e54aebd98..bfdb36606ae5 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rpm-4.0.4-gentoo-uclibc.patch 1418 RMD160 b2b89f401c6f6f3d275e4666312555a3ad6ffbeb SHA1 673ea952b741a140f9f20a24282589ef4f2a1198 SHA256 8671a390a1e1673e0415f8a4da96d0b8234d870d02d4e28b28d735dc35e49cf7
 AUX rpm-4.0.4-sandbox.patch 938 RMD160 95dad47ac3b18213a271657db643ca3188c2d208 SHA1 96ae471af884a0b4abbe6cbdcc55b62e58683bd6 SHA256 d10e4674993bbfd3294837639a3cfbd2cda443fad3486ef15ee695c2f0f80651
 AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
 AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 SHA1 dc41417f4064eb9476de9ef51e616042e55e5f73 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b
+AUX rpm-4.4.6-neon-0.28.patch 2393 RMD160 7cc24ef31e46682bffa57721e18299c4a9b74637 SHA1 14dd947d44150caa89b58991ed7dbdd358152c3e SHA256 e7b9c177a4ff8027f731ae54b2d6a836ea7be3e6eca92b704dbe30b33b8166c4
 AUX rpm-4.4.6-qa-fix-undefined.patch 553 RMD160 647b19a10c86850873d65b5a65c2530d5a44ed54 SHA1 75e1bb924ed57f3b0ef7776551c3d782a9121904 SHA256 1c72bb60b4c9af6b0c366debe7276f948308e777ff6fef090bb778d9bc724a06
 AUX rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a SHA1 317f19c9f181ca2cd40d832536c458884bb5b279 SHA256 84af6ddab50982e15df90d2c7895ecd0f0b568caa6cd0af57ce33e1af784b4a7
 AUX rpm-4.4.6-with-sqlite.patch 517 RMD160 0af724f63b528aabd05f4bcf2d4c4830ebdf98d2 SHA1 0a22207c6bd4114aef4cc9cdca840e996fcf0297 SHA256 c84020fd6402c4d9bfddb554f251b4ac13c6ca151689070a7471e66c8f7bb6ac
@@ -19,17 +17,12 @@ DIST rpm-5.0.0.tar.gz 8990824 RMD160 a10793c9a776dd1478b0675914a71f46eb5e2999 SH
 DIST rpm-5.0.3.tar.gz 9337992 RMD160 d26cdfef5a3bf18442e1825d810afb32bcfa2161 SHA1 d3461710de17a8f7dc3e49371d7edf620b10c27e SHA256 224d15c52511b453b2a63e6447b279a622c03af5fe373a67757979f4d00cd042
 EBUILD rpm-4.4.6-r3.ebuild 2774 RMD160 78caecc05338a6ac5cd1280d4fcc7a8346da62bf SHA1 85307e4d23ea07fafb8929e31b873086c1b5ace9 SHA256 021f9f32b65781e02991c0d4c4e55024234bd1d2b8193c56b658c8b62cc947c8
 EBUILD rpm-4.4.6-r4.ebuild 3047 RMD160 39328127dcf0bde2792922fcf93e79219a000216 SHA1 2eceb86c44953c02b742bd22f61de0708ca8759f SHA256 87066e1d9594d9a2d3ece3a6f9f23090e89b4b7739acab525f25a4966ac3d558
+EBUILD rpm-4.4.6-r5.ebuild 3099 RMD160 8d0ca6d53973cd1aa1624bd2bc2e5691a96b3190 SHA1 470c8fca1dc3103a255f0b49c78cd3c3b2ea94a1 SHA256 69cae71c0e2441bb54f45fefff84a034f6a8312bb9db0d6f100e609a06092298
 EBUILD rpm-4.4.7-r1.ebuild 2794 RMD160 c5afdbf9fe52b9bf4c48eaedd2d9886af90e900d SHA1 e415019dc31032c80e5ab9e127f66dc4f9e413b2 SHA256 7a1bdd8bf0541ad1c58e0c3b19f3c4fed15df017496d977c92c361fb4d8971e3
 EBUILD rpm-4.4.7-r2.ebuild 2989 RMD160 937b40114e5acfd171618b6649619175438e8ac6 SHA1 9da20fb85c32d3a28a9061bf99f86e0e6d02f505 SHA256 c02f8f206b8dfbccca95e31b45cac223cb57bff79ba7160d2a3c757bd728fe57
 EBUILD rpm-4.4.7-r3.ebuild 8214 RMD160 0e71469a760703011281b1ee5e0ad42749eef15a SHA1 9ad8466b1df65eeecd6579d41475065598e45bef SHA256 6caa28c3d917e084074637cfc567ffdbb2386667a9c7880da6c80e2f4e3aaac0
+EBUILD rpm-4.4.7-r4.ebuild 3048 RMD160 e57970a521474ef5009025bc36f60faec001b4fc SHA1 fd1dd85e46df1150b4b9b2e0f09a290793cd20d9 SHA256 28b82da49b98ddb8cc669459bc1ea53194c0943b4054f9cfa44c0b9ad402cc9a
 EBUILD rpm-5.0.0.ebuild 2732 RMD160 bb1da5416a4869216a186e6868f253b8a0d6f7d6 SHA1 736d093a2030df32ad8c1e7ff5fc93f0e6d5f55f SHA256 ed8e918b9d471f0e03f16546f310f9d5742ed84e2d2f6730214531c8f8bacca2
 EBUILD rpm-5.0.3.ebuild 2732 RMD160 b6f3c4235495c738c186b5ca48a0b7b56c74d94f SHA1 87accb4d8065a7d1b8ddd945ef74feadbb06e2f9 SHA256 384c2c0c84ccae427bcb08f2188230ce342d11dabe538252ddc45fa1b29962bf
-MISC ChangeLog 13684 RMD160 a127cb7bd4d6acf1f9d4d420bb21e1722f9e41b3 SHA1 b14af4e675c89172f11e0be41ea51cbb12fb57ae SHA256 a247b4cf087b8d8bd1abd509c60e1184f9d24feeac9403b1a43b1890530510a8
+MISC ChangeLog 14125 RMD160 3315df5bf8d281c09dde7e83c66e08edd51bc385 SHA1 19becd68038503b96c395d7c4c57dc75cd764c26 SHA256 5219e01f953a432abd0a4876fc82dc007b644e45696b6b01d0a49b295099660e
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH7w6Sj9hvisErhMIRAjjQAKDIWoYG6zzwqQ0cj3EKCAMYTCwTDACfeGBo
-9fZEKwCLM6vb1uz4gS182qQ=
-=O6B2
------END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch b/app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch
new file mode 100644
index 000000000000..2218205048c7
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-neon-0.28.patch
@@ -0,0 +1,63 @@
+Update to neon 0.28 API, by Honza Machacek <Hloupy.Honza@centrum.cz> bug #214799.
+
+diff -Naur tmp-old/rpmio/rpmdav.c tmp-new/rpmio/rpmdav.c
+--- rpmio/rpmdav.c	2008-03-28 04:40:52.000000000 +0000
++++ rpmio/rpmdav.c	2008-03-28 05:19:50.000000000 +0000
+@@ -103,7 +103,7 @@
+ }
+ 
+ static void davNotify(void * userdata,
+-		ne_conn_status connstatus, const char * info)
++		ne_session_status sessionstatus, const char * info)
+ 	/*@*/
+ {
+     urlinfo u = userdata;
+@@ -124,18 +124,20 @@
+ 
+ #ifdef	REFERENCE
+ typedef enum {
+-    ne_conn_namelookup, /* lookup up hostname (info = hostname) */
+-    ne_conn_connecting, /* connecting to host (info = hostname) */
+-    ne_conn_connected, /* connected to host (info = hostname) */
+-    ne_conn_secure /* connection now secure (info = crypto level) */
+-} ne_conn_status;
++    ne_status_lookup = 0, /* looking up hostname */
++    ne_status_connecting, /* connecting to host */
++    ne_status_connected, /* connected to host */
++    ne_status_sending, /* sending a request body */
++    ne_status_recving, /* receiving a response body */
++    ne_status_disconnected /* disconnected from host */
++} ne_session_status;
+ #endif
+ 
+-    u->connstatus = connstatus;
++    u->sessionstatus = sessionstatus;
+ 
+ /*@-boundsread@*/
+ if (_dav_debug < 0)
+-fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, connstatus, info, sess, u, connstates[ (connstatus < 4 ? connstatus : 4)]);
++fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, sessionstatus, info, sess, u, connstates[ (sessionstatus < 5 ? sessionstatus : 5)]);
+ /*@=boundsread@*/
+ 
+ }
+@@ -350,7 +352,7 @@
+ #endif
+ 
+ 	ne_set_progress(u->sess, davProgress, u);
+-	ne_set_status(u->sess, davNotify, u);
++	ne_set_notifier(u->sess, davNotify, u);
+ 
+ 	ne_set_persist(u->sess, 1);
+ 	ne_set_read_timeout(u->sess, httpTimeoutSecs);
+diff -Naur tmp-old/rpmio/rpmurl.h tmp-new/rpmio/rpmurl.h
+--- rpmio/rpmurl.h	2008-03-28 04:55:02.000000000 +0000
++++ rpmio/rpmurl.h	2008-03-28 04:56:09.000000000 +0000
+@@ -60,7 +60,7 @@
+     void * sess;		/*!< neon: ne_session ptr */
+     off_t current;		/*!< neon: current body offset. */
+     off_t total;		/*!< neon: total body length. */
+-    int connstatus;		/*!< neon: connection status. */
++    int sessionstatus;		/*!< neon: session status. */
+ #ifdef  REFERENCE
+ typedef enum {
+     ne_conn_namelookup,	/* lookup up hostname (info = hostname) */
diff --git a/app-arch/rpm/rpm-4.4.6-r5.ebuild b/app-arch/rpm/rpm-4.4.6-r5.ebuild
new file mode 100644
index 000000000000..aeb219567e3f
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.6-r5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r5.ebuild,v 1.1 2008/05/20 07:44:25 caster Exp $
+
+inherit eutils autotools distutils perl-module flag-o-matic
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="http://wraptastic.org/pub/rpm-4.4.x/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls python perl doc sqlite"
+
+RDEPEND="=sys-libs/db-3.2*
+	>=sys-libs/zlib-1.1.3
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-libs/beecrypt-3.1.0-r1
+	python? ( >=dev-lang/python-2.2 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	>=net-misc/neon-0.28"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-with-sqlite.patch
+	epatch "${FILESDIR}"/${P}-stupidness.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
+	# bug 214799
+	epatch "${FILESDIR}"/${P}-neon-0.28.patch
+
+	# rpm uses AM_GNU_GETTEXT() but fails to actually
+	# include any of the required gettext files
+	cp /usr/share/gettext/config.rpath . || die
+
+	# the following are additional libraries that might be packaged with
+	# the rpm sources. grep for "test -d" in configure.ac
+	cp file/src/{file,patchlevel}.h tools/
+	rm -rf beecrypt elfutils neon popt sqlite zlib intl file
+
+	sed -i -e "s:intl ::" Makefile.am
+	sed -i -e "s:intl/Makefile ::" configure.ac
+	AT_NO_RECURSIVE="yes" eautoreconf
+	# TODO Get rid of internal copies of lua, db and db3
+}
+
+src_compile() {
+	# Until strict aliasing is porperly fixed...
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	python_version
+	econf \
+		--enable-posixmutexes \
+		--without-javaglue \
+		--without-selinux \
+		$(use_with python python ${PYVER}) \
+		$(use_with doc apidocs) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_enable nls) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	mv "${D}"/bin/rpm "${D}"/usr/bin
+	rmdir "${D}"/bin
+
+	use nls || rm -rf "${D}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README* RPM*
+	use doc && dohtml -r apidocs/html/*
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+
+	for magic_file in "magic.mime.mgc" "magic.mgc" "magic.mime" "magic"; do
+		dosym /usr/share/misc/file/${magic_file} /usr/lib/rpm/${magic_file}
+	done
+}
+
+pkg_postinst() {
+	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
+	else
+		einfo "No RPM database found... Creating database..."
+		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
+	fi
+
+	distutils_pkg_postinst
+}
diff --git a/app-arch/rpm/rpm-4.4.7-r4.ebuild b/app-arch/rpm/rpm-4.4.7-r4.ebuild
new file mode 100644
index 000000000000..fcae57d10836
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.7-r4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r4.ebuild,v 1.1 2008/05/20 07:44:25 caster Exp $
+
+inherit eutils autotools distutils perl-module flag-o-matic
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="http://wraptastic.org/pub/rpm-4.4.x/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls python perl doc sqlite"
+
+RDEPEND="=sys-libs/db-3.2*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-libs/beecrypt-3.1.0-r1
+	python? ( >=dev-lang/python-2.2 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	>=net-misc/neon-0.28"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
+	epatch "${FILESDIR}"/rpm-4.4.7-stupidness.patch
+	epatch "${FILESDIR}"/rpm-4.4.6-autotools.patch
+	epatch "${FILESDIR}"/rpm-4.4.6-buffer-overflow.patch
+	epatch "${FILESDIR}"/${P}-qa-implicit-function-to-pointer.patch
+	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
+	# bug 214799
+	epatch "${FILESDIR}"/${PN}-4.4.6-neon-0.28.patch
+
+	# rpm uses AM_GNU_GETTEXT() but fails to actually
+	# include any of the required gettext files
+	cp /usr/share/gettext/config.rpath . || die
+
+	# the following are additional libraries that might be packaged with
+	# the rpm sources. grep for "test -d" in configure.ac
+	cp file/src/{file,patchlevel}.h tools/
+	rm -rf beecrypt elfutils neon popt sqlite zlib intl file
+
+	sed -i -e "s:intl ::" Makefile.am
+	sed -i -e "s:intl/Makefile ::" configure.ac
+	AT_NO_RECURSIVE="yes" eautoreconf
+	# TODO Get rid of internal copies of lua, db and db3
+}
+
+src_compile() {
+	# Until strict aliasing is porperly fixed...
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	python_version
+	econf \
+		--enable-posixmutexes \
+		--without-javaglue \
+		--without-selinux \
+		$(use_with python python ${PYVER}) \
+		$(use_with doc apidocs) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_enable nls) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	mv "${D}"/bin/rpm "${D}"/usr/bin
+	rmdir "${D}"/bin
+
+	use nls || rm -rf "${D}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README* RPM*
+	use doc && dohtml -r apidocs/html/*
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
+	else
+		einfo "No RPM database found... Creating database..."
+		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
+	fi
+
+	distutils_pkg_postinst
+}