Fix IndexError that occurs when there is whitespace at the end of the file

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 37 insertions, 15 deletions

diff --git a/dev-util/flawfinder/ChangeLog b/dev-util/flawfinder/ChangeLog
index f9d16cf32d75..b0b3f23003a1 100644
--- a/dev-util/flawfinder/ChangeLog
+++ b/dev-util/flawfinder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/flawfinder
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/ChangeLog,v 1.12 2009/01/25 23:21:01 angelos Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/ChangeLog,v 1.13 2009/09/29 12:11:59 rbu Exp $
+
+*flawfinder-1.27-r1 (29 Sep 2009)
+
+  29 Sep 2009; Robert Buchholz <rbu@gentoo.org> -flawfinder-1.27.ebuild,
+  +flawfinder-1.27-r1.ebuild,
+  +files/flawfinder-1.27-whitespace-traceback.patch:
+  Fix IndexError that occurs when there is whitespace at the end of the file
 
   25 Jan 2009; Christoph Mende <angelos@gentoo.org>
   -files/flawfinder-1.26-linenumbers.patch, -flawfinder-1.23.ebuild,
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 095ececa20ce..9b4e685179ae 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX flawfinder-1.27-whitespace-traceback.patch 685 RMD160 4c4b231c6b3ef86cb6ea0970b8c7e1728a29f574 SHA1 78ca383207d351e80364627511a903101acf5d53 SHA256 ceb1b89bf48de43abe837c412c4036456dcf3372cc25171674203d6f952a1e46
 DIST flawfinder-1.24.tar.gz 97222 RMD160 af5a037afeed92ea6ff1ba54711c59aad2dd2c9a SHA1 600e59a113327ad54875ed8a657146613bd59013 SHA256 6a94fdd379623585c1140b9a250488d4675a3ec8db938a8a66d1d6f5e716935b
 DIST flawfinder-1.27.tar.gz 123086 RMD160 edd41227c99d2b3c4869396d4e34dfd954e9eab6 SHA1 0af702c1e0cbd0385a78be6ef1f2f7752ba6193f SHA256 8825a9742db29da329ec57861d702a744452f84fbc02f617c037becafaf6f546
 EBUILD flawfinder-1.24.ebuild 602 RMD160 d272124c7842bcb8a15a5cc3e6c77b0622b1bc2c SHA1 619e89ffe3e866b90a413a0c665079b31a015c51 SHA256 a099c9486f99b208c5510d58b212089aa0166574566b12bb86683b7d5fc637cf
-EBUILD flawfinder-1.27.ebuild 615 RMD160 fb3f78887b7498720cf56664c3f18e09a6cf012a SHA1 2cbd42fc04455fd8c36adb4a66bb770499e0218f SHA256 edc4544978ca0d5f0c9df18d4c2b14815e62eda606b092392984c100687aa07c
-MISC ChangeLog 1808 RMD160 c917dec3c7ee798a52014c63080ab14acc25d4b5 SHA1 e5b0d9f92248ad2e2623760436beab0766d835a3 SHA256 877084a781ed0b62a51d91bd494d001ffe44eb13c72573a1e67ce471fcd1ec7e
+EBUILD flawfinder-1.27-r1.ebuild 721 RMD160 84ad9a2067537a4c45306a8983cdc4f54e08edc8 SHA1 08cc266e3994a822a0f92c5022a08fd2f36872dd SHA256 4ca2ffd6ab2ecb8be21e2cfb9543cc2532757492b7f25bc9966676f62188a6b8
+MISC ChangeLog 2073 RMD160 0a34c05c249d1183b9516cde4174a24322fe7151 SHA1 5fc8565e773aa9d83caed69ce9195f57a8c2f4df SHA256 92bfdeba857fdef36f3f205fa0eb48d7c1fec7673393094fcfdd35a7f621e7f5
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkl88+YACgkQKhnDs22gwa8CCgCgic9ev8w6UiU/EIwOxR+VVivL
-my8An34H7IcrhZoG2dlkv/DanOEBiZZm
-=pKnJ
------END PGP SIGNATURE-----
diff --git a/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch b/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch
new file mode 100644
index 000000000000..fcd60f916acd
--- /dev/null
+++ b/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch
@@ -0,0 +1,17 @@
+From: Robert Buchholz <rbu@gentoo.org>
+Subject: Fix IndexError that occurs when there is whitespace at the end of the file
+
+Origin: vendor, http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch
+Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1834743&group_id=186989&atid=919499
+
+--- flawfinder.orig	2009-09-29 13:55:15.433911571 +0200
++++ flawfinder	2009-09-29 13:56:03.114786154 +0200
+@@ -1299,6 +1299,8 @@
+     m = p_whitespace.match(text,i)
+     if m:
+       i = m.end(0)
++      if i >= len(text):
++        break
+ 
+     c = text[i]
+     if linebegin:  # If at beginning of line, see if #include is there.
diff --git a/dev-util/flawfinder/flawfinder-1.27.ebuild b/dev-util/flawfinder/flawfinder-1.27-r1.ebuild
index 6bcb78390b31..2e6f3c16116b 100644
--- a/dev-util/flawfinder/flawfinder-1.27.ebuild
+++ b/dev-util/flawfinder/flawfinder-1.27-r1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.27.ebuild,v 1.2 2009/01/25 23:21:01 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/flawfinder/flawfinder-1.27-r1.ebuild,v 1.1 2009/09/29 12:11:59 rbu Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="Examines C/C++ source code for security flaws"
 HOMEPAGE="http://www.dwheeler.com/flawfinder/"
@@ -14,6 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="dev-lang/python"
 
+src_prepare() {
+	epatch "${FILESDIR}"/flawfinder-1.27-whitespace-traceback.patch
+}
+
 src_install() {
 	dobin ${PN}
 	doman ${PN}.1