Version bump and additional patch for security bug #223657

Package-Manager: portage-2.1.5.2

4 files changed, 76 insertions, 2 deletions

diff --git a/app-misc/cbrpager/ChangeLog b/app-misc/cbrpager/ChangeLog
index ea10f9a9c05b..f553a7fb7f11 100644
--- a/app-misc/cbrpager/ChangeLog
+++ b/app-misc/cbrpager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/cbrpager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cbrpager/ChangeLog,v 1.7 2008/01/16 11:04:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cbrpager/ChangeLog,v 1.8 2008/05/26 19:56:44 keytoaster Exp $
+
+*cbrpager-0.9.17 (26 May 2008)
+
+  26 May 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/cbrpager-0.9.17-zip-filen-escape.patch, +cbrpager-0.9.17.ebuild:
+  Version bump and additional patch for security bug #223657
 
 *cbrpager-0.9.15 (16 Jan 2008)
 
diff --git a/app-misc/cbrpager/Manifest b/app-misc/cbrpager/Manifest
index 449796d9e1dc..af7e488d59be 100644
--- a/app-misc/cbrpager/Manifest
+++ b/app-misc/cbrpager/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cbrpager-0.9.17-zip-filen-escape.patch 864 RMD160 5a6e1a253ceb8aa2449916677ad4169c87687250 SHA1 318e79017d52f1f9ddbb286fe25091478557d123 SHA256 d8c27aa34931aaab0d7e715d8e85cb4bd0697be0f81c3d03f48c519b737c271e
 DIST cbrpager-0.9.11.tar.gz 115054 RMD160 fdc1d76b39da85a1cd81bccbea409c8924bd44a6 SHA1 30870c0fa478e5397cdda25c2bcacc08a492708b SHA256 1999068d41760a5ff0f0fa1c0d61f9eb2bdbe6349a9e107bd158799a8e9e5702
 DIST cbrpager-0.9.15.tar.gz 130934 RMD160 f49387ecbb8fe4d7204281712c136a707a1beda5 SHA1 50d9c613604895b3d0531e2cc67328519f117c96 SHA256 9b407e514231b35bbef265f45fb259ca5762e0fb77344c2352722ac7329d5cce
+DIST cbrpager-0.9.17.tar.gz 156164 RMD160 29eeae0fbaca5d107f97dacf6f0f8fa81af16572 SHA1 2584f9bc5c1d1affbc87e312e2fce54b879871b9 SHA256 be8f819847ae7523821d8cc150f6a1204f5ab7773854ad993ce1dab1783e1091
 EBUILD cbrpager-0.9.11.ebuild 706 RMD160 8210ef9f86ea7d2a7c2d1a3c81aa77698111125d SHA1 fb2e5fa1526d7e341da054269c4ec4674e97e4f3 SHA256 225d727976b3d3d818d610c319d950bfbcbfd2155db90908f2766f07267a9ff2
 EBUILD cbrpager-0.9.15.ebuild 806 RMD160 cb2d31873ff1b8ce4575917f1a1030595c259795 SHA1 f58d737fbf7458d431d5ce8b8a291dfb97254f67 SHA256 c0723ecda6132178653825e1e4a50ba24877227be4655adf377eb0a26ec554ae
-MISC ChangeLog 1103 RMD160 d53c31a5d34d7dcbcf9a5209f5e0b917b20ddb58 SHA1 eae910569272303c0e726f8c48a3fbf7e8973640 SHA256 74ea4e645915b259f34c51a1b678e361a4bc287651319a2c8e735b605d5e2bd2
+EBUILD cbrpager-0.9.17.ebuild 904 RMD160 520be3674e4499254ee1f340207fe6c7d7557285 SHA1 2c53286d5c8733038f0c525d4262d1d234d8fdd5 SHA256 06ac1fc73349de7654191a1381ed8199723c1736300a47bf0767e8420c6cf2e9
+MISC ChangeLog 1332 RMD160 ccec06003bc74f9b2f6be6508335bb61560855b5 SHA1 5b70de51f12b333e699acec852e658f580681c5f SHA256 a29a1be6ee350c5b9e4afe0384fd578d6667a5f7d81b9a3bb424ce9f7f573ac5
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg7FmcACgkQKfQzuokD2Iq3awCgnYD4steWPEhM8YU4DW2wQGSH
+icgAoLvAzxmW/iTZLhaRzGjIUKxBhfxO
+=C5O+
+-----END PGP SIGNATURE-----
diff --git a/app-misc/cbrpager/cbrpager-0.9.17.ebuild b/app-misc/cbrpager/cbrpager-0.9.17.ebuild
new file mode 100644
index 000000000000..df72d77359ea
--- /dev/null
+++ b/app-misc/cbrpager/cbrpager-0.9.17.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cbrpager/cbrpager-0.9.17.ebuild,v 1.1 2008/05/26 19:56:44 keytoaster Exp $
+
+inherit eutils
+
+DESCRIPTION="a simple comic book pager."
+HOMEPAGE="http://cbrpager.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-arch/unrar app-arch/unrar-gpl app-arch/rar )
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-zip-filen-escape.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog CONTRIBUTORS NEWS README TODO
+	make_desktop_entry ${PN} "CBR Pager" ${PN} "Graphics;Viewer;Amusement;GTK"
+}
diff --git a/app-misc/cbrpager/files/cbrpager-0.9.17-zip-filen-escape.patch b/app-misc/cbrpager/files/cbrpager-0.9.17-zip-filen-escape.patch
new file mode 100644
index 000000000000..b191114df918
--- /dev/null
+++ b/app-misc/cbrpager/files/cbrpager-0.9.17-zip-filen-escape.patch
@@ -0,0 +1,23 @@
+--- cbrpager-0.9.17/src/global.c.debug	2008-05-24 05:46:57.000000000 +0900
++++ cbrpager-0.9.17/src/global.c	2008-05-26 04:11:08.000000000 +0900
+@@ -324,7 +324,7 @@
+   esc[idx] = '\0';
+ 
+   printf(_("Requesting page %d/%d (%s)\n"), nr+1, 
+-		g_list_length(pagelist), esc);
++		g_list_length(pagelist), p);
+ 
+   /* The following patch was received from Mamoru Tasaka, 2008/05/22
+      to solve potential security problems with the system() call */
+@@ -354,9 +354,10 @@
+ 			pref.lastbook, p, (char *)NULL);
+           return; /* should not reach here */
+         case ZIP_FILE:
++          /* for zip file, esc must be passed instead of p */
+           execlp("unzip",
+ 			"unzip", "-p", "-C",
+-			pref.lastbook, p, (char *)NULL);
++			pref.lastbook, esc, (char *)NULL);
+           return; /* should not reach here */
+       }
+       return; /* should not reach here */