Fixing the collision mentioned by Christian Faulhammer in #157156.

Package-Manager: portage-2.1.2_rc2-r5

8 files changed, 63 insertions, 43 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 70e5a9e2e2c8..b531a06526e5 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/psad
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.33 2006/12/08 08:33:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.34 2006/12/09 12:46:10 phreak Exp $
+
+  09 Dec 2006; Christian Heim <phreak@gentoo.org> psad-1.3.4.ebuild,
+  psad-1.4.0.ebuild, psad-1.4.2.ebuild, psad-1.4.8.ebuild:
+  Fixing the collision mentioned by Christian Faulhammer in #157156.
 
   08 Dec 2006; Christian Faulhammer <opfer@gentoo.org> psad-1.4.8.ebuild:
   stable x86, security bug #157156
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 6f8e537c93a7..3607996540f0 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -2,29 +2,29 @@
 Hash: SHA1
 
 DIST psad-1.3.4.tar.bz2 493792 RMD160 3bc3d9ccba9e679cc15b43e96ba6b34ece50a122 SHA1 dfe6236ce026593cdefe22f5fc45ecca482dc962 SHA256 a3947e63328f7e7a863ba169a47e124b7a2b51fd179bb58c7b0bdfb371fe1638
-DIST psad-1.4.0.tar.bz2 505014
-DIST psad-1.4.2.tar.bz2 544733
+DIST psad-1.4.0.tar.bz2 505014 RMD160 951d6ca26311b3dca1d01123f0895a387af6c636 SHA1 9c0d683309b39e2d124d7e5e7bdf386c604fbe3c SHA256 c508de47d85fc256d2c96fc9c4cebf4d71efa5bce80b062b2cecc4d5501ac99f
+DIST psad-1.4.2.tar.bz2 544733 RMD160 570501c196654e428d49871a8d350ab8cc90ae0e SHA1 95f9ea49d3a702f8dd46e30006918731a4fb81e6 SHA256 0f894a0c16a0abdc4d3b843eae58360eb3c8c0b81ed18770b6113e3292c56342
 DIST psad-1.4.8.tar.bz2 564588 RMD160 bfc2e79c81caa5e786d7d4e36002fe84ff01bb50 SHA1 25e5f84fb1278b03c5eeaa507b3efbaef3829ec9 SHA256 93f71dc00a2b361db0e37232ce6cc943a6cb8873efaf17448589167826950110
