From cd101faf39d266ef177295aa3b23fd70fa7d6266 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sep 05 2008 14:56:00 +0000
Subject: - Fixed filename handling in foomatic-rip (bug #457679).


---

diff --git a/foomatic-ppd-filenames.patch b/foomatic-ppd-filenames.patch
new file mode 100644
index 0000000..7fce8b1
--- /dev/null
+++ b/foomatic-ppd-filenames.patch
@@ -0,0 +1,35 @@
+diff -U0 foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames foomatic-filters-3.0-20080904/ChangeLog
+--- foomatic-filters-3.0-20080904/ChangeLog.ppd-filenames	2008-09-04 08:20:14.000000000 +0100
++++ foomatic-filters-3.0-20080904/ChangeLog	2008-09-05 15:51:23.000000000 +0100
+@@ -0,0 +1,6 @@
++2008-09-05  Till Kamppeter <till.kamppeter@gmail.com>
++
++	* foomatic-rip.in: Make foomatic-rip also working with PPD file
++	  names which contain brackets or other special characters (Bug
++	  #169).
++
+diff -up foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames foomatic-filters-3.0-20080904/foomatic-rip.in
+--- foomatic-filters-3.0-20080904/foomatic-rip.in.ppd-filenames	2008-09-05 15:49:54.000000000 +0100
++++ foomatic-filters-3.0-20080904/foomatic-rip.in	2008-09-05 15:51:23.000000000 +0100
+@@ -517,10 +517,10 @@ if (defined($ENV{'PRINTCAP_ENTRY'})){
+ # PPD file name given via the command line
+ # allow duplicates, and use the last specified one
+ while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
+-    $ppdfile = removeshellescapes($2);
++    $ppdfile = $2;
+ }
+ while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
+-    $ppdfile = removeshellescapes($2);
++    $ppdfile = $2;
+ }
+ 
+ # Check for LPD/GNUlpr by typical options which the spooler puts onto
+@@ -818,7 +818,7 @@ if (($spooler eq 'lpd') ||
+     ($spooler eq 'gnulpr')) {
+ 
+     # Get PPD file name as the last command line argument
+-    $ppdfile = removeshellescapes($rargs[$#rargs]);
++    $ppdfile = $rargs[$#rargs];
+ 
+ }
+ 
diff --git a/foomatic.spec b/foomatic.spec
index b1a2174..d28c6d1 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    65%{?dist}
+Release:    66%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -32,6 +32,8 @@ Patch15: foomatic-bad-utf8.patch
 
 Patch18: foomatic-sigpipe.patch
 
+Patch19: foomatic-ppd-filenames.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -76,6 +78,7 @@ pushd foomatic-filters-3.0-%{filtersver}
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 %patch18 -p1 -b .sigpipe
+%patch19 -p1 -b .ppd-filenames
 ./make_configure
 popd
 
@@ -232,6 +235,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Sep  5 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-66
+- Fixed filename handling in foomatic-rip (bug #457679).
+
 * Thu Sep  4 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-65
 - Removed ampathxml and xml-cflags patches.
 - Updated db-hpijs to 20080904.