Old.

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

5 files changed, 9 insertions, 223 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 3a57ca07549b..4fa164f7840d 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/psad
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.89 2015/04/13 08:16:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.90 2015/04/14 04:19:56 jer Exp $
+
+  14 Apr 2015; Jeroen Roovers <jer@gentoo.org> -psad-2.2.3.ebuild,
+  -psad-2.2.4.ebuild, -files/psad-2.2-var-run.patch:
+  Old.
 
   13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> psad-2.2.5.ebuild:
   Stable for alpha, wrt bug #543988
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 182bcc3a972d..a0347de010b6 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,32 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX psad-2.2-var-run.patch 236 SHA256 fca16b2ef888f46e5eed5195a06231bbbe1fcd4d2e33547ff802c16075a78e01 SHA512 66845bd3dec96fc84b07c827f03520c94bdd7317e1df1f0f2b66a821ced45242c72f61aa5b82d6be5d2fc00d2f88671539808214545950db90c2dd0b7188e039 WHIRLPOOL fae6accd66b6e0d156291ee0bfc515415c41a334fee881cab4574a7e8b247260f736f970c357e94e4520c82e143b0edfbddab4f000887e6eacf4ac4640f7d20e
 AUX psad-2.2.4-var-run.patch 410 SHA256 41d2da9d15611f5c3b8252347adfff1364455550649c82d563b93ba910127d1b SHA512 c22b96e1136cd566631a342c6066b85991205adeaac820ab0cf2cd9feb8072989816446405140d1842736ce66d811df4d5fcaddefb284c8d4507ecc5a9246d57 WHIRLPOOL adb2b251b3a9ba87a87d7defc4ec1ba04435f8b800bd1d74d393a00068f087516233b87f8e6d137a7f768cdfae3631aeee7541943c8b09a71defeb18f93a442d
-DIST psad-2.2.3.tar.bz2 1253488 SHA256 2d6976c395cdf2d7372bb06d85608fed0c91d54a63737d7d2671f90b44cdbc1e SHA512 1cc424252d287cf8f120e9e097a174c19da218f3efaaec1d9249c6b5cb976c5ab8fce70e7cf8a770366919e83c99f9b5462d44f9919645ea1fc9312e757f904a WHIRLPOOL 377563f32a43655d1d0989166783369e8071808e9746795dbaafdcb7c9c673756e379a9ee5a2ee30751223b6ee41e8dbbc730a925464cc1632021359e94e3071
-DIST psad-2.2.4.tar.bz2 1231887 SHA256 244ec0a9cc523bb0d51dce24fec265247abf1b72d15b5c7713d6dc2f466b9e45 SHA512 d154127c6b2442077d9047ab8325a2b7188c6172d1a3c47339fbedfc3e78f4d7a8f3f885256c01fdb66458ae63ef6714d28bd11f57f8cd96721cd58bb181524e WHIRLPOOL 7ed4a48a614b11fc02c4d2582c8e556fdc21e141308222e0cb3b1ad0b6266c640841a41b07d7ee5386be56c4d5ebe894accfbfaaa6d5e002c01addc78e1404dc
 DIST psad-2.2.5.tar.bz2 1243987 SHA256 736d446266227cb65511d792c85224573c95ea4dc3bde3d5c65bc19084f57452 SHA512 195a06420cf821d182a5422705ba2d407fd35f23887430e61925cad0eada7d20e2416eaf6317857a5aec2f1264a280a7e0128cc301f17dcf20cf833a9f0efb6e WHIRLPOOL fac4797e0a399d4f5edf2179c21d37791d184ee1e334b9b8fb2707405afc10ca0c0d4ab43cd274f34cf8ba9453189066b1d46b955d0533fa357e376ef3817f1f
 DIST psad-2.4.0.tar.bz2 1359306 SHA256 2f2c55640c7da0dfeb00c58ee083d1cfcfaf38c5b2dd41e85b30b52e3e28e979 SHA512 0841e3ab85ac1d4f987663f131e9d4d84895c4386d6b7ede2dd4f690525e9ce0a5df2ee60d6af2a1e58044b710194baec30b5060e7fb537ae198e8e5bb2fa1c3 WHIRLPOOL e14d53eede1d062e5f67b805a44974792c61d02153b265ad1c71098e02db092513143a962fad40f40f1ad775128697c59d956933713d449462214b472c9d8369
