Remove mips, ia64, hppa and arm to avoid RDEPEND errors, Version bump.

6 files changed, 137 insertions, 14 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 53149d30fc27..78b0ddb336ea 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/psad
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.9 2003/12/01 19:29:06 seemant Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.10 2004/01/14 02:10:20 battousai Exp $
+
+*psad-1.3.1 (13 Jan 2004)
+
+  13 Jan 2004; Bryan Stine <battousai@gentoo.org> psad-1.3.1.ebuild,
+  psad-1.2.4-r1.ebuild, psad-1.3.ebuild:
+  Version bump. Thanks to seemant for helping me maintain this before now.
+  Also, hppa, mips, ia64 and arm have been removed from KEYWORDS. Runtime
+  dependencies are not yet available for those architectures.
 
 *psad-1.3 (01 Dec 2003)
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 15ed1e73318e..891ea3b14231 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,7 +1,9 @@
-MD5 91b7fdfdaf1c4cb31face5beb9f7285f psad-1.3.ebuild 2607
-MD5 73c828ae30ad0e57f2b48f8a95b2c4f2 psad-1.2.4-r1.ebuild 2834
-MD5 d0ce1e52d6e178617109450ee871a788 ChangeLog 1981
+MD5 b743b26a39d7442aa531ab4b32aaeab9 ChangeLog 2333
 MD5 624441f5e21afa19251eedc583e0c4e7 metadata.xml 433
-MD5 7bde50c81c6f3edeff3e8a2e34a0e004 files/digest-psad-1.3 61
+MD5 64667dc7ef83962882f0fca3d2e90df0 psad-1.2.4-r1.ebuild 2795
+MD5 8d16d79cedd625b69f40d68c39caaaa9 psad-1.3.ebuild 2568
+MD5 a0872514aca3774bbaeea3351a63657d psad-1.3.1.ebuild 2540
 MD5 de0f1f89e6d13f25077e8189a1709007 files/digest-psad-1.2.4-r1 63
+MD5 7bde50c81c6f3edeff3e8a2e34a0e004 files/digest-psad-1.3 61
 MD5 e6a344f93477acc8c7ac9bdf9a18f355 files/psad-1.2.4-metalog.patch 2436
+MD5 0685c8a54fb4c35dbc920b79c2bea80e files/digest-psad-1.3.1 63
diff --git a/net-firewall/psad/files/digest-psad-1.3.1 b/net-firewall/psad/files/digest-psad-1.3.1
new file mode 100644
index 000000000000..c537bef771c4
--- /dev/null
+++ b/net-firewall/psad/files/digest-psad-1.3.1
@@ -0,0 +1 @@
+MD5 ce400d52ffb9e98c138086e323e5aded psad-1.3.1.tar.bz2 478296
diff --git a/net-firewall/psad/psad-1.2.4-r1.ebuild b/net-firewall/psad/psad-1.2.4-r1.ebuild
index 699a3896a5d9..f69bab75c2ef 100644
--- a/net-firewall/psad/psad-1.2.4-r1.ebuild
+++ b/net-firewall/psad/psad-1.2.4-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2.4-r1.ebuild,v 1.2 2003/12/01 19:28:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.2.4-r1.ebuild,v 1.3 2004/01/14 02:10:20 battousai Exp $
 
 inherit eutils
 inherit perl-module
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Port Scannning Attack Detection daemon"
 SRC_URI="http://www.cipherdyne.org/psad/download/psad-${PV}.tar.bz2"
 HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 ~ia64 ~ppc ~alpha ~sparc ~hppa ~mips ~arm"
+KEYWORDS="x86 ~amd64 ~ppc ~alpha ~sparc"
 
 DEPEND="${DEPEND}
 	dev-lang/perl"
diff --git a/net-firewall/psad/psad-1.3.1.ebuild b/net-firewall/psad/psad-1.3.1.ebuild
new file mode 100644
index 000000000000..5b41b0e4518e
--- /dev/null
+++ b/net-firewall/psad/psad-1.3.1.ebuild
@@ -0,0 +1,114 @@
+# 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.1.ebuild,v 1.1 2004/01/14 02:10:20 battousai Exp $
+
+inherit eutils
+inherit perl-module
+
+IUSE=""
+
+DESCRIPTION="Port Scannning 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
+	net-mail/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
+
+	cd ${S}
+	# We'll use the C binaries
+	emake || die
+}
+
+src_install() {
+	local myhostname=
+	local mydomain=
+
+	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}
+
+	# 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_*
+
+	insinto /etc/init.d
+	newins 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."
+}
diff --git a/net-firewall/psad/psad-1.3.ebuild b/net-firewall/psad/psad-1.3.ebuild
index 2cf6a9d269d3..5c72890a82a9 100644
--- a/net-firewall/psad/psad-1.3.ebuild
+++ b/net-firewall/psad/psad-1.3.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.1 2003/12/01 19:28:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.ebuild,v 1.2 2004/01/14 02:10:20 battousai Exp $
 
 inherit eutils
 inherit perl-module
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Port Scannning Attack Detection daemon"
 SRC_URI="http://www.cipherdyne.org/psad/download/psad-${PV}.tar.bz2"
 HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~alpha ~sparc ~hppa ~mips ~arm"
+KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
 
 DEPEND="${DEPEND}
 	dev-lang/perl"