Fix a segmentation fault with the -n option.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 21 insertions, 77 deletions

diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index ecda778714a7..3348d6cd05d9 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nsat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.24 2014/07/05 17:19:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.25 2014/07/06 02:06:56 jer Exp $
+
+*nsat-1.5-r3 (06 Jul 2014)
+
+  06 Jul 2014; Jeroen Roovers <jer@gentoo.org> -nsat-1.5-r1.ebuild,
+  -nsat-1.5-r2.ebuild, +nsat-1.5-r3.ebuild, +files/nsat-1.5-va_list.patch:
+  Fix a segmentation fault with the -n option.
 
 *nsat-1.5-r2 (05 Jul 2014)
 
diff --git a/net-analyzer/nsat/files/nsat-1.5-va_list.patch b/net-analyzer/nsat/files/nsat-1.5-va_list.patch
new file mode 100644
index 000000000000..aedc105539f7
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-va_list.patch
@@ -0,0 +1,12 @@
+--- a/src/Logging.cpp
++++ b/src/Logging.cpp
+@@ -94,6 +94,9 @@
+  if(fp!=NULL)
+   vfprintf(fp, fmt, va);
+ 
++ va_end(va);
++ va_start(va, fmt);
++
+  if((pi.Foreground) && (out!=NULL))
+   vfprintf(stdout, fmt, va);
+ 
diff --git a/net-analyzer/nsat/nsat-1.5-r1.ebuild b/net-analyzer/nsat/nsat-1.5-r1.ebuild
deleted file mode 100644
index 1a89b8899b2b..000000000000
--- a/net-analyzer/nsat/nsat-1.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v 1.6 2014/07/05 15:27:58 jer Exp $
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
-HOMEPAGE="http://nsat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		dev-lang/tk
-	)
-	net-libs/libpcap
-"
-DEPEND="$RDEPEND"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	# bug 128204
-	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
-	epatch "${FILESDIR}"/${P}-strip.patch
-	# bug 389767
-	use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch
-
-	# Respect LDFLAGS
-	sed -i \
-		-e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \
-		src/Makefile.in  || die
-	sed -i \
-		-e '/@$(CC)/{s|$(CFLAGS)|$(CFLAGS) $(LDFLAGS)|;s|@||g}' \
-		-e '/^FLAGS1/d' \
-		src/smb/Makefile.in || die
-
-	sed -i \
-		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
-		nsat.conf || die "sed on nsat.conf failed"
-	sed -i -e "s:/usr/local:/usr:g" Makefile.in || die
-	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
-	sed -i \
-		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
-		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
-		src/lang.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_with X x)
-}
-
-src_install () {
-	dobin nsat smb-ns
-	use X && dobin tools/xnsat
-
-	insinto /usr/share/nsat
-	doins nsat.cgi
-
-	insinto /etc/nsat
-	doins nsat.conf
-
-	dodoc README doc/CHANGES
-	doman doc/nsat.8
-}
diff --git a/net-analyzer/nsat/nsat-1.5-r2.ebuild b/net-analyzer/nsat/nsat-1.5-r3.ebuild
index fcfcde2d16c7..0b0a3fd2da53 100644
--- a/net-analyzer/nsat/nsat-1.5-r2.ebuild
+++ b/net-analyzer/nsat/nsat-1.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r2.ebuild,v 1.1 2014/07/05 17:19:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r3.ebuild,v 1.1 2014/07/06 02:06:57 jer Exp $
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
@@ -31,6 +31,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
 	epatch "${FILESDIR}"/${P}-strip.patch
 	epatch "${FILESDIR}"/${P}-misc.patch
+	epatch "${FILESDIR}"/${P}-va_list.patch
 	use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch
 
 	sed -i \