Bump to 2.1.4, fixing bug #236434. Minor syntax fixes in all versions.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc4 x86_64

5 files changed, 198 insertions, 41 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 4d4681604bcb..6a483212365e 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/psad
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.43 2007/05/06 10:00:48 genone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.44 2008/09/12 05:03:41 battousai Exp $
+
+*psad-2.1.4 (12 Sep 2008)
+
+  12 Sep 2008; Bryan D. Stine <battousai@gentoo.org> psad-1.4.8.ebuild,
+  psad-2.0.6.ebuild, +psad-2.1.4.ebuild:
+  Version bump to 2.1.4. Dependencies, such as the bundled perl modules,
+  have been moved into the deps/ folder in the srcdir, so adjusted the
+  ebuild for that. Fixes bug #236434, thanks to Gustaf Ankarloo for the
+  report. Also, fixed minor syntax errors in all versions.
 
   06 May 2007; Marius Mauch <genone@gentoo.org> psad-1.4.8.ebuild,
   psad-2.0.6.ebuild:
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 07a4e0051ea1..f6d29248c3df 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,6 +1,8 @@
 DIST psad-1.4.8.tar.bz2 564588 RMD160 bfc2e79c81caa5e786d7d4e36002fe84ff01bb50 SHA1 25e5f84fb1278b03c5eeaa507b3efbaef3829ec9 SHA256 93f71dc00a2b361db0e37232ce6cc943a6cb8873efaf17448589167826950110
 DIST psad-2.0.6.tar.bz2 688632 RMD160 e2e49c2a6207edc4c1ba404ca01823348229ee0f SHA1 8447a942f082abe22787133561ae2ec19bb02930 SHA256 c59973bbc8d61071a28f5910c4b7b9cc183bf66a9f689e2d1d4564bbcd9dcd90
-EBUILD psad-1.4.8.ebuild 4076 RMD160 fa730adcc2c478c6e3d21b703842f6da1b6420f9 SHA1 c9f62b91dfb7937c9b737b3ad5d197ee58302d35 SHA256 30b6ccbe76bb8a78a1aa3209a4f54efaa27bcd5899c84a0538929980c9e33f98
-EBUILD psad-2.0.6.ebuild 4099 RMD160 dcd8870d32554d073f130569a8455c3a1fb25b6c SHA1 d6cb7167345034707f3556629c14e80d1addaf5a SHA256 834d45baee6b8b96fb04b0867b620c7ef92bd2cefc9d20a6156f8b412a9f876d
-MISC ChangeLog 7565 RMD160 4d271fe213f95fd7642d11df1ff7c69d603b56ab SHA1 101d53c3ad82eef8ba052de96809b82bbbbfd6c7 SHA256 dcd22f70905481e9de3b91ba3bada57d23670680f936eceaa936bd6902d22bb8
+DIST psad-2.1.4.tar.bz2 952601 RMD160 d51e981f0c4b8e933565e173cb5dd2e5dd49b8ea SHA1 4bcead2148884a654307329c6256782591195e50 SHA256 9628ef56fd42f56f8ce302bb0897de91ebbee075389fbf20774e6d56ed9a0896
+EBUILD psad-1.4.8.ebuild 4100 RMD160 204e9e00da80d6327b79b559f8bf14e84931a64f SHA1 4493b4d58db05b30cb77cc703697441640afeda6 SHA256 639e51895e14fa74f7b39a8773dc9531544e49fe063f46b626e9a0a43e9acce9
+EBUILD psad-2.0.6.ebuild 4119 RMD160 cbfd0985df696de3d945555ed8e843c24c1cf781 SHA1 fd44c2e570df893cab3cf6062a033cf22938ba3c SHA256 9d3b5ac2e304b41eb046c674b3a819153e56ba1e90b3fdf67acf02d3a8d1ff88
+EBUILD psad-2.1.4.ebuild 4154 RMD160 d81d487dadb1ed760b7612c45e2b787a5762f1b9 SHA1 b25ac15876edfa8de784240ac302c62ac12880a8 SHA256 ac823740fb497f977030a6262f2c1cc655480164932d1b6729cd4ecac3254698
+MISC ChangeLog 7984 RMD160 cd02e3587cee6530b7fd5c97c2f3f550180bf0bb SHA1 42637217f8d8e1688476e8361a9c3a8b133f3c78 SHA256 ce00bac9d5b2da31773f857a3c444be47010848e06c569e851082b675f1264ed
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
diff --git a/net-firewall/psad/psad-1.4.8.ebuild b/net-firewall/psad/psad-1.4.8.ebuild
index 9250dc44104d..a33b174304f4 100644
--- a/net-firewall/psad/psad-1.4.8.ebuild
+++ b/net-firewall/psad/psad-1.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.11 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.12 2008/09/12 05:03:41 battousai Exp $
 
 inherit eutils perl-app
 
@@ -25,23 +25,23 @@ RDEPEND="virtual/logger
 	net-misc/whois"
 
 src_compile() {
-	cd ${S}/Psad
+	cd "${S}"/Psad
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}
+	cd "${S}"
 	# We'll use the C binaries
 	emake || die "Make failed: daemons"
 }
