Fix bug #83295

Package-Manager: portage-2.1_pre4-r1

5 files changed, 64 insertions, 9 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..6139df06c3b8 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,8 +1,37 @@
-MD5 42fd7672b572270595b0b67f09a94ebf ChangeLog 937
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4e5a30fa832d92a9eb19238d6cd24e32 ChangeLog 1198
+RMD160 afdaf19b545e6c0fc283c3091bb78bca86a30e4d ChangeLog 1198
+SHA256 fa001392d81a4bc8b20c3b57a6394ab27a72aac95c1dde211e061a45e5db720a ChangeLog 1198
+MD5 66485bdc1ded12fbcab0ada3ce4ab07d files/digest-flawfinder-1.23 66
+RMD160 6cfef28076a1127ec96be2b1bc5bb0e562d26711 files/digest-flawfinder-1.23 66
+SHA256 de617bf4adf7229175d0dfec629d66a8862999563716a57e79adc5e8d28648b6 files/digest-flawfinder-1.23 66
+MD5 aa429f57a688a31d3c2b58b6b49403b0 files/digest-flawfinder-1.24 66
+RMD160 cab3d5d8a260ea0e88eb1feed327b04b5385e7e9 files/digest-flawfinder-1.24 66
+SHA256 709eb8a376ab98f77139c2e86730518ba3f2d455f1c99031a0c9bacbfd35c795 files/digest-flawfinder-1.24 66
+MD5 611e31eb40377ee7bc24b1e91897ce22 files/digest-flawfinder-1.26-r1 67
+RMD160 379fa80751bc87318e14725d408256fb7c993304 files/digest-flawfinder-1.26-r1 67
+SHA256 0c4a2d40caf33027fb138ff6d8c7f19b5e2a9423360eb958d0b449961520c2ad files/digest-flawfinder-1.26-r1 67
+MD5 1b12df59ef9e3ad94f4b767ab357bdab files/flawfinder-1.26-linenumbers.patch 353
+RMD160 780482cc4f03af30105b99de00977f287875902a files/flawfinder-1.26-linenumbers.patch 353
+SHA256 6425b26d1135efd1743fb83000a48268ddcc25e873b3d73da9204d2cc20e6342 files/flawfinder-1.26-linenumbers.patch 353
 MD5 6f717ebb76a9e81734810f3e05229db1 flawfinder-1.23.ebuild 596
+RMD160 989e257ed385880d1993c992e907f31f0cc89b49 flawfinder-1.23.ebuild 596
+SHA256 2e9b16f492654b606e0f96fa75511b19325d7c07c1f5fbf6aeaf563455b97cd1 flawfinder-1.23.ebuild 596
 MD5 eb9077dbebbe24ea3666daa127bff847 flawfinder-1.24.ebuild 605
+RMD160 6adabf339e21bc16b37b386b7ab898e6f2de5bff flawfinder-1.24.ebuild 605
+SHA256 152fa4eea9a0d4cabf1ec57625057865fdbbd62382c8b878d9b361cd1b101576 flawfinder-1.24.ebuild 605
+MD5 607bd2a959f3c596acf65805388cb3ec flawfinder-1.26-r1.ebuild 726
+RMD160 9b12e618d5a6333a2d671deca876c7801b215de5 flawfinder-1.26-r1.ebuild 726
+SHA256 45099310797ca7da876ca51fdf06fede071479ce743665ffd59405b0527c0fca flawfinder-1.26-r1.ebuild 726
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 1b003685f1136405242c3aa3427ec49f flawfinder-1.26.ebuild 622
-MD5 66485bdc1ded12fbcab0ada3ce4ab07d files/digest-flawfinder-1.23 66
-MD5 aa429f57a688a31d3c2b58b6b49403b0 files/digest-flawfinder-1.24 66
-MD5 611e31eb40377ee7bc24b1e91897ce22 files/digest-flawfinder-1.26 67
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD5yBrwnQyISwouHwRAvu1AJ96GXxnSIV+Dhr5IfQN/DeYWKSQfwCfbLrI
+CRHITPlzVHm/QDmg+4zZSDM=
+=OfNM
+-----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