Version bump.

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

5 files changed, 86 insertions, 20 deletions

diff --git a/net-analyzer/scanlogd/ChangeLog b/net-analyzer/scanlogd/ChangeLog
index e6c872ac8173..4f0a7083ec1d 100644
--- a/net-analyzer/scanlogd/ChangeLog
+++ b/net-analyzer/scanlogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/scanlogd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/ChangeLog,v 1.32 2013/01/02 23:33:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/ChangeLog,v 1.33 2013/10/27 17:55:35 jer Exp $
+
+*scanlogd-2.2.7 (27 Oct 2013)
+
+  27 Oct 2013; Jeroen Roovers <jer@gentoo.org> +scanlogd-2.2.7.ebuild,
+  files/scanlogd-2.2.6-Makefile.patch, +files/scanlogd-2.2.7-gentoo.patch:
+  Version bump.
 
   02 Jan 2013; Ulrich Müller <ulm@gentoo.org> scanlogd-2.2.6-r2.ebuild:
   Fix LICENSE, see scanlogd.c, bug 449834.
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 397672789653..776a2e7f996a 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX scanlogd-2.2.6-Makefile.patch 358 SHA256 d0aaf45280cc70ab335063ff068ca812d606e8167b80a1760c533622d46c257d SHA512 546246e039880e39e6830dd1a8ba83423c23ab1d29c275a0f0b4e6692e615713f12e43838c91f6f9d2a2664b266a750195c08023b31914efadaea73511696a56 WHIRLPOOL ea50b6f97736b11c4a2f30132a3275b903f3c6d27a99284a579785ee380c647bee5d7b3f2cdf1eb98818ef05fb9072bd9d84b6b3c751cad2f34954b8947ff4a2
+AUX scanlogd-2.2.6-Makefile.patch 290 SHA256 32e2b08f708e4edb9f1051b92f497bbf31c70d8d771a56adf322f87daa0db385 SHA512 c4e549f6303257e20eb5cdf69278331eee963ea5d0658191463ad1cba07160b8fb77eb90c019d9626d1cda1bc43c051f574ee356e98f057e6f89fef7d201c4e5 WHIRLPOOL 07198cd1f23008f06f0b30aeb741baf8097892835f35e549600025a0a2115358daeb9698157a11102683c1b2188afac2742a8c5cbf7b138e336ac403ab6877be
+AUX scanlogd-2.2.7-gentoo.patch 407 SHA256 2d70c2e93eb7ac86df7ced2c5db494c89161ecc36e15b9e6b244370ed155ccb9 SHA512 e395e5b7ad59b57959060a1a4abc4cd2f3245a127975d3e780f8af9849df109b4e34d68594dbe6d2978ca62d0676c06dc6fb185effa734b958fa5c8b96e332c5 WHIRLPOOL b9a53195e6e60b04ceb53160ad2452cda646fc5158f7f423784e606efe1060c709766ec35fc0aa331ae5106fb0d8318bf63b20b7514c7a1b5f58bb8fdc18ef15
 AUX scanlogd.rc 497 SHA256 632385f1a001a48803715d7b8cc909fb043f477b8a548ccc55e018bf7c4e571b SHA512 5319dbb324d4d6e60442eb791ba846e5372bd3290aa2c270ebe05d8490b0df904901ad680b5d308bdfeafb6483fc2820d7d97b0115c29a53c0a55f2f7511fa08 WHIRLPOOL 10e49611157d74c54710b5ab40938c4599ed60ff99ff1bf0019c67026e7e0fab5375e5c5303a8ae1ec70c046c396bd3159d991741e2ba8903c5637b1bdb92e4f
 DIST scanlogd-2.2.6.tar.gz 10975 SHA256 4a2621037270f88576c8770261c53761edc875984f126872c880c2a98a8f63fa SHA512 486c8eff976a76151e76a961dd919d9f0f35840c36d3c84e6546c349fcfb6c0b7ad32a69a331791b74833b3ce47424e7ec46dccbff73bd7fe3a1847491669c1f WHIRLPOOL 8c81ce38d065b86b219c5085945bffe4426d6f171bac54b9a77c585851c456406a46a407d683f11d86798454346e51491922f8ea5d2ad43967bf00a375777811
