Removed old, because off collision, #248231

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 16 insertions, 154 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index da508c3e4c9c..8b4296eb3012 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,9 @@
 # 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.54 2010/12/21 13:52:48 klausman Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.55 2011/03/09 11:51:03 jlec Exp $
+
+  09 Mar 2011; Justin Lecher <jlec@gentoo.org> -psad-1.4.8.ebuild:
+  Removed old, because off collision, #248231
 
   21 Dec 2010; Tobias Klausmann <klausman@gentoo.org> psad-2.1.7.ebuild:
   Stable on alpha, bug #340777
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 712bb8bb5277..e1b75ad5551d 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,6 +1,14 @@
-DIST psad-1.4.8.tar.bz2 564588 RMD160 bfc2e79c81caa5e786d7d4e36002fe84ff01bb50 SHA1 25e5f84fb1278b03c5eeaa507b3efbaef3829ec9 SHA256 93f71dc00a2b361db0e37232ce6cc943a6cb8873efaf17448589167826950110
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST psad-2.1.7.tar.bz2 967130 RMD160 f33c7fcf69601a2308ea45ca690cc6f8f0fa42b3 SHA1 d506b38d2891876dfa506079a7ed36c0ae43b403 SHA256 4342be5716e4b5aa630fb5a4c4cdd79f0732787a4859bd5d50aca49e3637b7a3
-EBUILD psad-1.4.8.ebuild 4100 RMD160 204e9e00da80d6327b79b559f8bf14e84931a64f SHA1 4493b4d58db05b30cb77cc703697441640afeda6 SHA256 639e51895e14fa74f7b39a8773dc9531544e49fe063f46b626e9a0a43e9acce9
 EBUILD psad-2.1.7.ebuild 4228 RMD160 378b7fd0c14dc7f63ee80f50ec120e291d29d09d SHA1 e1c51f4dc3e6926ac2a6d1862df8102bcd0a79af SHA256 83ba8c2f6dc58f5a87381c63a87e778b2ebdb2e57a8d14a59fd6498f8556357f
-MISC ChangeLog 9573 RMD160 7e49a182c12727d34d1ab21fd5430d9e6d56595d SHA1 e8495bfc564bc6b7955e6990ba9743bd5c5ea05c SHA256 fcd25489f6b2f3dfaa16acdb9b8279a2305e39cd5f11b27af040eb246ebb5af9
+MISC ChangeLog 9683 RMD160 b4e073a14d1d982490b5317e30f9a772cb461123 SHA1 9d0ec4d63b9bdfdabb637aba34aaee88ea4b418c SHA256 2420329eb964cf1d52d43d87e21c697ea3180b7342d01336c562d47f0d285d22
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk13aa0ACgkQgAnW8HDreRaBgwCg0KHOt8xbEs+RJANopEzhpIfx
+6uMAn3ijA+98FymqhSdNeuDR3wmClsuS
+=+wVn
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/psad/psad-1.4.8.ebuild b/net-firewall/psad/psad-1.4.8.ebuild
deleted file mode 100644
index a33b174304f4..000000000000
--- a/net-firewall/psad/psad-1.4.8.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.12 2008/09/12 05:03:41 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}"/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}"/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}"/Psad
-	perl-module_src_install
-
-	cd "${S}"/Net-IPv4Addr
-	perl-module_src_install
-
-	cd "${S}"/IPTables-ChainMgr
-	perl-module_src_install
-
-	cd "${S}"/IPTables-Parse
-	perl-module_src_install
-
-	cd "${S}"
-	insinto /usr
-	dosbin kmsgsd psad psadwatchd
-	newsbin fwcheck_psad.pl fwcheck_psad
-	dobin pscan
-
-	cd "${S}"
-
-	fix_psad_conf
-
-	insinto /etc/psad
-	doins *.conf
-	doins psad_*
-	doins auto_dl icmp_types posf signatures pf.os
-
-	cd "${S}"/init-scripts
-	newinitd 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 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
-}
-
-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:/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"
-	sed -i "s:/usr/bin/whois_psad:/usr/bin/whois:g" psad.conf || die "fix_psad_conf failed"
-}