From: Martin Jackson Date: Mon, 12 Feb 2007 00:13:45 +0000 (+0000) Subject: More fixes for 165482 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22ede50a4377da166faf39bf1e2cee4c3b2f0510;p=gentoo.git More fixes for 165482 Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index 4ec3d1f883a1..1ff0b82660e7 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.316 2007/02/11 23:42:35 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.317 2007/02/12 00:13:45 mjolnir Exp $ + +*postgresql-7.4.16 (12 Feb 2007) + + 12 Feb 2007; Martin Jackson + +files/postgresql-7.4.16-gentoo.patch, + +files/postgresql-7.4.16-hppa-testandset.patch, +postgresql-7.4.16.ebuild: + New version of 7.4 branch for bug 165482 11 Feb 2007; Tiziano Müller postgresql-7.3.18.ebuild: diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest index c779a3bb4cd3..24ce911bb1f0 100644 --- a/dev-db/postgresql/Manifest +++ b/dev-db/postgresql/Manifest @@ -58,6 +58,14 @@ AUX postgresql-7.4.14-hppa-testandset.patch 1394 RMD160 8f65f37b7e6cf251c4ab1342 MD5 2bf25091efb109eaf759b63e39b08716 files/postgresql-7.4.14-hppa-testandset.patch 1394 RMD160 8f65f37b7e6cf251c4ab134227570ee9974915a8 files/postgresql-7.4.14-hppa-testandset.patch 1394 SHA256 226f17c6064f53be2908325153b64e5f3b7d3e2275b7bd0f1abac27404b4678e files/postgresql-7.4.14-hppa-testandset.patch 1394 +AUX postgresql-7.4.16-gentoo.patch 2246 RMD160 618bfbcc5de1ab2aea671d97527b4cf7af1fa55e SHA1 d316491ba1ee1f3d751020aba6b4839671f73634 SHA256 9f90274605a96f5e62a23a5a299d28c37b8e3af114baa98675524a07e3648557 +MD5 72fb3a920e30c1b068c6c05c7349b1f7 files/postgresql-7.4.16-gentoo.patch 2246 +RMD160 618bfbcc5de1ab2aea671d97527b4cf7af1fa55e files/postgresql-7.4.16-gentoo.patch 2246 +SHA256 9f90274605a96f5e62a23a5a299d28c37b8e3af114baa98675524a07e3648557 files/postgresql-7.4.16-gentoo.patch 2246 +AUX postgresql-7.4.16-hppa-testandset.patch 1394 RMD160 8f65f37b7e6cf251c4ab134227570ee9974915a8 SHA1 359a4b598aa419d5ae92d746d13abd4a6e05a0cf SHA256 226f17c6064f53be2908325153b64e5f3b7d3e2275b7bd0f1abac27404b4678e +MD5 2bf25091efb109eaf759b63e39b08716 files/postgresql-7.4.16-hppa-testandset.patch 1394 +RMD160 8f65f37b7e6cf251c4ab134227570ee9974915a8 files/postgresql-7.4.16-hppa-testandset.patch 1394 +SHA256 226f17c6064f53be2908325153b64e5f3b7d3e2275b7bd0f1abac27404b4678e files/postgresql-7.4.16-hppa-testandset.patch 1394 AUX postgresql-8.0-gentoo.patch 1200 RMD160 0bba8152556896c6bcdb7086d0f6b5dd5b4e8112 SHA1 64544332f2be6cae6c33b630feab224627d10681 SHA256 24c8b74a1b68de000003a4dff9768679fce76561182db1ffaa6723d161bf94bd MD5 290d9cac9f228e7479e316b68aadfd7c files/postgresql-8.0-gentoo.patch 1200 RMD160 0bba8152556896c6bcdb7086d0f6b5dd5b4e8112 files/postgresql-8.0-gentoo.patch 1200 @@ -137,6 +145,7 @@ DIST postgresql-base-7.3.16.tar.bz2 5696231 RMD160 aaf7e4743bc67c0a45d8d44cef840 DIST postgresql-base-7.3.18.tar.bz2 5695073 RMD160 62607d50fbf97ae0b954943e2e27052bcf2c5aa0 SHA1 29e2121ee6383929e8b90b50e8f7bbac218f203e SHA256 648c7bddcab5477c5d7800795f8392a3ecdd361828c4374d9804bfa61a07b048 DIST postgresql-base-7.4.13.tar.bz2 6576973 RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef SHA1 cb326a788833e805a54a80d87aeeb6fa00fb7b1e SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7 DIST postgresql-base-7.4.14.tar.bz2 6575201 RMD160 c5b8ecd20ad2783c3f254f0e7402aab9ad722d0a SHA1 b737a35070bf13f478e8bca346a32243b9599b89 SHA256 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9 +DIST postgresql-base-7.4.16.tar.bz2 6586435 RMD160 8536d5f6f26a101240c64084e6adeb260efef891 SHA1 d3f36c6ace31d3725828aa9d86f4c08f266e33e3 SHA256 d8e7df2f06f248e66023452fa9cf565640b93ae43433dade7515f54e643f5c21 DIST postgresql-base-8.0.8.tar.bz2 7823046 RMD160 2c60dc22f714bc0182051a94c3c1f513b30f574e SHA1 a5e5147497f0c2b548762d232d297b48d6e97d02 SHA256 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183 DIST postgresql-base-8.0.9.tar.bz2 7824961 RMD160 40cbea0b0a3a0f67670dfbe1670e08b48dbb1999 SHA1 d11bb58349b3e42fd0a19ceb732e9381bba89b16 SHA256 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417 DIST postgresql-base-8.1.5.tar.bz2 8044522 RMD160 3460f38b720ce3a9687052d5523bcbd027655d6e SHA1 7d6cc07ca1cb8cb57a366a7860310a892fe6a2ba SHA256 cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df @@ -145,6 +154,7 @@ DIST postgresql-docs-7.3.16.tar.bz2 2361886 RMD160 ae36bf748e8a8a0b4842ddab48c2d DIST postgresql-docs-7.3.18.tar.bz2 2363625 RMD160 5c95e654b7029f1d6289987ad0a08266ab6e54fa SHA1 0165ca2c16d3095fbc96a2fa5dd1800bd163071a SHA256 24f509b444dc1a9009ffdb6a8e484f038762b971cea60fb9bdc8943fd6a0fa55 DIST postgresql-docs-7.4.13.tar.bz2 2426721 RMD160 4500c150a1638279394bf6f6882682f019ddf8ae SHA1 60c145ec822fca74cab03f3e11918df22752f899 SHA256 31d91342f23dc842839ee9f5b7475582a2e232c6831c6d514c3a414ed28ebdf8 DIST postgresql-docs-7.4.14.tar.bz2 2427724 RMD160 dd67ae2c4552986ced80d1ba52df50a5ae63db9b SHA1 47296643429237d81a0565aac819ded106cca36b SHA256 6739dcb6876e1f76933f88feae0b7d0a5e528e9677dac4175e3223ef379ed789 +DIST postgresql-docs-7.4.16.tar.bz2 2429657 RMD160 f6b50b3b7c1c5bad00b9a33694eef46634bd95f1 SHA1 4b49280188e269d87579004795c7063b58797cbc SHA256 7478f43e5071756434526259895f16ffeffa4c8a11dbd9af2df34250a7f463be DIST postgresql-docs-8.0.8.tar.bz2 2260219 RMD160 e3dbde03b553000d5a263a93713c434e88dd4fe1 SHA1 2f845d6740c7ed88d0b9240b274a75d479658f7c SHA256 60a93ee5b2b80f517696328d85f4db24791cb1099d89a0adc375ee740201dc54 DIST postgresql-docs-8.0.9.tar.bz2 2262698 RMD160 55df79bfc347147c33db925a1138c2341043f887 SHA1 f7c7acb292c2bc6256fc29b18ce7b4e9b7a1fafb SHA256 b55d4a77c0c3b0f42c7233c08112b884e1463157160007efd70a63806ede632b DIST postgresql-docs-8.1.5.tar.bz2 2489400 RMD160 a29a5d1738f6f776597d162d9fc6d69805c74943 SHA1 69a06691cae02ade3888c9c7f813ae5394be070a SHA256 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9 @@ -153,12 +163,14 @@ DIST postgresql-opt-7.3.16.tar.bz2 341908 RMD160 00e0f059910eed3021ba5b096e86bdc DIST postgresql-opt-7.3.18.tar.bz2 342315 RMD160 fa7cb704ff7bb131f6108217c645821413ecd5b8 SHA1 5c1a8a103d696668abae7d8931c0dd687cdb7766 SHA256 6d422a3d4d56192952c035d01aff59b90c7ab7b3cdb7f300572e40dd20db5e4b DIST postgresql-opt-7.4.13.tar.bz2 333860 RMD160 9fd1caacd6d842a473725450a0973173f68ae7b8 SHA1 79455e60f074a488ab3abafd10bfce4c63b33293 SHA256 8139a7161b2a55eba304b027896f0bfc81523dd41f7d1df222274b7a55e5aeab DIST postgresql-opt-7.4.14.tar.bz2 333417 RMD160 a6279f5b9d52f72ce786bc468c114befb5a1f29a SHA1 becc575260128261dc7f8ed46f166f54f48b8732 SHA256 e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d +DIST postgresql-opt-7.4.16.tar.bz2 333683 RMD160 fec0e9b68c4868f4e2b85c002103089fbdbedf6f SHA1 657fe7c4ae1ba3020de4594117a1ab5db45f61bc SHA256 13a3063570c27ecc8ae163c86439b3c0b95d21bd55cac2506b105a486d410469 DIST postgresql-opt-8.0.8.tar.bz2 134600 RMD160 352f07aa25d0dcf1d2e3502f5cec7295c40bc3d5 SHA1 081d0b8d755a49395001b46ca0585c4e2b5ecf4f SHA256 427e82253b068b35e47235a1b78c521c89a9774b80dcc2433946f86220a34926 DIST postgresql-opt-8.0.9.tar.bz2 134706 RMD160 be148e079c20c13aec1767180d993933b91c2116 SHA1 a1263b4ec563ec24165db4657dcc4faab567ef90 SHA256 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020 DIST postgresql-opt-8.1.5.tar.bz2 144784 RMD160 5ac9b1ffdf1357316ceb1736f7b9be3ee339be3b SHA1 6d62463d6bcadcef1e515d740c15489ab4e428e7 SHA256 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c DIST postgresql-test-7.3.16.tar.bz2 891104 RMD160 7510ed474d4c86610c14c232cf5be13c4ca0b32b SHA1 c79aec31949e54700c45ac436b4844bc8bf5ee4e SHA256 5844984770b326cfc62580d88f878196e304867fa339925fef20c017bb298d56 DIST postgresql-test-7.3.18.tar.bz2 891032 RMD160 f18fa7025a37bf85936ba78f5cdbb4e26e0a9bfb SHA1 f9488d5c113083563b652e9d4d9c4f4918892aa3 SHA256 61bf71f0b09fa0a0dc667f636fe7a338f33d7b337159b16820a0a6240318a48e DIST postgresql-test-7.4.14.tar.bz2 902074 RMD160 c6e1f57c77815b5395882cd482ef8bc952adabbf SHA1 3b15dbebe4232f66a253ff03729ee4ec3ffbd877 SHA256 39c87c0227f8c757d29141bb8c24e2a95d3a06d9bc459667fdee4d0028d6d12d +DIST postgresql-test-7.4.16.tar.bz2 901854 RMD160 37a1ca493bd35534636dd82c1dd2468c4e37cf6c SHA1 565cfcfce7aae3e09ed1ecf0d7bc573ec0d31f96 SHA256 851d5de0f66e3a13a57acffc50f15288a2d367160902e08d0bd1a0deb72b0f39 DIST postgresql-test-8.0.9.tar.bz2 931363 RMD160 ae38c2225daff32449ebe6b483096f2f35aa8067 SHA1 1a32090f302542daa92558a3f78129cd39782b98 SHA256 f2b81b3cf7ade17a748fa84570c295817d82fd05b53d2e0fb9d9e922b0c613ea DIST postgresql-test-8.1.5.tar.bz2 947271 RMD160 644b352354743eb5250bf422c62e1f2c340c1ed2 SHA1 8371da286f43e689b5bd84999185565cb7c37d19 SHA256 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166 EBUILD postgresql-7.3.15-r1.ebuild 8526 RMD160 964cd95b6779fb33292583ff2664c7d370b0192e SHA1 6e9df5a5d79e6606d4df8cbbfa2f9d03d90cad16 SHA256 d0fe380162b88b3480a82a8ed816dc4ac201be7f5f60122c6e1a18e1846ad2df @@ -181,6 +193,10 @@ EBUILD postgresql-7.4.14.ebuild 9605 RMD160 714fa76e5346441f088962389b26287e5ab9 MD5 f549da2272d229385b72bb6cc2918d86 postgresql-7.4.14.ebuild 9605 RMD160 714fa76e5346441f088962389b26287e5ab9c6a2 postgresql-7.4.14.ebuild 9605 SHA256 769d0ce8fb6b83eac2fbee9d0c2d30d671b8a43ac052f864ff95ded4f1955541 postgresql-7.4.14.ebuild 9605 +EBUILD postgresql-7.4.16.ebuild 9616 RMD160 b500c7e9d61840371524461c7e74a34f9f01e413 SHA1 56136ac01f912dfb25c3c73e9c0f6c8181a6828b SHA256 4ffae4d15c00ac6308c2a936b94dc0fb5f7ba8161b2cb64edc4f1f362fc1f4bc +MD5 845773302899b117ec103713221d8329 postgresql-7.4.16.ebuild 9616 +RMD160 b500c7e9d61840371524461c7e74a34f9f01e413 postgresql-7.4.16.ebuild 9616 +SHA256 4ffae4d15c00ac6308c2a936b94dc0fb5f7ba8161b2cb64edc4f1f362fc1f4bc postgresql-7.4.16.ebuild 9616 EBUILD postgresql-8.0.8.ebuild 7671 RMD160 d820ff2188af6bb6d90ce81e59434187dc4a51f9 SHA1 3567eafb1099f3bd8894881e9c73ad945465aa03 SHA256 6e953e8ce3b6e057022fc2c08569f221dde779c595562b9597ffed2fdf310591 MD5 e5593b676c330eb0f88e49a7a363e5d0 postgresql-8.0.8.ebuild 7671 RMD160 d820ff2188af6bb6d90ce81e59434187dc4a51f9 postgresql-8.0.8.ebuild 7671 @@ -193,10 +209,10 @@ EBUILD postgresql-8.1.5-r1.ebuild 8497 RMD160 aec3c8a4220aba7ebe8c1e7defb136a832 MD5 ca1c9142e329325d94a0c8a168f67b50 postgresql-8.1.5-r1.ebuild 8497 RMD160 aec3c8a4220aba7ebe8c1e7defb136a83202df5a postgresql-8.1.5-r1.ebuild 8497 SHA256 ebb92b2ab9d435033a33b1695f164cca7055dea17c463dd8c834a9f4c2a57a0a postgresql-8.1.5-r1.ebuild 8497 -MISC ChangeLog 67209 RMD160 5be429bb2eb93f0871f6fdaac58597f9aea83284 SHA1 b8a8d3e0f267dd43002caa1680617658f57a6f95 SHA256 a87c819305fc58a1c708fbeb45b76d684f299b1ace519ce861dacae9c33f5a2a -MD5 7b012fe2dfcbcbff2802c92930a42fe1 ChangeLog 67209 -RMD160 5be429bb2eb93f0871f6fdaac58597f9aea83284 ChangeLog 67209 -SHA256 a87c819305fc58a1c708fbeb45b76d684f299b1ace519ce861dacae9c33f5a2a ChangeLog 67209 +MISC ChangeLog 67455 RMD160 5bf6534fad9d119cf6ceb1d8bfeb21521d9c696a SHA1 d92a0c77385b19cd97fa6ea7109943e116c6eca4 SHA256 274deb2b2494f6b390dacfefb55cf484b6b14cdffe9574e35f9667f6d86c806d +MD5 f7d324a0a457a01dfec01b91406f669c ChangeLog 67455 +RMD160 5bf6534fad9d119cf6ceb1d8bfeb21521d9c696a ChangeLog 67455 +SHA256 274deb2b2494f6b390dacfefb55cf484b6b14cdffe9574e35f9667f6d86c806d ChangeLog 67455 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164 @@ -216,6 +232,9 @@ SHA256 d4f40c91569847681ebd3254bf787f393f893c0e05b603d52eeb28e40d4fc2c4 files/di MD5 7b76bbcea127ebb491bd6d5342429198 files/digest-postgresql-7.4.14 1087 RMD160 3113cc18d78ac8358e2233fd5eb6719aca9e49f7 files/digest-postgresql-7.4.14 1087 SHA256 6910f88a5fc143d08c6ee0f6746833c586e8bb42b29d9ba7b8efa3ad53376414 files/digest-postgresql-7.4.14 1087 +MD5 9584d4741603568a5f6c52c0f33433b1 files/digest-postgresql-7.4.16 1087 +RMD160 c51a91a6ca5c01ade5a3505289c80e475bb11fff files/digest-postgresql-7.4.16 1087 +SHA256 cdcf54028993acd7d4c1f8d31f2ebc3d095193c516fbdc99aa8638fe49499ea7 files/digest-postgresql-7.4.16 1087 MD5 4dd90d685497cfc29caef97a786fbfc6 files/digest-postgresql-8.0.8 1063 RMD160 c27fbdc33e77854dda297a5466e1854a9e52f0f4 files/digest-postgresql-8.0.8 1063 SHA256 b47e1cde8cc579e0334c598c8798e6d02bdc0cf4436281949d10cf750ffb6360 files/digest-postgresql-8.0.8 1063 diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.16 b/dev-db/postgresql/files/digest-postgresql-7.4.16 new file mode 100644 index 000000000000..a8ad8607b8ec --- /dev/null +++ b/dev-db/postgresql/files/digest-postgresql-7.4.16 @@ -0,0 +1,12 @@ +MD5 a876404e4186537cba0ba9d2afe5e554 postgresql-base-7.4.16.tar.bz2 6586435 +RMD160 8536d5f6f26a101240c64084e6adeb260efef891 postgresql-base-7.4.16.tar.bz2 6586435 +SHA256 d8e7df2f06f248e66023452fa9cf565640b93ae43433dade7515f54e643f5c21 postgresql-base-7.4.16.tar.bz2 6586435 +MD5 f0465262c56f9d150fb2d4d717c14851 postgresql-docs-7.4.16.tar.bz2 2429657 +RMD160 f6b50b3b7c1c5bad00b9a33694eef46634bd95f1 postgresql-docs-7.4.16.tar.bz2 2429657 +SHA256 7478f43e5071756434526259895f16ffeffa4c8a11dbd9af2df34250a7f463be postgresql-docs-7.4.16.tar.bz2 2429657 +MD5 51aa935cac1a13483ff76d8770b51fe3 postgresql-opt-7.4.16.tar.bz2 333683 +RMD160 fec0e9b68c4868f4e2b85c002103089fbdbedf6f postgresql-opt-7.4.16.tar.bz2 333683 +SHA256 13a3063570c27ecc8ae163c86439b3c0b95d21bd55cac2506b105a486d410469 postgresql-opt-7.4.16.tar.bz2 333683 +MD5 d4dbef48016d11345868fa9f04e4501f postgresql-test-7.4.16.tar.bz2 901854 +RMD160 37a1ca493bd35534636dd82c1dd2468c4e37cf6c postgresql-test-7.4.16.tar.bz2 901854 +SHA256 851d5de0f66e3a13a57acffc50f15288a2d367160902e08d0bd1a0deb72b0f39 postgresql-test-7.4.16.tar.bz2 901854 diff --git a/dev-db/postgresql/files/postgresql-7.4.16-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.16-gentoo.patch new file mode 100644 index 000000000000..e50f94adaaad --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4.16-gentoo.patch @@ -0,0 +1,63 @@ +diff -Nru postgresql-7.4.14.orig/configure postgresql-7.4.14/configure +--- postgresql-7.4.14.orig/configure 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/configure 2006-11-05 15:48:27.000000000 +0100 +@@ -6003,7 +6003,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + pgac_cv_check_readline=no +-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do ++for pgac_lib in "" " -lncurses" " -lcurses" ; do + for pgac_rllib in -lreadline -ledit ; do + pgac_save_LIBS=$LIBS + LIBS="${pgac_rllib}${pgac_lib} $LIBS" +diff -Nru postgresql-7.4.14.orig/src/bin/Makefile postgresql-7.4.14/src/bin/Makefile +--- postgresql-7.4.14.orig/src/bin/Makefile 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/src/bin/Makefile 2006-11-05 15:49:06.000000000 +0100 +@@ -14,7 +14,7 @@ + include $(top_builddir)/src/Makefile.global + + DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \ +- psql scripts pg_config pg_controldata pg_resetxlog \ ++ psql scripts pg_controldata pg_resetxlog \ + pg_encoding + + ifeq ($(with_tcl), yes) +diff -Nru postgresql-7.4.14.orig/src/interfaces/Makefile postgresql-7.4.14/src/interfaces/Makefile +--- postgresql-7.4.14.orig/src/interfaces/Makefile 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/src/interfaces/Makefile 2006-11-05 15:48:27.000000000 +0100 +@@ -12,7 +12,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-DIRS := libpq ecpg ++DIRS := ecpg + + ALLDIRS := $(DIRS) libpgtcl jdbc + +diff -Nru postgresql-7.4.14.orig/src/Makefile postgresql-7.4.14/src/Makefile +--- postgresql-7.4.14.orig/src/Makefile 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/src/Makefile 2006-11-05 15:48:27.000000000 +0100 +@@ -17,7 +17,6 @@ + $(MAKE) -C port $@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -28,7 +27,6 @@ + clean: + $(MAKE) -C port $@ + $(MAKE) -C backend $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -39,7 +37,6 @@ + distclean maintainer-clean: + -$(MAKE) -C port $@ + -$(MAKE) -C backend $@ +- -$(MAKE) -C include $@ + -$(MAKE) -C interfaces $@ + -$(MAKE) -C bin $@ + -$(MAKE) -C pl $@ diff --git a/dev-db/postgresql/files/postgresql-7.4.16-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.16-hppa-testandset.patch new file mode 100644 index 000000000000..d5f916d455eb --- /dev/null +++ b/dev-db/postgresql/files/postgresql-7.4.16-hppa-testandset.patch @@ -0,0 +1,50 @@ +--- postgresql-7.4.12.orig/src/include/port/linux.h 2003-10-26 01:41:10.000000000 +0000 ++++ postgresql-7.4.12/src/include/port/linux.h 2004-01-09 20:22:50.000000000 +0000 +@@ -3,6 +3,11 @@ + + #define HAS_TEST_AND_SET + ++#elif defined(__hppa__) ++typedef struct { int sema[4]; } slock_t; ++ ++#define HAS_TEST_AND_SET ++ + #elif defined(__sparc__) + typedef unsigned char slock_t; + +--- postgresql-7.4.12.orig/src/include/storage/s_lock.h 2003-11-04 09:43:56.000000000 +0000 ++++ postgresql-7.4.12/src/include/storage/s_lock.h 2004-01-09 20:12:15.000000000 +0000 +@@ -112,6 +112,33 @@ + + #endif /* __i386__ || __x86_64__ */ + ++#if defined(__hppa__) || defined(__hppa) ++#define TAS(lock) tas(lock) ++ ++#define __ldcw(a) ({ \ ++ unsigned int __ret; \ ++ __asm__ __volatile__("ldcw 0(%2),%0" \ ++ : "=r" (__ret), "=m" (*(a)) : "r" (a)); \ ++ __ret; \ ++}) ++ ++#define __PA_LDCW_ALIGNMENT 16 ++#define __ldcw_align(a) ({ \ ++ volatile unsigned int __ret = (unsigned int) a; \ ++ if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \ ++ __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \ ++ (unsigned int *) __ret; \ ++}) ++ ++static __inline__ int ++tas(volatile slock_t *lock) ++{ ++ volatile unsigned int *a = __ldcw_align (lock); ++ return (__ldcw(a) == 0); ++} ++ ++#endif /* __hppa__ || __hppa */ ++ + + /* Intel Itanium */ + #if defined(__ia64__) || defined(__ia64) diff --git a/dev-db/postgresql/postgresql-7.4.16.ebuild b/dev-db/postgresql/postgresql-7.4.16.ebuild new file mode 100644 index 000000000000..e547f58eb6f0 --- /dev/null +++ b/dev-db/postgresql/postgresql-7.4.16.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.16.ebuild,v 1.1 2007/02/12 00:13:45 mjolnir Exp $ + +inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +DESCRIPTION="Sophisticated and powerful Object-Relational DBMS." +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 + mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2 + doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 ) + test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )" +LICENSE="POSTGRESQL" +SLOT="0" +IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib" + +RDEPEND="~dev-db/libpq-${PV} + >=sys-libs/ncurses-5.2 + kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) + readline? ( >=sys-libs/readline-4.1 ) + selinux? ( sec-policy/selinux-postgresql ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + tcl? ( >=dev-lang/tcl-8 ) + xml? ( dev-libs/libxml2 dev-libs/libxslt ) + zlib? ( >=sys-libs/zlib-1.1.3 )" +DEPEND="${RDEPEND} + sys-devel/autoconf + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext ) + xml? ( dev-util/pkgconfig )" + +PG_DIR="/var/lib/postgresql" +[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512" + +cluster_exists() { + [[ -f "${PG_DIR}/data/PG_VERSION" ]] && return 0 + return 1 +} + +pkg_setup() { + if hasq pg-hier ${USE} ; then + ewarn "Warning: pg-hier USE-flag detected:" + ewarn "The hier-patch has been dropped for this version and the pg-hier USE-flag is therefore deprecated." + ewarn "If you really used the 'hier' patch in your database with the 'CONNECT BY' statement," + ewarn "you should stop now and reconsider. You will be able to reuse your data, but not" + ewarn "any VIEWS or QUERIES based on that statement." + ewarn "Please disable the pg-hier USE-flag!" + ebeep 3 + if cluster_exists ; then + eerror "There is already a database in '${PG_DIR}/data' and you have the pg-hier USE-flag set." + eerror "Please read the message above first. If you decide that the warnings there don't" + eerror "apply to your situation, dump the database using pg_dump and move the '${PG_DIR}/data'" + eerror "away. Then restart the merge. After that create a new database cluster and use pg_restore to" + eerror "re-import the previously dumped data." + eerror "Moving '${PG_DIR}/data' temporarely away or just disable the 'pg-hier' USE-flag won't work." + die "Can't update this database." + fi + fi + if cluster_exists ; then + local cluster_version=$(cat "${PG_DIR}/data/PG_VERSION") + if [[ ${cluster_version} != $(get_version_component_range 1-2) ]] ; then + eerror "There is a database in '${PG_DIR}/data' from PostgreSQL version ${cluster_version}." + eerror "PostgreSQL doesn't support upgrades between major versions, you have to use pg_dump" + eerror "to dump your existing database. Then move your '${PG_DIR}/data' directory away and" + eerror "restart the merge. After that create a new database cluster and use pg_restore to" + eerror "re-import the previously dumped data." + die "Can't update this database." + fi + fi + + enewgroup postgres 70 + enewuser postgres 70 /bin/bash /var/lib postgres +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch" + epatch "${FILESDIR}/${PN}-${PV}-hppa-testandset.patch" + + # Prepare package for future tests + if use test ; then + # We need to run the tests as a non-root user, portage seems the most fitting here, + # so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we + # don't support that in this version of PostgreSQL ... :) + mkdir -p "${S}/src/test/regress/tmp_check" + chown portage "${S}/src/test/regress/tmp_check" + einfo "Tests will be run as user portage." + fi +} + +src_compile() { + filter-flags -ffast-math -feliminate-dwarf2-dups + + # Correctly support the XML stuff + if use xml ; then + CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)" + LIBS="${LIBS} $(pkg-config --libs libxml-2.0)" + fi + + # Detect mips systems properly + gnuconfig_update + + cd "${S}" + + ./configure --prefix=/usr \ + --includedir=/usr/include/postgresql/pgsql \ + --sysconfdir=/etc/postgresql \ + --mandir=/usr/share/man \ + --host=${CHOST} \ + --docdir=/usr/share/doc/${PF} \ + --libdir=/usr/$(get_libdir) \ + --enable-depend \ + $(use_with kerberos krb5) \ + $(use_enable nls ) \ + $(use_with pam) \ + $(use_with perl) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with python) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(use_with tcl) \ + --without-tk \ + $(use_with zlib) \ + || die "configure failed" + + emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed" + + cd "${S}/contrib" + emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed" + + if use xml ; then + cd "${S}/contrib/xml" + emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml emake failed" + fi +} + +src_install() { + if use perl ; then + mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig" + sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ + "${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile" + fi + + cd "${S}" + emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed" + + cd "${S}/contrib" + emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed" + + if use xml ; then + cd "${S}/contrib/xml" + emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml emake install failed" + fi + + cd "${S}" + dodoc README HISTORY + dodoc contrib/adddepend/* + + cd "${S}/doc" + dodoc FAQ* README.* TODO bug.template + + if use doc ; then + cd "${S}/doc" + docinto FAQ_html + dodoc src/FAQ/* + docinto sgml + dodoc src/sgml/*.{sgml,dsl} + docinto sgml/ref + dodoc src/sgml/ref/*.sgml + docinto TODO.detail + dodoc TODO.detail/* + fi + + newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed" + newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed" + + newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum init.d-file failed" + newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum conf.d-file failed" + dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum +} + +pkg_postinst() { + elog "Execute the following command to setup the initial database environment:" + elog + elog "emerge --config =${PF}" + elog + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'." +} + +pkg_config() { + einfo "Creating the data directory ..." + mkdir -p "${PG_DIR}/data" + chown -Rf postgres:postgres "${PG_DIR}" + chmod 0700 "${PG_DIR}/data" + + einfo "Initializing the database ..." + if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then + eerror "PostgreSQL ${PV} cannot upgrade your existing databases." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + die "Remove your database directory to continue" + else + if use kernel_linux ; then + local SEM=`sysctl -n kernel.sem | cut -f-3` + local SEMMNI=`sysctl -n kernel.sem | cut -f4` + local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16` + local SHMMAX=`sysctl -n kernel.shmmax` + local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}` + + if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then + eerror "The current value of SEMMNI is too low" + eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!" + eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database." + echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem + fi + + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + + if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then + echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem + ewarn "Restoring the SEMMNI value to the previous value." + ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf" + ewarn "and set it to at least ${SEMMNI_MIN}:" + ewarn + ewarn " kernel.sem = ${SEM} ${SEMMNI_MIN}" + ewarn + fi + + if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then + eerror "The current value of SHMMAX is too low for postgresql to run." + eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:" + eerror + eerror " kernel.shmmax = ${SHMMAX_MIN}" + eerror + fi + else + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + fi + + einfo + einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'." + einfo + fi +} + +src_test() { + cd "${S}" + + einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" + if hasq userpriv ${FEATURES} ; then + if ! emake -j1 check ; then + hasq test ${FEATURES} && die "Make check failed. See above for details." + hasq test ${FEATURES} || eerror "Make check failed. See above for details." + fi + else + eerror "Tests won't be run if FEATURES=userpriv is disabled!" + fi + + einfo "Yes, there are other tests which could be run." + einfo "... and no, we don't plan to add/support them." + einfo "For now, the main regressions tests will suffice." + einfo "If you think other tests are necessary, please submit a" + einfo "bug including a patch for this ebuild to enable them." +}