Version bump. Install /etc/psad/protocols.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 116 insertions, 3 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index c323d25c955b..76877efb9816 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/psad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.70 2014/01/24 18:30:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.71 2014/03/03 13:15:36 jer Exp $
+
+*psad-2.2.3 (03 Mar 2014)
+*psad-2.2.2-r1 (03 Mar 2014)
+
+  03 Mar 2014; Jeroen Roovers <jer@gentoo.org> -psad-2.2.2.ebuild,
+  +psad-2.2.2-r1.ebuild, +psad-2.2.3.ebuild:
+  Version bump. Install /etc/psad/protocols.
 
 *psad-2.2.2 (24 Jan 2014)
 
diff --git a/net-firewall/psad/psad-2.2.2-r1.ebuild b/net-firewall/psad/psad-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..6a05abe39c8d
--- /dev/null
+++ b/net-firewall/psad/psad-2.2.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.2-r1.ebuild,v 1.1 2014/03/03 13:15:36 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 \
+		protocols 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
+}
diff --git a/net-firewall/psad/psad-2.2.2.ebuild b/net-firewall/psad/psad-2.2.3.ebuild
index 20c717d4bcb0..968698a95b0a 100644
--- a/net-firewall/psad/psad-2.2.2.ebuild
+++ b/net-firewall/psad/psad-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.2.ebuild,v 1.1 2014/01/24 18:30:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.3.ebuild,v 1.1 2014/03/03 13:15:36 jer Exp $
 
 EAPI=4
 #PERL_EXPORT_PHASE_FUNCTIONS=no
@@ -72,7 +72,9 @@ src_install() {
 	newsbin fwcheck_psad.pl fwcheck_psad
 
 	insinto /etc/psad
-	doins *.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf signatures
+	doins \
+		*.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf \
+		protocols signatures
 
 	newinitd init-scripts/psad-init.gentoo psad