rpm/jbigkit
SHA256
1
0
Fork 0
forked from pool/jbigkit
Code Pull Requests Activity

Accepting request 230269 from graphics

Browse Source 
Improve .changes entry per mrdocs

OBS-URL: https://build.opensuse.org/request/show/230269
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jbigkit?expand=0&rev=9
This commit is contained in:
Tomáš Chvátal 2014-04-17 12:43:59 +00:00 committed by Git OBS Bridge
commit fb8884421f
5 changed files with 68 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jbigkit-2.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee
size 435027

100
jbigkit-2.0-shlib.patch → jbigkit-2.1-shlib.patch
View File

@ -1,28 +1,28 @@
diff -aur jbigkit/libjbig/Makefile jbigkit+/libjbig/Makefile diff -ruN jbigkit-2.1/libjbig/Makefile jbigkit-2.1-shlib/libjbig/Makefile
--- jbigkit/libjbig/Makefile 2008-08-30 13:20:52.000000000 -0400 --- jbigkit-2.1/libjbig/Makefile 2014-03-27 14:47:15.000000000 -0400
+++ jbigkit+/libjbig/Makefile 2012-04-12 04:56:11.000000000 -0400 +++ jbigkit-2.1-shlib/libjbig/Makefile 2014-04-14 19:54:00.000000000 -0400
@@ -2,28 +2,33 @@ @@ -1,28 +1,33 @@
# $Id: Makefile 1285 2008-08-18 13:36:45Z mgk25 $ # Unix makefile for the JBIG-KIT library
# Select an ANSI/ISO C compiler here, GNU gcc is recommended # Select an ANSI/ISO C compiler here, GNU gcc is recommended
-CC = gcc -CC = gcc
+CC ?= gcc +CC ?= gcc
# Options for the compiler: A high optimization level is suggested # Options for the compiler: A high optimization level is suggested
-CFLAGS = -g -O -Wall -ansi -pedantic # --coverage -CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
+CFLAGS ?= -g -O -Wall -ansi -pedantic # --coverage +CFLAGS ?= -g -O -W -Wall -ansi -pedantic # --coverage
+PICFLAGS := -fPIC -DPIC +PICFLAGS := -fPIC -DPIC
-all: libjbig.a tstcodec tstcodec85 -all: libjbig.a libjbig85.a tstcodec tstcodec85
+all: libjbig.so.$(SOVERSION) libjbig85.so.$(SOVERSION) tstcodec tstcodec85 +all: libjbig.so.$(SOVERSION) libjbig85.so.$(SOVERSION) tstcodec tstcodec85
-tstcodec: tstcodec.o jbig.o jbig_ar.o -tstcodec: tstcodec.o jbig.o jbig_ar.o
- $(CC) $(CFLAGS) -o tstcodec $+ - $(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
+tstcodec: tstcodec.o libjbig.so +tstcodec: tstcodec.o libjbig.so
+ $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig + $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig
-tstcodec85: tstcodec85.o jbig85.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
+tstcodec85: tstcodec85.o libjbig85.so +tstcodec85: tstcodec85.o libjbig85.so
+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig + $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
@ -50,8 +50,8 @@ diff -aur jbigkit/libjbig/Makefile jbigkit+/libjbig/Makefile
jbig.o: jbig.c jbig.h jbig_ar.h jbig.o: jbig.c jbig.h jbig_ar.h
jbig85.o: jbig85.c jbig85.h jbig_ar.h jbig85.o: jbig85.c jbig85.h jbig_ar.h
@@ -37,12 +42,12 @@ @@ -43,13 +48,13 @@
--msgid-bugs-address='http://www.cl.cam.ac.uk/~mgk25/jbigkit/' $+ clang --analyze *.c
test: tstcodec tstcodec85 test: tstcodec tstcodec85
- ./tstcodec - ./tstcodec
@ -64,75 +64,85 @@ diff -aur jbigkit/libjbig/Makefile jbigkit+/libjbig/Makefile
+ LD_LIBRARY_PATH=`pwd` ./tstcodec $@ + LD_LIBRARY_PATH=`pwd` ./tstcodec $@
clean: clean:
rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm rm -f *.o *.gcda *.gcno *.gcov *.plist *~ core gmon.out dbg_d\=??.pbm
rm -f t82test.pbm
- rm -f tstcodec tstcodec85 - rm -f tstcodec tstcodec85
+ rm -f tstcodec tstcodec85 libjbig*.so libjbig*.so.$(SOVERSION) libjbig*.so.$(VERSION) + rm -f tstcodec tstcodec85 libjbig*.so libjbig*.so.$(SOVERSION) libjbig*.so.$(VERSION)
diff -aur jbigkit/Makefile jbigkit+/Makefile diff -ruN jbigkit-2.1/Makefile jbigkit-2.1-shlib/Makefile
--- jbigkit/Makefile 2008-08-30 16:40:22.000000000 -0400 --- jbigkit-2.1/Makefile 2014-03-27 14:47:15.000000000 -0400
+++ jbigkit+/Makefile 2012-04-12 04:55:40.000000000 -0400 +++ jbigkit-2.1-shlib/Makefile 2014-04-14 20:59:40.000000000 -0400
@@ -2,33 +2,35 @@ @@ -1,37 +1,39 @@
# $Id: Makefile 1303 2008-08-30 20:16:20Z mgk25 $ # Unix makefile for JBIG-KIT
# Select an ANSI/ISO C compiler here, GNU gcc is recommended # Select an ANSI/ISO C compiler here, GNU gcc is recommended
-CC = gcc -CC = gcc
+CC ?= gcc +CC ?= gcc
# Options for the compiler: A high optimization level is suggested # Options for the compiler: A high optimization level is suggested
CCFLAGS = -O2 -W -CFLAGS = -O2 -W -Wno-unused-result
#CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only +CFLAGS ?= -O2 -W -Wno-unused-result
# CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
-CFLAGS = $(CCFLAGS) -I../libjbig export CC CFLAGS
+CFLAGS ?= $(CCFLAGS) -I../libjbig
VERSION=2.0 VERSION=2.1
+SOVERSION = $(basename $(VERSION)) +SOVERSION = $(basename $(VERSION))
+export VERSION SOVERSION CFLAGS CC +export VERSION SOVERSION
all: lib pbm all: lib pbm
@echo "Enter 'make test' in order to start some automatic tests." @echo "Enter 'make test' in order to start some automatic tests."
lib: lib:
- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") - cd libjbig && $(MAKE) -e
+ make -C libjbig + make -C libjbig
pbm: lib pbm: lib
- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") - cd pbmtools && $(MAKE) -e
+ make -C pbmtools + make -C pbmtools
test: lib pbm test: lib pbm
- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) - cd libjbig && $(MAKE) test
- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) - cd pbmtools && $(MAKE) test
+ LD_LIBRARY_PATH=`pwd`/libjbig make -C libjbig test + LD_LIBRARY_PATH=`pwd`/libjbig make -C libjbig test
+ LD_LIBRARY_PATH=`pwd`/libjbig make -C pbmtools test + LD_LIBRARY_PATH=`pwd`/libjbig make -C pbmtools test
analyze:
- cd libjbig && $(MAKE) analyze
- cd pbmtools && $(MAKE) analyze
+ make -C libjbig analyze
+ make -C pbmtools analyze
clean: clean:
rm -f *~ core rm -f *~ core
- (cd libjbig; make clean) - cd libjbig && $(MAKE) clean
- (cd pbmtools; make clean) - cd pbmtools && $(MAKE) clean
+ make -C libjbig clean + make -C libjbig clean
+ make -C pbmtools clean + make -C pbmtools clean
distribution: clean distribution:
rm -f libjbig/libjbig*.a rm -rf jbigkit-$(VERSION)
diff -aur jbigkit/pbmtools/Makefile jbigkit+/pbmtools/Makefile diff -ruN jbigkit-2.1/pbmtools/Makefile jbigkit-2.1-shlib/pbmtools/Makefile
--- jbigkit/pbmtools/Makefile 2008-08-25 18:26:39.000000000 -0400 --- jbigkit-2.1/pbmtools/Makefile 2014-03-27 14:47:15.000000000 -0400
+++ jbigkit+/pbmtools/Makefile 2012-04-12 04:55:18.000000000 -0400 +++ jbigkit-2.1-shlib/pbmtools/Makefile 2014-04-14 21:04:14.000000000 -0400
@@ -2,26 +2,26 @@ @@ -1,29 +1,29 @@
# $Id: Makefile 1293 2008-08-25 22:26:39Z mgk25 $ # Unix makefile for the JBIG-KIT PBM tools
# Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
-CC = gcc -CC = gcc
+CC ?= gcc +CC ?= gcc
# Options for the compiler # Options for the compiler
-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage -CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
+CFLAGS ?= -g -Wall -ansi -pedantic -I../libjbig # --coverage +CFLAGS ?= -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
CPPFLAGS = -I../libjbig
.SUFFIXES: .1 .5 .txt $(SUFFIXES) .SUFFIXES: .1 .5 .txt $(SUFFIXES)
.PHONY: txt test test82 test85 clean
all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \ -all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt
- pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt +all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 # txt
+# pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
+pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so +pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so
@ -151,7 +161,7 @@ diff -aur jbigkit/pbmtools/Makefile jbigkit+/pbmtools/Makefile
$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
@@ -29,13 +29,13 @@ @@ -31,13 +31,13 @@
jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h
pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h
@ -167,5 +177,5 @@ diff -aur jbigkit/pbmtools/Makefile jbigkit+/pbmtools/Makefile
- make -C ../libjbig libjbig85.a - make -C ../libjbig libjbig85.a
+ make -C ../libjbig libjbig85.so + make -C ../libjbig libjbig85.so
test: test82 test85 analyze:
clang $(CPPFLAGS) --analyze *.c

BIN
jbigkit-2.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

7
jbigkit.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 15 01:11:00 UTC 2014 - brian@aljex.com
- v2.1
-Fixes bnc#870855
-Fixes CVE-2013-6369
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 19 09:20:49 UTC 2013 - schwab@linux-m68k.org Fri Jul 19 09:20:49 UTC 2013 - schwab@linux-m68k.org

6
jbigkit.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package jbigkit # spec file for package jbigkit
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
Name: jbigkit Name: jbigkit
%define ver_maj 2 %define ver_maj 2
%define ver_min 0 %define ver_min 1
Version: %{ver_maj}.%{ver_min} Version: %{ver_maj}.%{ver_min}
Release: 0 Release: 0
Summary: JBIG1 lossless image compression tools Summary: JBIG1 lossless image compression tools
@ -69,7 +69,7 @@ The jbigkit package contains tools for converting between PBM and JBIG1
formats. formats.
%prep %prep
%setup -n %name %setup
%patch0 -p1 %patch0 -p1
%build %build