-EBUILD psad-2.2.3.ebuild 2285 SHA256 cc5a5f2615c9ce70f65cf034256dccd10855c0a617561c3b978c18b6aa422336 SHA512 346ad5accd99727c5d512e5b10c0bf4619768290915887bf89bf6758de2e472fd745ceb2aff14edb86d03d4f0d9db44c585222640c28023cf01bc7c4e2a2c385 WHIRLPOOL 56171b20d566e295690fbadf6482c975462d5e323113ef05eb31a4ba08f9470bf4b9e6dfbbb1904395751040fb2eab012a64fdc15f0b0c286130c2834e8cab49
-EBUILD psad-2.2.4.ebuild 1978 SHA256 4d07e3088154bf4cca517771bce617f2e99252531088cd94f6a88dcbec8ffb92 SHA512 a6ecd8de9ee63f0d6d0573dae681af8bde77f1a4ea3f2a26a09b9c980bf9170fd3b3c971a55522950cd1722ec14e40295243f8719c93e1bec22af44eb0322132 WHIRLPOOL 1fef9dc9182728c772216e11b6354d6630673f3d943eb181187ffa6669a6fbe04e02f41c697fa873af0183ff82def56a0fbdac186504bb04a76d27000b6d98e5
 EBUILD psad-2.2.5.ebuild 1974 SHA256 f622679265bdba57f50ad1eb42b4203e2e1069fa5a12298372f72bfdf9c2fa02 SHA512 4c7078287b8b75cb5241e03cf8d854f01a1affd1fa857c792e9c6599749ce83b175cf8accb4fddb70d136152fbd6fcc77bef31989378280b17a0f60171431900 WHIRLPOOL d46af303116d74e72f66240b091d58c61c5f9fb60ced8e16912970c5f3ba2ac712b887487f5da6d2b263be4d35760d9992b6344da790c6346d45e447fdff3a0a
 EBUILD psad-2.4.0.ebuild 1978 SHA256 ea9bc8ff57dbcdc4cdfbe65fd4edca1ae2d032fc6f601aae027955b8c61b177c SHA512 9fa99bbf718364851a5a4a2e89826d8fdfc5c57689dcfabf67a590e7799761303f717761a60017d31fe5f76474531b4ca27eb13b3556511dada86d67424e1692 WHIRLPOOL 04674bc75e2b1b2fc5f78b15aa6792c691b0316ddfa46ff375cffeec278fd1798297912983de88986fd5c4f464a60d2108bedad3469bd3b03f97bb534317c946
-MISC ChangeLog 13822 SHA256 4ff5c842c580011f8b41509281879c15877e05343aa96eba45e86910a0797528 SHA512 3df8997f0181a85901557d79ed7b4abc3a7249a04eb82db9ce9307ca65ee5d24631e5d42568cbfdece8730060bf3d22813a092b6bffabe9cca27e3e4f0c3a63b WHIRLPOOL 505f020b998e417faca31767a354e6deacb90b64f31eb1e49762378bb4683e4fd5fb4e22961de1eb36eb168ca991215d4b211ebfbec98379816a97910ed283bf
+MISC ChangeLog 13950 SHA256 49ad0afde030e757e30fa9114d68f502f9d6ac3087fd4991a15ed28f84b352dd SHA512 57f1f23f1578a14b9e24ad521a2d935f8f7d5aced045a929d7b67ff9d33e0d35d134b9e0ccdfadc3739c9838bba7c9277e3ecc3ff0edb8bb2d5cfeaaeb920c57 WHIRLPOOL 7a9937d20c94806c60f028b0c3efb8393bd859b21d06ac8c1e08e0e9d14fd350ef3458ef95f8fceee5988bf5b7f030a7d5a6234bdf6cd8302c7f7378581a6455
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVK3tEAAoJELp701BxlEWfdokQAL23pfLmrQqiGMuZ2bYe4hCe
-nDwS/mbnvCANHDsEmdNkB8C0YRJAOiAHt8ueLuE7prcauR2LLJWR8nboe6N9UuaN
-yahYjwgiIj47fFYaFmBrPxq+FL7MLghFN43FAfrHLRzbZUXI9NooizNHwTbtHlQe
-YbhSVnsDWDWYMBZslOl+Yp0ORevdZrQT+pmB6FwzYT6nrDDs7jijQD1fRtZ8rfno
-o+/hbtudqO7Ta1NNccK3oeEpEaHNk2+tegrLZ64w7LPrTJva6tEM0rixmdUoM7mF
-hUJOIVfIbLPw2+3CsMp1jldgiPHmN3Bnu/euYmnpEaN+vY037StbbYdtV8H0BgH1
-Xe4vpYOW7nEUo8yQEQ3F58yF5/S8ls7vrFS5WPUWEVqO4AsdHlE6+c/2fQC+5Ls6
-hxnLdkyz6EH9n9XdUwA+hZ95kq0/5bNZOaaAJxbS2JDpLz2Ns0dXjFbnj1t7V+RX
-ZBL8UzGNywIW6eqbbHbf6K1Fx7OieY4Frgo5Ua9p87TSP2PP9R/zSGnT2A+5BS4b
-6wWAVCK0UzUdf3p7evVhTALUqxy+GKz+vaBY6ldeoSu3I0OitRrAPTKjktBo7PWh
-oY8XHDnPugB/IkTnzjn3Gr+igcv7t/1SkaRm43dKEvh7htenVUAINHFZRSIfXcQY
-/4Ov3FZ15U5QNsOvYjoL
-=0QbH
+iEYEAREIAAYFAlUslW0ACgkQVWmRsqeSphOc0QCePWLSzbglO+IPJmKWQqe6Jv99
+lHEAn2IJYqCMw0P/QprezZZlsMuQE1E9
+=M48s
 -----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
deleted file mode 100644
index 7760b9ea45d4..000000000000
--- a/net-firewall/psad/files/psad-2.2-var-run.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/psad-2.2.3.ebuild b/net-firewall/psad/psad-2.2.3.ebuild
deleted file mode 100644
index 5304114876fb..000000000000
--- a/net-firewall/psad/psad-2.2.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.3.ebuild,v 1.6 2014/11/03 10:26:38 zlogene Exp $
-
-EAPI=5
-#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"
-
-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.4.ebuild b/net-firewall/psad/psad-2.2.4.ebuild
deleted file mode 100644
index a1218078749b..000000000000
--- a/net-firewall/psad/psad-2.2.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.2.4.ebuild,v 1.1 2015/01/20 17:20:27 jer Exp $
-
-EAPI=5
-#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"
-
-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.4-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:/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
-
-	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
-}