From: Sandro Bonazzola Date: Mon, 12 Feb 2007 19:44:53 +0000 (+0000) Subject: ebuild bump trying to increase QA level of this package as per bug #162447. Added... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36b31e234cb98dedc65f41653040e509c1131a4a;p=gentoo.git ebuild bump trying to increase QA level of this package as per bug #162447. Added a workaround trying to fix bug #153292. Thanks to Marti Raudsepp for reporting. Thanks to Jeff Johnson and Ken Gilmer for their help. Package-Manager: portage-2.1.2-r9 --- diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 2f48da7aa9bf..639832227f2d 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,8 +1,19 @@ # ChangeLog for app-arch/rpm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.78 2007/01/16 22:10:59 sanchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.79 2007/02/12 19:44:53 sanchan Exp $ - 16 Jan 2007; Sandro Bonazzola +*rpm-4.4.7-r3 (12 Feb 2007) +*rpm-4.4.6-r4 (12 Feb 2007) + + 12 Feb 2007; Sandro Bonazzola + +files/rpm-4.4.6-qa-fix-undefined.patch, + +files/rpm-4.4.7-qa-fix-undefined.patch, + +files/rpm-4.4.7-qa-implicit-function-to-pointer.patch, + +rpm-4.4.6-r4.ebuild, rpm-4.4.7-r2.ebuild, +rpm-4.4.7-r3.ebuild: + ebuild bump trying to increase QA level of this package as per bug #162447. + Added a workaround trying to fix bug #153292. Thanks to Marti Raudsepp + for reporting. Thanks to Jeff Johnson and Ken Gilmer + for their help. *rpm-4.4.7-r2 (16 Jan 2007) @@ -237,7 +248,7 @@ Mark stable on alpha 7 Mar 2003; Stefan Jones rpm-4.2.ebuild : - Added dev-libs/elfutils to DEPEND + Added dev-libs/elfutils to DEPEND 6 Mar 2003; Stefan Jones rpm-4.2.ebuild : Newest rpm available from redhat rawhide. Seems to work fine. @@ -255,7 +266,7 @@ *rpm-4.1 (19 Feb 2003) - 19 Feb 2003; Nick Hadaway rpm-4.1.ebuild, + 19 Feb 2003; Nick Hadaway rpm-4.1.ebuild, files/digest-rpm-4.1, files/rpm-4.1-system-popt.diff : Package builds. rpm doesn't run. All are -arch. This has been added to portage so people can test and maybe find a @@ -269,19 +280,19 @@ jwarren@cheesefoam.dyndns.org (Jeremy Warren) in bug #13784. 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - + 12 Oct 2002; Bruce A. Locke rpm-4.0.4-r4.ebuild: Remove dead symlink (bug #8578) and ebuild no longer blindly creates a database if one already exists. *rpm-4.0.4-r3 (23 Jul 2002) - 14 Sep 2002; Maarten Thibaut ChangeLog rpm-4.0.4-r3.ebuild: + 14 Sep 2002; Maarten Thibaut ChangeLog rpm-4.0.4-r3.ebuild: This package can not compile on sparc64 without a --host option to configure, so I added that flag. Revamped ChangeLog layout according to new guidelines. - - 07 Sep 2002; Seemant Kulleen rpm-4.0.4-r3.ebuild: - This package can not compile with autoconf-2.53a, so autoconf-2.1 is forced. + + 07 Sep 2002; Seemant Kulleen rpm-4.0.4-r3.ebuild: + This package can not compile with autoconf-2.53a, so autoconf-2.1 is forced. Thanks to: garion@garion.mnbsyr.com (John Sutherland) in bug #7595 23 Jul 2002; Seemant Kulleen rpm-4.0.4-r3.ebuild: In keeping diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index ecbc3d26de2a..db032f276730 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX rpm-4.0.4-gentoo-uclibc.patch 1418 RMD160 b2b89f401c6f6f3d275e4666312555a3ad6ffbeb SHA1 673ea952b741a140f9f20a24282589ef4f2a1198 SHA256 8671a390a1e1673e0415f8a4da96d0b8234d870d02d4e28b28d735dc35e49cf7 MD5 b367caa0d4230b567bdd63eeb430e67f files/rpm-4.0.4-gentoo-uclibc.patch 1418 RMD160 b2b89f401c6f6f3d275e4666312555a3ad6ffbeb files/rpm-4.0.4-gentoo-uclibc.patch 1418 @@ -14,6 +17,10 @@ AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5 MD5 f0f2c037211b85a8f725d4c51f65c622 files/rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 files/rpm-4.4.6-buffer-overflow.patch 1952 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b files/rpm-4.4.6-buffer-overflow.patch 1952 +AUX rpm-4.4.6-qa-fix-undefined.patch 553 RMD160 647b19a10c86850873d65b5a65c2530d5a44ed54 SHA1 75e1bb924ed57f3b0ef7776551c3d782a9121904 SHA256 1c72bb60b4c9af6b0c366debe7276f948308e777ff6fef090bb778d9bc724a06 +MD5 ce2012c3aac7fd3483b6b75e4c33e0d3 files/rpm-4.4.6-qa-fix-undefined.patch 553 +RMD160 647b19a10c86850873d65b5a65c2530d5a44ed54 files/rpm-4.4.6-qa-fix-undefined.patch 553 +SHA256 1c72bb60b4c9af6b0c366debe7276f948308e777ff6fef090bb778d9bc724a06 files/rpm-4.4.6-qa-fix-undefined.patch 553 AUX rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a SHA1 317f19c9f181ca2cd40d832536c458884bb5b279 SHA256 84af6ddab50982e15df90d2c7895ecd0f0b568caa6cd0af57ce33e1af784b4a7 MD5 ba3ebde8f6d04c144f7d42f4eaba3dcf files/rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a files/rpm-4.4.6-stupidness.patch 4992 @@ -26,6 +33,14 @@ AUX rpm-4.4.7-config.rpath.patch 16976 RMD160 cf2d7d781707cd8258eceec61b0fcecb93 MD5 9f78ce7b8993007d14cec24b341873d1 files/rpm-4.4.7-config.rpath.patch 16976 RMD160 cf2d7d781707cd8258eceec61b0fcecb93dcb9d2 files/rpm-4.4.7-config.rpath.patch 16976 SHA256 13d1352f17676d0199c868192adae8d74ff2c59c9978ec5d6acf9a7d4bb5f73b files/rpm-4.4.7-config.rpath.patch 16976 +AUX rpm-4.4.7-qa-fix-undefined.patch 776 RMD160 895ab185d15c94890ed8f2a34bf4f6b54c8bfb61 SHA1 d16d4a491625d304e96ba85fda982011c9d6d946 SHA256 87a444e00328cd6d78391acdf58ac3ab57fa161241c944df173ac14b2cb025a4 +MD5 3c79045716338d1c5273d3470e38f89d files/rpm-4.4.7-qa-fix-undefined.patch 776 +RMD160 895ab185d15c94890ed8f2a34bf4f6b54c8bfb61 files/rpm-4.4.7-qa-fix-undefined.patch 776 +SHA256 87a444e00328cd6d78391acdf58ac3ab57fa161241c944df173ac14b2cb025a4 files/rpm-4.4.7-qa-fix-undefined.patch 776 +AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878c94dbcd6855af82ee852caf SHA1 61079e3109a41c639015f312603ea43ae49a5bb7 SHA256 a8f12898b8ddba5d7dcc70c1128a2b27dd729c7fe2247450cca068bfa68f1d65 +MD5 b2ecb8a897b53b335af62119ecb3efcf files/rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 +RMD160 f87086379c28fa878c94dbcd6855af82ee852caf files/rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 +SHA256 a8f12898b8ddba5d7dcc70c1128a2b27dd729c7fe2247450cca068bfa68f1d65 files/rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850 MD5 55bd72d42827a85e9a4d76e2478ab576 files/rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 files/rpm-4.4.7-stupidness.patch 5268 @@ -33,22 +48,30 @@ SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850 files/rp DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595 DIST rpm-4.4.7-patches-1.tar.gz 48537 RMD160 9baaf952fa105bc2a51241eac89ff28ffd2378a0 SHA1 4ee1557645e33cfaa222ce4246c06c279300b93e SHA256 1444dc2eb7c07953bd5e0857d6d9db3817a692308729288d3acd84910abdb4a4 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5 -EBUILD rpm-4.4.6-r3.ebuild 2775 RMD160 4f5c139299f125900ff56da72e806b789094b361 SHA1 2421c3afeeb2b41825ce1e7aa9f42b31ff649a2d SHA256 fef54145ba4404f3d90d1dc587f563b0305e14bc5f822434e6df07a166c8674e -MD5 9d90b8e68cea479b87a0b1f2802fc5ed rpm-4.4.6-r3.ebuild 2775 -RMD160 4f5c139299f125900ff56da72e806b789094b361 rpm-4.4.6-r3.ebuild 2775 -SHA256 fef54145ba4404f3d90d1dc587f563b0305e14bc5f822434e6df07a166c8674e rpm-4.4.6-r3.ebuild 2775 -EBUILD rpm-4.4.7-r1.ebuild 2794 RMD160 25e8dbf913b1a13eb75696753982238358151535 SHA1 4863aa864215470eea2c502e17fd64b1d975e944 SHA256 f6645d8b478ecbfb44b2bbc704f0c03bc255865a9c1f15c3b2bd130b4c70cce9 -MD5 06fa13c03cc0b5c6a161ad49d2dfca4e rpm-4.4.7-r1.ebuild 2794 -RMD160 25e8dbf913b1a13eb75696753982238358151535 rpm-4.4.7-r1.ebuild 2794 -SHA256 f6645d8b478ecbfb44b2bbc704f0c03bc255865a9c1f15c3b2bd130b4c70cce9 rpm-4.4.7-r1.ebuild 2794 -EBUILD rpm-4.4.7-r2.ebuild 7603 RMD160 f27a3c101f0de9b9b037964bd413382b18ac6b98 SHA1 da2169debe817d06a972f450806934aef9478ec5 SHA256 bb6197c4210a1f5eab09de92c750af265db77bc0dc846800c39fe2d4ba27987a -MD5 37ef1ac344845310e07b45c1494dfb40 rpm-4.4.7-r2.ebuild 7603 -RMD160 f27a3c101f0de9b9b037964bd413382b18ac6b98 rpm-4.4.7-r2.ebuild 7603 -SHA256 bb6197c4210a1f5eab09de92c750af265db77bc0dc846800c39fe2d4ba27987a rpm-4.4.7-r2.ebuild 7603 -MISC ChangeLog 11612 RMD160 286ed489bb35ba0e92c537fa335bab550744e979 SHA1 78ed1d2f7c63676c256c1bf637c650935786e61f SHA256 0742f2d8868ba8405e56a9ef68925005c3e135d8aa948d37b73258176bca53ee -MD5 bb33ddde8a1a754304e28ccca11c26f8 ChangeLog 11612 -RMD160 286ed489bb35ba0e92c537fa335bab550744e979 ChangeLog 11612 -SHA256 0742f2d8868ba8405e56a9ef68925005c3e135d8aa948d37b73258176bca53ee ChangeLog 11612 +EBUILD rpm-4.4.6-r3.ebuild 2775 RMD160 93ad5aeaf17c0d1272d71a37330b7c5f36a8f796 SHA1 244c09eeefb5e0d9fc14ae456629842b67720cf0 SHA256 9c0192acbfcf63ad3d3a884539cc36dc72b6f980d53dd81c58cb4cf7a926a043 +MD5 815c814fe3eef8a048e553e87b7e237f rpm-4.4.6-r3.ebuild 2775 +RMD160 93ad5aeaf17c0d1272d71a37330b7c5f36a8f796 rpm-4.4.6-r3.ebuild 2775 +SHA256 9c0192acbfcf63ad3d3a884539cc36dc72b6f980d53dd81c58cb4cf7a926a043 rpm-4.4.6-r3.ebuild 2775 +EBUILD rpm-4.4.6-r4.ebuild 3047 RMD160 39328127dcf0bde2792922fcf93e79219a000216 SHA1 2eceb86c44953c02b742bd22f61de0708ca8759f SHA256 87066e1d9594d9a2d3ece3a6f9f23090e89b4b7739acab525f25a4966ac3d558 +MD5 d15aea7bda233634638b953bf1a9a452 rpm-4.4.6-r4.ebuild 3047 +RMD160 39328127dcf0bde2792922fcf93e79219a000216 rpm-4.4.6-r4.ebuild 3047 +SHA256 87066e1d9594d9a2d3ece3a6f9f23090e89b4b7739acab525f25a4966ac3d558 rpm-4.4.6-r4.ebuild 3047 +EBUILD rpm-4.4.7-r1.ebuild 2794 RMD160 c5afdbf9fe52b9bf4c48eaedd2d9886af90e900d SHA1 e415019dc31032c80e5ab9e127f66dc4f9e413b2 SHA256 7a1bdd8bf0541ad1c58e0c3b19f3c4fed15df017496d977c92c361fb4d8971e3 +MD5 6c4741214b31937fbba288f3b956995b rpm-4.4.7-r1.ebuild 2794 +RMD160 c5afdbf9fe52b9bf4c48eaedd2d9886af90e900d rpm-4.4.7-r1.ebuild 2794 +SHA256 7a1bdd8bf0541ad1c58e0c3b19f3c4fed15df017496d977c92c361fb4d8971e3 rpm-4.4.7-r1.ebuild 2794 +EBUILD rpm-4.4.7-r2.ebuild 2989 RMD160 937b40114e5acfd171618b6649619175438e8ac6 SHA1 9da20fb85c32d3a28a9061bf99f86e0e6d02f505 SHA256 c02f8f206b8dfbccca95e31b45cac223cb57bff79ba7160d2a3c757bd728fe57 +MD5 5cfb3d56945c4504f5af7096428c3230 rpm-4.4.7-r2.ebuild 2989 +RMD160 937b40114e5acfd171618b6649619175438e8ac6 rpm-4.4.7-r2.ebuild 2989 +SHA256 c02f8f206b8dfbccca95e31b45cac223cb57bff79ba7160d2a3c757bd728fe57 rpm-4.4.7-r2.ebuild 2989 +EBUILD rpm-4.4.7-r3.ebuild 8157 RMD160 2a6ca4742e72e0a66c3d5e83f3642a44da220fa3 SHA1 b179c3df968799af5e753e47ebd8f085ebfcfb9d SHA256 06b3a59deac479eba28da1d0d90a803192e63c1f6fe67ff031ffa529c98cf455 +MD5 1eb162bc2730f26f3e26ef51dfab995a rpm-4.4.7-r3.ebuild 8157 +RMD160 2a6ca4742e72e0a66c3d5e83f3642a44da220fa3 rpm-4.4.7-r3.ebuild 8157 +SHA256 06b3a59deac479eba28da1d0d90a803192e63c1f6fe67ff031ffa529c98cf455 rpm-4.4.7-r3.ebuild 8157 +MISC ChangeLog 12151 RMD160 cf987db0d021663ea0558913731266ec477fb466 SHA1 c792f46277dd4936ec2a09d09121b70c7a169d18 SHA256 b7d50b6fd2946d28dfce97eec4bd43795e0ab37555d3d8b85e3e3e8966c98459 +MD5 d7273fcc186f91f58c2c6f5e720725e4 ChangeLog 12151 +RMD160 cf987db0d021663ea0558913731266ec477fb466 ChangeLog 12151 +SHA256 b7d50b6fd2946d28dfce97eec4bd43795e0ab37555d3d8b85e3e3e8966c98459 ChangeLog 12151 MISC metadata.xml 221 RMD160 57859b0d6c681ad2aa7db0d58348892219149231 SHA1 37657578addb8fd633479dd88dc6f8011ac55080 SHA256 01f54e470bf605b606876efa6e6bfd634a2f964909f3920b0994fe2b21c3b731 MD5 305207dd9314b4b02a0becf597cf875f metadata.xml 221 RMD160 57859b0d6c681ad2aa7db0d58348892219149231 metadata.xml 221 @@ -56,9 +79,22 @@ SHA256 01f54e470bf605b606876efa6e6bfd634a2f964909f3920b0994fe2b21c3b731 metadata MD5 5ee2f2cd59d279b728247d54548a3529 files/digest-rpm-4.4.6-r3 235 RMD160 cb1beebaaafaa9024dca4713846df4da6877e723 files/digest-rpm-4.4.6-r3 235 SHA256 1a9d97d24a7c07cfd808a471e9fd22ced0813b41a109f6716b1d216fc828ecce files/digest-rpm-4.4.6-r3 235 +MD5 5ee2f2cd59d279b728247d54548a3529 files/digest-rpm-4.4.6-r4 235 +RMD160 cb1beebaaafaa9024dca4713846df4da6877e723 files/digest-rpm-4.4.6-r4 235 +SHA256 1a9d97d24a7c07cfd808a471e9fd22ced0813b41a109f6716b1d216fc828ecce files/digest-rpm-4.4.6-r4 235 MD5 1bb4771bd008ae0ecf2541173a600056 files/digest-rpm-4.4.7-r1 235 RMD160 5738523442bad1419926794367ffc30a16b59140 files/digest-rpm-4.4.7-r1 235 SHA256 1bf6cb96963acf3da6ad4a4b2e8166f0b426c0e396cdfe4428b2386d1fcad697 files/digest-rpm-4.4.7-r1 235 -MD5 18dfcdb4d8f4adc13946e28c5de86030 files/digest-rpm-4.4.7-r2 491 -RMD160 48986918cca3c8ec1cb91467da3b7f5a28a39ff4 files/digest-rpm-4.4.7-r2 491 -SHA256 478cc2c4a2e93efbe0b1902f3f5591fa78d2d64f20ad7586346685275313bd5a files/digest-rpm-4.4.7-r2 491 +MD5 1bb4771bd008ae0ecf2541173a600056 files/digest-rpm-4.4.7-r2 235 +RMD160 5738523442bad1419926794367ffc30a16b59140 files/digest-rpm-4.4.7-r2 235 +SHA256 1bf6cb96963acf3da6ad4a4b2e8166f0b426c0e396cdfe4428b2386d1fcad697 files/digest-rpm-4.4.7-r2 235 +MD5 18dfcdb4d8f4adc13946e28c5de86030 files/digest-rpm-4.4.7-r3 491 +RMD160 48986918cca3c8ec1cb91467da3b7f5a28a39ff4 files/digest-rpm-4.4.7-r3 491 +SHA256 478cc2c4a2e93efbe0b1902f3f5591fa78d2d64f20ad7586346685275313bd5a files/digest-rpm-4.4.7-r3 491 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF0MJmwmS/YhfgUiURAk81AJ0R9GH62fo9Kq7kAbQWRLvPHkdl2gCgookE +j6jGttMk+yr25nhDxdwYOoI= +=Wmks +-----END PGP SIGNATURE----- diff --git a/app-arch/rpm/files/digest-rpm-4.4.6-r4 b/app-arch/rpm/files/digest-rpm-4.4.6-r4 new file mode 100644 index 000000000000..8dae251f56e0 --- /dev/null +++ b/app-arch/rpm/files/digest-rpm-4.4.6-r4 @@ -0,0 +1,3 @@ +MD5 baa6f371446c65b4080d1cd1f194a7ae rpm-4.4.6.tar.gz 17157249 +RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 rpm-4.4.6.tar.gz 17157249 +SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595 rpm-4.4.6.tar.gz 17157249 diff --git a/app-arch/rpm/files/digest-rpm-4.4.7-r2 b/app-arch/rpm/files/digest-rpm-4.4.7-r2 index 2739a8ed4c19..8ad784707d6f 100644 --- a/app-arch/rpm/files/digest-rpm-4.4.7-r2 +++ b/app-arch/rpm/files/digest-rpm-4.4.7-r2 @@ -1,6 +1,3 @@ -MD5 3df07424eb50a8dc9f174acd649746af rpm-4.4.7-patches-1.tar.gz 48537 -RMD160 9baaf952fa105bc2a51241eac89ff28ffd2378a0 rpm-4.4.7-patches-1.tar.gz 48537 -SHA256 1444dc2eb7c07953bd5e0857d6d9db3817a692308729288d3acd84910abdb4a4 rpm-4.4.7-patches-1.tar.gz 48537 MD5 d012c81b5169f7377ea4a36607e1445e rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c rpm-4.4.7.tar.gz 14125623 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5 rpm-4.4.7.tar.gz 14125623 diff --git a/app-arch/rpm/files/digest-rpm-4.4.7-r3 b/app-arch/rpm/files/digest-rpm-4.4.7-r3 new file mode 100644 index 000000000000..2739a8ed4c19 --- /dev/null +++ b/app-arch/rpm/files/digest-rpm-4.4.7-r3 @@ -0,0 +1,6 @@ +MD5 3df07424eb50a8dc9f174acd649746af rpm-4.4.7-patches-1.tar.gz 48537 +RMD160 9baaf952fa105bc2a51241eac89ff28ffd2378a0 rpm-4.4.7-patches-1.tar.gz 48537 +SHA256 1444dc2eb7c07953bd5e0857d6d9db3817a692308729288d3acd84910abdb4a4 rpm-4.4.7-patches-1.tar.gz 48537 +MD5 d012c81b5169f7377ea4a36607e1445e rpm-4.4.7.tar.gz 14125623 +RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c rpm-4.4.7.tar.gz 14125623 +SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5 rpm-4.4.7.tar.gz 14125623 diff --git a/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch b/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch new file mode 100644 index 000000000000..25537d19b009 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch @@ -0,0 +1,21 @@ +--- rpm-4.4.6/rpmio/url.c.orig 2007-01-20 16:29:35.471962977 +0100 ++++ rpm-4.4.6/rpmio/url.c 2007-01-20 16:30:34.438967191 +0100 +@@ -28,6 +28,8 @@ + #define IPPORT_PGPKEYSERVER 11371 + #endif + ++#include ++ + /** + */ + /*@unchecked@*/ + +--- rpm-4.4.6/lib/rpmfi.c.orig 2007-01-20 18:11:30.186124993 +0100 ++++ rpm-4.4.6/lib/rpmfi.c 2007-01-20 18:13:26.938313715 +0100 +@@ -24,6 +24,7 @@ + + #include "misc.h" /* XXX stripTrailingChar */ + #include "rpmmacro.h" /* XXX rpmCleanPath */ ++#include "legacy.h" /* XXX dodigest */ + + #include "debug.h" diff --git a/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch b/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch new file mode 100644 index 000000000000..a5627ebc0599 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch @@ -0,0 +1,33 @@ +--- rpmio/url.c.orig 2007-01-20 16:29:35.471962977 +0100 ++++ rpmio/url.c 2007-01-20 16:30:34.438967191 +0100 +@@ -28,6 +28,8 @@ + #define IPPORT_PGPKEYSERVER 11371 + #endif + ++#include ++ + /** + */ + /*@unchecked@*/ + +--- lib/rpmrc.c.orig 2007-01-20 16:40:21.922342919 +0100 ++++ lib/rpmrc.c 2007-01-20 16:42:11.185674112 +0100 +@@ -13,7 +13,7 @@ + #else + #define __power_pc() 0 + #endif +- ++#include + #include + #include + #include + +--- lib/rpmfi.c.orig 2007-01-20 18:11:30.186124993 +0100 ++++ lib/rpmfi.c 2007-01-20 18:13:26.938313715 +0100 +@@ -24,6 +24,7 @@ + + #include "misc.h" /* XXX stripTrailingChar */ + #include "rpmmacro.h" /* XXX rpmCleanPath */ ++#include "legacy.h" /* XXX dodigest */ + + #include "debug.h" diff --git a/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch b/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch new file mode 100644 index 000000000000..96f7afbf1eab --- /dev/null +++ b/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch @@ -0,0 +1,14 @@ +Fix QA Notice: Function `dbiFreeIndexSet' implicitly converted to pointer at transaction.c:2086 +that will almost certainly crash on 64bit architectures. +Patch provided by Jeff Johnson on Rpm-devel list. +--- rpm-4.4.7/lib/transaction.c.orig 2007-01-20 15:44:30.275657635 +0100 ++++ rpm-4.4.7/lib/transaction.c 2007-01-20 15:45:09.818625107 +0100 +@@ -2083,7 +2083,7 @@ + shared->isRemoved = (knownBad == ro); + shared++; + } +- matches[i] = dbiFreeIndexSet(matches[i]); ++ (void) dbiFreeIndexSet(matches[i]); + } + numShared = shared - sharedList; + shared->otherPkg = -1; diff --git a/app-arch/rpm/rpm-4.4.6-r3.ebuild b/app-arch/rpm/rpm-4.4.6-r3.ebuild index b67487186a0c..0b6ac16a7ca6 100644 --- a/app-arch/rpm/rpm-4.4.6-r3.ebuild +++ b/app-arch/rpm/rpm-4.4.6-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r3.ebuild,v 1.1 2006/11/06 21:11:24 sanchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r3.ebuild,v 1.2 2007/02/12 19:44:53 sanchan Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" diff --git a/app-arch/rpm/rpm-4.4.6-r4.ebuild b/app-arch/rpm/rpm-4.4.6-r4.ebuild new file mode 100644 index 000000000000..9dd6bd0198e8 --- /dev/null +++ b/app-arch/rpm/rpm-4.4.6-r4.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/02/12 19:44:53 sanchan 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 ~mips ~ppc ~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" +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 + + # 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-r1.ebuild b/app-arch/rpm/rpm-4.4.7-r1.ebuild index 2a63e1692ebb..b7d95e094be1 100644 --- a/app-arch/rpm/rpm-4.4.7-r1.ebuild +++ b/app-arch/rpm/rpm-4.4.7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r1.ebuild,v 1.1 2006/11/06 21:11:24 sanchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r1.ebuild,v 1.2 2007/02/12 19:44:53 sanchan Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" diff --git a/app-arch/rpm/rpm-4.4.7-r2.ebuild b/app-arch/rpm/rpm-4.4.7-r2.ebuild index 0d1a0657b7bf..8538189a621f 100644 --- a/app-arch/rpm/rpm-4.4.7-r2.ebuild +++ b/app-arch/rpm/rpm-4.4.7-r2.ebuild @@ -1,48 +1,35 @@ # Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/01/16 22:10:59 sanchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r2.ebuild,v 1.2 2007/02/12 19:44:53 sanchan Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -inherit eutils autotools distutils perl-module gnuconfig toolchain-funcs +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 - http://dev.gentoo.org/~sanchan/patches/rpm-4.4.7-patches-1.tar.gz" +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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="berkdb doc elibc_uclibc java lua minimal nls perl python sqlite threads" -GUID="37" +IUSE="nls python perl doc sqlite" -RDEPEND="berkdb? ( >sys-libs/db-4 ) +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 - elibc_glibc? ( dev-libs/elfutils ) + dev-libs/elfutils virtual/libintl - >=dev-libs/beecrypt-4.1.2 + >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) - nls? ( sys-devel/gettext ) + nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) net-misc/neon" -# lua? ( dev-lang/lua ) DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen )" -pkg_setup() { - if ! (use berkdb || use sqlite) ; then - ewarn "Haven't chosen any database format, either berkdb or sqlite" - ewarn "have to be used!" - die - fi -} - src_unpack() { unpack ${A} cd "${S}" @@ -50,103 +37,36 @@ src_unpack() { 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 "${WORKDIR}"/${P}-openpkg.bugfix.patch - epatch "${WORKDIR}"/${P}-openpkg.porting.patch - epatch "${WORKDIR}"/${P}-openpkg.feature.patch - epatch "${WORKDIR}"/${P}-libintl.patch - epatch "${FILESDIR}"/rpm-4.0.4-sandbox.patch - epatch "${WORKDIR}"/${P}-zdefs.patch - epatch "${WORKDIR}"/${P}-zdefs-x_functions.patch - epatch "${WORKDIR}"/${P}-uclibc-nolibio.patch - epatch "${WORKDIR}"/${P}-uclibc-no__fxstat64.patch - epatch "${WORKDIR}"/${P}-fix-exec_prefix.patch - - epatch "${WORKDIR}"/${P}-no_threads.patch - epatch "${WORKDIR}"/${P}-no_threads2.patch - epatch "${WORKDIR}"/${P}-with-threads.patch - - epatch "${WORKDIR}"/${P}-gentoo.patch - epatch "${WORKDIR}"/${P}-fix-redhat.patch - epatch "${FILESDIR}"/rpm-4.0.4-gentoo-uclibc.patch - - epatch "${WORKDIR}"/${P}-external_db.patch - epatch "${WORKDIR}"/${P}-external_db2.patch - epatch "${WORKDIR}"/${P}-external_db3.patch - - epatch "${WORKDIR}"/${P}-no_lua.patch - - cp autodeps/linux.req autodeps/linux-uclibc.req - cp autodeps/linux.prov autodeps/linux-uclibc.prov + epatch "${FILESDIR}"/${P}-qa-implicit-function-to-pointer.patch + epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch # rpm uses AM_GNU_GETTEXT() but fails to actually # include any of the required gettext files - # the gettext files exist only if gettext is installed (not on uClibc) - if use nls ; then - cp /usr/share/gettext/config.rpath . || die - else - epatch "${FILESDIR}"/${P}-config.rpath.patch - sed -i -e '/AM_GNU_GETTEXT/d' configure.ac - sed -i -e '/^SUBDIRS/s:po::' Makefile.am - fi - if use elibc_uclibc ; then - sed -i 's:--enable-rpc:--disable-rpc:' db3/configure - sed -i 's:rpmdb_svc rpmdb_stat:rpmdb_stat:' rpmdb/Makefile.am - fi + 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 syck tools - use lua || rm -rf lua - use berkdb && rm -rf db db3 - #use sqlite && rm -rf db db3 + 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 - use nls || sed -i -e "s:@INTLLIBS@::" lib/Makefile.am - sed -i -e '/lua\/Makefile/d' configure.ac - sed -i -e '/syck\/Makefile/d' -e '/syck\/lib\/Makefile/d' configure.ac - sed -i -e '/tools\/Makefile/d' configure.ac - sed -i -e '/^SUBDIRS/s:tools scripts:scripts:' Makefile.am - - gnuconfig_update AT_NO_RECURSIVE="yes" eautoreconf - # TODO: make it work with external lua too + # TODO Get rid of internal copies of lua, db and db3 } src_compile() { - # we use arch-gentoo-linux-{gnu,uclibc} tuple - export CHOST="${CHOST//-pc-/-gentoo-}" - export CHOST="${CHOST//-unknown-/-gentoo-}" - - local myconf - if use threads ; then - myconf="--with-threads --enable-posixmutexes" - else - myconf="--without-threads --disable-posixmutexes --with-mutex=\"UNIX/fcntl\"" - fi - if use minimal ; then - # it does not work with berkdb, hash method is missing - if use berkdb ; then - myconf="${myconf} --disable-cryptography --disable-queue - --disable-replication --disable-verify" - else - myconf="${myconf} --enable-smallbuild" - fi - fi - - -#$(use_with perl) \ + # Until strict aliasing is porperly fixed... + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing python_version - econf ${myconf} \ + econf \ + --enable-posixmutexes \ --without-javaglue \ --without-selinux \ - --without-syck \ - $(use_with lua) \ $(use_with python python ${PYVER}) \ $(use_with doc apidocs) \ - --without-perl \ - $(use_with db) \ + $(use_with perl) \ $(use_with sqlite) \ $(use_enable nls) \ || die "econf failed" @@ -161,76 +81,16 @@ src_install() { use nls || rm -rf "${D}"/usr/share/man/?? - keepdir /etc/rpm - keepdir /var/spool/repackage - keepdir /var/lib/rpm - local dbi - for dbi in \ - Basenames Conflictname Dirnames Group Installtid Name Packages \ - Providename Provideversion Requirename Requireversion Triggername \ - Filemd5s Pubkeys Sha1header Sigmd5 Depends \ - __db.001 __db.002 __db.003 __db.004 __db.006 __db.007 \ - __db.008 __db.009 - do - touch "${D}"/var/lib/rpm/${dbi} - done - keepdir /usr/src/gentoo/{SRPMS,SPECS,SOURCES,RPMS,BUILD} - keepdir /usr/src/gentoo/RPMS/noarch - keepdir /usr/src/gentoo/RPMS/$(tc-arch) - local x - if [[ $(tc-arch) == "x86" ]] ; then - for x in athlon i386 i486 i586 i686 pentium3 pentium4 ; do - keepdir /usr/src/gentoo/RPMS/${x} - done - #else - #[[ $(tc-arch) == "ppc64" ]] && keepdir /usr/src/gentoo/RPMS/ppc - fi + 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 - - # remove development stuff - rm -rf "${D}"/usr/include - rm -f "${D}"/usr/lib/lib*.*a - rm -f "${D}"/usr/lib/rpm/rpmcache - rm -f "${D}"/usr/bin/rpmgraph - rm -f "${D}"/usr/share/man/man*/rpmcache* - rm -f "${D}"/usr/share/man/man*/rpmgraph* - # remove unneeded links - rm -f "${D}"/usr/bin/rpm? - # remove unused utilities/files - #rm -f "${D}"/usr/lib/rpm/rpm.{daily,log,xinetd} - rm -f "${D}"/usr/lib/rpm/rpm.xinetd - [[ $(tc-arch) != "sparc64" ]] && rm -f "${D}"/usr/lib/rpm/*sparc64* - use java || rm -f "${D}"/usr/lib/rpm/*java* - dodir /etc/logrotate.d - mv "${D}"/usr/lib/rpm/rpm.log "${D}"/etc/logrotate.d/rpm - dodir /etc/cron.daily - mv "${D}"/usr/lib/rpm/rpm.daily "${D}"/etc/cron.daily/rpm - # remove unused requirement checks - rm -f "${D}"/usr/lib/rpm/{tcl,sql}.* - # misc - rm -f "${D}"/usr/lib/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi} - # disable automatic perl requirements - # puts too much info into db - chmod 644 "${D}"/usr/lib/rpm/perl.req - - dodir /etc/env.d - echo 'CONFIG_PROTECT_MASK="/var/lib/rpm"' > "${D}"/etc/env.d/50rpm -} - -pkg_preinst() { - enewgroup ${PN} ${GUID} - enewuser ${PN} ${GUID} /bin/bash /var/lib/rpm rpm } pkg_postinst() { - chown -R rpm:rpm ${ROOT}/usr/lib/rpm - chown -R rpm:rpm ${ROOT}/var/lib/rpm - chown rpm:rpm ${ROOT}/usr/bin/rpm{,2cpio,build,db,query,sign,verify} 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} @@ -238,7 +98,6 @@ pkg_postinst() { einfo "No RPM database found... Creating database..." "${ROOT}"/usr/bin/rpm --initdb --root=${ROOT} fi - chown rpm:rpm ${ROOT}/var/lib/rpm/* distutils_pkg_postinst } diff --git a/app-arch/rpm/rpm-4.4.7-r3.ebuild b/app-arch/rpm/rpm-4.4.7-r3.ebuild new file mode 100644 index 000000000000..6f5649e06220 --- /dev/null +++ b/app-arch/rpm/rpm-4.4.7-r3.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/02/12 19:44:53 sanchan Exp $ + +inherit eutils autotools distutils gnuconfig toolchain-funcs 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 + http://dev.gentoo.org/~sanchan/patches/rpm-4.4.7-patches-1.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="berkdb doc elibc_uclibc java lua minimal nls perl python sqlite threads debug" +GUID="37" + +RDEPEND="berkdb? ( >sys-libs/db-4 ) + >=sys-libs/zlib-1.2.3-r1 + >=app-arch/bzip2-1.0.1 + >=dev-libs/popt-1.7 + >=app-crypt/gnupg-1.2 + elibc_glibc? ( dev-libs/elfutils ) + virtual/libintl + >=dev-libs/beecrypt-4.1.2 + python? ( >=dev-lang/python-2.2 ) + perl? ( >=dev-lang/perl-5.8.8 ) + nls? ( sys-devel/gettext ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + net-misc/neon" +# lua? ( dev-lang/lua ) +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + doc? ( app-doc/doxygen )" + +pkg_setup() { + if use perl; then + ewarn "Perl bindings are provided by perl module RPM2. Just run:" + ewarn "emerge app-portage/g-cpan" + ewarn "g-cpan -i RPM2" + ewarn "or if you prefer:" + ewarn "g-cpan -i RPM4" + fi + if ! (use berkdb || use sqlite) ; then + ewarn "Haven't chosen any database format, either berkdb or sqlite" + ewarn "have to be used!" + die + fi +} + +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 "${WORKDIR}"/${P}-openpkg.bugfix.patch + epatch "${WORKDIR}"/${P}-openpkg.porting.patch + epatch "${WORKDIR}"/${P}-openpkg.feature.patch + epatch "${WORKDIR}"/${P}-libintl.patch + epatch "${FILESDIR}"/rpm-4.0.4-sandbox.patch + epatch "${WORKDIR}"/${P}-zdefs.patch + epatch "${WORKDIR}"/${P}-zdefs-x_functions.patch + epatch "${WORKDIR}"/${P}-uclibc-nolibio.patch + epatch "${WORKDIR}"/${P}-uclibc-no__fxstat64.patch + epatch "${WORKDIR}"/${P}-fix-exec_prefix.patch + + epatch "${WORKDIR}"/${P}-no_threads.patch + epatch "${WORKDIR}"/${P}-no_threads2.patch + epatch "${WORKDIR}"/${P}-with-threads.patch + + epatch "${WORKDIR}"/${P}-gentoo.patch + epatch "${WORKDIR}"/${P}-fix-redhat.patch + epatch "${FILESDIR}"/rpm-4.0.4-gentoo-uclibc.patch + + #epatch "${WORKDIR}"/${P}-external_db.patch + #epatch "${WORKDIR}"/${P}-external_db2.patch + #epatch "${WORKDIR}"/${P}-external_db3.patch + + epatch "${WORKDIR}"/${P}-no_lua.patch + epatch "${FILESDIR}"/${P}-qa-implicit-function-to-pointer.patch + epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch + + cp autodeps/linux.req autodeps/linux-uclibc.req + cp autodeps/linux.prov autodeps/linux-uclibc.prov + + # rpm uses AM_GNU_GETTEXT() but fails to actually + # include any of the required gettext files + # the gettext files exist only if gettext is installed (not on uClibc) + if use nls ; then + cp /usr/share/gettext/config.rpath . || die + else + epatch "${FILESDIR}"/${P}-config.rpath.patch + sed -i -e '/AM_GNU_GETTEXT/d' configure.ac + sed -i -e '/^SUBDIRS/s:po::' Makefile.am + fi + if use elibc_uclibc ; then + sed -i 's:--enable-rpc:--disable-rpc:' db3/configure + sed -i 's:rpmdb_svc rpmdb_stat:rpmdb_stat:' rpmdb/Makefile.am + fi + + # 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 syck tools perl + use lua || rm -rf lua + + sed -i -e "s:intl ::" Makefile.am + sed -i -e "s:intl/Makefile ::" configure.ac + use nls || sed -i -e "s:@INTLLIBS@::" lib/Makefile.am + sed -i -e '/lua\/Makefile/d' configure.ac + sed -i -e '/syck\/Makefile/d' -e '/syck\/lib\/Makefile/d' configure.ac + sed -i -e '/tools\/Makefile/d' configure.ac + sed -i -e '/^SUBDIRS/s:tools scripts:scripts:' Makefile.am + + gnuconfig_update + AT_NO_RECURSIVE="yes" eautoreconf + # TODO: make it work with external lua too +} + +src_compile() { + # Until strict aliasing is porperly fixed... + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + use debug && append-flags -g2 -ggdb && filter-flags -fomit-frame-pointer + + # we use arch-gentoo-linux-{gnu,uclibc} tuple + export CHOST="${CHOST//-pc-/-gentoo-}" + export CHOST="${CHOST//-unknown-/-gentoo-}" + + local myconf + if use threads ; then + myconf="--with-threads --enable-posixmutexes" + else + #myconf="--without-threads --disable-posixmutexes --with-mutex=\"UNIX/fcntl\"" + myconf="--without-threads --disable-posixmutexes" + fi + if use berkdb ; then + myconf="${myconf} --with-db" + else + myconf="${myconf} --without-db" + fi + if use minimal ; then + # it does not work with berkdb, hash method is missing + if use berkdb ; then + myconf="${myconf} --disable-cryptography --disable-queue --disable-replication --disable-verify" + else + myconf="${myconf} --enable-smallbuild" + fi + fi + + + python_version + econf ${myconf} \ + --without-javaglue \ + --without-selinux \ + --without-syck \ + --without-perl \ + $(use_with lua) \ + $(use_with python python ${PYVER}) \ + $(use_with doc apidocs) \ + $(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 /etc/rpm + keepdir /var/spool/repackage + keepdir /var/lib/rpm + local dbi + for dbi in \ + Basenames Conflictname Dirnames Group Installtid Name Packages \ + Providename Provideversion Requirename Requireversion Triggername \ + Filemd5s Pubkeys Sha1header Sigmd5 Depends \ + __db.001 __db.002 __db.003 __db.004 __db.006 __db.007 \ + __db.008 __db.009 + do + touch "${D}"/var/lib/rpm/${dbi} + done + keepdir /usr/src/gentoo/{SRPMS,SPECS,SOURCES,RPMS,BUILD} + keepdir /usr/src/gentoo/RPMS/noarch + keepdir /usr/src/gentoo/RPMS/$(tc-arch) + local x + if [[ $(tc-arch) == "x86" ]] ; then + for x in athlon i386 i486 i586 i686 pentium3 pentium4 ; do + keepdir /usr/src/gentoo/RPMS/${x} + done + #else + #[[ $(tc-arch) == "ppc64" ]] && keepdir /usr/src/gentoo/RPMS/ppc + fi + + dodoc CHANGES CREDITS GROUPS README* RPM* + use doc && dohtml -r apidocs/html/* + + # remove development stuff + rm -rf "${D}"/usr/include + rm -f "${D}"/usr/lib/lib*.*a + rm -f "${D}"/usr/lib/rpm/rpmcache + rm -f "${D}"/usr/bin/rpmgraph + rm -f "${D}"/usr/share/man/man*/rpmcache* + rm -f "${D}"/usr/share/man/man*/rpmgraph* + # remove unneeded links + rm -f "${D}"/usr/bin/rpm? + # remove unused utilities/files + #rm -f "${D}"/usr/lib/rpm/rpm.{daily,log,xinetd} + rm -f "${D}"/usr/lib/rpm/rpm.xinetd + [[ $(tc-arch) != "sparc64" ]] && rm -f "${D}"/usr/lib/rpm/*sparc64* + use java || rm -f "${D}"/usr/lib/rpm/*java* + dodir /etc/logrotate.d + mv "${D}"/usr/lib/rpm/rpm.log "${D}"/etc/logrotate.d/rpm + dodir /etc/cron.daily + mv "${D}"/usr/lib/rpm/rpm.daily "${D}"/etc/cron.daily/rpm + # remove unused requirement checks + rm -f "${D}"/usr/lib/rpm/{tcl,sql}.* + # misc + rm -f "${D}"/usr/lib/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi} + # disable automatic perl requirements + # puts too much info into db + chmod 644 "${D}"/usr/lib/rpm/perl.req + + 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 + + dodir /etc/env.d + echo 'CONFIG_PROTECT_MASK="/var/lib/rpm"' > "${D}"/etc/env.d/50rpm +} + +pkg_preinst() { + enewgroup ${PN} ${GUID} + enewuser ${PN} ${GUID} /bin/bash /var/lib/rpm rpm +} + +pkg_postinst() { + chown -R rpm:rpm ${ROOT}/usr/lib/rpm + chown -R rpm:rpm ${ROOT}/var/lib/rpm + chown rpm:rpm ${ROOT}/usr/bin/rpm{,2cpio,build,db,query,sign,verify} + 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 + chown rpm:rpm ${ROOT}/var/lib/rpm/* + + distutils_pkg_postinst +}