diff --git a/.gitignore b/.gitignore index b0af131..eba4b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bzip2-1.0.5.tar.gz /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.5-autoconfiscated.patch b/bzip2-1.0.5-autoconfiscated.patch index 15d9cb9..2383bea 100644 --- a/bzip2-1.0.5-autoconfiscated.patch +++ b/bzip2-1.0.5-autoconfiscated.patch @@ -61,7 +61,7 @@ diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.57]) -+AC_INIT([bzip2], [1.0.5], [Julian Seward ]) ++AC_INIT([bzip2], [1.0.8], [Julian Seward ]) +BZIP2_LT_CURRENT=1 +BZIP2_LT_REVISION=5 +BZIP2_LT_AGE=0 diff --git a/mingw-bzip2.spec b/mingw-bzip2.spec index a341d70..2832484 100644 --- a/mingw-bzip2.spec +++ b/mingw-bzip2.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-bzip2 -Version: 1.0.6 -Release: 13%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: MinGW port of bzip2 file compression utility License: BSD @@ -11,10 +11,6 @@ Source0: http://www.bzip.org/%{version}/bzip2-%{version}.tar.gz BuildArch: noarch -Patch6: bzip2-1.0.4-bzip2recover.patch - -Patch10: mingw32-bzip2-1.0.5-slash.patch - Patch12: bzip2-1.0.5-autoconfiscated.patch # Export all symbols using the cdecl calling convention instead of @@ -98,10 +94,6 @@ Static library for mingw64-bzip2 development. %prep %setup -q -n bzip2-%{version} -%patch6 -p1 -b .bz2recover - -%patch10 -p1 -b .slash - %patch12 -p1 -b .autoconfiscated %patch13 -p1 -b .cdecl @@ -185,6 +177,9 @@ rm $RPM_BUILD_ROOT%{mingw64_libdir}/libbz2.la %changelog +* Tue Aug 13 2019 Marc-André Lureau - 1.0.8-1 +- New upstream version 1.0.8 + * Thu Jul 25 2019 Fedora Release Engineering - 1.0.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/mingw32-bzip2-1.0.5-slash.patch b/mingw32-bzip2-1.0.5-slash.patch deleted file mode 100644 index 3b5ed14..0000000 --- a/mingw32-bzip2-1.0.5-slash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzip2-1.0.5.orig/bzip2.c 2007-12-09 12:22:06.000000000 +0000 -+++ bzip2-1.0.5/bzip2.c 2008-09-25 12:31:02.000000000 +0100 -@@ -128,7 +128,7 @@ - #if BZ_LCCWIN32 - # include - # include --# include -+# include - - # define NORETURN /**/ - # define PATH_SEP '\\' 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