SHA256
1
0
forked from pool/gzip
OBS User unknown 2008-05-09 19:40:28 +00:00 committed by Git OBS Bridge
parent 439897d4d8
commit 014ff1d35d
3 changed files with 98 additions and 67 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 8 14:19:06 CEST 2008 - schwab@suse.de
- Fix zdiff with two compressed files.
-------------------------------------------------------------------
Sun May 20 19:17:21 CEST 2007 - schwab@suse.de

136
gzip.spec
View File

@ -1,23 +1,23 @@
#
# spec file for package gzip (Version 1.3.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 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.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gzip
URL: http://www.gzip.org/
License: GNU General Public License (GPL)
Url: http://www.gzip.org/
License: GPL v2 or later
Group: Productivity/Archiving/Compression
Autoreqprov: on
AutoReqProv: on
PreReq: %{install_info_prereq}
Version: 1.3.12
Release: 9
Release: 68
Summary: GNU Zip Compression Utilities
Source: %{name}-%{version}.tar.gz
Patch: zgrep.diff
@ -26,6 +26,7 @@ Patch2: zmore.diff
Patch3: non-exec-stack.diff
Patch4: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff
Patch5: futimens.diff
Patch6: zdiff.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -48,24 +49,13 @@ Authors:
%patch3
%patch4 -p1
%patch5
%patch6
%build
CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \
-W -Wall -Wno-unused-parameter -Wstrict-prototypes -Wpointer-arith"
./configure CFLAGS="$CFLAGS" \
--prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir}
test_gzip()
{
for i in 1 2 3 4 5 6 7 8 9; do
for f in build-aux/texinfo.tex /bin/bash; do
basef=${f##*/}
time ./gzip -$i < $f > $basef.gz
./gzip --test $basef.gz
./gzip -d < $basef.gz > $basef.test$i
cmp $f $basef.test$i
done
done
}
profile_gzip()
{
tmpfile=$(mktemp)
@ -82,7 +72,17 @@ make CFLAGS="$CFLAGS -fprofile-use"
%else
make
%endif
test_gzip
%check
for i in 1 2 3 4 5 6 7 8 9; do
for f in build-aux/texinfo.tex /bin/bash; do
basef=${f##*/}
time ./gzip -$i < $f > $basef.gz
./gzip --test $basef.gz
./gzip -d < $basef.gz > $basef.test$i
cmp $f $basef.test$i
done
done
%install
make DESTDIR=$RPM_BUILD_ROOT install
@ -107,15 +107,17 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%changelog
* Sun May 20 2007 - schwab@suse.de
* Thu May 08 2008 schwab@suse.de
- Fix zdiff with two compressed files.
* Sun May 20 2007 schwab@suse.de
- Fix compiling with glibc 2.6.
* Sun Apr 15 2007 - schwab@suse.de
* Sun Apr 15 2007 schwab@suse.de
- Update to gzip 1.3.12.
* znew now uses $TMPDIR (default /tmp) instead of always using /tmp.
* Tue Mar 27 2007 - dmueller@suse.de
* Tue Mar 27 2007 dmueller@suse.de
- reenable profile feedback
- remove hardcoded -mcpu=pentiumpro for x86
* Tue Feb 06 2007 - schwab@suse.de
* Tue Feb 06 2007 schwab@suse.de
- Update to gzip 1.3.11.
* As per the GNU coding standards, the behavior of gzip and its
companion executables no longer depend on the name used to invoke them.
@ -123,7 +125,7 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
instead, 'gunzip' is now a small program that invokes 'gzip -d'.
* zdiff now checks for subsidiary gzip failures, and works around
bugs in IRIX 6 sh, Tru64 4.0F ksh, and Solaris 8 bash.
* Mon Jan 08 2007 - schwab@suse.de
* Mon Jan 08 2007 schwab@suse.de
- Update to gzip 1.3.10.
* gzip -c and zcat now work on special files, files with special mode bits,
and files with multiple hard links.
@ -132,16 +134,16 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
* zgrep has many bugs fixed with argument handling, special characters,
and exit status.
* zless no longer mishandles $%%=~ in file names.
* Fri Dec 15 2006 - schwab@suse.de
* Fri Dec 15 2006 schwab@suse.de
- Update to gzip 1.3.9.
* No major changes; only porting fixes.
* Tue Dec 12 2006 - schwab@suse.de
* Tue Dec 12 2006 schwab@suse.de
- Update to gzip 1.3.8.
* Fix some gzip problems:
- A security fix from Debian 1.3.5-5 was inadvertently omitted.
- The assembler is now invoked with --noexecstack if supported,
so that gzip can better resist stack-smashing attacks.
* Thu Dec 07 2006 - schwab@suse.de
* Thu Dec 07 2006 schwab@suse.de
- Update to gzip 1.3.7.
* Fix some gzip problems:
- Refuse to compress setuid or setgid files, or files with the sticky bit.
@ -162,7 +164,7 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
- Rely on PATH in the generated executable, as the man page says.
- Don't assume IFS is sane.
- Exit with signal's status, if signaled.
* Mon Dec 04 2006 - schwab@suse.de
* Mon Dec 04 2006 schwab@suse.de
- Update to gzip 1.3.6.
* Fix some race conditions in setting file time stamps, permissions, and owner.
* Fix some race conditions in signal handling.
@ -177,33 +179,33 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
* The manual is now distributed under the terms of the GNU Free
Documentation License without invariant sections or cover texts.
* Port to current versions of Autoconf, Automake, and Gnulib.
* Wed Sep 13 2006 - schwab@suse.de
* Wed Sep 13 2006 schwab@suse.de
- Verify hash tables when unpacking [#202365].
* Mon Mar 13 2006 - schwab@suse.de
* Mon Mar 13 2006 schwab@suse.de
- Add rsyncable patch [#155442].
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Fri Nov 11 2005 - pth@suse.de
* Fri Nov 11 2005 pth@suse.de
- Don't obsolete compress.
* Mon Oct 31 2005 - dmueller@suse.de
* Mon Oct 31 2005 dmueller@suse.de
- build with non-executable stack
* Tue Jul 26 2005 - schwab@suse.de
* Tue Jul 26 2005 schwab@suse.de
- Ignore directory part on saved file name [#79292].
* Tue Apr 19 2005 - kukuk@suse.de
* Tue Apr 19 2005 kukuk@suse.de
- Remove uncompress symlink [#78331]
* Thu Mar 24 2005 - werner@suse.de
* Thu Mar 24 2005 werner@suse.de
- Add support for bzip2 and simply pager options to zmore
* Mon May 03 2004 - schwab@suse.de
* Mon May 03 2004 schwab@suse.de
- Fix quoting issues in zgrep [#39329].
* Fri Feb 27 2004 - schwab@suse.de
* Fri Feb 27 2004 schwab@suse.de
- Add %%defattr.
* Tue Dec 02 2003 - pthomas@suse.de
* Tue Dec 02 2003 pthomas@suse.de
- Remove the patch for tail syntax as it's wrong and unnecessary.
* Thu Sep 18 2003 - mmj@suse.de
* Thu Sep 18 2003 mmj@suse.de
- Fix tail syntax in gzexe [#31229]
* Thu Aug 28 2003 - kukuk@suse.de
* Thu Aug 28 2003 kukuk@suse.de
- Make sure we have no hardlinks from /bin to /usr/bin [Bug #29522]
* Tue Jun 17 2003 - pthomas@suse.de
* Tue Jun 17 2003 pthomas@suse.de
- Update to 1.3.5
- gzip now removes any output symlink before writing output file.
- zgrep etc. scripts now port to POSIX 1003.1-2001 hosts.
@ -213,63 +215,63 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
- Less output is lost when decompressing a truncated file.
- zgrep now supports --, -H, -h, -L, -l, -C, -d, -m and their long
equivalents.
* Wed Jun 04 2003 - jh@suse.de
* Wed Jun 04 2003 jh@suse.de
- Enable profile feedback
* Thu Apr 24 2003 - ro@suse.de
* Thu Apr 24 2003 ro@suse.de
- fix install_info --delete call and move from preun to postun
* Tue Apr 15 2003 - coolo@suse.de
* Tue Apr 15 2003 coolo@suse.de
- use BuildRoot
* Sat Feb 08 2003 - kukuk@suse.de
* Sat Feb 08 2003 kukuk@suse.de
- Readded prereq for install-info, else we cannot install info
pages
- Add dir entry to info page
* Sat Feb 08 2003 - ro@suse.de
* Sat Feb 08 2003 ro@suse.de
- removed prereq for texinfo to avoid prereq-cycle
* Fri Feb 07 2003 - ro@suse.de
* Fri Feb 07 2003 ro@suse.de
- added install_info macros
* Wed Jan 29 2003 - kukuk@suse.de
* Wed Jan 29 2003 kukuk@suse.de
- Remove mimencode requires, it is optional
* Tue Dec 17 2002 - werner@suse.de
* Tue Dec 17 2002 werner@suse.de
- The `:' line of zgrep will be removed by configure
- zgrep requzires mimencode from metamail
* Tue Sep 17 2002 - ro@suse.de
* Tue Sep 17 2002 ro@suse.de
- removed bogus self-provides
* Thu Mar 14 2002 - kukuk@suse.de
* Thu Mar 14 2002 kukuk@suse.de
- Add uncompress compat link
* Wed Feb 06 2002 - coolo@suse.de
* Wed Feb 06 2002 coolo@suse.de
- use %%suse_update_config
* Thu Jan 24 2002 - okir@suse.de
* Thu Jan 24 2002 okir@suse.de
- fixed tempfile race in zdiff (current code used bash noclobber
which is inherently racey)
* Wed Jun 06 2001 - werner@suse.de
* Wed Jun 06 2001 werner@suse.de
- Make zgrep knowing about bzip2
* Tue Apr 03 2001 - uli@suse.de
* Tue Apr 03 2001 uli@suse.de
- fixed for gcc >2.96
* Tue Mar 27 2001 - bk@suse.de
* Tue Mar 27 2001 bk@suse.de
- use i686 insn scheduling on i386 and strip binaries(performance)
- make tmpfiles in gzexe secure and improve znew tempdir creation
- remove unnessary expr use and fix gzip output checking in zforce
- add simple tests if gzip/gunzip work
* Mon Nov 27 2000 - aj@suse.de
* Mon Nov 27 2000 aj@suse.de
- Update to gzip 1.3.
* Wed Aug 23 2000 - werner@suse.de
* Wed Aug 23 2000 werner@suse.de
- Security changes for the znew script
* Mon May 01 2000 - kukuk@suse.de
* Mon May 01 2000 kukuk@suse.de
- LSB-FHS requires /bin/gunzip and /bin/zcat to /bin/gzip
* Tue Apr 18 2000 - kukuk@suse.de
* Tue Apr 18 2000 kukuk@suse.de
- Add /bin/zcat (required by FHS 2.1)
* Fri Feb 25 2000 - schwab@suse.de
* Fri Feb 25 2000 schwab@suse.de
- cleanup spec file, get rid of Makefile.Linux
- define _GNU_SOURCE for basename declaration
- /usr/man -> /usr/share/man
- add gzip.info to file list
* Mon Sep 13 1999 - bs@suse.de
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Fri Mar 06 1998 - florian@suse.de
* Fri Mar 06 1998 florian@suse.de
- fixed security bug posted on Dez 27 to bugtraq
* Thu Jan 08 1998 - bs@suse.de
* Thu Jan 08 1998 bs@suse.de
- fixed "double" /bin/gzip & /usr/bin/gzip
* Thu Apr 24 1997 - bs@suse.de
* Thu Apr 24 1997 bs@suse.de
- added symlink /bin/gunzip
* Sun Apr 13 1997 - florian@suse.de
* Mon Apr 14 1997 florian@suse.de
- add bug-fixes from gnu.utils.bugs

24
zdiff.diff Normal file
View File

@ -0,0 +1,24 @@
--- zdiff.in
+++ zdiff.in
@@ -101,15 +101,17 @@ elif test $# -eq 2; then
5<&0
then
gzip_status=$(
- exec 4>&1
- (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- |
- ( (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null |
- eval "$cmp" /dev/fd/5 -) 5<&0
+ exec 4>&1 6<&0
+ (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- 6<&- |
+ ( (gzip -cdfq -- "$2" 4>&- 0<&6 6<&-; echo $? >&4) 3>&- 5<&- </dev/null |
+ eval "$cmp" /dev/fd/5 - >&3) 5<&0
)
+ cmp_status=$?
case $gzip_status in
*[1-9]*) gzip_status=1;;
*) gzip_status=0;;
esac
+ (exit $cmp_status)
else
F=`expr "/$2" : '.*/\(.*\)[-.][zZtga]*$'` || F=$prog
tmp=