@@ -54,25 +54,25 @@ src_install() {
 
 	keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
 	dodir /etc/psad
-	cd ${S}/Psad
+	cd "${S}"/Psad
 	perl-module_src_install
 
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	perl-module_src_install
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	perl-module_src_install
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	perl-module_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /usr
 	dosbin kmsgsd psad psadwatchd
 	newsbin fwcheck_psad.pl fwcheck_psad
 	dobin pscan
 
-	cd ${S}
+	cd "${S}"
 
 	fix_psad_conf
 
@@ -81,23 +81,23 @@ src_install() {
 	doins psad_*
 	doins auto_dl icmp_types posf signatures pf.os
 
-	cd ${S}/init-scripts
+	cd "${S}"/init-scripts
 	newinitd psad-init.gentoo psad
 
-	cd ${S}/snort_rules
+	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
+	cd "${S}"
+	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README SCAN_LOG
 }
 
 pkg_postinst() {
-	if [ ! -p ${ROOT}/var/lib/psad/psadfifo ]
+	if [ ! -p "${ROOT}"/var/lib/psad/psadfifo ]
 	then
 		ebegin "Creating syslog FIFO for PSAD"
-		mknod -m 600 ${ROOT}/var/lib/psad/psadfifo p
+		mknod -m 600 "${ROOT}"/var/lib/psad/psadfifo p
 		eend $?
 	fi
 
diff --git a/net-firewall/psad/psad-2.0.6.ebuild b/net-firewall/psad/psad-2.0.6.ebuild
index d2a361b5f6bd..33846af7a06c 100644
--- a/net-firewall/psad/psad-2.0.6.ebuild
+++ b/net-firewall/psad/psad-2.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild,v 1.5 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild,v 1.6 2008/09/12 05:03:41 battousai Exp $
 
 inherit eutils perl-app
 
@@ -25,19 +25,19 @@ RDEPEND="virtual/logger
 	net-misc/whois"
 
 src_compile() {
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}
+	cd "${S}"
 	# We'll use the C binaries
 	emake || die "Make failed: daemons"
 }
@@ -51,22 +51,22 @@ src_install() {
 	keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
 	dodir /etc/psad
 
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	perl-module_src_install
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	perl-module_src_install
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	perl-module_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /usr
 	dosbin kmsgsd psad psadwatchd
 	newsbin fwcheck_psad.pl fwcheck_psad
 	dobin pscan
 
-	cd ${S}
+	cd "${S}"
 
 	fix_psad_conf
 
@@ -75,23 +75,23 @@ src_install() {
 	doins psad_*
 	doins auto_dl icmp_types ip_options posf signatures pf.os
 
-	cd ${S}/init-scripts
+	cd "${S}"/init-scripts
 	newinitd psad-init.gentoo psad
 
-	cd ${S}/snort_rules
+	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
+	cd "${S}"
+	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README SCAN_LOG
 }
 
 pkg_postinst() {
-	if [ ! -p ${ROOT}/var/lib/psad/psadfifo ]
+	if [ ! -p "${ROOT}"/var/lib/psad/psadfifo ]
 	then
 		ebegin "Creating syslog FIFO for PSAD"
-		mknod -m 600 ${ROOT}/var/lib/psad/psadfifo p
+		mknod -m 600 "${ROOT}"/var/lib/psad/psadfifo p
 		eend $?
 	fi
 
diff --git a/net-firewall/psad/psad-2.1.4.ebuild b/net-firewall/psad/psad-2.1.4.ebuild
new file mode 100644
index 000000000000..65552d2f3a8d
--- /dev/null
+++ b/net-firewall/psad/psad-2.1.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.4.ebuild,v 1.1 2008/09/12 05:03:41 battousai 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="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="${DEPEND}
+	dev-lang/perl"
+
+RDEPEND="virtual/logger
+	dev-perl/Unix-Syslog
+	dev-perl/Date-Calc
+	virtual/mailx
+	net-firewall/iptables
+	net-misc/whois"
+
+src_compile() {
+	cd "${S}"/deps/Net-IPv4Addr
+	SRC_PREP="no" perl-module_src_compile
+	emake test
+
+	cd "${S}"/deps/IPTables-Parse
+	SRC_PREP="no" perl-module_src_compile
+	emake test
+
+	cd "${S}"/deps/IPTables-ChainMgr
+	SRC_PREP="no" perl-module_src_compile
+	emake test
+
+	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}"/deps/Net-IPv4Addr
+	perl-module_src_install
+
+	cd "${S}"/deps/IPTables-ChainMgr
+	perl-module_src_install
+
+	cd "${S}"/deps/IPTables-Parse
+	perl-module_src_install
+
+	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 ip_options posf signatures pf.os
+
+	cd "${S}"/init-scripts
+	newinitd psad-init.gentoo psad
+
+	cd "${S}"/deps/snort_rules
+	dodir /etc/psad/snort_rules
+	insinto /etc/psad/snort_rules
+	doins *.rules
+
+	cd "${S}"
+	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README 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
+	elog "Please be sure to edit /etc/psad/psad.conf to reflect your system's"
+	elog "configuration or it may not work correctly or start up. Specifically, check"
+	elog "the validity of the HOSTNAME setting and replace the EMAIL_ADDRESSES and"
+	elog "HOME_NET settings at the least."
+	elog
+	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;"
+		ewarn
+	fi
+	if has_version ">=app-admin/sysklogd-0.0.0"
+	then
+		elog "You have sysklogd installed. If this is your default system logger, no"
+		elog "special configuration is needed. If it is not, please set SYSLOG_DAEMON"
+		elog "in /etc/psad/psad.conf accordingly."
+		elog
+	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
+
+	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() {
+	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:/usr/bin/whois_psad:/usr/bin/whois:g" psad.conf || die "fix_psad_conf failed"
+}