-EBUILD psad-1.3.4.ebuild 3404 RMD160 53dbbdca9b6ddedf16bcedc6c034d458cc791776 SHA1 882d84438d01b5bd2cc970e772944b28003e5d77 SHA256 3f7e1f5bd28c1baf43694037b32f3e9c26adefae837f0fc52aeddcea2c210186
-MD5 ea24fb515df58b96714f4cb4e49fa696 psad-1.3.4.ebuild 3404
-RMD160 53dbbdca9b6ddedf16bcedc6c034d458cc791776 psad-1.3.4.ebuild 3404
-SHA256 3f7e1f5bd28c1baf43694037b32f3e9c26adefae837f0fc52aeddcea2c210186 psad-1.3.4.ebuild 3404
-EBUILD psad-1.4.0.ebuild 4108 RMD160 85b6b4290169f5fa5ad66d24835dd22da24b3cff SHA1 542de97bdcd79bcc22b5e79cbd5ca44a1769821a SHA256 b174e3895bf751a71f991d7485bd2cd3c78bad876b2f2f7abcb8dc3659631394
-MD5 430edbbbbd3b839986145eb102cc933d psad-1.4.0.ebuild 4108
-RMD160 85b6b4290169f5fa5ad66d24835dd22da24b3cff psad-1.4.0.ebuild 4108
-SHA256 b174e3895bf751a71f991d7485bd2cd3c78bad876b2f2f7abcb8dc3659631394 psad-1.4.0.ebuild 4108
-EBUILD psad-1.4.2.ebuild 4353 RMD160 a1e30bf458df9a61658c337a93211973a17cc332 SHA1 9f55ca9cb230e4410559f47ef32916cd6163ed2a SHA256 b46f70269881078f6b9620c2d484ff27867eff1d002d901c0b53483c36eddad1
-MD5 5e07f9ebb83b7457fe6eabdca01e694f psad-1.4.2.ebuild 4353
-RMD160 a1e30bf458df9a61658c337a93211973a17cc332 psad-1.4.2.ebuild 4353
-SHA256 b46f70269881078f6b9620c2d484ff27867eff1d002d901c0b53483c36eddad1 psad-1.4.2.ebuild 4353
-EBUILD psad-1.4.8.ebuild 4270 RMD160 cf568a0c73651d81bd19c5cdae5d7242793a6569 SHA1 9a6bbac8b506ae4ddb91512f5d78f5879f0eae78 SHA256 2ba24fd9fd4e479159573e72b00f19ceceebecfcf7d7da7d4be683b833a93a7c
-MD5 0b3b7eee4401ed326c46bf02cfae358f psad-1.4.8.ebuild 4270
-RMD160 cf568a0c73651d81bd19c5cdae5d7242793a6569 psad-1.4.8.ebuild 4270
-SHA256 2ba24fd9fd4e479159573e72b00f19ceceebecfcf7d7da7d4be683b833a93a7c psad-1.4.8.ebuild 4270
-MISC ChangeLog 6104 RMD160 756aa05ffe210e69fd0faa097d0e64ef8a5476a3 SHA1 5631ca7b2265350f8a111c855628fc3d764aeaa1 SHA256 5be523c73ea283300237c761005e45a0f7b884bab9a7694e6c01a42b4d5a39c5
-MD5 fdd3f89d18eb0eed5ecb94a5ddd32820 ChangeLog 6104
-RMD160 756aa05ffe210e69fd0faa097d0e64ef8a5476a3 ChangeLog 6104
-SHA256 5be523c73ea283300237c761005e45a0f7b884bab9a7694e6c01a42b4d5a39c5 ChangeLog 6104
+EBUILD psad-1.3.4.ebuild 3486 RMD160 2dd58f979a6e3456124f68c150575027187bfc7e SHA1 c41fc5d1161c60ba8ae594cf761c724627eedb43 SHA256 307ce769f08a8183117d16eadb585f3bf64f1cc13142bf96e762e0e5cdb8da41
+MD5 ea2477e4f94ae1a8c9efb0ec9bda971e psad-1.3.4.ebuild 3486
+RMD160 2dd58f979a6e3456124f68c150575027187bfc7e psad-1.3.4.ebuild 3486
+SHA256 307ce769f08a8183117d16eadb585f3bf64f1cc13142bf96e762e0e5cdb8da41 psad-1.3.4.ebuild 3486
+EBUILD psad-1.4.0.ebuild 4190 RMD160 63b2a796667378f975ead00da85fbbeeb46691cc SHA1 8bb272a7a81fc8e23a91ed009dbbce1711e18150 SHA256 29d62c72baec3cf0e121a70e114b6bd50a36eea8ebd27ca515bb1b52536e4725
+MD5 917e96178461ac99b527b0877d4ff6f2 psad-1.4.0.ebuild 4190
+RMD160 63b2a796667378f975ead00da85fbbeeb46691cc psad-1.4.0.ebuild 4190
+SHA256 29d62c72baec3cf0e121a70e114b6bd50a36eea8ebd27ca515bb1b52536e4725 psad-1.4.0.ebuild 4190
+EBUILD psad-1.4.2.ebuild 4423 RMD160 40e9f27724df41facaa052191e02de38ea342198 SHA1 358283bc0fd11367d531e2a60e7403e60e2b64ac SHA256 9738804d8aaf3ae96fa86873b022f916398a473caecc925f2725645608974467
+MD5 8d4ea54fb1a5353bbea91e000ee5dd51 psad-1.4.2.ebuild 4423
+RMD160 40e9f27724df41facaa052191e02de38ea342198 psad-1.4.2.ebuild 4423
+SHA256 9738804d8aaf3ae96fa86873b022f916398a473caecc925f2725645608974467 psad-1.4.2.ebuild 4423
+EBUILD psad-1.4.8.ebuild 4356 RMD160 2920a24ca98fead66020e587b2419a8bae0636cc SHA1 3a22707343e0625eedcd2101dd776ded9b13d66b SHA256 810687deecadf1255666ab7ac227906bf522c984b1c53d34347a5bb83d492ca8
+MD5 9ff3223e607160c22b5b1713c02c153c psad-1.4.8.ebuild 4356
+RMD160 2920a24ca98fead66020e587b2419a8bae0636cc psad-1.4.8.ebuild 4356
+SHA256 810687deecadf1255666ab7ac227906bf522c984b1c53d34347a5bb83d492ca8 psad-1.4.8.ebuild 4356
+MISC ChangeLog 6303 RMD160 04de97c5b3a9137dbc0d3506868f3f0d993a07d3 SHA1 116ef8ac5d2fc973162454f2e6ea83c4de2d3594 SHA256 af38327fa425619746959cd5f0beb68c58cc4934e17d67b59781dd57e83dd2ae
+MD5 56cef0335b6ba1c427c5ec4a8bf20ca7 ChangeLog 6303
+RMD160 04de97c5b3a9137dbc0d3506868f3f0d993a07d3 ChangeLog 6303
+SHA256 af38327fa425619746959cd5f0beb68c58cc4934e17d67b59781dd57e83dd2ae ChangeLog 6303
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
 MD5 ac85ccaacab6bf7a9dd356b8c92b3bac metadata.xml 326
 RMD160 28fe5b256012109509ece09a19485561d72c3fdb metadata.xml 326
