Version bump to 2.1.7.

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

3 files changed, 160 insertions, 2 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index d5deebef2aad..4012402c8427 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.48 2010/06/03 21:55:40 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.49 2010/07/15 20:29:42 battousai Exp $
+
+*psad-2.1.7 (15 Jul 2010)
+
+  15 Jul 2010; Bryan Stine <battousai@gentoo.org> +psad-2.1.7.ebuild:
+  Version bump to 2.1.7.
 
 *psad-2.1.5-r2 (03 Jun 2010)
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index f7e0399b0f13..84242191fca6 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -2,9 +2,11 @@ DIST psad-1.4.8.tar.bz2 564588 RMD160 bfc2e79c81caa5e786d7d4e36002fe84ff01bb50 S
 DIST psad-2.0.6.tar.bz2 688632 RMD160 e2e49c2a6207edc4c1ba404ca01823348229ee0f SHA1 8447a942f082abe22787133561ae2ec19bb02930 SHA256 c59973bbc8d61071a28f5910c4b7b9cc183bf66a9f689e2d1d4564bbcd9dcd90
 DIST psad-2.1.4.tar.bz2 952601 RMD160 d51e981f0c4b8e933565e173cb5dd2e5dd49b8ea SHA1 4bcead2148884a654307329c6256782591195e50 SHA256 9628ef56fd42f56f8ce302bb0897de91ebbee075389fbf20774e6d56ed9a0896
 DIST psad-2.1.5.tar.bz2 962775 RMD160 eba09cef247209252370854f5d708fd42ecf160a SHA1 312bf54f17b11939b5843618fd279ce7fd74408a SHA256 abf1daf9e218d0ac7cc18cf78e83c80d27e1c1114a11ace2b619c97648226a3d
+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.0.6.ebuild 4119 RMD160 cbfd0985df696de3d945555ed8e843c24c1cf781 SHA1 fd44c2e570df893cab3cf6062a033cf22938ba3c SHA256 9d3b5ac2e304b41eb046c674b3a819153e56ba1e90b3fdf67acf02d3a8d1ff88
 EBUILD psad-2.1.4.ebuild 4159 RMD160 101973b6f995ab426d5f4da68c62933433566942 SHA1 d83c1233a7a5119803ae0db28cb3c0e249e35a6a SHA256 736bb988dc91fab4aa7b69efb2fd674f412ccc5a5f01f32f87d03bc13eca02e9
 EBUILD psad-2.1.5-r2.ebuild 4247 RMD160 2d75d34a1e5b2dca1a5e15f6fa6a651c68eb15fa SHA1 d0bb5307dcecf6071659ff5fc0b717d7eab06dbe SHA256 572d97535423342c734a2f98413a98819c8b29bcbabab8dde264ff620bb293c4
-MISC ChangeLog 8895 RMD160 3c7b0b074b5b51e0b74d89ca9ca4ddf1ae78c86a SHA1 d19729ef68f571eb663cf84b34d0629a76450776 SHA256 c009467fd94bb35e5854b5e9047303ced26c0793e959c6ddb7e9d4c77876e68a
+EBUILD psad-2.1.7.ebuild 4233 RMD160 f5c95e0626c71138d02ad2fd67bc50dd0c84b940 SHA1 a11713513ecbe279b8eb1a181f580fc2fd1cde0a SHA256 46cb75da24fc34f1ed3d459420f2371a64aee46835c2971edf61a04873921886
+MISC ChangeLog 9018 RMD160 2c256d1c18651f4fc3c9a4fd26558d539add01fc SHA1 2aa7b570696b969e859390dd3633c09308ddc7de SHA256 9082443cb9c1116f29fb1bf106ed332a4bf82c09ed1001256074c35fb48d3acc
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11
diff --git a/net-firewall/psad/psad-2.1.7.ebuild b/net-firewall/psad/psad-2.1.7.ebuild
new file mode 100644
index 000000000000..3774243b979d
--- /dev/null
+++ b/net-firewall/psad/psad-2.1.7.ebuild
@@ -0,0 +1,151 @@
+# 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.7.ebuild,v 1.1 2010/07/15 20:29:42 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}"
+
+	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_preinst() {
+	cd "${S}"
+
+	# Set sane defaults in config file.
+	fix_psad_conf
+}
+
+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"
+}