diff --git a/.gitignore b/.gitignore index 3f84b6f..794cc99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /bzip2-1.0.6.tar.gz +/bzip2-1.0.8.tar.gz diff --git a/bzip2-1.0.4-bzip2recover.patch b/bzip2-1.0.4-bzip2recover.patch deleted file mode 100644 index e2bfe1c..0000000 --- a/bzip2-1.0.4-bzip2recover.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 -+++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 -@@ -309,7 +309,8 @@ - UInt32 buffHi, buffLo, blockCRC; - Char* p; - -- strcpy ( progName, argv[0] ); -+ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); -+ progName[BZ_MAX_FILENAME-1]='\0'; - inFileName[0] = outFileName[0] = 0; - - fprintf ( stderr, diff --git a/bzip2-1.0.4-cflags.patch b/bzip2-cflags.patch similarity index 68% rename from bzip2-1.0.4-cflags.patch rename to bzip2-cflags.patch index 209d738..992abbf 100644 --- a/bzip2-1.0.4-cflags.patch +++ b/bzip2-cflags.patch @@ -5,8 +5,8 @@ diff -up bzip2-1.0.6/Makefile-libbz2_so.pom bzip2-1.0.6/Makefile-libbz2_so bzlib.o all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 diff --git a/bzip2-ldflags.patch b/bzip2-ldflags.patch index 2281262..53c6ecc 100644 --- a/bzip2-ldflags.patch +++ b/bzip2-ldflags.patch @@ -27,10 +27,10 @@ diff -up bzip2-1.0.6/Makefile-libbz2_so.jx bzip2-1.0.6/Makefile-libbz2_so bzlib.o all: $(OBJS) -- $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 diff --git a/bzip2-1.0.4-saneso.patch b/bzip2-saneso.patch similarity index 59% rename from bzip2-1.0.4-saneso.patch rename to bzip2-saneso.patch index 6b3430c..ec76a4c 100644 --- a/bzip2-1.0.4-saneso.patch +++ b/bzip2-saneso.patch @@ -5,8 +5,8 @@ diff -up bzip2-1.0.6/Makefile-libbz2_so.pom bzip2-1.0.6/Makefile-libbz2_so bzlib.o all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 diff --git a/bzip2.spec b/bzip2.spec index 3e7a385..6109178 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -1,21 +1,18 @@ -%global library_version 1.0.6 +%global library_version 1.0.8 Summary: A file compression utility Name: bzip2 -Version: 1.0.6 -Release: 30%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: BSD URL: http://www.bzip.org/ -Source0: http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz +#Source0: http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz +Source0: https://sourceware.org/pub/bzip2/%{name}-%{version}.tar.gz Source1: bzip2.pc -Patch0: bzip2-1.0.4-saneso.patch -Patch1: bzip2-1.0.4-cflags.patch -# resolves: #226979 -Patch2: bzip2-1.0.4-bzip2recover.patch -Patch3: bzip2-ldflags.patch -# resolves: #1348179 -Patch4: set-out-file-to-null.patch +Patch0: bzip2-saneso.patch +Patch1: bzip2-cflags.patch +Patch2: bzip2-ldflags.patch BuildRequires: gcc @@ -55,11 +52,9 @@ Static libraries for applications using the bzip2 compression format. %prep %setup -q -%patch0 -p1 -b .saneso -%patch1 -p1 -b .cflags -%patch2 -p1 -b .bz2recover -%patch3 -p1 -b .ldflags -%patch4 -p1 -b .bzip2recover +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 cp -a %{SOURCE1} . sed -i "s|^libdir=|libdir=%{_libdir}|" bzip2.pc @@ -138,6 +133,11 @@ ln -s bzgrep.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzfgrep.1 %{_libdir}/pkgconfig/bzip2.pc %changelog +* Tue Aug 06 2019 Jakub Martisko - 1.0.8-1 +- Update to version 1.0.8 + resolves: #1724797 + resolves: #1717478 + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.6-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/set-out-file-to-null.patch b/set-out-file-to-null.patch deleted file mode 100644 index 18d193b..0000000 --- a/set-out-file-to-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./bzip2recover.c.old ./bzip2recover.c ---- ./bzip2recover.c.old 2016-03-22 08:49:38.855620000 +0100 -+++ ./bzip2recover.c 2016-03-30 10:22:27.341430099 +0200 -@@ -458,6 +458,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/sources b/sources index 3e55e9f..3aca83c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +SHA512 (bzip2-1.0.8.tar.gz) = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3