rpms/enscript/devel .cvsignore, 1.4, 1.5 enscript-1.6.4-hilight.patch, 1.1, 1.2 enscript-rh477382.patch, 1.1, 1.2 enscript-wrap_header.patch, 1.2, 1.3 enscript.spec, 1.45, 1.46 sources, 1.4, 1.5 enscript-1.6.1-CAN-2004-1185.patch, 1.2, NONE enscript-1.6.1-CAN-2004-1186.patch, 1.1, NONE enscript-1.6.1-config.patch, 1.3, NONE enscript-CVE-2008-3863+CVE-2008-4306.patch, 1.1, NONE enscript-doublefree.patch, 1.2, NONE
Adam Tkac
atkac at fedoraproject.org
Fri May 21 11:20:35 UTC 2010
Author: atkac
Update of /cvs/pkgs/rpms/enscript/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2918
Modified Files:
.cvsignore enscript-1.6.4-hilight.patch
enscript-rh477382.patch enscript-wrap_header.patch
enscript.spec sources
Removed Files:
enscript-1.6.1-CAN-2004-1185.patch
enscript-1.6.1-CAN-2004-1186.patch enscript-1.6.1-config.patch
enscript-CVE-2008-3863+CVE-2008-4306.patch
enscript-doublefree.patch
Log Message:
- update to 1.6.5.1
- patches merged
- enscript-1.6.1-config.patch
- enscript-doublefree.patch
- enscript-1.6.1-CAN-2004-1185.patch
- enscript-1.6.1-CAN-2004-1186.patch
- enscript-CVE-2008-3863+CVE-2008-4306.patch
- license changed to GPLv3+
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 17 Feb 2006 15:33:18 -0000 1.4
+++ .cvsignore 21 May 2010 11:20:34 -0000 1.5
@@ -1,3 +1,3 @@
-enscript-1.6.4.tar.gz
-enscript-ruby-1.6.4.tar.gz
enscript-php-1.6.4.st
+enscript-ruby-1.6.4.tar.gz
+enscript-1.6.5.1.tar.gz
enscript-1.6.4-hilight.patch:
Makefile.am | 5 +
changelog.st | 2
dylan.st | 124 +++++++++++++++++++++++++++++++++++++++++++++
eiffel.st | 132 ++++++++++++++++++++++++++++++++++++++++++++++++
enscript.st | 13 ++++
erlang.st | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
forth.st | 96 +++++++++++++++++++++++++++++++++++
icon.st | 93 ++++++++++++++++++++++++++++++++++
lua.st | 91 +++++++++++++++++++++++++++++++++
mail.st | 2
oberon2.st | 111 ++++++++++++++++++++++++++++++++++++++++
oz.st | 89 ++++++++++++++++++++++++++++++++
perl.st | 6 +-
smalltalk.st | 80 +++++++++++++++++++++++++++++
sml.st | 101 +++++++++++++++++++++++++++++++++++++
tcl.st | 2
16 files changed, 1101 insertions(+), 7 deletions(-)
Index: enscript-1.6.4-hilight.patch
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript-1.6.4-hilight.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- enscript-1.6.4-hilight.patch 17 Feb 2006 15:33:18 -0000 1.1
+++ enscript-1.6.4-hilight.patch 21 May 2010 11:20:34 -0000 1.2
@@ -1,12 +1,7 @@
-04_hilight.dpatch from Debian's 1.6.4-7 patchset, with a few changes:
-o hilight *.xhtml as html
-o install php.st and ruby.st bits
-o patch Makefile.am too
-
-diff -Nru enscript-1.6.4.orig/states/hl/changelog.st enscript-1.6.4/states/hl/changelog.st
---- enscript-1.6.4.orig/states/hl/changelog.st 2003-03-05 09:26:33.000000000 +0200
-+++ enscript-1.6.4/states/hl/changelog.st 2006-01-09 22:02:28.000000000 +0200
-@@ -43,7 +43,7 @@
+diff -up enscript-1.6.5.1/states/hl/changelog.st.hilight enscript-1.6.5.1/states/hl/changelog.st
+--- enscript-1.6.5.1/states/hl/changelog.st.hilight 2009-01-24 21:59:34.000000000 +0100
++++ enscript-1.6.5.1/states/hl/changelog.st 2010-05-20 15:28:08.148580599 +0200
+@@ -43,7 +43,7 @@ state changelog extends HighlightEntry
}
/* File descriptions without function names. */
@@ -15,9 +10,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
language_print ($1);
function_name_face (true);
-diff -Nru enscript-1.6.4.orig/states/hl/dylan.st enscript-1.6.4/states/hl/dylan.st
---- enscript-1.6.4.orig/states/hl/dylan.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/dylan.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/dylan.st.hilight enscript-1.6.5.1/states/hl/dylan.st
+--- enscript-1.6.5.1/states/hl/dylan.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/dylan.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,124 @@
+/**
+ * Name: dylan
@@ -143,9 +138,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+mode: c
+End:
+*/
-diff -Nru enscript-1.6.4.orig/states/hl/eiffel.st enscript-1.6.4/states/hl/eiffel.st
---- enscript-1.6.4.orig/states/hl/eiffel.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/eiffel.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/eiffel.st.hilight enscript-1.6.5.1/states/hl/eiffel.st
+--- enscript-1.6.5.1/states/hl/eiffel.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/eiffel.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,132 @@
+/**
+ * Name: eiffel
@@ -279,10 +274,10 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ }
+
+}
-diff -Nru enscript-1.6.4.orig/states/hl/enscript.st enscript-1.6.4/states/hl/enscript.st
---- enscript-1.6.4.orig/states/hl/enscript.st 2003-03-05 10:31:31.000000000 +0200
-+++ enscript-1.6.4/states/hl/enscript.st 2006-01-09 22:04:22.000000000 +0200
-@@ -474,24 +474,31 @@
+diff -up enscript-1.6.5.1/states/hl/enscript.st.hilight enscript-1.6.5.1/states/hl/enscript.st
+--- enscript-1.6.5.1/states/hl/enscript.st.hilight 2009-12-28 00:57:12.000000000 +0100
++++ enscript-1.6.5.1/states/hl/enscript.st 2010-05-20 15:28:08.148580599 +0200
+@@ -472,24 +472,31 @@ namerules
/\.m$/ matlab;
/\.(mpl|mp|maple)$/ maple;
/\.(scm|scheme)$/ scheme;
@@ -315,7 +310,7 @@ diff -Nru enscript-1.6.4.orig/states/hl/
/\.js$/ javascript;
/\.java$/ java;
/\.([Pp][Aa][Ss]|[Pp][Pp]|[Pp])$/ pascal;
-@@ -530,6 +537,10 @@
+@@ -529,6 +536,10 @@ startrules
/-\*- [Ii][Dd][Ll] -\*-/ idl;
/-\*- [Pp][Ee][Rr][Ll] -\*-/ perl;
/^#![ \t]*\/.*\/perl/ perl;
@@ -326,9 +321,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
/^From:/ mail;
/^#![ \t]*(\/usr)?\/bin\/[ngmt]?awk/ awk;
/^#![ \t]*(\/usr)?\/bin\/sh/ sh;
-diff -Nru enscript-1.6.4.orig/states/hl/erlang.st enscript-1.6.4/states/hl/erlang.st
---- enscript-1.6.4.orig/states/hl/erlang.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/erlang.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/erlang.st.hilight enscript-1.6.5.1/states/hl/erlang.st
+--- enscript-1.6.5.1/states/hl/erlang.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/erlang.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,161 @@
+/**
+ * Name: erlang
@@ -491,9 +486,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+mode: erlang
+End:
+*/
-diff -Nru enscript-1.6.4.orig/states/hl/forth.st enscript-1.6.4/states/hl/forth.st
---- enscript-1.6.4.orig/states/hl/forth.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/forth.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/forth.st.hilight enscript-1.6.5.1/states/hl/forth.st
+--- enscript-1.6.5.1/states/hl/forth.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/forth.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,96 @@
+/**
+ * Name: forth
@@ -591,9 +586,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ }
+}
+
-diff -Nru enscript-1.6.4.orig/states/hl/icon.st enscript-1.6.4/states/hl/icon.st
---- enscript-1.6.4.orig/states/hl/icon.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/icon.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/icon.st.hilight enscript-1.6.5.1/states/hl/icon.st
+--- enscript-1.6.5.1/states/hl/icon.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/icon.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,93 @@
+/**
+ * Name: icon
@@ -688,9 +683,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ language_print ($3);
+ }
+}
-diff -Nru enscript-1.6.4.orig/states/hl/lua.st enscript-1.6.4/states/hl/lua.st
---- enscript-1.6.4.orig/states/hl/lua.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/lua.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/lua.st.hilight enscript-1.6.5.1/states/hl/lua.st
+--- enscript-1.6.5.1/states/hl/lua.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/lua.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,91 @@
+/**
+ * Name: lua
@@ -783,10 +778,10 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ }
+
+}
-diff -Nru enscript-1.6.4.orig/states/hl/mail.st enscript-1.6.4/states/hl/mail.st
---- enscript-1.6.4.orig/states/hl/mail.st 2003-03-05 09:26:33.000000000 +0200
-+++ enscript-1.6.4/states/hl/mail.st 2006-01-09 22:02:28.000000000 +0200
-@@ -27,7 +27,7 @@
+diff -up enscript-1.6.5.1/states/hl/mail.st.hilight enscript-1.6.5.1/states/hl/mail.st
+--- enscript-1.6.5.1/states/hl/mail.st.hilight 2009-01-24 21:59:34.000000000 +0100
++++ enscript-1.6.5.1/states/hl/mail.st 2010-05-20 15:28:08.148580599 +0200
+@@ -27,7 +27,7 @@ state mail_header extends Highlight
END {
comment_face (true);
}
@@ -795,35 +790,26 @@ diff -Nru enscript-1.6.4.orig/states/hl/
language_print ($0);
return;
}
-diff -Nru enscript-1.6.4.orig/states/hl/Makefile.am enscript-1.6.4/states/hl/Makefile.am
---- enscript-1.6.4.orig/states/hl/Makefile.am 2003-03-05 09:26:33.000000000 +0200
-+++ enscript-1.6.4/states/hl/Makefile.am 2006-01-09 22:06:23.000000000 +0200
-@@ -38,7 +38,8 @@
+diff -up enscript-1.6.5.1/states/hl/Makefile.am.hilight enscript-1.6.5.1/states/hl/Makefile.am
+--- enscript-1.6.5.1/states/hl/Makefile.am.hilight 2010-03-06 13:59:56.000000000 +0100
++++ enscript-1.6.5.1/states/hl/Makefile.am 2010-05-20 15:29:46.656051228 +0200
+@@ -36,9 +36,10 @@ idl.st inf.st java.st javascript.st ksh.
matlab.st nroff.st objc.st outline.st pascal.st passthrough.st perl.st \
postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st \
sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st \
-vhdl.st vrml.st wmlscript.st zsh.st
-+vhdl.st vrml.st wmlscript.st zsh.st eiffel.st erlang.st dylan.st oz.st \
++vhdl.st vrml.st wmlscript.st zsh.st eiffel.st erlang.st dylan.st oz.st \
+lua.st oberon2.st icon.st smalltalk.st forth.st sml.st php.st ruby.st
- states = $(misc) $(styles) $(languages) $(highlightings)
+ hldir = $(pkgdatadir)/hl
+ dist_hl_DATA = $(misc) $(styles) $(languages) $(highlightings)
-diff -Nru enscript-1.6.4.orig/states/hl/Makefile.in enscript-1.6.4/states/hl/Makefile.in
---- enscript-1.6.4.orig/states/hl/Makefile.in 2003-03-05 09:40:07.000000000 +0200
-+++ enscript-1.6.4/states/hl/Makefile.in 2006-01-09 22:05:26.000000000 +0200
-@@ -188,7 +188,8 @@
- matlab.st nroff.st objc.st outline.st pascal.st passthrough.st perl.st \
- postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st \
- sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st \
--vhdl.st vrml.st wmlscript.st zsh.st
-+vhdl.st vrml.st wmlscript.st zsh.st eiffel.st erlang.st dylan.st oz.st \
-+lua.st oberon2.st icon.st smalltalk.st forth.st sml.st php.st ruby.st
-
-
- states = $(misc) $(styles) $(languages) $(highlightings)
-diff -Nru enscript-1.6.4.orig/states/hl/oberon2.st enscript-1.6.4/states/hl/oberon2.st
---- enscript-1.6.4.orig/states/hl/oberon2.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/oberon2.st 2006-01-09 22:02:28.000000000 +0200
+-EXTRA_DIST = ChangeLog.old
+\ No newline at end of file
++EXTRA_DIST = ChangeLog.old
+diff -up enscript-1.6.5.1/states/hl/oberon2.st.hilight enscript-1.6.5.1/states/hl/oberon2.st
+--- enscript-1.6.5.1/states/hl/oberon2.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/oberon2.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,111 @@
+/**
+ * Name: oberon2
@@ -936,9 +922,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ language_print ($3);
+ }
+}
-diff -Nru enscript-1.6.4.orig/states/hl/oz.st enscript-1.6.4/states/hl/oz.st
---- enscript-1.6.4.orig/states/hl/oz.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/oz.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/oz.st.hilight enscript-1.6.5.1/states/hl/oz.st
+--- enscript-1.6.5.1/states/hl/oz.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/oz.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,89 @@
+/**
+ * Name: oz
@@ -1029,10 +1015,10 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ }
+
+}
-diff -Nru enscript-1.6.4.orig/states/hl/perl.st enscript-1.6.4/states/hl/perl.st
---- enscript-1.6.4.orig/states/hl/perl.st 2003-03-05 09:32:09.000000000 +0200
-+++ enscript-1.6.4/states/hl/perl.st 2006-01-09 22:02:28.000000000 +0200
-@@ -60,6 +60,11 @@
+diff -up enscript-1.6.5.1/states/hl/perl.st.hilight enscript-1.6.5.1/states/hl/perl.st
+--- enscript-1.6.5.1/states/hl/perl.st.hilight 2009-01-24 21:59:34.000000000 +0100
++++ enscript-1.6.5.1/states/hl/perl.st 2010-05-20 15:28:08.148580599 +0200
+@@ -60,6 +60,11 @@ state perl_bquot_string extends Highligh
state perl extends HighlightEntry
{
@@ -1044,7 +1030,7 @@ diff -Nru enscript-1.6.4.orig/states/hl/
/* Comments. */
/#.*$/ {
comment_face (true);
-@@ -127,7 +132,6 @@
+@@ -127,7 +132,6 @@ state perl extends HighlightEntry
/* Variables */
/[$%@&]+\w+/ {
@@ -1052,9 +1038,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
language_print ($0);
}
-diff -Nru enscript-1.6.4.orig/states/hl/smalltalk.st enscript-1.6.4/states/hl/smalltalk.st
---- enscript-1.6.4.orig/states/hl/smalltalk.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/smalltalk.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/smalltalk.st.hilight enscript-1.6.5.1/states/hl/smalltalk.st
+--- enscript-1.6.5.1/states/hl/smalltalk.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/smalltalk.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,80 @@
+/**
+ * Name: Smalltalk
@@ -1136,9 +1122,9 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ }
+
+}
-diff -Nru enscript-1.6.4.orig/states/hl/sml.st enscript-1.6.4/states/hl/sml.st
---- enscript-1.6.4.orig/states/hl/sml.st 1970-01-01 02:00:00.000000000 +0200
-+++ enscript-1.6.4/states/hl/sml.st 2006-01-09 22:02:28.000000000 +0200
+diff -up enscript-1.6.5.1/states/hl/sml.st.hilight enscript-1.6.5.1/states/hl/sml.st
+--- enscript-1.6.5.1/states/hl/sml.st.hilight 2010-05-20 15:28:08.148580599 +0200
++++ enscript-1.6.5.1/states/hl/sml.st 2010-05-20 15:28:08.148580599 +0200
@@ -0,0 +1,101 @@
+/**
+ * Name: sml
@@ -1241,10 +1227,10 @@ diff -Nru enscript-1.6.4.orig/states/hl/
+ }
+
+}
-diff -Nru enscript-1.6.4.orig/states/hl/tcl.st enscript-1.6.4/states/hl/tcl.st
---- enscript-1.6.4.orig/states/hl/tcl.st 2003-03-05 09:26:33.000000000 +0200
-+++ enscript-1.6.4/states/hl/tcl.st 2006-01-09 22:02:28.000000000 +0200
-@@ -128,7 +128,7 @@
+diff -up enscript-1.6.5.1/states/hl/tcl.st.hilight enscript-1.6.5.1/states/hl/tcl.st
+--- enscript-1.6.5.1/states/hl/tcl.st.hilight 2009-01-24 21:59:34.000000000 +0100
++++ enscript-1.6.5.1/states/hl/tcl.st 2010-05-20 15:28:08.148580599 +0200
+@@ -128,7 +128,7 @@ state tcl extends HighlightEntry
|e(ntry|of|rror|v(al|ent)|x(ec|it|pr))\
|f(blocked|configure|ile(|event|name)|lush|o(cus|nt|r(|each|mat))|rame)\
|g(ets|lob(|al)|r(ab|id))|history|i(f|mage|n(cr|fo|terp))|join\
enscript-rh477382.patch:
afm/Makefile.am | 5 ++++-
src/util.c | 13 ++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
Index: enscript-rh477382.patch
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript-rh477382.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- enscript-rh477382.patch 30 Nov 2009 14:01:37 -0000 1.1
+++ enscript-rh477382.patch 21 May 2010 11:20:34 -0000 1.2
@@ -1,31 +1,24 @@
-diff -up enscript-1.6.4/afm/Makefile.am.rh477382 enscript-1.6.4/afm/Makefile.am
---- enscript-1.6.4/afm/Makefile.am.rh477382 2009-11-30 14:26:54.520478161 +0100
-+++ enscript-1.6.4/afm/Makefile.am 2009-11-30 14:29:12.937976060 +0100
-@@ -31,11 +31,11 @@ hvnbo.afm hvno.afm hvo.afm ncb.afm ncbi.
+diff -up enscript-1.6.5.1/afm/Makefile.am.rh477382 enscript-1.6.5.1/afm/Makefile.am
+--- enscript-1.6.5.1/afm/Makefile.am.rh477382 2010-03-06 14:02:53.000000000 +0100
++++ enscript-1.6.5.1/afm/Makefile.am 2010-05-21 13:09:28.000346827 +0200
+@@ -29,9 +29,12 @@ hvnbo.afm hvno.afm hvo.afm ncb.afm ncbi.
pobi.afm poi.afm por.afm sy.afm tib.afm tibi.afm tii.afm tir.afm \
zcmi.afm zd.afm
-public_fonts = matrix.afm matrix.pfa
+public_fonts = matrix.afm matrix.eps
- EXTRA_DIST = font.map $(default_afm) $(public_fonts)
+ afmdir = $(pkgdatadir)/afm
+ dist_afm_DATA = font.map $(default_afm) $(public_fonts)
--install-data-local:
-+install-data-local: $(EXTRA_DIST)
- $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
- $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
- for f in $(EXTRA_DIST); do \
-@@ -44,3 +44,6 @@ install-data-local:
-
- uninstall-local:
- rm -rf $(DESTDIR)/$(datadir)/enscript/afm
+ EXTRA_DIST = ChangeLog.old
+
+matrix.eps: matrix.pfa
-+ mv matrix.pfa matrix.eps
-diff -up enscript-1.6.4/src/util.c.rh477382 enscript-1.6.4/src/util.c
---- enscript-1.6.4/src/util.c.rh477382 2003-03-05 08:26:32.000000000 +0100
-+++ enscript-1.6.4/src/util.c 2009-11-30 14:26:54.550489123 +0100
-@@ -1081,9 +1081,16 @@ download_font (char *name)
++ cp matrix.pfa matrix.eps
+diff -up enscript-1.6.5.1/src/util.c.rh477382 enscript-1.6.5.1/src/util.c
+--- enscript-1.6.5.1/src/util.c.rh477382 2009-12-28 00:57:12.000000000 +0100
++++ enscript-1.6.5.1/src/util.c 2010-05-21 13:08:10.920347803 +0200
+@@ -1079,9 +1079,16 @@ download_font (char *name)
buffer_append (&fname, ".pfb");
if (stat (buffer_ptr (&fname), &stat_st) != 0)
{
enscript-wrap_header.patch:
simple.hdr | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
Index: enscript-wrap_header.patch
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript-wrap_header.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- enscript-wrap_header.patch 12 Feb 2007 12:20:50 -0000 1.2
+++ enscript-wrap_header.patch 21 May 2010 11:20:35 -0000 1.3
@@ -1,121 +1,50 @@
---- enscript-1.6.1/lib/simple.hdr.wrap_header 1997-03-03 09:00:08.000000000 +0100
-+++ enscript-1.6.1/lib/simple.hdr 2007-02-12 12:57:02.000000000 +0100
-@@ -1,50 +1,68 @@
--%
--% Default simple header.
--% Copyright (c) 1995 Markku Rossi.
--% Author: Markku Rossi <mtr at iki.fi>
--%
--
--%
--% This file is part of GNU enscript.
--%
--% This program is free software; you can redistribute it and/or modify
--% it under the terms of the GNU General Public License as published by
--% the Free Software Foundation; either version 2, or (at your option)
--% any later version.
--%
--% This program is distributed in the hope that it will be useful,
--% but WITHOUT ANY WARRANTY; without even the implied warranty of
--% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--% GNU General Public License for more details.
--%
--% You should have received a copy of the GNU General Public License
--% along with this program; see the file COPYING. If not, write to
--% the Free Software Foundation, 59 Temple Place - Suite 330,
--% Boston, MA 02111-1307, USA.
--%
--
--% -- code follows this line --
--%Format: fmodstr $D{%a %b %d %H:%M:%S %Y}
--%Format: pagenumstr $V$%
--
--/do_header { % print default simple header
-- gsave
-- d_header_x d_header_y HFpt_h 3 div add translate
--
-- HF setfont
-- user_header_p {
-- 5 0 moveto user_header_left_str show
--
-- d_header_w user_header_center_str stringwidth pop sub 2 div
-- 0 moveto user_header_center_str show
--
-- d_header_w user_header_right_str stringwidth pop sub 5 sub
-- 0 moveto user_header_right_str show
-- } {
+diff -up enscript-1.6.5.1/lib/simple.hdr.wrap_header enscript-1.6.5.1/lib/simple.hdr
+--- enscript-1.6.5.1/lib/simple.hdr.wrap_header 2009-01-24 21:59:34.000000000 +0100
++++ enscript-1.6.5.1/lib/simple.hdr 2010-05-21 13:04:28.070346832 +0200
+@@ -3,6 +3,10 @@
+ % Copyright (c) 1995 Markku Rossi.
+ % Author: Markku Rossi <mtr at iki.fi>
+ %
++% Modified: Chris Josefy, USA, MAY 2006
++% + Added line wrapping to header to work more like AIX enscript
++% + This assumes that one does not change the header font size from the default
++% + This also assumes that the line only wraps once
+
+ %
+ % This file is part of GNU Enscript.
+@@ -24,6 +28,7 @@
+ % -- code follows this line --
+ %Format: fmodstr $D{%a %b %d %H:%M:%S %Y}
+ %Format: pagenumstr $V$%
++%HeaderHeight: 44
+
+ /do_header { % print default simple header
+ gsave
+@@ -39,10 +44,23 @@
+ d_header_w user_header_right_str stringwidth pop sub 5 sub
+ 0 moveto user_header_right_str show
+ } {
- 5 0 moveto fname show
- 45 0 rmoveto fmodstr show
- 45 0 rmoveto pagenumstr show
- } ifelse
--
-- grestore
--} def
-+%
-+% Default simple header.
-+% Copyright (c) 1995 Markku Rossi.
-+% Author: Markku Rossi <mtr at iki.fi>
-+%
-+% Modified: Chris Josefy, USA, MAY 2006
-+% + Added line wrapping to header to work more like AIX enscript
-+% + This assumes that one does not change the header font size from the default
-+% + This also assumes that the line only wraps once
-+
-+%
-+% This file is part of GNU enscript.
-+%
-+% This program is free software; you can redistribute it and/or modify
-+% it under the terms of the GNU General Public License as published by
-+% the Free Software Foundation; either version 2, or (at your option)
-+% any later version.
-+%
-+% This program is distributed in the hope that it will be useful,
-+% but WITHOUT ANY WARRANTY; without even the implied warranty of
-+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+% GNU General Public License for more details.
-+%
-+% You should have received a copy of the GNU General Public License
-+% along with this program; see the file COPYING. If not, write to
-+% the Free Software Foundation, 59 Temple Place - Suite 330,
-+% Boston, MA 02111-1307, USA.
-+%
-+
-+% -- code follows this line --
-+%Format: fmodstr $D{%a %b %d %H:%M:%S %Y}
-+%Format: pagenumstr $V$%
-+%HeaderHeight: 44
-+
-+/do_header { % print default simple header
-+ gsave
-+ d_header_x d_header_y HFpt_h 3 div add translate
-+
-+ HF setfont
-+ user_header_p {
-+ 5 0 moveto user_header_left_str show
-+
-+ d_header_w user_header_center_str stringwidth pop sub 2 div
-+ 0 moveto user_header_center_str show
-+
-+ d_header_w user_header_right_str stringwidth pop sub 5 sub
-+ 0 moveto user_header_right_str show
-+ } {
-+ fname length fmodstr length add pagenumstr length add 95 6 idiv add d_header_w 6 idiv le{
-+ 5 0 moveto fname show
-+ 45 0 rmoveto fmodstr show
-+ 45 0 rmoveto pagenumstr show
-+ } {
-+ 5 0 moveto fmodstr show
-+ 45 0 rmoveto pagenumstr show
-+ fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto
-+ 1 1 fname length d_header_w 6 idiv idiv
-+ {
-+ dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show
-+ 5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto
-+ } for
-+ 5 10 moveto
-+ fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show
-+ }ifelse
-+ }ifelse
-+
-+ grestore
-+} def
++ fname length fmodstr length add pagenumstr length add 95 6 idiv add d_header_w 6 idiv le{
++ 5 0 moveto fname show
++ 45 0 rmoveto fmodstr show
++ 45 0 rmoveto pagenumstr show
++ } {
++ 5 0 moveto fmodstr show
++ 45 0 rmoveto pagenumstr show
++ fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto
++ 1 1 fname length d_header_w 6 idiv idiv
++ {
++ dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show
++ 5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto
++ } for
++ 5 10 moveto
++ fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show
++ }ifelse
++ }ifelse
+
+ grestore
+ } def
Index: enscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- enscript.spec 14 Dec 2009 13:01:28 -0000 1.45
+++ enscript.spec 21 May 2010 11:20:35 -0000 1.46
@@ -1,8 +1,8 @@
Summary: A plain ASCII to PostScript converter
Name: enscript
-Version: 1.6.4
-Release: 16%{?dist}
-License: GPLv2+
+Version: 1.6.5.1
+Release: 1%{?dist}
+License: GPLv3+
Group: Applications/Publishing
URL: http://www.gnu.org/software/enscript
# Tarball exists nowhere. You have to obtain it via:
@@ -14,24 +14,16 @@ Source1: enscript-ruby-1.6.4.tar.gz
Source2: enscript-php-1.6.4.st
#http://home.raxnet.net/downloads/viewcvs/php.st
-# Make `make DESTDIR=dir install` working
-Patch0: enscript-1.6.1-config.patch
# RH #177336
Patch1: enscript-1.6.4-hilight.patch
# RH #61294
Patch3: enscript-1.6.1-locale.patch
-# RH #132964
-Patch4: enscript-doublefree.patch
-
-Patch6: enscript-1.6.1-CAN-2004-1185.patch
-Patch7: enscript-1.6.1-CAN-2004-1186.patch
# RH #224548
Patch8: enscript-wrap_header.patch
Patch9: enscript-1.6.4-rh457719.patch
Patch10:enscript-1.6.4-rh457720.patch
-Patch11:enscript-CVE-2008-3863+CVE-2008-4306.patch
Patch12:enscript-rh477382.patch
Requires(preun): /sbin/install-info
Requires(post): /sbin/install-info
@@ -50,16 +42,11 @@ includes many options for customizing pr
%prep
%setup -q
-%patch0 -p1 -b .config
%patch1 -p1 -b .hilight
%patch3 -p1 -b .locale
-%patch4 -p1 -b .doublefree
-%patch6 -p1 -b .CAN-2004-1185
-%patch7 -p1 -b .CAN-2004-1186
%patch8 -p1 -b .wrap_header
%patch9 -p1 -b .rh457719
%patch10 -p1 -b .rh457720
-%patch11 -p0 -b .CVE-2008-3863+CVE-2008-4306
%patch12 -p1 -b .rh477382
%{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
@@ -121,6 +108,16 @@ fi
%config(noreplace) %{_sysconfdir}/enscript.cfg
%changelog
+* Thu May 20 2010 Adam Tkac <atkac redhat com> - 1.6.5.1-1
+- update to 1.6.5.1
+- patches merged
+ - enscript-1.6.1-config.patch
+ - enscript-doublefree.patch
+ - enscript-1.6.1-CAN-2004-1185.patch
+ - enscript-1.6.1-CAN-2004-1186.patch
+ - enscript-CVE-2008-3863+CVE-2008-4306.patch
+- license changed to GPLv3+
+
* Mon Dec 14 2009 Adam Tkac <atkac redhat com> - 1.6.4-16
- merge review related fixes (#225729)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 17 Feb 2006 15:33:18 -0000 1.4
+++ sources 21 May 2010 11:20:35 -0000 1.5
@@ -1,3 +1,3 @@
-b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz
-fa9c837b2a258716411f6df827d36eb3 enscript-ruby-1.6.4.tar.gz
f3a0083638ac3fddc493d44b6515182a enscript-php-1.6.4.st
+fa9c837b2a258716411f6df827d36eb3 enscript-ruby-1.6.4.tar.gz
+2d9568800bfa2831c82b6e216adaad78 enscript-1.6.5.1.tar.gz
--- enscript-1.6.1-CAN-2004-1185.patch DELETED ---
--- enscript-1.6.1-CAN-2004-1186.patch DELETED ---
--- enscript-1.6.1-config.patch DELETED ---
--- enscript-CVE-2008-3863+CVE-2008-4306.patch DELETED ---
--- enscript-doublefree.patch DELETED ---
More information about the scm-commits
mailing list