Version bump, update ebuild, verbose build, drop useflags.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 128 insertions, 31 deletions

diff --git a/net-analyzer/netsniff-ng/ChangeLog b/net-analyzer/netsniff-ng/ChangeLog
index 05c3863c6569..8634a32357d9 100644
--- a/net-analyzer/netsniff-ng/ChangeLog
+++ b/net-analyzer/netsniff-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/netsniff-ng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.6 2013/05/31 08:06:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/ChangeLog,v 1.7 2013/08/05 07:42:05 xmw Exp $
+
+*netsniff-ng-0.5.8_rc2 (05 Aug 2013)
+
+  05 Aug 2013; Michael Weber <xmw@gentoo.org>
+  +files/netsniff-ng-0.5.8-fortify_source.patch,
+  +files/netsniff-ng-0.5.8-libcli-test.patch, +netsniff-ng-0.5.8_rc2.ebuild,
+  metadata.xml, netsniff-ng-9999.ebuild:
+  Version bump, update ebuild, verbose build, drop useflags.
 
 *netsniff-ng-9999 (31 May 2013)
 
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 2593e362811f..228c60c7e1e7 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -2,15 +2,19 @@
 Hash: SHA256
 
 AUX netsniff-ng-0.5.6-man-no-compress.patch 1459 SHA256 49914cab8857c6f44b20c902c3f92613ee6168d18709166598df1a1b779fbfef SHA512 955bb365dc3c5ea00bce4e1411f95270d3671cad00e54acbd9956f0f013792c4e0e8d9adf4339a898f1356407e6f009348cff56d8db97e07e6128f86b9bf6966 WHIRLPOOL 1621ff07a9b8c446cd14ec1ffb40d90d392fbf42252c286bca8a29da7156d09ff34695f3de417a65a801fd51cab4098bc7adde3a9cedfad8f317b125a01d5928
+AUX netsniff-ng-0.5.8-fortify_source.patch 389 SHA256 0c3ca27ba6258566fa3dd8e61924fa05ab594284dfc4f02a901cb41216b8a819 SHA512 e13d0764ab13a15ce14d2136689c04e86aef48f2c6c086bcb29d5a8e58611c54bd33881c1f05203bffb21097d7824e76a59bbca5f8be2d5cb64f34146055aa1a WHIRLPOOL b898e43e5c6e2ecff844ebea4d374bacf4da1634f72dbba7ef77b56e91cbe5d957416ba0263d743020ad5e8b481ffc4843bc2224ce948873824f4849ff529266
+AUX netsniff-ng-0.5.8-libcli-test.patch 286 SHA256 2d16a17bf04098b4bd0f68463fd7408b6abfaf3f175ae0c318a3acee28faa9cd SHA512 b98e18d828df64b44a38bcc5d5833866ef787a35715be9bec1b9759490c546b59720b69f9644dc370746ad92d75c1659dbbe66057160d57b855d87e4b46bf526 WHIRLPOOL 35c0b6b0f0bb1f595712baa5586a7634e22a0a79c02d7a4b965c8f33af294856e09e9e9572fd0558827ea09ade3fa2f5c3f67169e3dae98660d0df8d3db9d757
 DIST netsniff-ng-0.5.7-r1.tar.gz 2957112 SHA256 ab4e1ef6aadb00b998349aff66e4e1cec53910113344c53ac8eb947fd46b5e89 SHA512 b400d8b21edb4395b946ac105bbb25a83330151e09d1efd130537375930ea03b928c166b792f44ccbacfa72f9de818c37553a0be98970c26da5ba255a1f2d6c1 WHIRLPOOL b83e1351e60fdaa076e611fd308b61be549a1cc6663f6039affd3fa3be002ec485776f67ceba54879584fc1822a9ad178141833ac5522d2444e67859cf8fbe58
+DIST netsniff-ng-0.5.8-rc2.tar.xz 511744 SHA256 1ad697a0280121d6ef42a9fe61108dde6444c1e507b2478a103ea33eb286b963 SHA512 b87fd8e0cd035f9d0a636da5602e983f04d8f3d4e85886c6f607c1c1badcdbf1955f3e3e341ad9931817bc68d1897772e00aa6ebf26446cd357893c38ab94ccf WHIRLPOOL 569463a341979293f5ffd47fe77319b28188fa0e42aad83ee23e88e1828b73e9bb451eb2b70c4f025d67818e9d27cfe5ad116ac449fb7a7a8219f042ed24e082
 EBUILD netsniff-ng-0.5.7-r1.ebuild 728 SHA256 31c4c3bba827b3c01be304aadcb53ab0332c7dc8110ee39f10b94f13315c737a SHA512 6bc21116ce8fbb1325655595a23e221776e071e99a6546ebce36a7d52de80dee09878692172c1668374794a5966de74a7b4b5334432ec71143dac0ecd4f3319f WHIRLPOOL 78c34ac745d35526271310c95ea4f02093de754636d4c9af7a836f5676bdf7659d717f4b82e0b3442746afb6c8357f64250fae464dd7ff2e0001ffe504bb34a7
