Bump to 2.1.5-r2 with fix for bug #298262, drop older 2.1.5 versions.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 25 insertions, 162 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 220b3c76ed36..d5deebef2aad 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/psad
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.47 2010/03/18 19:08:19 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.48 2010/06/03 21:55:40 battousai Exp $
+
+*psad-2.1.5-r2 (03 Jun 2010)
+
+  03 Jun 2010; Bryan Stine <battousai@gentoo.org> psad-2.1.4.ebuild,
+  -psad-2.1.5.ebuild, -psad-2.1.5-r1.ebuild, +psad-2.1.5-r2.ebuild:
+  Bump to 2.1.5-r2, moving config file changes to pkg_preinst to fix bug
+  #298262. Drop older 2.1.5 versions. This will be targetted for stable.
 
 *psad-2.1.5-r1 (18 Mar 2010)
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 401baf1398aa..f7e0399b0f13 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -4,8 +4,7 @@ DIST psad-2.1.4.tar.bz2 952601 RMD160 d51e981f0c4b8e933565e173cb5dd2e5dd49b8ea S
 DIST psad-2.1.5.tar.bz2 962775 RMD160 eba09cef247209252370854f5d708fd42ecf160a SHA1 312bf54f17b11939b5843618fd279ce7fd74408a SHA256 abf1daf9e218d0ac7cc18cf78e83c80d27e1c1114a11ace2b619c97648226a3d
 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
-EBUILD psad-2.1.5-r1.ebuild 4169 RMD160 cc5192427b581db2cc74616fb3799607bf00f021 SHA1 f27be5cd7e38bf874a9862c4d4a99ffb6f7d5c98 SHA256 f7a4bec8952924eacb946dce96ac36938bd96a47a7f38aa80353a71a5a7bfaba
-EBUILD psad-2.1.5.ebuild 4166 RMD160 0e7057ddede4d89f483bcf64e68c81d7fe7aaca2 SHA1 3b7042a508b81e6a5fd4d01f80bcaa8ce3807487 SHA256 802709b471b600095879a216be3052b4464c27a7993b16cd706a72d2c7fda473
-MISC ChangeLog 8581 RMD160 012c5aa877456d204e3e83061dc860808a1f5771 SHA1 bf7ebade4f02fb1b0bbd42ecc13dc81c206a58c2 SHA256 c2b350c8accc57e0d1b4d3d8fa95e92f42e37042dddc290478a41ff47c61c552
+EBUILD psad-2.1.4.ebuild 4159 RMD160 101973b6f995ab426d5f4da68c62933433566942 SHA1 d83c1233a7a5119803ae0db28cb3c0e249e35a6a SHA256 736bb988dc91fab4aa7b69efb2fd674f412ccc5a5f01f32f87d03bc13eca02e9
+EBUILD psad-2.1.5-r2.ebuild 4247 RMD160 2d75d34a1e5b2dca1a5e15f6fa6a651c68eb15fa SHA1 d0bb5307dcecf6071659ff5fc0b717d7eab06dbe SHA256 572d97535423342c734a2f98413a98819c8b29bcbabab8dde264ff620bb293c4
+MISC ChangeLog 8895 RMD160 3c7b0b074b5b51e0b74d89ca9ca4ddf1ae78c86a SHA1 d19729ef68f571eb663cf84b34d0629a76450776 SHA256 c009467fd94bb35e5854b5e9047303ced26c0793e959c6ddb7e9d4c77876e68a
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
diff --git a/net-firewall/psad/psad-2.1.4.ebuild b/net-firewall/psad/psad-2.1.4.ebuild
index 65552d2f3a8d..61ea2be89995 100644
--- a/net-firewall/psad/psad-2.1.4.ebuild
+++ b/net-firewall/psad/psad-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.4.ebuild,v 1.2 2010/06/03 21:55:40 battousai Exp $
 
 inherit eutils perl-app
 
@@ -64,7 +64,7 @@ src_install() {
 	insinto /usr
 	dosbin kmsgsd psad psadwatchd
 	newsbin fwcheck_psad.pl fwcheck_psad
-	dobin pscan
+	dobin psad-pscan
 
 	cd "${S}"
 
diff --git a/net-firewall/psad/psad-2.1.5-r1.ebuild b/net-firewall/psad/psad-2.1.5-r2.ebuild
index 1385b5e67562..049b3ecc0d7d 100644
--- a/net-firewall/psad/psad-2.1.5-r1.ebuild
+++ b/net-firewall/psad/psad-2.1.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.5-r1.ebuild,v 1.1 2010/03/18 19:08:19 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.5-r2.ebuild,v 1.1 2010/06/03 21:55:40 battousai Exp $
 
 inherit eutils perl-app
 
@@ -68,8 +68,6 @@ src_install() {
 
 	cd "${S}"
 
-	fix_psad_conf
-
 	insinto /etc/psad
 	doins *.conf
 	doins psad_*
@@ -87,6 +85,11 @@ src_install() {
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README SCAN_LOG
 }
 
+pkg_preinst() {
+	# Set sane defaults in config file.
+	fix_psad_conf
+}
+
 pkg_postinst() {
 	if [ ! -p "${ROOT}"/var/lib/psad/psadfifo ]
 	then
@@ -131,16 +134,16 @@ pkg_postinst() {
 }
 
 fix_psad_conf() {
-	cp psad.conf psad.conf.orig
+	PSADCONF="${D}/etc/psad/psad.conf"
 
 	# 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"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" "${PSADCONF}" || 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"
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" "${PSADCONF}" || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" "${PSADCONF}" || die "fix_psad_conf failed"
+	sed -i "s:/usr/bin/whois_psad:/usr/bin/whois:g" "${PSADCONF}" || die "fix_psad_conf failed"
 }
diff --git a/net-firewall/psad/psad-2.1.5.ebuild b/net-firewall/psad/psad-2.1.5.ebuild
deleted file mode 100644
index 86ce5d179ae6..000000000000
--- a/net-firewall/psad/psad-2.1.5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.5.ebuild,v 1.2 2010/03/10 19:37:06 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
-	newbin pscan psad-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"
-}