+DIST scanlogd-2.2.7.tar.gz 11352 SHA256 556a1c82b3561ea796d2ce8dfd20f578717903fd2c6557ebe27775d8ef8771da SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b WHIRLPOOL a909801802f3caac1811e0432d83359bff39c05aee8e5fe802441eeeb85fb9b4f870e698ba501bbd2c335c4041b3182313247f7e1d699cd460745c5ef5a85de7
 EBUILD scanlogd-2.2.6-r2.ebuild 1345 SHA256 f07913b4e0c7871f328e1063bd2ae438bf34a18a6ac8ef40a6003469eb8eb7bb SHA512 6e82604b8f0ebefe5b371f5e27458ac357b856991be9ae7b8f4e61313a015cfaf5539b36bb5d5487e604bf5ff4a06b672d3f9a121f8a8b6910ca383c24989a81 WHIRLPOOL 606e65cd2fa192550896edeb3cd5ae6d2dff258321acd8ed227677b7807f3141bd9480deb5a2b2228ea47cb85266b2c72120c9993db59f6e09823df22eb12532
-MISC ChangeLog 3592 SHA256 71084f82bb5f54aa195c76db08aeaefb57081db2756353f675e0ef4d2a10cc4b SHA512 f36a76c9810a8b922a68abc75af2d7ea8fad42dc8ad2bd0de0c67a08ffd25cbf81ace145ab1082abd62ec21dd94c8dd0bc0e12b056ff034153e9a468ad905539 WHIRLPOOL 2b44b777cb755612077a6b334eabfb9be728d2d32463cb20702cdd11c5787d9b65c801d4d80b35b67a7578288ce678b1b5630e642b7b4956797bdd6024ec65a0
+EBUILD scanlogd-2.2.7.ebuild 1058 SHA256 33339b55d276c57a744bf216e2856ad31e0f65c4021dd7b4816f59916946b9b8 SHA512 1af1675ae7e5c50a14ad60fb4dc31235bd548e1865d6686af4faf51569ed173b72ed8bbe76ef72bba3cc58a8ccb50bf3e99eab069f2b8cac47319b1f49e20994 WHIRLPOOL ea2f3887ddeb911711518751117e22cfb29642bfeb3fe286973fb528a65ecb96c23b580037dc7592aec6a40e24cd4d0b8005347b9fd0d23c2ab90d4ada2207a1
+MISC ChangeLog 3786 SHA256 260b1170fb015e5b95aeef8693c7a305ac9948d455e66a3c6c4c8ab16ec19229 SHA512 eb6706b68c4770631811f65e59ba32bb4f99711ee3ce888d1cbb101c3bca68855dd72388df26b0c34a95818067e4bf4f1b5473ebbcb0d2ff4844471169c254c0 WHIRLPOOL c3ccd5ac9ee0766de6182440282ef259af1e6f24de4cbbae2dae0eb3ceaeb61ad396a09ac26e354d38037dad715ebd347ee59ce5fe50299c368e902a4750145f
 MISC metadata.xml 406 SHA256 6307c71105221faf8e9073e181a48846d078ada780f6bb77408283e68c85509b SHA512 c3f78d3fa5327f449339a3e1b0325554f1f47c526e4dbc557495cf9688b1c52635546b7a471d877eeff3b8d28dd97b8e5fbc891eef936a8d31ba95645e17cbe6 WHIRLPOOL 9d051d052cf9f6e169c6681c2de6e10faeb70adc89f50d434c5e82c4497a5b19b42fa5d8657a10e6cc2f051ca73a60a948b171391e5a9eb0fc669fba46e2b437
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5MReAAoJEDxpGckxwJCBAHsQAJscV1NMG3eYWUlkjzJevKDT
-jtugptD8RZyuMijmJRgDUpdabrGZzX4HjlvCpeniJ8uYN/8ez39/ntCjL3RgSukc
-FwOjRm5yrp0ovpK1ZvDwQPAwI9j0gl+JZvEuOKpO2aLQkQ2JqmuSJhdqH/sLnzUl
-h5wIS3ukOYXIAkw9ic7jgO5kLwSf+nFH95tSB1agZb+oT/5WLg8JHlqJfoa/T95K
-Wqc3dnQOlOU/nZZwtjdPXvKwrdWgLEcdPCUhJDdirmwNi5PNpTA/AmHhbNnL0Yua
-P9C1EI9Un7evph06EpI6zs1Xoos+yvMDBKGExo9ord4A6j3uumfoH+Z7MRkBky6j
-1LUOlCI0lhNfwpktoEyA4di6Sox+VU/7IxltXljVSJTJZUzz96KloG6ggLr24+uY
-jXgZlpa1SoQv4zxVQVSNRxZXWam2KGHDQ5SO5/6E6ePFyA888GUNCfY3aciqBTWP
-NUX1SxpI1HZymTVQIqiEL+nWYTMm16c/FY7YgtO7ASVb70TlVDoeYT/RHFLXRtf8
-Ca2gWvzwko8p3Z7Zi61pEA2jqjp3ElAvp7CGgfzm75+6ZsQG0yyTCwxSrzJ69xzU
-hWM7DVvtwKA+6TkHGZfgDjgRBDzaNkVEJL9QDw4Tuc7jdLajP4XU/Vy5IT0LUtVH
-vTovT1QEkPDnY8iXiF0L
-=pXa7
+iEYEAREIAAYFAlJtU5kACgkQVWmRsqeSphMEigCfQeJPOLuemAVwRRiPW+q1UG9z
+zbwAmgJh282LdNuoMuDjWeTRuyH1B+n4
+=AxeM
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/scanlogd/files/scanlogd-2.2.6-Makefile.patch b/net-analyzer/scanlogd/files/scanlogd-2.2.6-Makefile.patch
index 07dbd9b834f3..ef36abda0911 100644
--- a/net-analyzer/scanlogd/files/scanlogd-2.2.6-Makefile.patch
+++ b/net-analyzer/scanlogd/files/scanlogd-2.2.6-Makefile.patch
@@ -1,6 +1,5 @@
-diff -urN ./scanlogd-2.2.6.orig/Makefile ./scanlogd-2.2.6/Makefile
---- ./scanlogd-2.2.6.orig/Makefile	2006-03-05 11:03:15.000000000 +0100
-+++ ./scanlogd-2.2.6/Makefile	2006-03-27 00:39:16.000000000 +0200
+--- a/./scanlogd-2.2.6/Makefile	2006-03-05 11:03:15.000000000 +0100
++++ b/./scanlogd-2.2.6/Makefile	2006-03-27 00:39:16.000000000 +0200
 @@ -1,8 +1,6 @@
  CC = gcc
  LD = $(CC)