@@ -32,19 +32,19 @@ SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11 metadata
 MD5 571d8ef4763021a3b7cdf17ac9e0d103 files/digest-psad-1.3.4 235
 RMD160 b4ab6446a78288f0003ca9d4c30ba0fda61795c9 files/digest-psad-1.3.4 235
 SHA256 7de6a903ac84cb153e38b7aa1ad4ec61eaa44198d54fa1dcceda7df0d3585df0 files/digest-psad-1.3.4 235
-MD5 c43f2f1a27860fdad099c9000d373b01 files/digest-psad-1.4.0 63
-RMD160 d17c0f51fc952b42e59ae28f693a318021dd22b6 files/digest-psad-1.4.0 63
-SHA256 7e320a9e571038ab340a7a7ba2f143bb0e80920d5a7abfa0433e6d7ce9d1765d files/digest-psad-1.4.0 63
-MD5 3ddd128f7239ca0bde300b2125ed63ab files/digest-psad-1.4.2 63
-RMD160 3139460e988fde5cf0d0694b3bfa214e7672fc2a files/digest-psad-1.4.2 63
-SHA256 bcb60ffbbd6dd5b20a6b62f05a919fea65e27ff37dbd5f80cc38a4a33cb86ddf files/digest-psad-1.4.2 63
+MD5 380f5b19780d5e8575727eae9ebae743 files/digest-psad-1.4.0 235
+RMD160 b3a9abf4cae6c8effcb2c0703e55446962502442 files/digest-psad-1.4.0 235
+SHA256 dbbd38c6e359b469bbc2db0b72898ddb21c65861afd336def9b33a3c4c046a41 files/digest-psad-1.4.0 235
+MD5 0474bb46ff272ddbd68a0a6e599cf52f files/digest-psad-1.4.2 235
+RMD160 39998b7e0644d2a37a85d7520f98d51ef00aca97 files/digest-psad-1.4.2 235
+SHA256 4ecd10b234b61dbd6610e43106582273da4ef3b98e257e7b29b9360ca26a4703 files/digest-psad-1.4.2 235
 MD5 a271d8d6d5d0b994cb66e0008d6e271f files/digest-psad-1.4.8 235
 RMD160 39a0044dcacf7d926ae18d0184e831d2775f6099 files/digest-psad-1.4.8 235
 SHA256 4d3b792a8be313e2a5d2e891dc3f5bf42afe72101493d7b39fff9ffb2649fc19 files/digest-psad-1.4.8 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFeSNnNQqtfCuFneMRAsP6AJ9OpTozXNVAP6HTo387ACx1zxp/nQCfbvAl
