bump and cruft cleanup

8 files changed, 16 insertions, 120 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index b52e337659f9..f06fa0a7cf7c 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2003/10/29 06:18:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.8 2003/12/01 19:28:32 seemant Exp $
+
+*psad-1.3 (01 Dec 2003)
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> psad-1.2.3-r1.ebuild,
+  psad-1.2.4-r1.ebuild, psad-1.2.4.ebuild, psad-1.3.ebuild:
+  version bump, and moved 1.2.4-r1 to stable x86
 
 *psad-1.2.4-r1 (28 Oct 2003)
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index dc2ae04b0dc5..a64dc96802cb 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,11 +1,7 @@
-MD5 d53d8f350b98cb2c133a02ed1bb7b17f psad-1.2.3-r1.ebuild 2318
-MD5 d0086904a7c1e9b6b5d7fd0f8c3198c0 psad-1.3.ebuild 2510
-MD5 c8ca4777aadd89784d12199bce21e85f psad-1.2.4-r1.ebuild 2835
-MD5 cd8a79e76c6745c3eaa0d4cf8a18b9eb psad-1.2.4.ebuild 2814
-MD5 7c3a90592ee0d2d60c91140d5d47d798 ChangeLog 1723
+MD5 91b7fdfdaf1c4cb31face5beb9f7285f psad-1.3.ebuild 2607
+MD5 73c828ae30ad0e57f2b48f8a95b2c4f2 psad-1.2.4-r1.ebuild 2834
+MD5 2f6db3ad895fcbd27068d7eb0741fb86 ChangeLog 1932
 MD5 624441f5e21afa19251eedc583e0c4e7 metadata.xml 433
 MD5 7bde50c81c6f3edeff3e8a2e34a0e004 files/digest-psad-1.3 61
-MD5 de0f1f89e6d13f25077e8189a1709007 files/digest-psad-1.2.4 63
-MD5 2958d8637b53c70d3e7c1fc812265c96 files/digest-psad-1.2.3-r1 62
 MD5 de0f1f89e6d13f25077e8189a1709007 files/digest-psad-1.2.4-r1 63
 MD5 e6a344f93477acc8c7ac9bdf9a18f355 files/psad-1.2.4-metalog.patch 2436
diff --git a/net-firewall/psad/files/digest-psad-1.2.3-r1 b/net-firewall/psad/files/digest-psad-1.2.3-r1
deleted file mode 100644
index 16b7474b4eed..000000000000
--- a/net-firewall/psad/files/digest-psad-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9aa74b03528ee6143af45f6f3b1fb0c psad-1.2.3.tar.gz 432797
diff --git a/net-firewall/psad/files/digest-psad-1.2.4 b/net-firewall/psad/files/digest-psad-1.2.4
deleted file mode 100644
index 5f9f33ef07e3..000000000000
--- a/net-firewall/psad/files/digest-psad-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7233ac8929e7ee5e3b66edaae72b4c92 psad-1.2.4.tar.bz2 454610
diff --git a/net-firewall/psad/files/digest-psad-1.3 b/net-firewall/psad/files/digest-psad-1.3
new file mode 100644
index 000000000000..aad479cce683
--- /dev/null
+++ b/net-firewall/psad/files/digest-psad-1.3
@@ -0,0 +1 @@
+MD5 3b61233ab3d38d50e97d7ff46ec96762 psad-1.3.tar.bz2 471166
diff --git a/net-firewall/psad/psad-1.2.3-r1.ebuild b/net-firewall/psad/psad-1.2.3-r1.ebuild
deleted file mode 100644
index 08351970c4a8..000000000000
--- a/net-firewall/psad/psad-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2003 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.3-r1.ebuild,v 1.1 2003/10/07 06:22:33 seemant 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.gz"
-HOMEPAGE="http://www.cipherdyne.org/psad"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~alpha ~sparc ~hppa ~mips ~arm"
-
-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 until we see them break
-	emake || die
-}
-
-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
-
-	cd ${S}/Net-IPv4Addr
-	insinto /usr/lib/psad
-	doins IPv4Addr.pm
-
-	cd ${S}/IPTables/Parse
-	insinto /usr/lib/psad
-	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 diskmond kmsgsd psad psadwatchd
-	dobin pscan
-
-	cd ${S}
-	insinto /etc/psad
-	doins *.conf
-
-	cd ${S}/snort_rules
-	dodir /etc/psad/snort_rules
-	insinto /etc/psad/snort_rules
-	doins *.rules
-
-	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 "Several programs in the PSAD package are in the process of being converted to"
-	einfo "compiled C from PERL. If you have any problems, please notify the PSAD"
-	einfo "maintainers. Please do not take PSAD issues to the Bastille-Linux team."
-	echo
-	ewarn "Please be sure to edit /etc/psad/psad.conf to reflect your system's configuration"
-	ewarn "or it may not work correctly or start up."
-}
diff --git a/net-firewall/psad/psad-1.2.4-r1.ebuild b/net-firewall/psad/psad-1.2.4-r1.ebuild
index f96c197d6d46..699a3896a5d9 100644
--- a/net-firewall/psad/psad-1.2.4-r1.ebuild
+++ b/net-firewall/psad/psad-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.1 2003/10/29 06:18:07 seemant Exp $
+# $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 $
 
 inherit eutils
 inherit perl-module
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~alpha ~sparc ~hppa ~mips ~arm"
+KEYWORDS="x86 ~amd64 ~ia64 ~ppc ~alpha ~sparc ~hppa ~mips ~arm"
 
 DEPEND="${DEPEND}
 	dev-lang/perl"
diff --git a/net-firewall/psad/psad-1.2.4.ebuild b/net-firewall/psad/psad-1.3.ebuild
index efe26cd7ab4e..2cf6a9d269d3 100644
--- a/net-firewall/psad/psad-1.2.4.ebuild
+++ b/net-firewall/psad/psad-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.1 2003/10/21 06:43:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.ebuild,v 1.1 2003/12/01 19:28:32 seemant Exp $
 
 inherit eutils
 inherit perl-module
@@ -110,10 +110,6 @@ pkg_postinst() {
 	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 setting"
-	einfo "at the least."
-	echo
-	ewarn "If you're using metalog as your system logger, please be aware that PSAD does"
-	ewarn "not officially support it, and it probably won't work. Syslog-ng and sysklogd"
-	ewarn "do seem to work fine, though."
+	einfo "the validity of the HOSTNAME setting and replace the EMAIL_ADDRESSES and"
+	einfo "HOME_NET settings at the least."
 }