diff --git a/net-analyzer/scanlogd/files/scanlogd-2.2.7-gentoo.patch b/net-analyzer/scanlogd/files/scanlogd-2.2.7-gentoo.patch
new file mode 100644
index 000000000000..4d1d2f01c643
--- /dev/null
+++ b/net-analyzer/scanlogd/files/scanlogd-2.2.7-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,14 +1,11 @@
+-CC = gcc
+ LD = $(CC)
+ RM = rm -f
+-CFLAGS = -Wall -O2 -fomit-frame-pointer
+-LDFLAGS = -s
+ 
+-PCAP_H = -I/usr/include/pcap
+-PCAP_L = -lpcap
++PCAP_H = $(shell pcap-config --cflags)
++PCAP_L = $(shell pcap-config --libs)
+ 
+-NIDS_H = -I/usr/local/include
+-NIDS_L = -L/usr/local/lib -lnids -lnet -lpcap
++NIDS_H = -I/usr/include
++NIDS_L = -lnids
+ 
+ PROJ = scanlogd
+ 
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
new file mode 100644
index 000000000000..27b423c658d3
--- /dev/null
+++ b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild,v 1.1 2013/10/27 17:55:35 jer Exp $
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs user
+
+DESCRIPTION="a port scan detection tool"
+SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
+HOMEPAGE="http://www.openwall.com/scanlogd/"
+
+LICENSE="scanlogd GPL-2" # GPL-2 for initscript
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+nids pcap"
+REQUIRED_USE="?? ( nids pcap )"
+
+DEPEND="
+	nids? ( net-libs/libnids )
+	pcap? ( net-libs/libpcap )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	restore_config params.h
+	tc-export CC
+}
+
+src_compile() {
+	local target=linux
+	use nids && target=libnids
+	use pcap && target=libpcap
+	emake ${target}
+}
+
+src_install() {
+	dosbin scanlogd
+	doman scanlogd.8
+	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
+	save_config params.h
+}
+
+pkg_preinst() {
+	enewgroup scanlogd
+	enewuser scanlogd -1 -1 /dev/null scanlogd
+}