Accepting request 101629 from home:apachelogger:branches:Archiving

drop pre-2005 compatibility patch which influences the output of bzip2. it is incredibly weird that one cannot reproduce the same bzip2 after bunzip2 on a non-opensuse system with the same bzip2 version. so, since the patch in question is only there to allow incredibly old bzip2 versions to decompress files created with a newer one it seems just about time to get rid of this patch.

OBS-URL: https://build.opensuse.org/request/show/101629
OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=28

bzip2-maxlen20.patch

@@ -1,38 +0,0 @@
---- compress.c
-+++ compress.c
-@@ -444,11 +444,9 @@
-       /*--
-         Recompute the tables based on the accumulated frequencies.
-       --*/
--      /* maxLen was changed from 20 to 17 in bzip2-1.0.3.  See 
--         comment in huffman.c for details. */
-       for (t = 0; t < nGroups; t++)
-          BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), 
--                                 alphaSize, 17 /*20*/ );
-+                                 alphaSize, 20 );
-    }
- 
- 
-@@ -485,7 +483,7 @@
-          if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-          if (s->len[t][i] < minLen) minLen = s->len[t][i];
-       }
--      AssertH ( !(maxLen > 17 /*20*/ ), 3004 );
-+      AssertH ( !(maxLen > 20), 3004 );
-       AssertH ( !(minLen < 1),  3005 );
-       BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), 
-                           minLen, maxLen, alphaSize );
---- huffman.c
-+++ huffman.c
-@@ -137,7 +137,10 @@
-          Huffman codes with a maximum length of 17 bits.  However, in
-          order to preserve backwards compatibility with bitstreams
-          produced by versions pre-1.0.3, the decompressor must still
--         handle lengths of up to 20. */
-+         handle lengths of up to 20.
-+
-+         SuSE: we changed it back to 20 to be compatible to older
-+         bzip2 versions */
- 
-       for (i = 1; i <= alphaSize; i++) {
-          j = weight[i] >> 8;

bzip2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 26 09:38:00 UTC 2012 - sitter@kde.org
+
+- Drop bzip2-maxlen20.patch as pre-2005 compatibility should not
+  be a concern anymore.
+
 -------------------------------------------------------------------
 Sat Jan  7 19:26:14 UTC 2012 - crrodriguez@opensuse.org
 

bzip2.spec

@@ -15,15 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           bzip2
 Version:        1.0.6
-Release:        11
+Release:        0
 Provides:       bzip
 Obsoletes:      bzip
-BuildRequires:  pkg-config
 BuildRequires:  libtool
+BuildRequires:  pkg-config
 # The following is a kludge to get updating bzip2 to after the split work
 PreReq:         libbz2-1
 # bug437293
@@ -31,10 +29,10 @@ PreReq:         libbz2-1
 Obsoletes:      bzip2-64bit
 %endif
 #
-Group:          Productivity/Archiving/Compression
-License:        BSD-3-Clause
 Url:            http://www.bzip.org/
 Summary:        A Program for Compressing Files
+License:        BSD-3-Clause
+Group:          Productivity/Archiving/Compression
 Source:         bzip2-%{version}.tar.gz
 Source1:        bznew.gz
 Source2:        bznew.1.gz
@@ -42,7 +40,6 @@ Source3:        baselibs.conf
 Source100:      rpmlintrc
 # PATCH-FEATURE-OPENSUSE bzip2-1.0.6-autoconfiscated.patch sbrabec@suse.cz -- Convert to a standard autoconf based package.
 Patch:          http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch
-Patch2:         bzip2-maxlen20.patch
 Patch3:         bzip2-faster.patch
 Patch5:         bzip2-unsafe_strcpy.patch
 Patch6:         bzip2-point-to-doc-pkg.patch
@@ -53,7 +50,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 The bzip2 program is a very powerful program for compressing files.
 
 %package doc
-License:        BSD-3-Clause
 Summary:        The bzip2 program and Library Documentation
 Group:          Productivity/Archiving/Compression
 %if 0%{?suse_version} >= 1120
@@ -64,7 +60,6 @@ BuildArch:      noarch
 The bzip2 program and library documentation.
 
 %package -n libbz2-1
-License:        BSD-3-Clause
 Summary:        The bzip2 runtime library
 Group:          Productivity/Archiving/Compression
 
@@ -72,7 +67,6 @@ Group:          Productivity/Archiving/Compression
 The bzip2 runtime library
 
 %package -n libbz2-devel
-License:        BSD-3-Clause
 Summary:        The bzip2 runtime library development files
 Group:          Development/Libraries/Other
 Requires:       libbz2-1 = %{version} glibc-devel
@@ -83,7 +77,6 @@ The bzip2 runtime library development files.
 %prep
 %setup -q
 %patch
-%patch2
 %patch3
 %patch5
 %patch6 -p1