-EBUILD netsniff-ng-9999.ebuild 1358 SHA256 2b9a24cdce3aa08b2fea28b69828c5341ffc0d6e69bd5affe8057e402581b43c SHA512 078ed7cd8e0bd2df6351d3f927717157d01c481ee079269ae1808f90be3e5612362c53cd6102236f8e1a55d375d37ed0011844281cb94e5308c55b6dfb186cf1 WHIRLPOOL 8546022e383979bfe1977f366797dccd2eaff0a9f8a3a29d7ac4bafc52731c0024e41bc286481697a7e68351cef06fa8ef1a85736aef4114ab898f08a77c3a41
-MISC ChangeLog 1402 SHA256 5ef2e40daecbc8cd88d5e5240957bf69117641cde745aef871b191eae300cc64 SHA512 43ebf15656f6d6cee1650c6987520068560f3fb3bcf1032e37be1b6a0387e8c3b5e6a59e8f6db4e95e092bba555c61980da48aede5721746dbe124927dd3519c WHIRLPOOL 0e4563c46b792511e4f1c953cae8679cf0f36291a65cf123535c7594ca7ac13dc173b138dbb643a0be63537b60a78f7119273eb0d25bbe0f9c4b34ceb047d59f
-MISC metadata.xml 345 SHA256 b04e4f6c928419224d889bddda7029b5f78b8b0b741bbb9b63ea3c1942b1c50c SHA512 a161308003725677852320429c74269bb8e05de980ba9deb1be9a06c4abf286b10005caad8cfe934e5d863509d39e5a9e3fdc759b921b0af77d56836d44f3d43 WHIRLPOOL beedd6275307b2ca93ac44318f1a0215f2687bf1f6a7885effc01a696cbe76d3de0f0b145cfa2330c800f77590cdbcccdf2575896731e47450a434b439b942f2
+EBUILD netsniff-ng-0.5.8_rc2.ebuild 1558 SHA256 17d38a70aea0c381caa991be5449b8238b5c61631f41f412b123d7fd39f95be7 SHA512 efb8d948db4c113029c79ffaf1061b1db770b1ff98b87b94d9a55a82fea5d3a8fd4ae89298fcf82e2b89abe46bde409622ba209fb1ba880e7661ca5e36326900 WHIRLPOOL 7456256d3adbc9b45c44eb35a89e83490668914c7ad0869f3433d42267f3afa3e27a9e34fea474fec51eba36e71299414c3cd5c669da4380c55ddd6fb4fcce42
+EBUILD netsniff-ng-9999.ebuild 1513 SHA256 f23d6037a8d1395731d1b5870db79a679c4636781ca05963c3a020357517ffb0 SHA512 ad866427859dca20410f49568ebeefb7ae0dc6b47736856ef8d9343b5918b8e21c7a18985cd5294e891783287afe759d48c4fd1577e61ebc840a2e4dfdb9d210 WHIRLPOOL eb12d917dcc62b654c876d5172cb1f3562caedf881fc12cc0bc4c7f7518a38b51a8bde401e16694890a54e5ea68646c4a0f1f38e5219d02ccb861dd0e8ca0287
+MISC ChangeLog 1715 SHA256 77a0ab305ac3f2537e5d64a47ba1d02937d7de7d779b6865b0da36a91c6cdef2 SHA512 3295ce1cb686262b0b908bf0a0db02c0a79871cfbe3c58c066c4f21f56dfa06eb3eab26a6cc4f7aa98639e6ef8be38ec1b73ef3c11bd2eea03588107ae0f4937 WHIRLPOOL aaae6f88981c20305cc2898e826318098460103ad15a37755d499b362650104e01f8d755e0c2ca83405895b9ece61e940f1c70ec0e297ec7ce771d8d0ea6698f
+MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGoWfgACgkQknrdDGLu8JBOSQD/QoNmgIasr+6XQEv6ociCgzqx
-bBnthaY006QXEnYwbQIA/2ldyy0EedPKyy9RmrNT6a5p2GPWBlC/Zl6ofBsy2UDl
-=eXAs
+iF4EAREIAAYFAlH/V1EACgkQknrdDGLu8JDYjAD/eTXkxsL5LtJANgoXkkDkw/+O
+rit30er12hm93Ka+jtoA/RS4P4sJ0G/U4R1SS/JDQJZEqYsNSRgjZNAHDU8Z9FBJ
+=hA/m
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-fortify_source.patch b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-fortify_source.patch
new file mode 100644
index 000000000000..b4f3672dd88c
--- /dev/null
+++ b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-fortify_source.patch
@@ -0,0 +1,12 @@
+As seen on http://code.google.com/p/android/issues/detail?id=20795
+--- netsniff-ng-0.5.8-rc2/Makefile
++++ netsniff-ng-0.5.8-rc2/Makefile
+@@ -72,7 +72,7 @@
+   CFLAGS_DEF += -Wstack-protector
+   CFLAGS_DEF += --param=ssp-buffer-size=4
+   CFLAGS_DEF += -ftrapv
+-  CFLAGS_DEF += -D_FORTIFY_SOURCE=2
++  CFLAGS_DEF += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+   CFLAGS_DEF += -fexceptions
+ endif
+ 
diff --git a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-libcli-test.patch b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-libcli-test.patch
new file mode 100644
index 000000000000..903a4b94a904
--- /dev/null
+++ b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.8-libcli-test.patch
@@ -0,0 +1,11 @@
+Seen on https://bugzilla.redhat.com/show_bug.cgi?id=836923
+--- netsniff-ng-0.5.8-rc2/configure
++++ netsniff-ng-0.5.8-rc2/configure
+@@ -463,6 +463,7 @@
+ 	echo -n "[*] Checking libcli ... "
+ 
+ 	cat > $TMPDIR/clitest.c << EOF
++#include <sys/time.h>
+ #include <libcli.h>
+ 
+ void main(void)
diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
index 09d6f932f1cc..59acc2cc580e 100644
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -5,9 +5,5 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
-<use>
-	<flag name="curvetun">Build curvetun utility</flag>
-	<flag name="mausezahn">Build mausezahn utility</flag>
-</use>
 </pkgmetadata>
 
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild
new file mode 100644
index 000000000000..026e62baf939
--- /dev/null
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-0.5.8_rc2.ebuild,v 1.1 2013/08/05 07:42:05 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="high performance network sniffer for packet inspection"
+HOMEPAGE="http://netsniff-ng.org/"
+MY_P=${P/_rc/-rc}
+SRC_URI="http://pub.${PN}.org/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/geoip
+	dev-libs/libcli
+	dev-libs/libnl:3
+	dev-libs/userspace-rcu
+	net-libs/libnet:1.1
+	net-libs/libnetfilter_conntrack
+	net-libs/libpcap
+	sys-libs/ncurses:5
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	=net-libs/nacl-0_p20110221*
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	#needed for <libcli-1.9.7
+	epatch "${FILESDIR}"/${PN}-0.5.8-libcli-test.patch \
+		"${FILESDIR}"/${PN}-0.5.8-fortify_source.patch
+
+	sed -e '/CFLAGS/s:?=:+=:' \
+		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
+		 -i Makefile || die
+
+	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
+		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
+	fi
+
+	export NACL_INC_DIR="${EROOT}usr/include/nacl"
+	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
+		LEX=lex YAAC=bison STRIP=@true \
+		Q= HARDENING=1
+}
+
+src_install() {
+	emake PREFIX="${ED}" install
+	dodoc AUTHORS README REPORTING-BUGS
+}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
index 0c9cfbfebefc..b35d7ca743a6 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild,v 1.1 2013/05/31 08:06:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild,v 1.2 2013/08/05 07:42:05 xmw Exp $
 
 EAPI=5
 
