From 4cbcbe04eef777c72498e7e37664600ac099f30aab3f711b3189cd78dbb5156a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 19 Jan 2007 11:25:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bzip2?expand=0&rev=2 --- bzip2-1.0.3.tar.gz | 3 -- ...2-1.0.3.diff => bzip2-1.0.4-makefile.patch | 22 ++++++++----- bzip2-1.0.4.tar.gz | 3 ++ bzip2-faster.diff => bzip2-faster.patch | 0 bzip2-maxlen20.diff => bzip2-maxlen20.patch | 0 bzip2.changes | 19 +++++++++++ bzip2.spec | 33 ++++++++++++++----- 7 files changed, 59 insertions(+), 21 deletions(-) delete mode 100644 bzip2-1.0.3.tar.gz rename bzip2-1.0.3.diff => bzip2-1.0.4-makefile.patch (90%) create mode 100644 bzip2-1.0.4.tar.gz rename bzip2-faster.diff => bzip2-faster.patch (100%) rename bzip2-maxlen20.diff => bzip2-maxlen20.patch (100%) diff --git a/bzip2-1.0.3.tar.gz b/bzip2-1.0.3.tar.gz deleted file mode 100644 index ff77433..0000000 --- a/bzip2-1.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4aaa8e7b4ecf03d91c33e8bf92d489533fa6c1f99e825c34058003f18eb68c13 -size 669075 diff --git a/bzip2-1.0.3.diff b/bzip2-1.0.4-makefile.patch similarity index 90% rename from bzip2-1.0.3.diff rename to bzip2-1.0.4-makefile.patch index 3fcc3ff..56dfe3f 100644 --- a/bzip2-1.0.3.diff +++ b/bzip2-1.0.4-makefile.patch @@ -1,7 +1,11 @@ --- Makefile +++ Makefile -@@ -14,30 +14,47 @@ - PREFIX=/usr +@@ -24,33 +24,50 @@ + CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) + + # Where you want it installed when you do 'make install' +-PREFIX=/usr/local ++PREFIX=/usr -OBJS= blocksort.o \ @@ -19,9 +23,9 @@ + decompress.lo \ + bzlib.lo + -+LIB= libbz2.la ++LIB= libbz2.la + -+prefix= /usr ++prefix= /usr +bindir= $(prefix)/bin +libdir= $(prefix)/lib +mandir= $(prefix)/share/man @@ -68,7 +72,7 @@ check: test test: bzip2 -@@ -56,70 +73,18 @@ +@@ -69,70 +86,18 @@ cmp sample3.tst sample3.ref @cat words3 @@ -93,14 +97,14 @@ - cp -f libbz2.a $(PREFIX)/lib - chmod a+r $(PREFIX)/lib/libbz2.a - cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep +- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep +- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep - chmod a+x $(PREFIX)/bin/bzgrep - cp -f bzmore $(PREFIX)/bin/bzmore -- ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless +- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless - chmod a+x $(PREFIX)/bin/bzmore - cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp +- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp - chmod a+x $(PREFIX)/bin/bzdiff - cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 - chmod a+r $(PREFIX)/man/man1/bzgrep.1 diff --git a/bzip2-1.0.4.tar.gz b/bzip2-1.0.4.tar.gz new file mode 100644 index 0000000..29d4694 --- /dev/null +++ b/bzip2-1.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f41c3898fbd53e68e0b052418960e538813cc98afcd72b2b604079d8de3e529c +size 841221 diff --git a/bzip2-faster.diff b/bzip2-faster.patch similarity index 100% rename from bzip2-faster.diff rename to bzip2-faster.patch diff --git a/bzip2-maxlen20.diff b/bzip2-maxlen20.patch similarity index 100% rename from bzip2-maxlen20.diff rename to bzip2-maxlen20.patch diff --git a/bzip2.changes b/bzip2.changes index 4456ffa..603d8f4 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jan 15 13:50:53 CET 2007 - lmichnovic@suse.cz + +- Update to version 1.0.4 + + * Fixes some minor bugs since the last version, 1.0.3. + * Fix file permissions race problem (CAN-2005-0953). + * Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD + scan. + * 'const'/prototype cleanups in the C code. + * Change default install location to /usr/local, and handle + multiple 'make install's without error. + * Sanitise file names more carefully in bzgrep. Fixes + CAN-2005-0758 to the extent that applies to bzgrep. + * Use 'mktemp' rather than 'tempfile' in bzdiff. + * Tighten up a couple of assertions in blocksort.c following + automated analysis. + * Fix minor doc/comment bugs. + ------------------------------------------------------------------- Mon Oct 16 12:15:05 CEST 2006 - dmueller@suse.de diff --git a/bzip2.spec b/bzip2.spec index c2ed0f8..1ee6b98 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -1,7 +1,7 @@ # -# spec file for package bzip2 (Version 1.0.3) +# spec file for package bzip2 (Version 1.0.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,21 +11,21 @@ # norootforbuild Name: bzip2 -Version: 1.0.3 -Release: 26 +Version: 1.0.4 +Release: 1 Provides: bzip Obsoletes: bzip Autoreqprov: on Group: Productivity/Archiving/Compression -License: Other License(s), see package +License: BSD License and BSD-like URL: http://www.bzip.org/ Summary: A Program for Compressing Files Source: bzip2-%{version}.tar.gz Source1: bznew.gz Source2: bznew.1.gz -Patch: bzip2-%{version}.diff -Patch2: bzip2-maxlen20.diff -Patch3: bzip2-faster.diff +Patch1: bzip2-%{version}-makefile.patch +Patch2: bzip2-maxlen20.patch +Patch3: bzip2-faster.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,7 +39,7 @@ Authors: %prep %setup -q -%patch +%patch1 %patch2 %patch3 @@ -76,6 +76,21 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog -n bzip2 +* Mon Jan 15 2007 - lmichnovic@suse.cz +- Update to version 1.0.4 + * Fixes some minor bugs since the last version, 1.0.3. + * Fix file permissions race problem (CAN-2005-0953). + * Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD + scan. + * 'const'/prototype cleanups in the C code. + * Change default install location to /usr/local, and handle + multiple 'make install's without error. + * Sanitise file names more carefully in bzgrep. Fixes + CAN-2005-0758 to the extent that applies to bzgrep. + * Use 'mktemp' rather than 'tempfile' in bzdiff. + * Tighten up a couple of assertions in blocksort.c following + automated analysis. + * Fix minor doc/comment bugs. * Mon Oct 16 2006 - dmueller@suse.de - strip .la files * Wed Jan 25 2006 - mls@suse.de