-37vG61/tMLeJqgZ9qWwwMck=
-=jEqk
+iD8DBQFFerAdyuNVb5qfaOYRAp3OAJoC2TUezUTfHHKRNgeAACuMHDGsSQCfRDAE
+4cXmXLchmO7DEHL/q4CcbpQ=
+=9cdi
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/psad/files/digest-psad-1.4.0 b/net-firewall/psad/files/digest-psad-1.4.0
index e12cf6ac2fbf..ae5cec0d5fe9 100644
--- a/net-firewall/psad/files/digest-psad-1.4.0
+++ b/net-firewall/psad/files/digest-psad-1.4.0
@@ -1 +1,3 @@
 MD5 0a0804ba77b0d9cb636aed1a6f70e019 psad-1.4.0.tar.bz2 505014
+RMD160 951d6ca26311b3dca1d01123f0895a387af6c636 psad-1.4.0.tar.bz2 505014
+SHA256 c508de47d85fc256d2c96fc9c4cebf4d71efa5bce80b062b2cecc4d5501ac99f psad-1.4.0.tar.bz2 505014
diff --git a/net-firewall/psad/files/digest-psad-1.4.2 b/net-firewall/psad/files/digest-psad-1.4.2
index 471c273311fa..bf618fe8431e 100644
--- a/net-firewall/psad/files/digest-psad-1.4.2
+++ b/net-firewall/psad/files/digest-psad-1.4.2
@@ -1 +1,3 @@
 MD5 228c3e17f41f810129e930b979d1346e psad-1.4.2.tar.bz2 544733
+RMD160 570501c196654e428d49871a8d350ab8cc90ae0e psad-1.4.2.tar.bz2 544733
+SHA256 0f894a0c16a0abdc4d3b843eae58360eb3c8c0b81ed18770b6113e3292c56342 psad-1.4.2.tar.bz2 544733
diff --git a/net-firewall/psad/psad-1.3.4.ebuild b/net-firewall/psad/psad-1.3.4.ebuild
index 4350d0073218..88021ded45e4 100644
--- a/net-firewall/psad/psad-1.3.4.ebuild
+++ b/net-firewall/psad/psad-1.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.8 2005/11/28 12:11:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.9 2006/12/09 12:46:10 phreak Exp $
 
-inherit eutils perl-app
+inherit eutils perl-app perl-module
 
 IUSE=""
 
@@ -96,6 +96,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {
diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-1.4.0.ebuild
index 13218346ee65..d6673cfcc7cb 100644
--- a/net-firewall/psad/psad-1.4.0.ebuild
+++ b/net-firewall/psad/psad-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.7 2005/11/28 12:11:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.8 2006/12/09 12:46:10 phreak Exp $
 
-inherit eutils perl-app
+inherit eutils perl-app perl-module
 
 IUSE=""
 
@@ -96,6 +96,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {
diff --git a/net-firewall/psad/psad-1.4.2.ebuild b/net-firewall/psad/psad-1.4.2.ebuild
index 67bb3509c6a8..bcc017ebfe1b 100644
--- a/net-firewall/psad/psad-1.4.2.ebuild
+++ b/net-firewall/psad/psad-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.2.ebuild,v 1.3 2005/11/28 12:11:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.2.ebuild,v 1.4 2006/12/09 12:46:10 phreak Exp $
 
 inherit eutils perl-app
 
@@ -100,6 +100,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {
diff --git a/net-firewall/psad/psad-1.4.8.ebuild b/net-firewall/psad/psad-1.4.8.ebuild
index a76384ef0af5..9d1f06d3573e 100644
--- a/net-firewall/psad/psad-1.4.8.ebuild
+++ b/net-firewall/psad/psad-1.4.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.2 2006/12/08 08:33:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.3 2006/12/09 12:46:10 phreak Exp $
 
-inherit eutils perl-app
+inherit eutils perl-app perl-module
 
 IUSE=""
 
@@ -92,6 +92,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {