Bump to 2.0.6. Re-fix perl module collisions, bug #133767. Clean up old ebuilds.

Package-Manager: portage-2.1.2.3

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 390b6460c07fc6a029a988d38b9b4d7a6dfb0275..2b4b02ca1ebed796748787fcd2358c6a39890a6a 100644 (file)
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,15 @@
 # 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.39 2006/12/18 12:31:19 kloeri Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.40 2007/04/26 23:46:53 battousai Exp $
+
+*psad-2.0.6 (26 Apr 2007)
+
+  26 Apr 2007; Bryan Stine <battousai@gentoo.org> -psad-1.3.4.ebuild,
+  -psad-1.4.0.ebuild, -psad-1.4.2.ebuild, psad-1.4.8.ebuild,
+  +psad-2.0.6.ebuild:
+  Bump to newest upstream, 2.0.6. Now installing modules with
+  perl-module_src_install to fix ebuilds for perllocal.pod collisions as
+  described in bug #133767. Cleaned out old ebuilds.
 
   18 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> psad-1.4.8.ebuild:
   Stable on Alpha, bug 157156.

diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 8ecd69ec15b0d2a9c91cef0da14902ed913d229c..78e401e991c2d0d6ccc160f404e87ceafdbf77a0 100644 (file)
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,40 +1,24 @@
-DIST psad-1.3.4.tar.bz2 493792 RMD160 3bc3d9ccba9e679cc15b43e96ba6b34ece50a122 SHA1 dfe6236ce026593cdefe22f5fc45ecca482dc962 SHA256 a3947e63328f7e7a863ba169a47e124b7a2b51fd179bb58c7b0bdfb371fe1638
-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 3402 RMD160 2fa074f79de240834ba2b05f526e82062a8529ad SHA1 38d2b706dbe3d2e41d873027ee46357811baff86 SHA256 5e48e9f64183f53c913b9005a1a9ff9baf0e4160abf055dcd821ab5069aead81
-MD5 b50e7de26783dbf1d06de354ca61e258 psad-1.3.4.ebuild 3402
-RMD160 2fa074f79de240834ba2b05f526e82062a8529ad psad-1.3.4.ebuild 3402
-SHA256 5e48e9f64183f53c913b9005a1a9ff9baf0e4160abf055dcd821ab5069aead81 psad-1.3.4.ebuild 3402
-EBUILD psad-1.4.0.ebuild 4105 RMD160 6e5153de0578a5745b5737a732d30009cabb59f2 SHA1 4254198c11998a6f3806ce101e65562e930fd260 SHA256 a3be7c297c3507a26b8aef39795c9fe2ce215293ff6aee56940cb4c20b58d156
-MD5 1c161dd3ec8e511e3f5fd7f81a0716a2 psad-1.4.0.ebuild 4105
-RMD160 6e5153de0578a5745b5737a732d30009cabb59f2 psad-1.4.0.ebuild 4105
-SHA256 a3be7c297c3507a26b8aef39795c9fe2ce215293ff6aee56940cb4c20b58d156 psad-1.4.0.ebuild 4105
-EBUILD psad-1.4.2.ebuild 4350 RMD160 cc7d31033814814cfaae9d8b4b2cea0b98b26733 SHA1 bd3882291ada01897fde0f0a3dce83c82f0bf91f SHA256 934b741d5a605a83a90b3dadff8d76e83b2a0fc376cdb7d9df460635813b6d9c
-MD5 5b647b4f7aad9eb5295a522679595b1f psad-1.4.2.ebuild 4350
-RMD160 cc7d31033814814cfaae9d8b4b2cea0b98b26733 psad-1.4.2.ebuild 4350
-SHA256 934b741d5a605a83a90b3dadff8d76e83b2a0fc376cdb7d9df460635813b6d9c psad-1.4.2.ebuild 4350
-EBUILD psad-1.4.8.ebuild 4268 RMD160 f11425bee753cee5f404a2f1d476e412e0e8a69c SHA1 998f3796e4dd33ce80c2ff5277827d97dbbb626a SHA256 1dc6e29a67d03603fe9e024e082c36dca9553086cade1e524ab5b6c379ff8076
-MD5 35ea7233f75655d5874d4e7bf34898eb psad-1.4.8.ebuild 4268
-RMD160 f11425bee753cee5f404a2f1d476e412e0e8a69c psad-1.4.8.ebuild 4268
-SHA256 1dc6e29a67d03603fe9e024e082c36dca9553086cade1e524ab5b6c379ff8076 psad-1.4.8.ebuild 4268
-MISC ChangeLog 6838 RMD160 2f4db4bc73d2e28320e35fa6314c13cbb9a16e4b SHA1 f52c2b9257a69b555ab085af6ad6ae4e16074e93 SHA256 fcb20191f66ab8d5df6574bb0051f685fc450bf4f8518db5a2f2c3ec1826d017
-MD5 903fa69dd82af0ca201fcff5dbbcbc49 ChangeLog 6838
-RMD160 2f4db4bc73d2e28320e35fa6314c13cbb9a16e4b ChangeLog 6838
-SHA256 fcb20191f66ab8d5df6574bb0051f685fc450bf4f8518db5a2f2c3ec1826d017 ChangeLog 6838
+DIST psad-2.0.6.tar.bz2 688632 RMD160 e2e49c2a6207edc4c1ba404ca01823348229ee0f SHA1 8447a942f082abe22787133561ae2ec19bb02930 SHA256 c59973bbc8d61071a28f5910c4b7b9cc183bf66a9f689e2d1d4564bbcd9dcd90
+EBUILD psad-1.4.8.ebuild 4101 RMD160 e31d9916ba5c7784c1853bcb0c2f0082a04e1345 SHA1 3cce7650990c94dd79c38a6a3147b4c435de5938 SHA256 d71ee28afb3fcd80025933449ffbd69202db7a2585fc88de91be207e4eda3f6f
+MD5 9b056c7679bb02838db21e79034a79ed psad-1.4.8.ebuild 4101
+RMD160 e31d9916ba5c7784c1853bcb0c2f0082a04e1345 psad-1.4.8.ebuild 4101
+SHA256 d71ee28afb3fcd80025933449ffbd69202db7a2585fc88de91be207e4eda3f6f psad-1.4.8.ebuild 4101
+EBUILD psad-2.0.6.ebuild 4121 RMD160 1385666729997a7b4c9b19e221aaeeeea21c42a6 SHA1 55f0d171bf670fce491d9dba306ecec9e2066846 SHA256 6c4655e60a9708e2d613d3ced95ff624f958857090053acd4045ed8daf396783
+MD5 8cdb54414b0e75ddc6ba51b6bd896b1c psad-2.0.6.ebuild 4121
+RMD160 1385666729997a7b4c9b19e221aaeeeea21c42a6 psad-2.0.6.ebuild 4121
+SHA256 6c4655e60a9708e2d613d3ced95ff624f958857090053acd4045ed8daf396783 psad-2.0.6.ebuild 4121
+MISC ChangeLog 7210 RMD160 3017720274abf88b8cab51b5ff42093e084c7e59 SHA1 3ad97db775cfc8defc4911f759aff470d2abef20 SHA256 2533458875b387ec0714621990957ca8dccee108ddb74e8a3838a5fd4d8f22c2
+MD5 78cb3efc87781b070f9b16155fa96bf4 ChangeLog 7210
+RMD160 3017720274abf88b8cab51b5ff42093e084c7e59 ChangeLog 7210
+SHA256 2533458875b387ec0714621990957ca8dccee108ddb74e8a3838a5fd4d8f22c2 ChangeLog 7210
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
 MD5 ac85ccaacab6bf7a9dd356b8c92b3bac metadata.xml 326
 RMD160 28fe5b256012109509ece09a19485561d72c3fdb metadata.xml 326
 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11 metadata.xml 326
-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 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
+MD5 c726808b00fa86533eb573454c1f9577 files/digest-psad-2.0.6 235
+RMD160 dc20fd7cb8cc408320b39b696d71f4427574ee6d files/digest-psad-2.0.6 235
+SHA256 62aa88c619185aaca73fca41a752f4a1cd1843e17d9a7274d20de5b4388e7891 files/digest-psad-2.0.6 235

diff --git a/net-firewall/psad/files/digest-psad-1.3.4 b/net-firewall/psad/files/digest-psad-1.3.4
deleted file mode 100644 (file)
index 96ff79e..0000000
--- a/net-firewall/psad/files/digest-psad-1.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 98c8f60b0c41de25243b99753d8b6143 psad-1.3.4.tar.bz2 493792
-RMD160 3bc3d9ccba9e679cc15b43e96ba6b34ece50a122 psad-1.3.4.tar.bz2 493792
-SHA256 a3947e63328f7e7a863ba169a47e124b7a2b51fd179bb58c7b0bdfb371fe1638 psad-1.3.4.tar.bz2 493792

diff --git a/net-firewall/psad/files/digest-psad-1.4.0 b/net-firewall/psad/files/digest-psad-1.4.0
deleted file mode 100644 (file)
index ae5cec0..0000000
--- a/net-firewall/psad/files/digest-psad-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644 (file)
index bf618fe..0000000
--- a/net-firewall/psad/files/digest-psad-1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-psad-2.0.6 b/net-firewall/psad/files/digest-psad-2.0.6
new file mode 100644 (file)
index 0000000..78a1c2a
--- /dev/null
+++ b/net-firewall/psad/files/digest-psad-2.0.6
@@ -0,0 +1,3 @@
+MD5 5263264ad4bd63a3558e0c50522af6a5 psad-2.0.6.tar.bz2 688632
+RMD160 e2e49c2a6207edc4c1ba404ca01823348229ee0f psad-2.0.6.tar.bz2 688632
+SHA256 c59973bbc8d61071a28f5910c4b7b9cc183bf66a9f689e2d1d4564bbcd9dcd90 psad-2.0.6.tar.bz2 688632

diff --git a/net-firewall/psad/psad-1.3.4.ebuild b/net-firewall/psad/psad-1.3.4.ebuild
deleted file mode 100644 (file)
index 012494d..0000000
--- a/net-firewall/psad/psad-1.3.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.10 2006/12/10 10:55:18 phreak Exp $
-
-inherit eutils perl-app
-
-IUSE=""
-
-DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="http://www.cipherdyne.org/psad"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc alpha ~sparc"
-
-DEPEND="${DEPEND}
-       dev-lang/perl"
-
-RDEPEND="virtual/logger
-       dev-perl/Unix-Syslog
-       dev-perl/Date-Calc
-       virtual/mailx
-       net-firewall/iptables"
-
-src_compile() {
-       cd ${S}/Psad
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/Net-IPv4Addr
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/IPTables/Parse
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/whois
-       emake || die "Make failed: whois"
-
-       cd ${S}
-       # We'll use the C binaries
-       emake || die "Make failed: daemons"
-}
-
-src_install() {
-       local myhostname=
-       local mydomain=
-
-       doman *.8
-
-       keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
-       dodir /etc/psad
-       cd ${S}/Psad
-       insinto /usr/lib/psad
-       doins Psad.pm
-
-       cd ${S}/Net-IPv4Addr
-       insinto /usr/lib/psad/Net
-       doins IPv4Addr.pm
-
-       cd ${S}/IPTables/Parse
-       insinto /usr/lib/psad/IPTables
-       doins Parse.pm
-
-       cd ${S}/whois
-       # Makefile seems borken, do install by hand...
-       insinto /usr
-       newbin whois whois_psad
-       newman whois.1 whois_psad.1
-
-       cd ${S}
-       insinto /usr
-       dosbin kmsgsd psad psadwatchd
-       newsbin fwcheck_psad.pl fwcheck_psad
-       dobin pscan
-
-       cd ${S}
-
-       fix_psad_conf
-
-       insinto /etc/psad
-       doins *.conf
-       doins psad_*
-       doins auto_dl icmp_types posf signatures
-
-       cd ${S}/init-scripts
-       exeinto /etc/init.d
-       newexe psad-init.gentoo psad
-
-       cd ${S}/snort_rules
-       dodir /etc/psad/snort_rules
-       insinto /etc/psad/snort_rules
-       doins *.rules
-
-       cd ${S}
-       dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
-}
-
-pkg_postinst() {
-       if [ ! -p ${ROOT}/var/lib/psad/psadfifo ]
-       then
-               ebegin "Creating syslog FIFO for PSAD"
-               mknod -m 600 ${ROOT}/var/lib/psad/psadfifo p
-               eend $?
-       fi
-
-       echo
-       einfo "Please be sure to edit /etc/psad/psad.conf to reflect your system's"
-       einfo "configuration or it may not work correctly or start up. Specifically, check"
-       einfo "the validity of the HOSTNAME setting and replace the EMAIL_ADDRESSES and"
-       einfo "HOME_NET settings at the least."
-       echo
-       einfo "If you are using a logger other than sysklogd, please be sure to change the"
-       einfo "syslogdCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
-       einfo "would be:"
-       einfo "         syslogdCmd      /usr/sbin/syslog-ng;"
-}
-
-fix_psad_conf() {
-       cp psad.conf psad.conf.orig
-
-       # Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-       [ -e /etc/hostname ] && myhostname="$(< /etc/hostname)"
-       [ "${myhostname}" == "" ] && myhostname="$HOSTNAME"
-       mydomain=".$(grep ^domain /etc/resolv.conf | cut -d" " -f2)"
-       sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
-
-       # Fix up paths
-       sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
-}

diff --git a/net-firewall/psad/psad-1.4.2.ebuild b/net-firewall/psad/psad-1.4.2.ebuild
deleted file mode 100644 (file)
index e4924d6..0000000
--- a/net-firewall/psad/psad-1.4.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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.5 2006/12/10 10:55:18 phreak Exp $
-
-inherit eutils perl-app
-
-IUSE=""
-
-DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="http://www.cipherdyne.org/psad"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
-
-DEPEND="${DEPEND}
-       dev-lang/perl"
-
-RDEPEND="virtual/logger
-       dev-perl/Unix-Syslog
-       dev-perl/Date-Calc
-       virtual/mailx
-       net-firewall/iptables"
-
-src_compile() {
-       cd ${S}/Psad
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/Net-IPv4Addr
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/IPTables-Parse
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/IPTables-ChainMgr
-       SRC_PREP="no" perl-module_src_compile
-       emake test
-
-       cd ${S}/whois
-       emake || die "Make failed: whois"
-
-       cd ${S}
-       # We'll use the C binaries
-       emake || die "Make failed: daemons"
-}
-
-src_install() {
-       local myhostname=
-       local mydomain=
-
-       doman *.8
-
-       keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
-       dodir /etc/psad
-       cd ${S}/Psad
-       emake install DESTDIR=${D} || die "Install failed: Psad.pm"
-
-       cd ${S}/Net-IPv4Addr
-       emake install DESTDIR=${D} || die "Install failed: Net-IPv4Addr.pm"
-
-       cd ${S}/IPTables-ChainMgr
-       emake install DESTDIR=${D} || die "Install failed: IPTables-Mgr.pm"
-
-       cd ${S}/IPTables-Parse
-       emake install DESTDIR=${D} || die "Install failed: IPTables-Parse.pm"
-
-       cd ${S}/whois
-       # Makefile seems borken, do install by hand...
-       insinto /usr
-       newbin whois whois_psad
-       newman whois.1 whois_psad.1
-
-       cd ${S}
-       insinto /usr
-       dosbin kmsgsd psad psadwatchd
-       newsbin fwcheck_psad.pl fwcheck_psad
-       dobin pscan
-
-       cd ${S}
-
-       fix_psad_conf
-
-       insinto /etc/psad
-       doins *.conf
-       doins psad_*
-       doins auto_dl icmp_types posf signatures pf.os
-
-       cd ${S}/init-scripts
-       exeinto /etc/init.d
-       newexe psad-init.gentoo psad
-
-       cd ${S}/snort_rules
-       dodir /etc/psad/snort_rules
-       insinto /etc/psad/snort_rules
-       doins *.rules
-
-       cd ${S}
-       dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
-}
-
-pkg_postinst() {
-       if [ ! -p ${ROOT}/var/lib/psad/psadfifo ]
-       then
-               ebegin "Creating syslog FIFO for PSAD"
-               mknod -m 600 ${ROOT}/var/lib/psad/psadfifo p
-               eend $?
-       fi
-
-       echo
-       einfo "Please be sure to edit /etc/psad/psad.conf to reflect your system's"
-       einfo "configuration or it may not work correctly or start up. Specifically, check"
-       einfo "the validity of the HOSTNAME setting and replace the EMAIL_ADDRESSES and"
-       einfo "HOME_NET settings at the least."
-       echo
-       if has_version ">=app-admin/syslog-ng-0.0.0"
-       then
-               ewarn "You appear to have installed syslog-ng. If you are using syslog-ng as your"
-               ewarn "default system logger, please change the SYSLOG_DAEMON entry in"
-               ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
-               ewarn "         SYSLOG_DAEMON   syslog-ng;"
-               echo
-       fi
-       if has_version ">=app-admin/sysklogd-0.0.0"
-       then
-               einfo "You have sysklogd installed. If this is your default system logger, no"
-               einfo "special configuration is needed. If it is not, please set SYSLOG_DAEMON"
-               einfo "in /etc/psad/psad.conf accordingly."
-               echo
-       fi
-       if has_version ">=app-admin/metalog-0.0"
-       then
-               ewarn "You appear to have installed metalog. If you are using metalog as your"
-               ewarn "default system logger, please change the SYSLOG_DAEMON entry in"
-               ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
-               ewarn "         SYSLOG_DAEMON   metalog"
-       fi
-}
-
-fix_psad_conf() {
-       cp psad.conf psad.conf.orig
-
-       # Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-       [ -e /etc/hostname ] && myhostname="$(< /etc/hostname)"
-       [ "${myhostname}" == "" ] && myhostname="$HOSTNAME"
-       mydomain=".$(grep ^domain /etc/resolv.conf | cut -d" " -f2)"
-       sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
-
-       # Fix up paths
-       sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
-}
-

diff --git a/net-firewall/psad/psad-1.4.8.ebuild b/net-firewall/psad/psad-1.4.8.ebuild
index ced7ec6d52bcfe47a930b9bddf57958abcdcb581..077440587bf07cccf5889302ca3448511f72b974 100644 (file)
--- a/net-firewall/psad/psad-1.4.8.ebuild
+++ b/net-firewall/psad/psad-1.4.8.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/net-firewall/psad/psad-1.4.8.ebuild,v 1.7 2006/12/18 12:31:19 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.8 2007/04/26 23:46:53 battousai Exp $
 
 inherit eutils perl-app
 
@@ -55,16 +55,16 @@ src_install() {
        keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
        dodir /etc/psad
        cd ${S}/Psad
-       emake install DESTDIR=${D} || die "Install failed: Psad.pm"
+       perl-module_src_install
 
        cd ${S}/Net-IPv4Addr
-       emake install DESTDIR=${D} || die "Install failed: Net-IPv4Addr.pm"
+       perl-module_src_install
 
        cd ${S}/IPTables-ChainMgr
-       emake install DESTDIR=${D} || die "Install failed: IPTables-Mgr.pm"
+       perl-module_src_install
 
        cd ${S}/IPTables-Parse
-       emake install DESTDIR=${D} || die "Install failed: IPTables-Parse.pm"
+       perl-module_src_install
 
        cd ${S}
        insinto /usr

diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-2.0.6.ebuild
similarity index 79%
rename from net-firewall/psad/psad-1.4.0.ebuild
rename to net-firewall/psad/psad-2.0.6.ebuild
index 138786ff67853c545445ff49c11adc4d6a410e22..fe39d58a474f70f4f11169ca412fad6a0412f2cd 100644 (file)
--- a/net-firewall/psad/psad-1.4.0.ebuild
+++ b/net-firewall/psad/psad-2.0.6.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/net-firewall/psad/psad-1.4.0.ebuild,v 1.9 2006/12/10 10:55:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild,v 1.1 2007/04/26 23:46:53 battousai Exp $
 
 inherit eutils perl-app
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 
 DEPEND="${DEPEND}
        dev-lang/perl"
@@ -21,24 +21,22 @@ RDEPEND="virtual/logger
        dev-perl/Unix-Syslog
        dev-perl/Date-Calc
        virtual/mailx
-       net-firewall/iptables"
+       net-firewall/iptables
+       net-misc/whois"
 
 src_compile() {
-       cd ${S}/Psad
+       cd ${S}/Net-IPv4Addr
        SRC_PREP="no" perl-module_src_compile
        emake test
 
-       cd ${S}/Net-IPv4Addr
+       cd ${S}/IPTables-Parse
        SRC_PREP="no" perl-module_src_compile
        emake test
 
-       cd ${S}/IPTables/Parse
+       cd ${S}/IPTables-ChainMgr
        SRC_PREP="no" perl-module_src_compile
        emake test
 
-       cd ${S}/whois
-       emake || die "Make failed: whois"
-
        cd ${S}
        # We'll use the C binaries
        emake || die "Make failed: daemons"
@@ -52,23 +50,15 @@ src_install() {
 
        keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
        dodir /etc/psad
-       cd ${S}/Psad
-       insinto /usr/lib/psad
-       doins Psad.pm
 
        cd ${S}/Net-IPv4Addr
-       insinto /usr/lib/psad/Net
-       doins IPv4Addr.pm
+       perl-module_src_install
 
-       cd ${S}/IPTables/Parse
-       insinto /usr/lib/psad/IPTables
-       doins Parse.pm
+       cd ${S}/IPTables-ChainMgr
+       perl-module_src_install
 
-       cd ${S}/whois
-       # Makefile seems borken, do install by hand...
-       insinto /usr
-       newbin whois whois_psad
-       newman whois.1 whois_psad.1
+       cd ${S}/IPTables-Parse
+       perl-module_src_install
 
        cd ${S}
        insinto /usr
@@ -83,7 +73,7 @@ src_install() {
        insinto /etc/psad
        doins *.conf
        doins psad_*
-       doins auto_dl icmp_types posf signatures pf.os
+       doins auto_dl icmp_types ip_options posf signatures pf.os
 
        cd ${S}/init-scripts
        exeinto /etc/init.d
@@ -134,6 +124,11 @@ pkg_postinst() {
                ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
                ewarn "         SYSLOG_DAEMON   metalog"
        fi
+
+       ewarn "NOTE: You need firewall rules to log dropped packets. Otherwise PSAD will"
+       ewarn "not be aware of any port scan attacks. Please see FW_EXAMPLE_RULES in the"
+       ewarn "psad documentation directory (ie /usr/share/doc/${P}) for the criteria and"
+       ewarn "sample rules."
 }
 
 fix_psad_conf() {
@@ -148,7 +143,6 @@ fix_psad_conf() {
        # Fix up paths
        sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
        sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
-       sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
+       sed -i "s:/usr/bin/whois_psad:/usr/bin/whois:g" psad.conf || die "fix_psad_conf failed"
 }