Fix bug #83295

(Portage version: 2.1_pre4-r1)

5 files changed, 44 insertions, 7 deletions

diff --git a/dev-util/flawfinder/ChangeLog b/dev-util/flawfinder/ChangeLog
index 8b47c71a6b92..72705b96f6c1 100644
--- a/dev-util/flawfinder/ChangeLog
+++ b/dev-util/flawfinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/flawfinder
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/ChangeLog,v 1.7 2004/07/17 19:23:38 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/ChangeLog,v 1.8 2006/02/06 10:09:21 truedfx Exp $
+
+*flawfinder-1.26-r1 (06 Feb 2006)
+
+  06 Feb 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/flawfinder-1.26-linenumbers.patch, -flawfinder-1.26.ebuild,
+  +flawfinder-1.26-r1.ebuild:
+  Show correct line numbers after backslash-newline in strings (#83295)
 
   17 Jul 2004; David Holm <dholm@gentoo.org> flawfinder-1.26.ebuild:
   Added to ~ppc.
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 01484ca1a67f..6c56ed225836 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 42fd7672b572270595b0b67f09a94ebf ChangeLog 937
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 6f717ebb76a9e81734810f3e05229db1 flawfinder-1.23.ebuild 596
 MD5 eb9077dbebbe24ea3666daa127bff847 flawfinder-1.24.ebuild 605
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 1b003685f1136405242c3aa3427ec49f flawfinder-1.26.ebuild 622
+MD5 43858365dbb931765c12571247e35470 flawfinder-1.26-r1.ebuild 725
 MD5 66485bdc1ded12fbcab0ada3ce4ab07d files/digest-flawfinder-1.23 66
 MD5 aa429f57a688a31d3c2b58b6b49403b0 files/digest-flawfinder-1.24 66
-MD5 611e31eb40377ee7bc24b1e91897ce22 files/digest-flawfinder-1.26 67
+MD5 611e31eb40377ee7bc24b1e91897ce22 files/digest-flawfinder-1.26-r1 67
+MD5 1b12df59ef9e3ad94f4b767ab357bdab files/flawfinder-1.26-linenumbers.patch 353
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD5x2iwnQyISwouHwRApN3AJ9cWAF7BAUMDibHmYuNNELDzeUPjwCfdwp6
+IMDcexRT6VMvQWroWVZDtQM=
+=1Ugt
+-----END PGP SIGNATURE-----
diff --git a/dev-util/flawfinder/files/digest-flawfinder-1.26 b/dev-util/flawfinder/files/digest-flawfinder-1.26-r1
index c095f8d53346..c095f8d53346 100644
--- a/dev-util/flawfinder/files/digest-flawfinder-1.26
+++ b/dev-util/flawfinder/files/digest-flawfinder-1.26-r1
diff --git a/dev-util/flawfinder/files/flawfinder-1.26-linenumbers.patch b/dev-util/flawfinder/files/flawfinder-1.26-linenumbers.patch
new file mode 100644
index 000000000000..9a67f62e7938
--- /dev/null
+++ b/dev-util/flawfinder/files/flawfinder-1.26-linenumbers.patch
@@ -0,0 +1,11 @@
+--- flawfinder-1.26/flawfinder
++++ flawfinder-1.26/flawfinder
+@@ -1157,7 +1157,7 @@
+            i = i + 1
+            incomment = 0
+     elif instring:
+-       if c == '\\': i = i + 1
++       if c == '\\' and nextc != '\n': i = i + 1
+        elif c == '"' and instring == 1: instring = 0
+        elif c == "'" and instring == 2: instring = 0
+     else:
diff --git a/dev-util/flawfinder/flawfinder-1.26.ebuild b/dev-util/flawfinder/flawfinder-1.26-r1.ebuild
index 67a8b1fe42c5..34ac2ddf5e66 100644
--- a/dev-util/flawfinder/flawfinder-1.26.ebuild
+++ b/dev-util/flawfinder/flawfinder-1.26-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.26.ebuild,v 1.3 2004/07/18 08:28:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.26-r1.ebuild,v 1.1 2006/02/06 10:09:21 truedfx Exp $
+
+inherit eutils
 
 DESCRIPTION="Examines C/C++ source code for security flaws"
 HOMEPAGE="http://www.dwheeler.com/flawfinder/"
@@ -14,6 +16,12 @@ IUSE=""
 DEPEND=""
 RDEPEND="dev-lang/python"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-linenumbers.patch
+}
+
 src_install() {
 	dobin ${PN}
 	doman ${PN}.1