rpms/cbrpager/F-7 cbrpager-0.9.17-zip-filen-escape.patch, NONE, 1.1 cbrpager.spec, 1.4, 1.5

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cbrpager/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28070/F-7

Modified Files:
	cbrpager.spec 
Added Files:
	cbrpager-0.9.17-zip-filen-escape.patch 
Log Message:
* Mon May 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.17-2
- Escape filename in zip file properly


cbrpager-0.9.17-zip-filen-escape.patch:

--- NEW FILE cbrpager-0.9.17-zip-filen-escape.patch ---
--- 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 */


Index: cbrpager.spec
===================================================================
RCS file: /cvs/extras/rpms/cbrpager/F-7/cbrpager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cbrpager.spec	24 May 2008 00:52:09 -0000	1.4
+++ cbrpager.spec	25 May 2008 19:22:09 -0000	1.5
@@ -1,12 +1,13 @@
 Name:		cbrpager
 Version:	0.9.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Simple comic book pager for Linux
 
 Group:		Amusements/Graphics
 License:	GPLv2+
 URL:		http://www.jcoppens.com/soft/cbrpager/index.en.php
 Source0:	http://downloads.sourceforge.net/cbrpager/%{name}-%{version}.tar.gz
+Patch0:		cbrpager-0.9.17-zip-filen-escape.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .zip_esc
 
 for f in \
 	ChangeLog \
@@ -78,6 +80,9 @@
 
 
 %changelog
+* Mon May 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.17-2
+- Escape filename in zip file properly
+
 * Sat May 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.17-1
 - 0.9.17
 - 2 patches dropped, upstream applied