Bump 2.1.5 to r1 for psad location change.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

3 files changed, 154 insertions, 2 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 110fe228420c..220b3c76ed36 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2010/03/10 19:37:06 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.47 2010/03/18 19:08:19 battousai Exp $
+
+*psad-2.1.5-r1 (18 Mar 2010)
+
+  18 Mar 2010; Bryan Stine <battousai@gentoo.org> +psad-2.1.5-r1.ebuild:
+  Bump psad-2.1.5 to r1 for pscan location change.
 
   10 Mar 2010; Bryan Stine <battousai@gentoo.org> psad-2.1.5.ebuild:
   Rename /usr/bin/pscan to /usr/bin/psad-pscan to avoid colliding with
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 7b4a2fc13db4..401baf1398aa 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -5,6 +5,7 @@ DIST psad-2.1.5.tar.bz2 962775 RMD160 eba09cef247209252370854f5d708fd42ecf160a S
 EBUILD psad-1.4.8.ebuild 4100 RMD160 204e9e00da80d6327b79b559f8bf14e84931a64f SHA1 4493b4d58db05b30cb77cc703697441640afeda6 SHA256 639e51895e14fa74f7b39a8773dc9531544e49fe063f46b626e9a0a43e9acce9
 EBUILD psad-2.0.6.ebuild 4119 RMD160 cbfd0985df696de3d945555ed8e843c24c1cf781 SHA1 fd44c2e570df893cab3cf6062a033cf22938ba3c SHA256 9d3b5ac2e304b41eb046c674b3a819153e56ba1e90b3fdf67acf02d3a8d1ff88
 EBUILD psad-2.1.4.ebuild 4154 RMD160 d81d487dadb1ed760b7612c45e2b787a5762f1b9 SHA1 b25ac15876edfa8de784240ac302c62ac12880a8 SHA256 ac823740fb497f977030a6262f2c1cc655480164932d1b6729cd4ecac3254698
+EBUILD psad-2.1.5-r1.ebuild 4169 RMD160 cc5192427b581db2cc74616fb3799607bf00f021 SHA1 f27be5cd7e38bf874a9862c4d4a99ffb6f7d5c98 SHA256 f7a4bec8952924eacb946dce96ac36938bd96a47a7f38aa80353a71a5a7bfaba
 EBUILD psad-2.1.5.ebuild 4166 RMD160 0e7057ddede4d89f483bcf64e68c81d7fe7aaca2 SHA1 3b7042a508b81e6a5fd4d01f80bcaa8ce3807487 SHA256 802709b471b600095879a216be3052b4464c27a7993b16cd706a72d2c7fda473
-MISC ChangeLog 8426 RMD160 29688c727d911151b1f165a78c7bf50c081aab92 SHA1 60ef1b4ba433b4ea7ae89f4c079b1b595c0fd6df SHA256 913b79a95ff3bea3e3b28879f8648bf41c82c4ef8f6c7e8b9c55933cef8371f5
+MISC ChangeLog 8581 RMD160 012c5aa877456d204e3e83061dc860808a1f5771 SHA1 bf7ebade4f02fb1b0bbd42ecc13dc81c206a58c2 SHA256 c2b350c8accc57e0d1b4d3d8fa95e92f42e37042dddc290478a41ff47c61c552
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
diff --git a/net-firewall/psad/psad-2.1.5-r1.ebuild b/net-firewall/psad/psad-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..1385b5e67562
--- /dev/null
+++ b/net-firewall/psad/psad-2.1.5-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.5-r1.ebuild,v 1.1 2010/03/18 19:08:19 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}"/deps/Net-IPv4Addr
+	SRC_PREP="no" perl-module_src_compile
+	emake test
+
+	cd "${S}"/deps/IPTables-Parse
+	SRC_PREP="no" perl-module_src_compile
+	emake test
+
+	cd "${S}"/deps/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}"/deps/Net-IPv4Addr
+	perl-module_src_install
+
+	cd "${S}"/deps/IPTables-ChainMgr
+	perl-module_src_install
+
+	cd "${S}"/deps/IPTables-Parse
+	perl-module_src_install
+
+	cd "${S}"
+	insinto /usr
+	dosbin kmsgsd psad psadwatchd
+	newsbin fwcheck_psad.pl fwcheck_psad
+	newbin pscan psad-pscan
+
+	cd "${S}"
+
+	fix_psad_conf
+
+	insinto /etc/psad
+	doins *.conf
+	doins psad_*
+	doins auto_dl icmp_types ip_options posf signatures pf.os
+
+	cd "${S}"/init-scripts
+	newinitd psad-init.gentoo psad
+
+	cd "${S}"/deps/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
+
+	ewarn "NOTE: You need firewall rules to log dropped packets. Otherwise PSAD will"
+	ewarn "not be aware of any port scan attacks. Please see FW_EXAMPLE_RULES in the"
+	ewarn "psad documentation directory (ie /usr/share/doc/${P}) for the criteria and"
+	ewarn "sample rules."
+}
+
+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:/usr/bin/whois_psad:/usr/bin/whois:g" psad.conf || die "fix_psad_conf failed"
+}