Bump to 1.3.2. Initscript doins -> doexe.

5 files changed, 142 insertions, 9 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index b0884dafa800..828eff5be309 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for net-firewall/psad
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.16 2004/06/24 22:41:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.17 2004/06/25 19:54:12 battousai Exp $
+
+*psad-1.3.2 (24 Jun 2004)
+
+  24 Jun 2004; Bryan Stine <battousai@gentoo.org>; psad-1.3.1.ebuild,
+  +psad-1.3.2.ebuild:
+  Version bump to new 1.3.2 release. This release also resulted in a few
+  rewritten installation instructions and some changed filenames. Also changed
+  /etc/init.d doins stuff to doexe.
 
   21 Jun 2004; Bryan Stine <battousai@gentoo.org>; psad-1.3.1.ebuild:
-  The ebuild now installs manfiles. Thanks to Michael Resh for pointing this out.
+  The ebuild now installs manfiles. Thanks to Michael Rash for pointing this out.
 
   05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> psad-1.3.1.ebuild:
   Stable on alpha.
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 76552e05b2d6..b9a22c3805d5 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,4 +1,6 @@
-MD5 e12c5139935a8a079b823a467d1fa70f psad-1.3.1.ebuild 2771
-MD5 c02f588a96bc7c97b0ce2218c8bde854 ChangeLog 3065
+MD5 14bed7b61f9658ff2078ac38bf2d1ef4 ChangeLog 3374
 MD5 ac85ccaacab6bf7a9dd356b8c92b3bac metadata.xml 326
+MD5 117a5092208ecc0a348e9b0fc731b70c psad-1.3.1.ebuild 2815
+MD5 5afeb023f48cbbc8bf4c4c121f04ad62 psad-1.3.2.ebuild 2930
 MD5 0685c8a54fb4c35dbc920b79c2bea80e files/digest-psad-1.3.1 63
+MD5 d5b2c82c2615fcf24e2f599706e35ade files/digest-psad-1.3.2 63
diff --git a/net-firewall/psad/files/digest-psad-1.3.2 b/net-firewall/psad/files/digest-psad-1.3.2
new file mode 100644
index 000000000000..695e288a0af3
--- /dev/null
+++ b/net-firewall/psad/files/digest-psad-1.3.2
@@ -0,0 +1 @@
+MD5 76d88442a3101d0597962aa58148b45f psad-1.3.2.tar.bz2 489072
diff --git a/net-firewall/psad/psad-1.3.1.ebuild b/net-firewall/psad/psad-1.3.1.ebuild
index b6026d629c90..562b79b4e5ef 100644
--- a/net-firewall/psad/psad-1.3.1.ebuild
+++ b/net-firewall/psad/psad-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8 2004/06/24 22:41:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.1.ebuild,v 1.9 2004/06/25 19:54:12 battousai Exp $
 
 inherit eutils perl-module
 
@@ -37,11 +37,11 @@ src_compile() {
 	emake test
 
 	cd ${S}/whois
-	emake || die
+	emake || die "Make failed: whois"
 
 	cd ${S}
 	# We'll use the C binaries
-	emake || die
+	emake || die "Make failed: daemons"
 }
 
 src_install() {
@@ -87,8 +87,8 @@ src_install() {
 	doins *.conf
 	doins psad_*
 
-	insinto /etc/init.d
-	newins psad-init.gentoo psad
+	exeinto /etc/init.d
+	doexe psad-init.gentoo psad
 
 	cd ${S}/snort_rules
 	dodir /etc/psad/snort_rules
diff --git a/net-firewall/psad/psad-1.3.2.ebuild b/net-firewall/psad/psad-1.3.2.ebuild
new file mode 100644
index 000000000000..61fe78ac3033
--- /dev/null
+++ b/net-firewall/psad/psad-1.3.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/06/25 19:54:12 battousai Exp $
+
+inherit eutils perl-module
+
+IUSE=""
+
+DESCRIPTION="Port Scannning 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
+	mail-client/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}
+
+	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
+	myhostname="$(< /etc/hostname)"
+	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
+	cp psad.conf psad.conf.orig
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+
+	insinto /etc/psad
+	doins *.conf
+	doins psad_*
+	doins auto_dl icmp_types posf signatures
+
+	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 "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
+	einfo "would be:"
+	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+}