-inherit git-2 multilib toolchain-funcs
+inherit git-2 eutils multilib toolchain-funcs
 
 DESCRIPTION="high performance network sniffer for packet inspection"
 HOMEPAGE="http://netsniff-ng.org/"
@@ -13,43 +13,47 @@ EGIT_REPO_URI="git://github.com/borkmann/${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="curvetun mausezahn"
+IUSE=""
 
 RDEPEND="dev-libs/geoip
 	dev-libs/libnl:3
 	dev-libs/userspace-rcu
 	net-libs/libnetfilter_conntrack
 	sys-libs/ncurses:5
-	mausezahn? (
-		dev-libs/libcli
-		net-libs/libnet:1.1 )"
+	dev-libs/libcli
+	net-libs/libpcap
+	sys-libs/ncurses:5
+	net-libs/libnet:1.1"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-devel/bison
-	curvetun? (	=net-libs/nacl-0_p20110221* )"
+	=net-libs/nacl-0_p20110221*
+	virtual/pkgconfig"
 
 src_prepare() {
-	if ! use mausezahn ; then
-		sed -e '/^TOOLS /s:mausezahn::' \
-			-i Makefile
-	fi
-	if ! use curvetun ; then
-		sed -e '/^TOOLS /s:curvetun::' \
-			-i Makefile
-	else
-		if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-			die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-		fi
+	#needed for <libcli-1.9.7
+	epatch "${FILESDIR}"/${PN}-0.5.8-libcli-test.patch \
+		"${FILESDIR}"/${PN}-0.5.8-fortify_source.patch
+
+	sed -e '/CFLAGS/s:?=:+=:' \
+		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
+		 -i Makefile || die
+
+	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
+		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
 	fi
+
+	export NACL_INC_DIR="${EROOT}usr/include/nacl"
+	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
 		LEX=lex YAAC=bison STRIP=@true \
-		NACL_INC_DIR="${EROOT}usr/include/nacl" \
-		NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
+		Q= HARDENING=1
 }
 
 src_install() {
 	emake PREFIX="${ED}" install
+	dodoc AUTHORS README REPORTING-BUGS
 }