[gentoo-commits] gentoo-x86 commit in net-firewall/psad: ChangeLog psad-1.4.8.ebuild psad-2.0.6.ebuild psad-2.1.4.ebuild

[Bryan Stine (battousai)]

battousai    08/09/12 05:03:42

  Modified:             ChangeLog psad-1.4.8.ebuild psad-2.0.6.ebuild
  Added:                psad-2.1.4.ebuild
  Log:
  Bump to 2.1.4, fixing bug #236434. Minor syntax fixes in all versions.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc4 x86_64)

Revision  Changes    Path
1.44                 net-firewall/psad/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	6 May 2007 10:00:48 -0000	1.43
+++ ChangeLog	12 Sep 2008 05:03:41 -0000	1.44
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/psad
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.43 2007/05/06 10:00:48 genone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.44 2008/09/12 05:03:41 battousai Exp $
+
+*psad-2.1.4 (12 Sep 2008)
+
+  12 Sep 2008; Bryan D. Stine <battousai@g.o> psad-1.4.8.ebuild,
+  psad-2.0.6.ebuild, +psad-2.1.4.ebuild:
+  Version bump to 2.1.4. Dependencies, such as the bundled perl modules,
+  have been moved into the deps/ folder in the srcdir, so adjusted the
+  ebuild for that. Fixes bug #236434, thanks to Gustaf Ankarloo for the
+  report. Also, fixed minor syntax errors in all versions.
 
   06 May 2007; Marius Mauch <genone@g.o> psad-1.4.8.ebuild,
   psad-2.0.6.ebuild:



1.12                 net-firewall/psad/psad-1.4.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild?r1=1.11&r2=1.12

Index: psad-1.4.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- psad-1.4.8.ebuild	13 Jul 2007 07:21:37 -0000	1.11
+++ psad-1.4.8.ebuild	12 Sep 2008 05:03:41 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.11 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.12 2008/09/12 05:03:41 battousai Exp $
 
 inherit eutils perl-app
 
@@ -25,23 +25,23 @@
 	net-misc/whois"
 
 src_compile() {
-	cd ${S}/Psad
+	cd "${S}"/Psad
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}
+	cd "${S}"
 	# We'll use the C binaries
 	emake || die "Make failed: daemons"
 }
@@ -54,25 +54,25 @@
 
 	keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
 	dodir /etc/psad
-	cd ${S}/Psad
+	cd "${S}"/Psad
 	perl-module_src_install
 
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	perl-module_src_install
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	perl-module_src_install
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	perl-module_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /usr
 	dosbin kmsgsd psad psadwatchd
 	newsbin fwcheck_psad.pl fwcheck_psad
 	dobin pscan
 
-	cd ${S}
+	cd "${S}"
 
 	fix_psad_conf
 
@@ -81,23 +81,23 @@
 	doins psad_*
 	doins auto_dl icmp_types posf signatures pf.os
 
-	cd ${S}/init-scripts
+	cd "${S}"/init-scripts
 	newinitd psad-init.gentoo psad
 
-	cd ${S}/snort_rules
+	cd "${S}"/snort_rules
 	dodir /etc/psad/snort_rules
 	insinto /etc/psad/snort_rules
 	doins *.rules
 
-	cd ${S}
-	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+	cd "${S}"
+	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README SCAN_LOG
 }
 
 pkg_postinst() {
-	if [ ! -p ${ROOT}/var/lib/psad/psadfifo ]
+	if [ ! -p "${ROOT}"/var/lib/psad/psadfifo ]
 	then
 		ebegin "Creating syslog FIFO for PSAD"
-		mknod -m 600 ${ROOT}/var/lib/psad/psadfifo p
+		mknod -m 600 "${ROOT}"/var/lib/psad/psadfifo p
 		eend $?
 	fi
 



1.6                  net-firewall/psad/psad-2.0.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild?r1=1.5&r2=1.6

Index: psad-2.0.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- psad-2.0.6.ebuild	13 Jul 2007 07:21:37 -0000	1.5
+++ psad-2.0.6.ebuild	12 Sep 2008 05:03:41 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild,v 1.5 2007/07/13 07:21:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.0.6.ebuild,v 1.6 2008/09/12 05:03:41 battousai Exp $
 
 inherit eutils perl-app
 
@@ -25,19 +25,19 @@
 	net-misc/whois"
 
 src_compile() {
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	SRC_PREP="no" perl-module_src_compile
 	emake test
 
-	cd ${S}
+	cd "${S}"
 	# We'll use the C binaries
 	emake || die "Make failed: daemons"
 }
@@ -51,22 +51,22 @@
 	keepdir /var/lib/psad /var/log/psad /var/run/psad /var/lock/subsys/${PN}
 	dodir /etc/psad
 
-	cd ${S}/Net-IPv4Addr
+	cd "${S}"/Net-IPv4Addr
 	perl-module_src_install
 
-	cd ${S}/IPTables-ChainMgr
+	cd "${S}"/IPTables-ChainMgr
 	perl-module_src_install
 
-	cd ${S}/IPTables-Parse
+	cd "${S}"/IPTables-Parse
 	perl-module_src_install
 
-	cd ${S}
+	cd "${S}"
 	insinto /usr
 	dosbin kmsgsd psad psadwatchd
 	newsbin fwcheck_psad.pl fwcheck_psad
 	dobin pscan
 
-	cd ${S}
+	cd "${S}"
 
 	fix_psad_conf
 
@@ -75,23 +75,23 @@
 	doins psad_*
 	doins auto_dl icmp_types ip_options posf signatures pf.os
 
-	cd ${S}/init-scripts
+	cd "${S}"/init-scripts
 	newinitd psad-init.gentoo psad
 
-	cd ${S}/snort_rules
+	cd "${S}"/snort_rules
 	dodir /etc/psad/snort_rules
 	insinto /etc/psad/snort_rules
 	doins *.rules
 
-	cd ${S}
-	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+	cd "${S}"
+	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README SCAN_LOG
 }
 
 pkg_postinst() {
-	if [ ! -p ${ROOT}/var/lib/psad/psadfifo ]
+	if [ ! -p "${ROOT}"/var/lib/psad/psadfifo ]
 	then
 		ebegin "Creating syslog FIFO for PSAD"
-		mknod -m 600 ${ROOT}/var/lib/psad/psadfifo p
+		mknod -m 600 "${ROOT}"/var/lib/psad/psadfifo p
 		eend $?
 	fi
 



1.1                  net-firewall/psad/psad-2.1.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-2.1.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/psad/psad-2.1.4.ebuild?rev=1.1&content-type=text/plain

Index: psad-2.1.4.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.4.ebuild,v 1.1 2008/09/12 05:03:41 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
	dobin 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"
}