Hello community,
here is the log from the commit of package filters
checked in at Tue Feb 6 19:33:50 CET 2007.
--------
--- filters/filters.changes 2007-01-26 13:17:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/filters/filters.changes 2007-02-06 14:37:21.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 6 14:34:33 CET 2007 - werner@suse.de
+
+- Drop foo2zjs.tar.bz2 because it contains a copy of the JBIG
+ reference implementation from Markus Kuhn (bug #227702)
+- Fix array subscript running above array bounds (bug #242359)
+
+-------------------------------------------------------------------
Old:
----
foo2zjs.dif
foo2zjs.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filters.spec ++++++
--- /var/tmp/diff_new_pack.j29797/_old 2007-02-06 19:33:28.000000000 +0100
+++ /var/tmp/diff_new_pack.j29797/_new 2007-02-06 19:33:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package filters (Version 2007.1.26)
+# spec file for package filters (Version 2007.2.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
Requires: ghostscript_any
Autoreqprov: on
Summary: Printer Filters for HP, Lexmark, CaPSL, Citizen, and Apple
-Version: 2007.1.26
+Version: 2007.2.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://sourceforge.net/projects/pnm2ppa
@@ -30,7 +30,6 @@
Source5: pbm2l2030-1.4.tar.gz
Source6: ppmtomd-1.2.tar.bz2
Source7: stylewriter.tar.gz
-Source8: foo2zjs.tar.bz2
Source9: min12xxw-0.0.9.tar.bz2
Patch0: pnm2ppa-1.12.dif
Patch1: c2070-0.99.dif
@@ -40,7 +39,6 @@
Patch5: pbm2l2030-1.4.dif
Patch6: ppmtomd-1.2.dif
Patch7: stylewriter.dif
-Patch8: foo2zjs.dif
#Patch9: min12xxw-0.0.9.dif
%description
@@ -61,7 +59,7 @@
Tim Norman
%prep
-%setup -n pnm2ppa-1.12 -b1 -b2 -b3 -b4 -b5 -b6 -b7 -b8 -b9
+%setup -n pnm2ppa-1.12 -b1 -b2 -b3 -b4 -b5 -b6 -b7 -b9
chmod -R a+rX ..
%patch -P 0 -p 0
pushd ../c2070-*
@@ -85,9 +83,6 @@
pushd ../stylewriter
%patch -P 7 -p 0
popd
-pushd ../foo2zjs
-%patch -P 8 -p 0
-popd
pushd ../min12xxw*
#%patch -P 9 -p 0
popd
@@ -118,9 +113,6 @@
pushd ../stylewriter
make LINKFLAGS=
popd
-pushd ../foo2zjs
- make
-popd
pushd ../min12xxw*
./configure --prefix=/usr --exec-prefix=/usr --mandir=%{_mandir}
make
@@ -180,19 +172,14 @@
install -m 0644 README.protocol $RPM_BUILD_ROOT%{_docdir}/filters/README.protocol.stylewriter
install -m 0644 README.troubleshooting $RPM_BUILD_ROOT%{_docdir}/filters/README.troubleshooting.stylewriter
popd
-pushd ../foo2zjs
- make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr
- rm -rf ${RPM_BUILD_ROOT}/usr/share/foomatic/
- rm -rf ${RPM_BUILD_ROOT}/usr/share/cups/model/
-popd
pushd ../min12xxw*
make install DESTDIR=$RPM_BUILD_ROOT
mkdir ${RPM_BUILD_ROOT}%{_docdir}/filters/min12xxw
install -m 0644 AUTHORS COPYING ChangeLog FAQ NEWS README \
${RPM_BUILD_ROOT}%{_docdir}/filters/min12xxw/
popd
-for file in arm2hpdl c2070 cZ11 cjet foo2zjs lm1100 lpstyl pbm2l2030 \
- ppmtomd pnm2ppa calibrate_ppa usb_printerid zjsdecode min12xxw
+for file in c2070 cZ11 cjet lm1100 lpstyl pbm2l2030 \
+ ppmtomd pnm2ppa calibrate_ppa min12xxw
do
# strip $RPM_BUILD_ROOT/usr/bin/$file # serves also as file exist check
test -x $RPM_BUILD_ROOT/usr/bin/$file
@@ -203,14 +190,6 @@
/usr/bin/*
%dir /usr/share/filters
/usr/share/filters/cZ11
-%dir /usr/share/filters/foo2oak
-%dir %attr(755,lp,lp) /usr/share/filters/foo2oak/icm
-%dir /usr/share/filters/foo2zjs
-/usr/share/filters/foo2zjs/*.ps
-%dir %attr(755,lp,lp) /usr/share/filters/foo2zjs/crd
-/usr/share/filters/foo2zjs/crd/*
-%dir %attr(755,lp,lp) /usr/share/filters/foo2zjs/firmware
-%dir %attr(755,lp,lp) /usr/share/filters/foo2zjs/icm
#/usr/share/foomatic/
#/usr/share/cups/model/
%config(noreplace) /etc/pnm2ppa.conf
@@ -218,6 +197,10 @@
%doc %{_docdir}/%{name}/
%changelog -n filters
+* Tue Feb 06 2007 - werner@suse.de
+- Drop foo2zjs.tar.bz2 because it contains a copy of the JBIG
+ reference implementation from Markus Kuhn (bug #227702)
+- Fix array subscript running above array bounds (bug #242359)
* Fri Jan 26 2007 - ro@suse.de
- replace ghostscript-mini by ghostscript_any in BuildReq (#119914)
* Tue Oct 31 2006 - meissner@suse.de
++++++ pbm2l2030-1.4.dif ++++++
--- /var/tmp/diff_new_pack.j29797/_old 2007-02-06 19:33:28.000000000 +0100
+++ /var/tmp/diff_new_pack.j29797/_new 2007-02-06 19:33:28.000000000 +0100
@@ -1,5 +1,5 @@
--- makefile
-+++ makefile
++++ makefile 2007-02-06 00:00:00.000000000 +0100
@@ -4,15 +4,15 @@
# the main target: pbm2l2030 binary
@@ -19,7 +19,7 @@
# use this to test your printing configuration
test:
-@@ -20,7 +20,8 @@
+@@ -20,7 +20,8 @@ test:
# install the driver into existing apsfilter (as root!)
install: pbm2l2030
@@ -30,7 +30,7 @@
# remove all files (to rebuild package)
clean:
--- pbm.c
-+++ pbm.c
++++ pbm.c 2007-02-06 00:00:00.000000000 +0100
@@ -13,6 +13,7 @@
*
*/
@@ -39,7 +39,7 @@
#include
#include
-@@ -59,7 +60,7 @@
+@@ -59,7 +60,7 @@ static int getbytes(FILE *fptr,int width
int num;
if(!width) return 0;
@@ -49,15 +49,15 @@
switch(getc(fptr))
{
--- pbm.h
-+++ pbm.h
-@@ -25,4 +25,4 @@
++++ pbm.h 2007-02-06 00:00:00.000000000 +0100
+@@ -25,4 +25,4 @@ int make_pbm_stat(pbm_stat*,FILE*);
int pbm_readline(pbm_stat*,char*); /* reads a single line into char* */
void pbm_unreadline(pbm_stat*,void*); /* pushes a single line back */
-#endif;
+#endif
--- pbm2l2030.c
-+++ pbm2l2030.c
++++ pbm2l2030.c 2007-02-06 14:50:10.000000000 +0100
@@ -44,6 +44,8 @@
#define CARTRIDGE_PENS 52
#define LEFT_MARGIN 20
@@ -67,7 +67,80 @@
/***************************************************************************
* Funktion: lex_move *
* Parameter: Zeiger auf Ausgabedatei, Pixel vertik. Versch. *
-@@ -256,7 +258,7 @@
+@@ -70,7 +72,7 @@ void lex_init(FILE *out)
+ int i;
+ char buffer[] = {0x1B,0x2A,0x80,0x1B,0x2A,0x07,
+ 0x73,0x30,0x1B,0x2A,0x07,0x63};
+- for(i=0; i<=11; fprintf(out, "%c", buffer[i++]));
++ for(i=0; i
