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

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 118 insertions, 25 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/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
 }