diff --git a/.gitignore b/.gitignore index c49f9d3..5690a98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ pnm2ppa-1.04.tar.gz ppa-0.8.6.tar.gz +/pnm2ppa-1.13.tar.gz diff --git a/pnm2ppa-coverity-return-local.patch b/pnm2ppa-coverity-return-local.patch index ce7e1d3..ab9c682 100644 --- a/pnm2ppa-coverity-return-local.patch +++ b/pnm2ppa-coverity-return-local.patch @@ -1,7 +1,7 @@ -diff -up pnm2ppa-1.04/calibrate_ppa.c.coverity-return-local pnm2ppa-1.04/calibrate_ppa.c ---- pnm2ppa-1.04/calibrate_ppa.c.coverity-return-local 2000-11-11 22:22:38.000000000 +0000 -+++ pnm2ppa-1.04/calibrate_ppa.c 2011-05-20 16:04:23.233425268 +0100 -@@ -75,7 +75,7 @@ main (int argc, char *argv[]) +diff -up pnm2ppa-1.13/calibrate_ppa.c.coverity-return-local pnm2ppa-1.13/calibrate_ppa.c +--- pnm2ppa-1.13/calibrate_ppa.c.coverity-return-local 2009-12-12 20:14:55.000000000 +0100 ++++ pnm2ppa-1.13/calibrate_ppa.c 2023-10-20 13:34:21.570205199 +0200 +@@ -80,7 +80,7 @@ main (int argc, char *argv[]) BOOLEAN gamma = false ; FILE *outFile = NULL ; int testPattern = 0; @@ -10,7 +10,7 @@ diff -up pnm2ppa-1.04/calibrate_ppa.c.coverity-return-local pnm2ppa-1.04/calibra char c; static struct option long_opts[] = { {"gamma",0,0,'g'}, -@@ -157,9 +157,7 @@ main (int argc, char *argv[]) +@@ -162,9 +162,7 @@ main (int argc, char *argv[]) { if ( strlen(optarg) < MAXPATHLEN ) { @@ -21,10 +21,10 @@ diff -up pnm2ppa-1.04/calibrate_ppa.c.coverity-return-local pnm2ppa-1.04/calibra use_stdout = false ; } } -diff -up pnm2ppa-1.04/pnm2ppa.c.coverity-return-local pnm2ppa-1.04/pnm2ppa.c ---- pnm2ppa-1.04/pnm2ppa.c.coverity-return-local 2000-11-11 19:53:03.000000000 +0000 -+++ pnm2ppa-1.04/pnm2ppa.c 2011-05-20 16:04:23.234425246 +0100 -@@ -145,20 +145,15 @@ print_pnm (FILE * fptr) +diff -up pnm2ppa-1.13/pnm2ppa.c.coverity-return-local pnm2ppa-1.13/pnm2ppa.c +--- pnm2ppa-1.13/pnm2ppa.c.coverity-return-local 2023-10-20 13:34:21.570205199 +0200 ++++ pnm2ppa-1.13/pnm2ppa.c 2023-10-20 13:38:05.524230753 +0200 +@@ -148,21 +148,15 @@ print_pnm (FILE * fptr) char * readPath(char *input ) { @@ -39,7 +39,8 @@ diff -up pnm2ppa-1.04/pnm2ppa.c.coverity-return-local pnm2ppa-1.04/pnm2ppa.c - a user-specifed file *File_path may later be opened; - should any extra validation of this be performed now ? - */ -- path = File_path; +- /* remember to free(path) after use! */ +- path = strdup(File_path); - return path; - } + path = strdup(input); diff --git a/pnm2ppa-gcc10.patch b/pnm2ppa-gcc10.patch index 223f310..8b77aa3 100644 --- a/pnm2ppa-gcc10.patch +++ b/pnm2ppa-gcc10.patch @@ -1,19 +1,6 @@ -diff --git a/syslog.c b/syslog.c -index e70f12c..af067e2 100644 ---- a/syslog.c -+++ b/syslog.c -@@ -27,6 +27,7 @@ - #include "global.h" - - -+char syslog_message[128]; - - /* - For some reason, BeOS doesn't seem to implement syslog(), even though it is -diff --git a/syslog.h b/syslog.h -index 7d0e436..5c1accd 100644 ---- a/syslog.h -+++ b/syslog.h +diff -up pnm2ppa-1.13/ppa_syslog.h.gcc10 pnm2ppa-1.13/ppa_syslog.h +--- pnm2ppa-1.13/ppa_syslog.h.gcc10 2023-10-20 14:27:00.381590872 +0200 ++++ pnm2ppa-1.13/ppa_syslog.h 2023-10-20 14:27:10.052671328 +0200 @@ -39,7 +39,7 @@ #include #endif @@ -23,3 +10,15 @@ index 7d0e436..5c1accd 100644 extern size_t message_size ; void wrap_syslog( int, char *, char *); +diff -up pnm2ppa-1.13/syslog.c.gcc10 pnm2ppa-1.13/syslog.c +--- pnm2ppa-1.13/syslog.c.gcc10 2023-10-20 14:23:10.093285301 +0200 ++++ pnm2ppa-1.13/syslog.c 2023-10-20 14:26:04.925129503 +0200 +@@ -33,6 +33,8 @@ + + BOOLEAN verbose = false ; + ++char syslog_message[128]; ++ + /* + For some reason, BeOS doesn't seem to implement syslog(), even though it is + included with the system. Wierd. This wraps the syslog functions used diff --git a/pnm2ppa-ldflags.patch b/pnm2ppa-ldflags.patch index 53b4e78..317dc1f 100644 --- a/pnm2ppa-ldflags.patch +++ b/pnm2ppa-ldflags.patch @@ -1,39 +1,18 @@ -diff -up pnm2ppa-1.04/Makefile.ldflags pnm2ppa-1.04/Makefile ---- pnm2ppa-1.04/Makefile.ldflags 2018-03-01 15:38:09.225582684 +0100 -+++ pnm2ppa-1.04/Makefile 2018-03-01 15:50:34.307261745 +0100 -@@ -11,7 +11,6 @@ INSTALL=install +diff -up pnm2ppa-1.13/Makefile.am.ldflags pnm2ppa-1.13/Makefile.am +--- pnm2ppa-1.13/Makefile.am.ldflags 2023-10-20 13:52:38.470722125 +0200 ++++ pnm2ppa-1.13/Makefile.am 2023-10-20 13:53:24.625056218 +0200 +@@ -125,7 +125,7 @@ CLEANFILES = hash_ink.c make_hash_ink + CC_FOR_BUILD = @CC_FOR_BUILD@ + CFLAGS_FOR_BUILD = $(RPM_OPT_FLAGS) -O2 + CPPFLAGS_FOR_BUILD = -I$(top_srcdir) +-LDFLAGS_FOR_BUILD = ++LDFLAGS_FOR_BUILD = $(LDFLAGS) + LDLIBS_FOR_BUILD = - # production build - CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG --LDFLAGS=-lm - OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o - SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c - -@@ -108,10 +107,10 @@ uninstall: - rm -f $(CONFDIR)/pnm2ppa.conf - - pnm2ppa: $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS) -+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS) - - calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o -- $(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o -+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o - - calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h - $(CC) $(CFLAGS) -c calibrate_ppa.c -@@ -144,7 +143,7 @@ syslog.o: syslog.c syslog.h global.h - $(CC) $(CFLAGS) -c syslog.c - - make_hash_ink: make_hash_ink.c palette.h hash_ink.h -- $(CC) $(CFLAGS) -o make_hash_ink make_hash_ink.c -+ $(CC) $(CFLAGS) -lm $(LDFLAGS) -o make_hash_ink make_hash_ink.c - - hash_ink.c: make_hash_ink - ./make_hash_ink 4 3 > hash_ink.c -diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile ---- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags 2018-03-01 15:38:09.226582676 +0100 -+++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2018-03-01 15:53:22.016739424 +0100 + make_hash_ink: make_hash_ink.c +diff -up pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile.ldflags pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile +--- pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile.ldflags 2023-10-20 13:39:19.049686539 +0200 ++++ pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile 2023-10-20 13:39:19.053686629 +0200 @@ -1,6 +1,5 @@ CC=gcc CFLAGS=$(RPM_OPT_FLAGS) diff --git a/pnm2ppa-optargs-read.patch b/pnm2ppa-optargs-read.patch deleted file mode 100644 index a837955..0000000 --- a/pnm2ppa-optargs-read.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pnm2ppa.c b/pnm2ppa.c -index 4ae36ce..0d60fbb 100644 ---- a/pnm2ppa.c -+++ b/pnm2ppa.c -@@ -604,7 +604,7 @@ main (int argc, char *argv[]) - int i, opt_index; - FILE *in = NULL, *out = NULL, *gf = NULL; - struct stat tmpstat; -- char c; -+ int c; - BOOLEAN get_Gamma = true; - - char *gammaFile=NULL; diff --git a/pnm2ppa-redhat.patch b/pnm2ppa-redhat.patch index f3294a1..677b2f4 100644 --- a/pnm2ppa-redhat.patch +++ b/pnm2ppa-redhat.patch @@ -1,18 +1,18 @@ -diff -up pnm2ppa-1.04/Makefile.rh pnm2ppa-1.04/Makefile ---- pnm2ppa-1.04/Makefile.rh 2000-11-02 18:33:08.000000000 +0000 -+++ pnm2ppa-1.04/Makefile 2008-09-24 15:18:26.000000000 +0100 -@@ -10,7 +10,7 @@ CC=gcc - INSTALL=install - - # production build --CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG -+CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG - LDFLAGS=-lm - OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o - SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c -diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile ---- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh 2008-09-24 15:18:26.000000000 +0100 -+++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2008-09-24 15:18:26.000000000 +0100 +diff -up pnm2ppa-1.13/Makefile.am.rh pnm2ppa-1.13/Makefile.am +--- pnm2ppa-1.13/Makefile.am.rh 2023-10-20 13:22:50.893888824 +0200 ++++ pnm2ppa-1.13/Makefile.am 2023-10-20 13:30:33.506822860 +0200 +@@ -123,7 +123,7 @@ CLEANFILES = hash_ink.c make_hash_ink + # run on the build host in case of cross compiling) + # + CC_FOR_BUILD = @CC_FOR_BUILD@ +-CFLAGS_FOR_BUILD = -O2 ++CFLAGS_FOR_BUILD = $(RPM_OPT_FLAGS) -O2 + CPPFLAGS_FOR_BUILD = -I$(top_srcdir) + LDFLAGS_FOR_BUILD = + LDLIBS_FOR_BUILD = +diff -up pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile.rh pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile +--- pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile.rh 2023-10-20 13:18:54.058176682 +0200 ++++ pnm2ppa-1.13/pbm2ppa-0.8.6/Makefile 2023-10-20 13:18:54.061176659 +0200 @@ -1,5 +1,5 @@ CC=gcc -CFLAGS=-Wall -O2 @@ -20,14 +20,4 @@ diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh pnm2ppa-1.04/pbm2ppa-0.8.6/Makef LDFLAGS= PRINTER=HP720 -diff -up pnm2ppa-1.04/pnm2ppa.conf.rh pnm2ppa-1.04/pnm2ppa.conf ---- pnm2ppa-1.04/pnm2ppa.conf.rh 2000-10-28 16:02:57.000000000 +0100 -+++ pnm2ppa-1.04/pnm2ppa.conf 2008-09-24 15:18:26.000000000 +0100 -@@ -12,7 +12,6 @@ - # will be used. The printer version can also be set with the command line - # option e.g., "-v 720". - --version ERROR # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!! - #version 720 # 710, 712, 722 also acceptable - #version 820 - #version 1000 +diff -up pnm2ppa-1.13/pnm2ppa.conf.rh pnm2ppa-1.13/pnm2ppa.conf diff --git a/pnm2ppa.spec b/pnm2ppa.spec index 9cb6e26..1691768 100644 --- a/pnm2ppa.spec +++ b/pnm2ppa.spec @@ -1,26 +1,30 @@ Name: pnm2ppa Summary: Drivers for printing to HP PPA printers Epoch: 1 -Version: 1.04 -Release: 55%{?dist} +Version: 1.13 +Release: 1%{?dist} URL: http://sourceforge.net/projects/pnm2ppa Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz # Following sourcelink is dead currently. Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz # Upstream sync. -Patch2: pbm2ppa-20000205.diff +Patch1: pbm2ppa-20000205.diff # Use RPM_OPT_FLAGS. -Patch3: pnm2ppa-redhat.patch +Patch2: pnm2ppa-redhat.patch # Don't return a local variable out of scope (bug #704568). -Patch4: pnm2ppa-coverity-return-local.patch +Patch3: pnm2ppa-coverity-return-local.patch +# FTBFS with GCC10 +Patch4: pnm2ppa-gcc10.patch # add ldflags to Makefile Patch5: pnm2ppa-ldflags.patch -# FTBFS with GCC 10 -Patch6: pnm2ppa-gcc10.patch -# fix argument reading for non x86_64 archs - use int instead of char -Patch7: pnm2ppa-optargs-read.patch -License: GPLv2+ +# pbm2ppa, pnm2ppa - GPL-2.0-or-later +# pdq/* - GPL-2.0, but not shipped, thus not mentioned in license tag +License: GPL-2.0-or-later +# for autoreconf +BuildRequires: autoconf +# for autoreconf +BuildRequires: automake # gcc is no longer in buildroot by default BuildRequires: gcc # uses make @@ -42,12 +46,11 @@ Install pnm2ppa if you need to print to a PPA printer. #pbm2ppa source %setup -q -T -D -a 1 -%patch2 -p0 -b .20000205 -%patch3 -p1 -b .rh -%patch4 -p1 -b .coverity-return-local -%patch5 -p1 -b .ldflags -%patch6 -p1 -b .gcc10 -%patch7 -p1 -b .optargs-read +%patch -P 1 -p0 -b .20000205 +%patch -P 2 -p1 -b .rh +%patch -P 3 -p1 -b .coverity-return-local +%patch -P 4 -p1 -b .gcc10 +%patch -P 5 -p1 -b .ldflags for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do sed "s|\r||g" $file > $file.new && \ @@ -55,9 +58,12 @@ for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do mv $file.new $file done +autoreconf -vfi + %build # set redhat build flags %set_build_flags +%configure %make_build pushd pbm2ppa-0.8.6 %make_build @@ -65,17 +71,17 @@ popd %install -install -d $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_sysconfdir} -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -make INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir} \ - MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install -install -p -m 0755 utils/Linux/detect_ppa $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 utils/Linux/test_ppa $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 pbm2ppa-0.8.6/pbm2ppa $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 pbm2ppa-0.8.6/pbmtpg $RPM_BUILD_ROOT%{_bindir} -install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_sysconfdir} +install -d %{buildroot}%{_mandir}/man1 +make INSTALLDIR=%{buildroot}%{_bindir} CONFDIR=%{buildroot}%{_sysconfdir} DESTDIR=%{buildroot} \ + MANDIR=%{buildroot}%{_mandir}/man1 install +install -p -m 0755 utils/Linux/detect_ppa %{buildroot}%{_bindir} +install -p -m 0755 utils/Linux/test_ppa %{buildroot}%{_bindir} +install -p -m 0755 pbm2ppa-0.8.6/pbm2ppa %{buildroot}%{_bindir} +install -p -m 0755 pbm2ppa-0.8.6/pbmtpg %{buildroot}%{_bindir} +install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf %{buildroot}%{_sysconfdir} +install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.1 %{buildroot}%{_mandir}/man1 chmod 644 docs/en/LICENSE mkdir -p pbm2ppa @@ -104,6 +110,10 @@ done %config(noreplace) %{_sysconfdir}/pbm2ppa.conf %changelog +* Fri Oct 20 2023 Zdenek Dohnal - 1:1.13-1 +- rebase to 1.13 +- license rescan and SPDX conversion + * Fri Jul 21 2023 Fedora Release Engineering - 1:1.04-55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 873edfc..02f8fef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8db1f0dcdb3cf86d8ccb9a34007b9e21 pnm2ppa-1.04.tar.gz -fb40576435d5979db64fbea305ec224b ppa-0.8.6.tar.gz +SHA512 (pnm2ppa-1.13.tar.gz) = 8f96792cf7f03fd024db9a8d338f06d7484fa4474c1cd73048c90f0e88ae5540df30e6894c0bbc82dfd87126fc72875b6d71b2031c0e24b343ef88f51d00bb7a +SHA512 (ppa-0.8.6.tar.gz) = e23769b340197888d5bce4d6b3d015197c5663d6ece1c2488b91e8f6ef25e21fdb832f54a579ed854ba5482b7e5c2271b9b4975c5593826de15ee34cf6d68cff