Version bump.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 115 insertions, 6 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 5b8b7e4fb657..e14e32f0e41a 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/psad
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.59 2012/11/21 19:23:45 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.60 2013/01/22 16:30:55 jer Exp $
+
+*psad-2.2.1 (22 Jan 2013)
+
+  22 Jan 2013; Jeroen Roovers <jer@gentoo.org> +psad-2.2.1.ebuild:
+  Version bump.
 
 *psad-2.2-r1 (21 Nov 2012)
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index d44d1047e74e..499d4168e3b6 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 AUX psad-2.2-var-run.patch 236 SHA256 fca16b2ef888f46e5eed5195a06231bbbe1fcd4d2e33547ff802c16075a78e01 SHA512 66845bd3dec96fc84b07c827f03520c94bdd7317e1df1f0f2b66a821ced45242c72f61aa5b82d6be5d2fc00d2f88671539808214545950db90c2dd0b7188e039 WHIRLPOOL fae6accd66b6e0d156291ee0bfc515415c41a334fee881cab4574a7e8b247260f736f970c357e94e4520c82e143b0edfbddab4f000887e6eacf4ac4640f7d20e
 DIST psad-2.1.7.tar.bz2 967130 SHA256 4342be5716e4b5aa630fb5a4c4cdd79f0732787a4859bd5d50aca49e3637b7a3 SHA512 13348424c874f0604d2b69c30e260e5e6d4e5c00bcad395e2f84168ace1c0242eb82e41f95667c83def28fde2e82e545f474009118de72bc4801bb1b564380ae WHIRLPOOL 40687183eaa5c9f62358268d4b55a74520011aa8667ea00206cc4ed5148b76f2b5a9a9f54cc161dd1680ff9169ac3276e34bf979db446d84966988f876f0ffa1
+DIST psad-2.2.1.tar.bz2 1255544 SHA256 17befa8879f326d8f416c4827ec4241c6a8882656776d677f1b7ed05728e9728 SHA512 08a4173126f3b9ea592224cd0079b41156e15366643f2347e6dbfe01a89bca112d3d94b0ec593da6c8fc9782befa74aad4a66b4117a40523d28a25bc1f1508c4 WHIRLPOOL fe22d8c1af4138f430e544c5b05de77f94e028261972d16b745d3a45f7b19cfacdb929701a10c8df95f3818174731223fa3ab87bfedec1ae5d6d203ed2da6f7a
 DIST psad-2.2.tar.bz2 1219681 SHA256 75820c2148499459c6d9ff33c34e69d07686f5fe28d54a16ba2fb29ea5f616ad SHA512 f6ae68bf5b5619dc1a2b97d6bc68037d4525928f3e96ed988e0fcca5fa7fd3e0440aec87f853c8115b3861c7cab9f6908fa5a7af8b8c7b2d9701b2601285ee78 WHIRLPOOL 58633a476c9e37f00c84d925d0bc5f01171124c20ff82a871e56f2bd95ba2c354ca2c6ebcd177e8a73af75c232cb13a15d5b79cc24477f85a53032ec024eabe3
 EBUILD psad-2.1.7.ebuild 4228 SHA256 83ba8c2f6dc58f5a87381c63a87e778b2ebdb2e57a8d14a59fd6498f8556357f SHA512 a5ce0950179627fd1610b375b55e393475e6b69d7bef7fc865070f196e1c588565d4f711fd547785397ff256296292c0b51ed0cbabfc894a86d0febf42367311 WHIRLPOOL 11e606c17404e56dfc3768adc46e7975ff4409297b3ef5de48c486e047dd28306736e101ec8596b6183bee8fe548f865ebde242313d5d060cf5ada97f7d2147d
 EBUILD psad-2.2-r1.ebuild 2305 SHA256 438f87e5d8cfd2593c6f3f79ad5c5780d19e36dfb1f455e417ea36e03df2ee03 SHA512 403b931c23c56d9adbe9401ed641521ead5d8a4f02d7dcd475dc03a80f6ceadcbf0f5cc6471b4f5faae47ee5cafc2c144f81d4cf1615bdad8d7b7e019b8631c1 WHIRLPOOL 4be9d7e54432ce23c3c52e7d92a59ac36cea17267049d18ae51cd02f4e2128e2cab3a96e9708b062df6103fc1256c2cc8117767fc24e41a08396e5d2a2440cd7
