9 files changed, 66 insertions, 165 deletions
diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index d7f4810c180c..af93634af100 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/psad
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.27 2005/06/17 20:07:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.28 2005/07/31 03:09:02 battousai Exp $
+
+*psad-1.4.2 (31 Jul 2005)
+
+  31 Jul 2005; Bryan Stine <battousai@gentoo.org> -psad-1.3.1.ebuild,
+  -psad-1.3.2.ebuild, psad-1.3.4.ebuild, psad-1.4.0.ebuild,
+  +psad-1.4.2.ebuild:
+  Bump to 1.4.2, add a fix for hostname and DNS domain name detection when
+  using newer baselayout. Closes bug #90544.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> psad-1.3.2.ebuild:
   Stable on ppc.
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index ebff4e590513..b432713e19ac 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,10 +1,8 @@
-MD5 9e330d67604b9ecdc1af9ab56fd43c5a psad-1.3.4.ebuild 3338
-MD5 938dbb3b56c0f7885c3408516e96a3be psad-1.3.1.ebuild 3210
+MD5 a89a4276c89d661a55a45287afb1e184 ChangeLog 5359
 MD5 ac85ccaacab6bf7a9dd356b8c92b3bac metadata.xml 326
-MD5 90da4c4a1b90473409da7501ae9cc2c9 ChangeLog 5059
-MD5 e138764647d5aad9de33c38273d0b4e3 psad-1.3.2.ebuild 3309
-MD5 bf74657e36d1519c721fb90559fc1491 psad-1.4.0.ebuild 4038
-MD5 0685c8a54fb4c35dbc920b79c2bea80e files/digest-psad-1.3.1 63
-MD5 d5b2c82c2615fcf24e2f599706e35ade files/digest-psad-1.3.2 63
+MD5 a598ce63be93fd1ee32ad40186932251 psad-1.3.4.ebuild 3408
+MD5 fd946d3fd647a2174aa8957d18a4eef0 psad-1.4.0.ebuild 4110
+MD5 7b0c9ac90e75935c24b16db15eae5d7f psad-1.4.2.ebuild 4355
 MD5 295923dc84bcfb6e5978b5039ffc0a3a files/digest-psad-1.3.4 63
 MD5 c43f2f1a27860fdad099c9000d373b01 files/digest-psad-1.4.0 63
+MD5 3ddd128f7239ca0bde300b2125ed63ab files/digest-psad-1.4.2 63
diff --git a/net-firewall/psad/files/digest-psad-1.3.1 b/net-firewall/psad/files/digest-psad-1.3.1
deleted file mode 100644
index c537bef771c4..000000000000
--- a/net-firewall/psad/files/digest-psad-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce400d52ffb9e98c138086e323e5aded psad-1.3.1.tar.bz2 478296
diff --git a/net-firewall/psad/files/digest-psad-1.3.2 b/net-firewall/psad/files/digest-psad-1.3.2
deleted file mode 100644
index 695e288a0af3..000000000000
--- a/net-firewall/psad/files/digest-psad-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76d88442a3101d0597962aa58148b45f psad-1.3.2.tar.bz2 489072
diff --git a/net-firewall/psad/files/digest-psad-1.4.2 b/net-firewall/psad/files/digest-psad-1.4.2
new file mode 100644
index 000000000000..471c273311fa
--- /dev/null
+++ b/net-firewall/psad/files/digest-psad-1.4.2
@@ -0,0 +1 @@
+MD5 228c3e17f41f810129e930b979d1346e psad-1.4.2.tar.bz2 544733
diff --git a/net-firewall/psad/psad-1.3.1.ebuild b/net-firewall/psad/psad-1.3.1.ebuild
deleted file mode 100644
index 1aa95f7607f5..000000000000
--- a/net-firewall/psad/psad-1.3.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.1.ebuild,v 1.13 2005/01/07 03:57:24 battousai Exp $
-
-inherit eutils perl-module
-
-IUSE=""
-
-DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="mirror://gentoo/${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
-	dobin pscan
-
-	cd ${S}
-
-	fix_psad_conf
-
-	insinto /etc/psad
-	doins *.conf
-	doins psad_*
-
-	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
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	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.3.4.ebuild b/net-firewall/psad/psad-1.3.4.ebuild
index 3cc7ebfb46b5..7bfe73aa3988 100644
--- a/net-firewall/psad/psad-1.3.4.ebuild
+++ b/net-firewall/psad/psad-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3 2005/01/07 03:57:24 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.4 2005/07/31 03:09:02 battousai Exp $
 
 inherit eutils perl-module
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~amd64 ppc alpha ~sparc"
 
 DEPEND="${DEPEND}
 	dev-lang/perl"
@@ -122,8 +122,9 @@ fix_psad_conf() {
 	cp psad.conf psad.conf.orig
 
 	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
+	[ -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
diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-1.4.0.ebuild
index de9859dd1434..e7ab447d1346 100644
--- a/net-firewall/psad/psad-1.4.0.ebuild
+++ b/net-firewall/psad/psad-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4 2005/01/08 00:07:49 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.5 2005/07/31 03:09:02 battousai Exp $
 
 inherit eutils perl-module
 
@@ -140,8 +140,9 @@ fix_psad_conf() {
 	cp psad.conf psad.conf.orig
 
 	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
+	[ -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
diff --git a/net-firewall/psad/psad-1.3.2.ebuild b/net-firewall/psad/psad-1.4.2.ebuild
index abd74eeafe64..4717ab543b4d 100644
--- a/net-firewall/psad/psad-1.3.2.ebuild
+++ b/net-firewall/psad/psad-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.2.ebuild,v 1.9 2005/06/17 20:07:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.2.ebuild,v 1.1 2005/07/31 03:09:02 battousai Exp $
 
 inherit eutils perl-module
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
+KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
 
 DEPEND="${DEPEND}
 	dev-lang/perl"
@@ -32,7 +32,11 @@ src_compile() {
 	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
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
@@ -53,16 +57,16 @@ 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
+	emake install DESTDIR=${D} || die "Install failed: Psad.pm"
 
 	cd ${S}/Net-IPv4Addr
-	insinto /usr/lib/psad/Net
-	doins IPv4Addr.pm
+	emake install DESTDIR=${D} || die "Install failed: Net-IPv4Addr.pm"
 
-	cd ${S}/IPTables/Parse
-	insinto /usr/lib/psad/IPTables
-	doins Parse.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...
@@ -83,8 +87,9 @@ src_install() {
 	insinto /etc/psad
 	doins *.conf
 	doins psad_*
-	doins auto_dl icmp_types posf signatures
+	doins auto_dl icmp_types posf signatures pf.os
 
+	cd ${S}/init-scripts
 	exeinto /etc/init.d
 	newexe psad-init.gentoo psad
 
@@ -111,18 +116,37 @@ pkg_postinst() {
 	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;"
+	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
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
+	[ -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
@@ -131,3 +155,4 @@ fix_psad_conf() {
 	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"
 }
+