commit 116fa7a2fd590c35e70b556d5b224857aa7599a2
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 16 17:25:15 2014 +0100
- updated to 2.1 (fixes CVE-2013-6369)
- updated shared patch
jbigkit-shared.patch | 86 ++++++++++++++++++++++------------------------------
jbigkit.pl.po | 24 +++++++--------
jbigkit.spec | 10 +++---
3 files changed, 54 insertions(+), 66 deletions(-)
---
diff --git a/jbigkit.spec b/jbigkit.spec
index 4fa37d0..ef63912 100644
--- a/jbigkit.spec
+++ b/jbigkit.spec
@@ -5,12 +5,12 @@
Summary: JBIG-KIT lossless image compression library
Summary(pl.UTF-8): JBIG-KIT - biblioteka do bezstratnej kompresji obrazków
Name: jbigkit
-Version: 2.0
-Release: 2
+Version: 2.1
+Release: 1
License: GPL v2+
Group: Libraries
-Source0:
http://www.cl.cam.ac.uk/~mgk25/download/%{name}-%{version}.tar.gz
-# Source0-md5: 3dd87f605abb1a97a22dc79d8b3e8f6c
+Source0:
http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/%{name}-%{version}.tar.gz
+# Source0-md5: ebcf09bed9f14d7fa188d3bd57349522
Source1: %{name}.pl.po
Patch0: %{name}-shared.patch
URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/
@@ -66,7 +66,7 @@ Package contains utilities to convert between JBIG and PBM
images.
Narzędzia do konwersji plików między formatami JBIG i PBM.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
cp %{SOURCE1} libjbig/po/pl.po
diff --git a/jbigkit-shared.patch b/jbigkit-shared.patch
index b4a3162..f5dfcb2 100644
--- a/jbigkit-shared.patch
+++ b/jbigkit-shared.patch
@@ -1,23 +1,23 @@
---- jbigkit/libjbig/Makefile.orig 2008-08-30 19:20:52.000000000 +0200
-+++ jbigkit/libjbig/Makefile 2010-03-20 13:27:12.610721140 +0100
-@@ -4,10 +4,11 @@
+--- jbigkit-2.1/libjbig/Makefile.orig 2014-11-16 16:52:22.715940948 +0100
++++ jbigkit-2.1/libjbig/Makefile 2014-11-16 17:13:54.832553505 +0100
+@@ -3,33 +3,34 @@
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
CC = gcc
-# Options for the compiler: A high optimization level is suggested
--CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
-
--all: libjbig.a tstcodec tstcodec85
+-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
+-
+-all: libjbig.a libjbig85.a tstcodec tstcodec85
+all: libjbig.la libjbig85.la tstcodec tstcodec85
-+
+
+%.lo: %.c
+ libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -c $*.c
-
++
tstcodec: tstcodec.o jbig.o jbig_ar.o
- $(CC) $(CFLAGS) -o tstcodec $+
-@@ -15,22 +16,23 @@
+ $(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
+
tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
- $(CC) $(CFLAGS) -o tstcodec85 $+
+ $(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
-libjbig.a: jbig.o jbig_ar.o
- rm -f libjbig.a
@@ -33,10 +33,10 @@
-jbig85.o: jbig85.c jbig85.h jbig_ar.h
-jbig_ar.o: jbig_ar.c jbig_ar.h
+libjbig.la: jbig.lo jbig_ar.lo
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath
$(libdir) -version-info 2:0:0
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath
$(libdir) -version-info 2:1:0
+
+libjbig85.la: jbig85.lo jbig_ar.lo
-+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath
$(libdir) -version-info 2:0:0
++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath
$(libdir) -version-info 2:1:0
+
+jbig.lo: jbig.c jbig.h jbig_ar.h
+jbig85.lo: jbig85.c jbig85.h jbig_ar.h
@@ -49,22 +49,22 @@
+ libtool --mode=install install libjbig85.la $(DESTDIR)$(libdir)
+ install -m644 jbig.h jbig85.h jbig_ar.h $(DESTDIR)$(includedir)
+
- jbig.pot: jbig.c
- xgettext -o$@ -k_ \
+ update-po: jbig.c jbig85.c Makefile
+ xgettext -ojbig.pot -k_ \
--copyright-holder='Markus Kuhn' \
---- jbigkit/pbmtools/Makefile.orig 2008-08-26 00:26:39.000000000 +0200
-+++ jbigkit/pbmtools/Makefile 2010-03-20 13:23:22.094704379 +0100
-@@ -5,37 +5,41 @@
+--- jbigkit-2.1/pbmtools/Makefile.orig 2014-11-16 16:52:22.715940948 +0100
++++ jbigkit-2.1/pbmtools/Makefile 2014-11-16 17:16:13.279214240 +0100
+@@ -4,7 +4,6 @@
CC = gcc
# Options for the compiler
--CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
-+CPPFLAGS = -I../libjbig
+-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
+ CPPFLAGS = -I../libjbig
.SUFFIXES: .1 .5 .txt $(SUFFIXES)
+@@ -14,30 +13,34 @@
- all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
- pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
+ txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
- $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
@@ -107,13 +107,13 @@
+ libtool --mode=install install pbmtojbg jbgtopbm $(DESTDIR)$(bindir)
+ install pbmtojbg.1 jbgtopbm.1 $(DESTDIR)$(mandir)/man1
- test: test82 test85
+ analyze:
+ clang $(CPPFLAGS) --analyze *.c
+--- jbigkit-2.1/Makefile.orig 2014-11-16 16:52:22.752607611 +0100
++++ jbigkit-2.1/Makefile 2014-11-16 17:19:54.552538286 +0100
+@@ -11,15 +11,26 @@
---- jbigkit/Makefile.orig 2010-03-20 13:23:31.746709407 +0100
-+++ jbigkit/Makefile 2010-03-20 13:26:52.578704379 +0100
-@@ -12,23 +12,34 @@
-
- VERSION=2.0
+ VERSION=2.1
+prefix=/usr/local
+libdir=$(prefix)/lib
@@ -125,30 +125,18 @@
@echo "Enter 'make test' in order to start some automatic tests."
lib:
-- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-+ $(MAKE) -C libjbig "libdir=$(libdir)"
+- cd libjbig && $(MAKE) -e
++ $(MAKE) -C libjbig -e
pbm: lib
-- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-+ $(MAKE) -C pbmtools "bindir=$(bindir)" "mandir=$(mandir)"
+- cd pbmtools && $(MAKE) -e
++ $(MAKE) -C pbmtools -e
- test: lib pbm
-- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
-- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
-+ $(MAKE) -C libjbig test
-+ $(MAKE) -C pbmtools test
-+
+install:
-+ install -d $(DESTDIR)/usr/{bin,lib,include,share/man/man1}
++ install -d $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
$(DESTDIR)$(includedir) $(DESTDIR)$(mandir)/man1
+ $(MAKE) -C libjbig install "DESTDIR=$(DESTDIR)" "libdir=$(libdir)"
"includedir=$(includedir)"
+ $(MAKE) -C pbmtools install "DESTDIR=$(DESTDIR)" "bindir=$(bindir)"
"mandir=$(mandir)"
-
- clean:
- rm -f *~ core
-- (cd libjbig; make clean)
-- (cd pbmtools; make clean)
-+ $(MAKE) -C libjbig clean
-+ $(MAKE) -C pbmtools clean
-
- distribution: clean
- rm -f libjbig/libjbig*.a
++
+ test: lib pbm
+ cd libjbig && $(MAKE) test
+ cd pbmtools && $(MAKE) test
diff --git a/jbigkit.pl.po b/jbigkit.pl.po
index 1d9baa8..18864f4 100644
--- a/jbigkit.pl.po
+++ b/jbigkit.pl.po
@@ -1,51 +1,51 @@
# Polish translation for jbigkit.
# This file is distributed under the same license as the jbigkit package.
-# Jakub Bogusz <[email protected]>, 2010
+# Jakub Bogusz <[email protected]>, 2010-2014
#
msgid ""
msgstr ""
"Project-Id-Version: jbigkit 2.0\n"
"Report-Msgid-Bugs-To: http://www.cl.cam.ac.uk/~mgk25/jbigkit/\n";
-"POT-Creation-Date: 2008-08-27 19:54+0100\n"
-"PO-Revision-Date: 2010-03-20 14:09+0100\n"
+"POT-Creation-Date: 2014-03-24 15:35+0000\n"
+"PO-Revision-Date: 2014-11-16 16:45+0100\n"
"Last-Translator: Jakub Bogusz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: jbig.c:110
+#: jbig.c:98 jbig85.c:69
msgid "All OK"
msgstr "Poprawnie"
-#: jbig.c:111
+#: jbig.c:99 jbig85.c:70
msgid "Reached specified image size"
msgstr "Osiągnięto określony rozmiar obrazu"
-#: jbig.c:112
+#: jbig.c:100 jbig85.c:71
msgid "Unexpected end of input data stream"
msgstr "Nieoczekiwany koniec strumienia danych wejściowych"
-#: jbig.c:113
+#: jbig.c:101 jbig85.c:72
msgid "Not enough memory available"
msgstr "Zbyt mało dostępnej pamięci"
-#: jbig.c:114
+#: jbig.c:102 jbig85.c:73
msgid "ABORT marker segment encountered"
msgstr "Napotkano segment znacznika ABORT"
-#: jbig.c:115
+#: jbig.c:103 jbig85.c:74
msgid "Unknown marker segment encountered"
msgstr "Napotkano segment nieznanego znacznika"
-#: jbig.c:116
+#: jbig.c:104 jbig85.c:75
msgid "Input data stream contains invalid data"
msgstr "Strumień danych wejściowych zawiera błędne dane"
-#: jbig.c:117
+#: jbig.c:105 jbig85.c:76
msgid "Input data stream uses unimplemented JBIG features"
msgstr "Strumień danych wejściowych korzysta z niezaimplementowanych cech JBIG"
-#: jbig.c:118
+#: jbig.c:106
msgid "Incremental BIE does not continue previous one"
msgstr "Przyrostowe dane obrazu nie są kontynuacją poprzednich"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jbigkit.git/commitdiff/116fa7a2fd590c35e70b556d5b224857aa7599a2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