-MISC ChangeLog 10606 SHA256 f6647c9dc2beb0248a0c4c8925b2dd5ee0a2d81647437a8b813cf133bcb287e7 SHA512 c958e41b62153239ce8b0775ff4f8bfbb91daf9210b00d9896e01eeb886535e6200e26e36adb39c2160dda19a2fbf1fd2bef3db72e97afe29ec2451064df763f WHIRLPOOL 24c00198d6f2431e4b3595a098177e460f6a8f692d5fecdc2ee785e158b3c69eee4668db7835d4429d9abe60f09f181aafc99e46e6291d9c09a5f4a90ac90805
+EBUILD psad-2.2.1.ebuild 2275 SHA256 f13472f600ee985f71d1482d0cf2e92cec753b9b4f2ddd3be3a384806f5d5626 SHA512 2e6cd52786bafd20fe6b0a74e927c881ab4dc5aacf150eb25e395b6ad6ad936de837eabf9deac284e8b786c8b45849d6687413d284c2fda9580bb8d0e7f9305d WHIRLPOOL 4f8329d39cb4d54192283cd0448fbbee8e3c818f69d21a126bd934947668deed5e36ad293daea62bc684c4ba90704470889b79128dac6430cf5a459557254e58
+MISC ChangeLog 10717 SHA256 3d43123aafeb08b94051651d701ecc31006ef02549ce6161240944f2dfe4822d SHA512 0f7da39fa13a9cad9cb95108705dce6befc5277f53432b2855a90ad9738d913484c25b9661912fe1fbd7785efa67510f5f21b7a54b164324b4ed9cf5121e664a WHIRLPOOL 5a9afecabd218ef73a029efcf49bfc00db5b6a560b085c977081a6eeacefba89ece26f0442a584adbfd974e52310da89550170b975b310644fd7c3856c050cbc
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCtKkIACgkQVWmRsqeSphP+ewCcDIeN/4BQ92pCj5iLK1C9v7tt
-o3QAnA4GPzt1g2w/SoMVjMUPAZxZeKDK
-=s8Z6
+iEYEAREIAAYFAlD+vsEACgkQVWmRsqeSphPGEgCeNQe0MKqhsN+Z9rWlYilPwQJ+
+nRAAnirC2LVZu17Itdhk7PxYUBL2IcWU
+=dWHt
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/psad/psad-2.2.1.ebuild b/net-firewall/psad/psad-2.2.1.ebuild
new file mode 100644
index 000000000000..d86e3c83745c
--- /dev/null
+++ b/net-firewall/psad/psad-2.2.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.1.ebuild,v 1.1 2013/01/22 16:30:55 jer Exp $
+
+EAPI=4
+#PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module toolchain-funcs
+
+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"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+RDEPEND="
+	dev-perl/Bit-Vector
+	dev-perl/Date-Calc
+	dev-perl/NetAddr-IP
+	dev-perl/Unix-Syslog
+	net-firewall/iptables
+	net-misc/whois
+	virtual/logger
+	virtual/mailx
+	virtual/perl-Storable
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2-var-run.patch
+
+	sed -i \
+		-e 's|/usr/bin/gcc|$(CC)|g' \
+		-e 's|-O|$(CFLAGS) $(LDFLAGS)|g' \
+		Makefile || die
+	# Fix up default paths
+	sed -i \
+		-e "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" \
+		-e "s:/sbin/syslogd:/usr/sbin/syslogd:g" \
+		-e "s:/usr/bin/whois_psad:/usr/bin/whois:g" \
+		psad.conf || die
+}
+
+src_configure() {
+	default
+
+	local deps_subdir
+	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${deps_subdir} || die
+		SRC_PREP="no" perl-module_src_configure
+	done
+}
+
+src_compile() {
+	tc-export CC
+	default
+
+	local deps_subdir
+	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${deps_subdir} || die
+		perl-module_src_compile
+	done
+}
+
+src_install() {
+	newbin pscan psad-pscan
+
+	insinto /usr
+	dosbin kmsgsd psad psadwatchd
+	newsbin fwcheck_psad.pl fwcheck_psad
+
+	insinto /etc/psad
+	doins *.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf signatures
+
+	newinitd init-scripts/psad-init.gentoo psad
+
+	doman *.8
+
+	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README SCAN_LOG
+
+	keepdir /var/lib/${PN} /var/log/${PN}
+
+	insinto /etc/psad/snort_rules
+	doins deps/snort_rules/*
+
+	local deps_subdir
+	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${deps_subdir} || die
+		perl-module_src_install
+	done
+}
+
+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
+}