Make netmon maintainer. Version bump (bug #439562). Respect CC, CFLAGS, LDFLAGS (bug #442486). Do not "fix" psad.conf (also fixes bug #349203). Do not ewarn/einfo/e.. users about configuration issues (RTFM). Add some more dependencies. Introduce some sanity in the build system (bug #340877 and a lot more). Replace keepdir /var/run using checkpath.

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

5 files changed, 134 insertions, 22 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 3239f6e2df62..d5f31e8e1a2e 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,16 @@
 # 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.57 2012/11/11 15:00:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.58 2012/11/21 06:42:19 jer Exp $
+
+*psad-2.2 (21 Nov 2012)
+
+  21 Nov 2012; Jeroen Roovers <jer@gentoo.org> +psad-2.2.ebuild,
+  +files/psad-2.2-var-run.patch, metadata.xml:
+  Make netmon maintainer. Version bump (bug #439562). Respect CC, CFLAGS,
+  LDFLAGS (bug #442486). Do not "fix" psad.conf (also fixes bug #349203). Do
+  not ewarn/einfo/e.. users about configuration issues (RTFM). Add some more
+  dependencies. Introduce some sanity in the build system (bug #340877 and a
+  lot more). Replace keepdir /var/run using checkpath.
 
   11 Nov 2012; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Dropping to maintainer-needed, not sure why it belonged to hardened
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index d3a7c1b203c5..3c7b8c9fc986 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,24 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST psad-2.1.7.tar.bz2 967130 SHA256 4342be5716e4b5aa630fb5a4c4cdd79f0732787a4859bd5d50aca49e3637b7a3
+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.tar.bz2 1219681 SHA256 75820c2148499459c6d9ff33c34e69d07686f5fe28d54a16ba2fb29ea5f616ad SHA512 f6ae68bf5b5619dc1a2b97d6bc68037d4525928f3e96ed988e0fcca5fa7fd3e0440aec87f853c8115b3861c7cab9f6908fa5a7af8b8c7b2d9701b2601285ee78 WHIRLPOOL 58633a476c9e37f00c84d925d0bc5f01171124c20ff82a871e56f2bd95ba2c354ca2c6ebcd177e8a73af75c232cb13a15d5b79cc24477f85a53032ec024eabe3
 EBUILD psad-2.1.7.ebuild 4228 SHA256 83ba8c2f6dc58f5a87381c63a87e778b2ebdb2e57a8d14a59fd6498f8556357f SHA512 a5ce0950179627fd1610b375b55e393475e6b69d7bef7fc865070f196e1c588565d4f711fd547785397ff256296292c0b51ed0cbabfc894a86d0febf42367311 WHIRLPOOL 11e606c17404e56dfc3768adc46e7975ff4409297b3ef5de48c486e047dd28306736e101ec8596b6183bee8fe548f865ebde242313d5d060cf5ada97f7d2147d
-MISC ChangeLog 9932 SHA256 120c2314ccc051ade49fae4398bacf3cc8855987b497c74c2111507ba68c843b SHA512 8e2a7be321cfcaa714d16e2bd6577763f59fe5a1d79cf1f1f4af8a22b528fccee37862b5b1962eac027aa290e5a0100a6e38232a55ff45527cfede4b683c3409 WHIRLPOOL 39d4eeb017c33c311855cfa06e24e12ef92904a3dd7829d1f1bff937743b7f3bd62e80f91f8a0bb21e0988f91e10157a8c4169818aab0a1438cf2ca2d5156ec1
-MISC metadata.xml 389 SHA256 6f010875fbf99d1dad2ad5b89715e4a09cf14c537231d005f867a292df420363 SHA512 a6bbae87ca142b02ac401b6ac7a09bde09c0f56c6a274e138406c7667bff4b0e486521c741dd8d9ed6ef46f3773c6962f374b55176e0496aaa52343e805f28a4 WHIRLPOOL 3e2a62ec663d54fc84e26d1c9f77fa69f79059a202b8960be8dc39e235aeb44c68ef4f5d47e003db45053f430bebf6834e45099f94346f5d260e392210c84435
+EBUILD psad-2.2.ebuild 2298 SHA256 e3463bd5d074745a41404e7614edceffc799e8d427daa63392fb23f1f8424c14 SHA512 056aad4839174454f4f0d54f2f7ad4e1b61dc75e43b192438d77c9b8e05895966628bd3b52707b01ed4305b272f0da652420d67c1ed16d00912fbcf0b1964b66 WHIRLPOOL d7214d8610249f6e0aec0b47fd1e8089e1a4c11e12d5919639cbb1000cd2e404892acd79c59fb72514696e5d9cdd43a15dd1a64e5fa4b1268faca03201902275
+MISC ChangeLog 10425 SHA256 08dee04ba3000838a59054c9a4d0ddd0b60dd7310d29f2b9adc1fc80d5d29ccf SHA512 53ce737303b3dd7efdecf256ae95e2ef97a2ff8c3e97556d1ae9e208d9d11dfd6a6cc2b06fba907e76ba9176aa7416d1ba019cfd5e6d8604fb68f1bebcc111f1 WHIRLPOOL 67fa9e237ddbdf0fe5448832f0bc4710fdcb387d01a1cabcb9f71e6fae422aec4194e2395bb3857acf9ff1733c785f9cc4dace62f465df371ecabf31280471c9
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQn72PAAoJEJOE+m71LUu6+wYQAJL24Ka/2S0DA+dBmG4EsvRP
-ya4eXn3Q4M9tuoKkOdr3tmljaolh3jHwnnV73T0oAaUy88xXHN7YRnH5w15iJrbV
-F08qc9vkIx/z3b0Ps9JA0Gosp8EqqJjP7w/GtGvkVi8esiHEI2t1JUsvq0RqHZ6C
-nCnIT9RV+ZpxjJIJsY0JDjeJzMerReYsmdPE3AGMG7KO01lAe/wJnIyuvH32L81Q
-6ewnD3I9hfD3YJZ+YnXceEKqb/yAAjJNdlzDJYKvahQdlzQQ6qHCWWqLFLFp2P+n
-tnAKazOWLNWf8PXMLskhSg1PF5aggulLz/oe18htUzWpcQWBGMnBMqOmUDFhk8lp
-VvBrZR4TPAmrYFLSaAXWpvbmn0/AJq2Ehob9A9Fko5pUbDwPRclDBjqir9eU6lZQ
-GIT4ryArTl3in1wNTFdeNLvXbKMVvOd5V8isSBZChbaouoH57kk/mxf/FEYRq1Cm
-W5PgrsDffebXeEr1Vl8oxB1QWvl485f2gkt4yDBIxUpFCmc00yNqSYvO24Uy/iI7
-zeYJ10QWNZ0TXgnKA+XUWcBtACfcZ3gDAtsmIfquYvOSe9WohC2XURaNmZFElCqT
-udS9e67BY6/1qL0MS2EnxItnCN1EfEyXfoksv0g8KEQ5z7Q0GxGpIXyzflG0DTIq
-ukrhIqtGCKDajh1+sGcy
-=JrP1
+iEYEAREIAAYFAlCsd80ACgkQVWmRsqeSphNFygCfQORkKzjuCUx3ZjsDmZpRJrJM
+Kg8An01t3OdnBUJpGI7NJxoyI0kbAW3Q
+=MmqU
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/psad/files/psad-2.2-var-run.patch b/net-firewall/psad/files/psad-2.2-var-run.patch
new file mode 100644
index 000000000000..7760b9ea45d4
--- /dev/null
+++ b/net-firewall/psad/files/psad-2.2-var-run.patch
@@ -0,0 +1,10 @@
+--- a/init-scripts/psad-init.gentoo
++++ b/init-scripts/psad-init.gentoo
+@@ -19,6 +19,7 @@
+ 
+ start() {
+ 	checkconfig || return 1
++	checkpath -q -d -m 755 -o root:root /var/run/psad
+ 
+ 	ebegin "Starting ${SVCNAME}"
+ 	start-stop-daemon \
diff --git a/net-firewall/psad/metadata.xml b/net-firewall/psad/metadata.xml
index 06a1848be2ad..03aa50bab7e3 100644
--- a/net-firewall/psad/metadata.xml
+++ b/net-firewall/psad/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
-	<longdescription>PSAD provides port scanning attack detection and protection.</longdescription>
+<herd>netmon</herd>
 </pkgmetadata>
diff --git a/net-firewall/psad/psad-2.2.ebuild b/net-firewall/psad/psad-2.2.ebuild
new file mode 100644
index 000000000000..31521185e094
--- /dev/null
+++ b/net-firewall/psad/psad-2.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.ebuild,v 1.1 2012/11/21 06:42:19 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_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}
+
+	dodir /etc/psad/snort_rules
+	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
+}