- Applied patch to fix CAN-2004-1185 (bug #144684).

This commit is contained in:
Tim Waugh 2005-01-29 12:50:02 +00:00
parent ace8c28bea
commit 0498d5568f
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,22 @@
--- enscript-1.6.1/src/psgen.c.CAN-2004-1185 2005-01-10 15:55:33.560648363 +0000
+++ enscript-1.6.1/src/psgen.c 2005-01-10 15:56:30.266830723 +0000
@@ -2210,9 +2210,10 @@
MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename));
i = strlen (token->u.epsf.filename);
+ /*
if (i > 0 && token->u.epsf.filename[i - 1] == '|')
{
- /* Read EPS data from pipe. */
+ / * Read EPS data from pipe. * /
token->u.epsf.pipe = 1;
token->u.epsf.filename[i - 1] = '\0';
token->u.epsf.fp = popen (token->u.epsf.filename, "r");
@@ -2225,6 +2226,7 @@
}
}
else
+ */
{
/* Read EPS data from file. */
tilde_subst (token->u.epsf.filename, filename);

View File

@ -10,6 +10,7 @@ Patch2: enscript-1.6.1-tmp.patch
Patch3: enscript-1.6.1-locale.patch
Patch4: enscript-doublefree.patch
Patch5: enscript-1.6.1-CAN-2004-1184.patch
Patch6: enscript-1.6.1-CAN-2004-1185.patch
URL: http://people.ssh.fi/mtr/genscript/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: nenscript
@ -28,6 +29,7 @@ includes many options for customizing printouts.
%patch3 -p1 -b .locale
%patch4 -p1 -b .doublefree
%patch5 -p1 -b .CAN-2004-1184
%patch6 -p1 -b .CAN-2004-1185
%build
%configure --with-media=Letter
@ -64,6 +66,7 @@ rm -rf %{buildroot}
%changelog
* Tue Jan 29 2005 Tim Waugh <twaugh@redhat.com>
- Applied patch to fix CAN-2004-1185 (bug #144684).
- Backported patch to fix CAN-2004-1184 (bug #144684).
* Mon Sep 27 2004 Tim Waugh <twaugh@redhat.com> 1.6.1-28