commit fbc6d8bd9615e4d3e494102963e97ec758f45c0e Author: Adrian Schröter Date: Mon Dec 18 17:15:10 2023 +0100 Sync from SUSE:ALP:Source:Standard:1.0 gzip revision 82edc35118ceca417c7e0d895fbc9bb8 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fecc750 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/gzip-1.13.tar.xz b/gzip-1.13.tar.xz new file mode 100644 index 0000000..2309c4d --- /dev/null +++ b/gzip-1.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057 +size 838248 diff --git a/gzip-1.13.tar.xz.sig b/gzip-1.13.tar.xz.sig new file mode 100644 index 0000000..5f7c362 --- /dev/null +++ b/gzip-1.13.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmThXGMACgkQf9n8ywAL +7u6DSQ//RjzCkC3iXdMyHAHz4Hotpzh98evO3VdM33rpa54JadQH9bQr/sN+AI3I +fOtXQ4YYl3kta5yF3Fq5bl8TmjZLi4kcv3unPBerTMesjyW5vzSIPSnqUAe8wH1Q +pysTVV5w785PxMrPmfEodc7YUi55JHsoeUCtsDqERVuMT/PRWEN/nMwMVsL41fQ9 +JqeJurH81mQguNheMF5YYbZjXJggb7Fggw/ZM2k60m4pPyGEdVUzOKd6Qg3UTYc2 +arj7L5EmxBTKolhs7hROInax/iP4t8xm9mSxpq+JghIsdu9MR4IWOTgagOhIZ0oD +0MvKTJVYiEQJp9+U2tYQEXJgcsMbLOJN94VxYHlPoGmJPYMhUBsfhwMj9ss/Jzsf +qNg9GlaBD5MQ90OQtdoZ6gzwgaHf/3NHJfu1XKdBSEVI1OqnfQtFhfisD6ScQaQe +RqTH6NNsksnOcULHgHU6hPWTVMpYXuCJi0GtNr2RpMzEbmWA7sg6/pKe/pvgDrzT +vRRpT3rBpSGGxQ1Mcyljk7lBNWGHvVlJENHHg6CVJ8pKCB4gQDRZ2QyOVxRic9Na +FB+SUmlpVfDWw6TA3WLARGSjOpSBZYmMG87O+1JrelH4j198ZdK8QgeqNFktmWVK +Q8bM2bYJUDEADTfkerRRwEMks9cEWMUGAWBDfXE94+vZKG6+xsY= +=QwvG +-----END PGP SIGNATURE----- diff --git a/gzip.changes b/gzip.changes new file mode 100644 index 0000000..fd2b523 --- /dev/null +++ b/gzip.changes @@ -0,0 +1,723 @@ +------------------------------------------------------------------- +Tue Oct 24 08:56:10 UTC 2023 - Sarah Kriesch + +- Fix s390x build with 'gcc -Dalignas=_Alignas' bug#66709 + +------------------------------------------------------------------- +Wed Aug 30 15:24:55 UTC 2023 - Danilo Spinella + +- Update to 1.13: + * zless now diagnoses gzip failures, if using less 623 or later. + * When SIGPIPE is ignored, gzip now exits with status 2 (warning) + instead of status 1 (error) when writing to a broken pipe. This is + more useful with programs like 'less' that treat gzip exit status 2 + as a non-failure. + * 'gzip -d' no longer fails to report invalid compressed data + that uses a dictionary distance outside the input window. + [bug present since the beginning] + * Port to C23, which does not allow K&R-style function definitions + with parameters, and which does not define __alignas_is_defined. +- Refreshed manpage-no-date.patch + +------------------------------------------------------------------- +Wed Aug 16 14:52:39 UTC 2023 - Dominique Leuenberger + +- export CONFIG_SHELL=/bin/sh before running configure: results in + the shell script (zcat/zgrep/…) to receive a /bin/sh shebang + instead of requiring bash (the local shell used to build). +- Use for i in $(seq 1 9) instead of bashism for in in {1..9}, and + drop buildshell definition to require bash. + +------------------------------------------------------------------- +Tue Dec 27 12:26:05 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + +------------------------------------------------------------------- +Wed Apr 27 08:53:53 UTC 2022 - Dominique Leuenberger + +- Rename xz_lzma.patch xz_lzma_zstd.patch and expand the patch to + supprt zstd compression (boo#1198922). + +------------------------------------------------------------------- +Sat Apr 9 11:45:49 UTC 2022 - Dirk Müller + +- update to 1.12 (CVE-2022-1271,bsc#1198062): + * 'gzip -l' no longer misreports file lengths 4 GiB and larger. + Previously, 'gzip -l' output the 32-bit value stored in the gzip + header even though that is the uncompressed length modulo 2**32. + Now, 'gzip -l' calculates the uncompressed length by decompressing + the data and counting the resulting bytes. Although this can take + much more time, nowadays the correctness pros seem to outweigh the + performance cons. + * 'zless' is no longer installed on platforms lacking 'less'. + * zgrep applied to a crafted file name with two or more newlines + can no longer overwrite an arbitrary, attacker-selected file. + [bug introduced in gzip-1.3.10] + * zgrep now names input file on error instead of mislabeling it as + "(standard input)", if grep supports the GNU -H and --label options. + * 'zdiff -C 5' no longer misbehaves by treating '5' as a file name. + * Configure-time options like --program-prefix now work. +- refresh zdiff.diff, zgrep.diff, zmore.diff + +------------------------------------------------------------------- +Sun Jan 30 23:02:42 UTC 2022 - Dirk Müller + +- add conflicts/provides for alternative(gzip) +- modernize spec file + +------------------------------------------------------------------- +Thu Sep 9 08:23:45 UTC 2021 - Danilo Spinella + +- Update to 1.11: + * Performance improvements + * Added hardware acceleration for IBM Z +- Refresh patches: + * manpage-no-date.patch + * xz_lzma.patch +- Remove upstreamed patches: + * gzip-1.10-fix-DFLTCC-segfault.patch + * gzip-1.10-fix_count_of_lines_to_skip.patch + * gzip-1.10-ibm_dfltcc_support.patch + +------------------------------------------------------------------- +Wed Jun 23 09:25:09 UTC 2021 - Franck Bui + +- Avoid text relocation on i386 (bsc#1143125) + + Text relocation doesn't cope well with some security hardening which + consists in prohibiting attempts to change memory mappings to become + executable. + + Hence disable the use of assembler code and get rid of text + relocations especially since the assembler code is slower than the + code generated by gcc according to Fedora. According to Debian this + also fixes gzip generating different results on ia64. + +------------------------------------------------------------------- +Tue Apr 13 13:23:44 UTC 2021 - pgajdos@suse.com + +- fix DFLTCC segfault [bsc#1177047] +- added patches + fix https://git.savannah.gnu.org/cgit/gzip.git/commit/?id=be0a534ba2b6e77da289de8da79e70843b1028cc + + gzip-1.10-fix-DFLTCC-segfault.patch + +------------------------------------------------------------------- +Thu Mar 4 01:57:35 UTC 2021 - Kristyna Streitova + +- gzip.spec: move %patch10 from the ifarch condition (mistake) + +------------------------------------------------------------------- +Wed Jan 27 22:05:47 UTC 2021 - Kristyna Streitova + +- add gzip-1.10-fix_count_of_lines_to_skip.patch to fix count + of lines to skip [bsc#1180713] + +------------------------------------------------------------------- +Fri Oct 16 09:48:53 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- +Wed Sep 2 14:12:24 UTC 2020 - Kristyna Streitova + +- Enable DFLTCC compression for s390x for levels 1-6 (i. e. to make + it used by default) by adding -DDFLTCC_LEVEL_MASK=0x7e to CLFAGS. + [jsc#SLE-13775] + +------------------------------------------------------------------- +Tue Aug 27 10:11:19 UTC 2019 - Kristyna Streitova + +- refresh gzip-1.10-ibm_dfltcc_support.patch to fix three data + corruption issues [bsc#1145276] [jsc#SLE-5818] [jsc#SLE-8914] + +------------------------------------------------------------------- +Thu Jun 6 15:16:47 UTC 2019 - Kristýna Streitová + +- add gzip-1.10-ibm_dfltcc_support.patch [jsc#SLE-5818] [jsc#SLE-8914] + * it adds support for DFLTCC (hardware-accelerated deflation) + for s390x arch + * enable it via "--enable-dfltcc" option + +------------------------------------------------------------------- +Sun Dec 30 11:34:12 UTC 2018 - astieger@suse.com + +- gzip 1.10: + * Compressed gzip output no longer contains the current time as + a timestamp when the input is not a regular file. Instead, the + output contains a null (zero) timestamp. This makes gzip's + behavior more reproducible when used as part of a pipeline. + * A use of uninitialized memory on some malformed inputs has been + fixed. + * A few theoretical race conditions in signal handers have been + fixed. +- drop upstreamed patches: + * gnulib-libio.patch + * gzip-1.8-deprecate_netstat.patch + +------------------------------------------------------------------- +Wed Aug 1 14:03:39 UTC 2018 - schwab@suse.de + +- gnulib-libio.patch: Update gnulib for libio.h removal + +------------------------------------------------------------------- +Thu Feb 22 15:10:34 UTC 2018 - fvogt@suse.com + +- Use %license (boo#1082318) + +------------------------------------------------------------------- +Fri Jan 12 15:29:22 UTC 2018 - meissner@suse.com + +- license is GPL-3.0+ + +------------------------------------------------------------------- +Thu Jan 11 09:29:30 UTC 2018 - kbabioch@suse.com + +- Update to 1.9 + * Fix suffix handling + * Fix bug when handling pack format while decompressing + * Fix time handling bug + * Improve exit code handling for shell scripts +- remove gzip-1.8-fix_unpack_EOB_check.patch as it is included + upstream now +- refresh manpage-no-date.patch +- spec file cleanups + +------------------------------------------------------------------- +Tue Jan 2 14:30:50 UTC 2018 - kstreitova@suse.com + +- add gzip-1.8-deprecate_netstat.patch to get rid of deprecated + 'netstat -n' command in tests/init.sh script + +------------------------------------------------------------------- +Fri Dec 1 16:38:19 UTC 2017 - kstreitova@suse.com + +- add gzip-1.8-fix_unpack_EOB_check.patch to fix mishandling of + leading zeros in the end-of-block code [bsc#1067891] + +------------------------------------------------------------------- +Wed May 31 02:54:52 UTC 2017 - bwiedemann@suse.com + +- Make build reproducible in spite of gcc profile based optimizations + (boo#1040589) + +------------------------------------------------------------------- +Tue May 30 09:59:59 UTC 2017 - src@posteo.de + +- changing the way how gcc profiling is generating to have a reproducible + build + +------------------------------------------------------------------- +Tue Apr 11 14:08:21 UTC 2017 - kstreitova@suse.com + +- define %{_buildshell} to /bin/bash as we newly rely on bash + features like {1..9} + +------------------------------------------------------------------- +Thu Mar 23 15:14:56 UTC 2017 - kstreitova@suse.com + +- cleanup with spec-cleaner +- use loop with a range instead of a number list + +------------------------------------------------------------------- +Wed Apr 27 10:14:03 UTC 2016 - mpluskal@suse.com + +- Update to 1.8 + * gzip -l no longer falsely reports a write error when writing to + a pipe. + * Port to Oracle Solaris Studio 12 on x86-64. + * When configuring gzip, ./configure DEFS='...-DNO_ASM...' now + suppresses assembler again. +- Small spec file cleanup + +------------------------------------------------------------------- +Tue Mar 29 07:45:50 UTC 2016 - tchvatal@suse.com + +- Version update to release 1.7: + * gzip now accepts the --synchronous option + * gzip now accepts the --rsyncable option + * The GZIP environment variable is now obsolescent + * Installed programs like 'zgrep' now use the PATH environment variable as + usual to find subsidiary programs like 'gzip' and 'grep' +- Remove obsolete patch tempfile.diff +- Remove upstreamed patch gzip-rsyncable.diff +- Rebase manpage-no-date.patch to apply to 1.7 version + +------------------------------------------------------------------- +Tue Mar 29 07:42:10 UTC 2016 - tchvatal@suse.com + +- Rename reproducible.patch to something actually explanatory: + * manpage-no-date.patch + +------------------------------------------------------------------- +Sun Mar 20 14:51:03 UTC 2016 - bwiedemann@suse.com + +- Add reproducible.patch to fix build-compare + +------------------------------------------------------------------- +Fri Dec 19 10:05:17 UTC 2014 - meissner@suse.com + +- build with PIE + +------------------------------------------------------------------- +Mon May 12 15:44:03 UTC 2014 - vdziewiecki@suse.com + +- Remove unneeded update-alternatives requirement (bnc#876129) +- Clean spec + +------------------------------------------------------------------- +Thu Sep 26 13:29:46 UTC 2013 - schwab@suse.de + +- Don't install twice + +------------------------------------------------------------------- +Tue Jul 30 12:20:55 UTC 2013 - sweet_f_a@gmx.de + +- add the correct project URL + +------------------------------------------------------------------- +Tue Jul 9 07:44:48 UTC 2013 - schwab@suse.de + +- Override broken configure checks + +------------------------------------------------------------------- +Mon Jun 10 19:55:39 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 1.6 +* The "--keep" (-k) option was added to not delete input files, + similar to other tools such as xz, lzip, and bzip2. +* A decompression issue with certain invalid data in the "pack" + format was fixed. +* An incorrect overwrite when compiled with optimization was fixed. +* zgrep's handling of multi-digit context options was fixed. +* zmore now acts more like "more". +- More robust make install call +- Provide files for signature verification (we do not actually do + it because gzip is part of the bootstrap cycle; but if you have + gpg-offline listed as Support or in ~/.oscrc, it will be done) + +------------------------------------------------------------------- +Thu Mar 28 08:36:08 UTC 2013 - mmeister@suse.com + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- +Tue Jan 29 12:28:39 UTC 2013 - vdziewiecki@suse.com + +- Add support for xz and lzma (bnc#799561 - zgrep silently fails on + LZMA compressed files) - xz_lzma.patch + +------------------------------------------------------------------- +Tue Oct 16 10:48:48 UTC 2012 - vcizek@suse.com + +- update to 1.5 + - gzip -cdf mishandles some concatenated input streams: test it + - gzip -cdf now handles concatenation of gzip'd and uncompressed data + - gzip: fix a data-loss bug when decompressing with --suffix='' + - gzip: fix nondeterministic compression results + - fix "znew -K" to work without use of compress utility + - Decode FHCRC flag properly, as per Internet RFC 1952. + - zgrep: fix parsing of -Eh options + - zgrep: terminate gracefully when a pipeline is interrupted by a signal + - zgrep: fix shell portability bug with -f; fix mishandling of "-e -" + - zless: decompress stdin too, if less 429 or later +- dropped gzip-stdio.in.patch, refreshed others + +------------------------------------------------------------------- +Tue Jul 17 19:00:13 UTC 2012 - aj@suse.de + +- Fix build with missing gets declaration (glibc 2.16) + +------------------------------------------------------------------- +Tue Feb 7 21:33:35 UTC 2012 - rschweikert@suse.com + +- keep binaries in /usr tree (UsrMerge project) + +------------------------------------------------------------------- +Sat Nov 13 12:36:20 UTC 2010 - cristian.rodriguez@opensuse.org + +- disable silent rules. + +------------------------------------------------------------------- +Sun Sep 19 09:48:02 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.4: + + gzip -d could segfault and/or clobber the stack, possibly + leading to arbitrary code execution. This affects x86_64 but + not 32-bit systems. This fixes CVE-2010-0001. See also + rh#554418. + + gzip -d would fail with a CRC error for some valid inputs. + So far, the only valid input known to exhibit this failure was + compressed "from FAT filesystem (MS-DOS, OS/2, NT)". In + addition, to trigger the failure, your memcpy implementation + must copy in the "reverse" order. +- Drop gzip-CVE-2010-0001.diff: fixed upstream. +- Remove AutoReqProv: it's default now. +- Use %configure, %makeinstall, and %{_bindir}. +- Update zdiff.diff: some of the patch is upstream now. It's + unclear to me if the rest is still needed :/ So leaving it. +- Rebase zgrep.diff. + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Tue Jan 19 15:26:41 UTC 2010 - mseben@novell.com + +- updated to 1.3.13 + - gzip interprets an argument of "-" as indicating stdin, but when + "-" is not the first name on the command line, it doesn't work. + - remove useless if-before-free tests + - remove useless casts to avoid "make syntax-check" failures + - avoid spurious warnings from clang + - avoid a leak on a error path + - don't misinterpret a failing test as successful + - avoid creating an undersized buffer for the hufts table + A malformed input file can cause gzip to crash with a segmentation + violation or hang in an endless loop. + - avoid silent data loss e.g., on NFS, due to unchecked close of stdout + - build require automake-1.11 and produce xz-compressed tarballs, too +- deprecated futimens.diff and CVE-2009-2624.diff + +------------------------------------------------------------------- +Thu Jan 14 17:17:49 UTC 2010 - mseben@novell.com + +- added gzip-CVE-2009-2624.diff and gzip-CVE-2010-0001.diff : fix + possible denial of service and arbitrary code execution + +------------------------------------------------------------------- +Sun Dec 6 18:57:34 CET 2009 - jengelh@medozas.de + +- enabled parallel make + +------------------------------------------------------------------- +Tue Mar 10 11:45:26 CET 2009 - sf@suse.de + +- added doc files (README, TODO, ...) (bnc #414305) + +------------------------------------------------------------------- +Wed Jan 7 13:59:52 CET 2009 - schwab@suse.de + +- Fixup rsyncable patch. + +------------------------------------------------------------------- +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 + +- Fix compiling with glibc 2.6. + +------------------------------------------------------------------- +Sun Apr 15 00:03:31 CEST 2007 - schwab@suse.de + +- Update to gzip 1.3.12. + * znew now uses $TMPDIR (default /tmp) instead of always using /tmp. + +------------------------------------------------------------------- +Tue Mar 27 13:50:42 CEST 2007 - dmueller@suse.de + +- reenable profile feedback +- remove hardcoded -mcpu=pentiumpro for x86 + +------------------------------------------------------------------- +Tue Feb 6 11:27:21 CET 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. + For example, 'gzip' and 'gunzip' are no longer hard links; + 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 8 18:13:21 CET 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. + * gzip -q now exits with status 2 (not 1) when SIGPIPE is received. + * zcmp and zdiff did not work in the usual case, due to a typo. + * zgrep has many bugs fixed with argument handling, special characters, + and exit status. + * zless no longer mishandles $%=~ in file names. + +------------------------------------------------------------------- +Fri Dec 15 11:48:41 CET 2006 - schwab@suse.de + +- Update to gzip 1.3.9. + * No major changes; only porting fixes. + +------------------------------------------------------------------- +Tue Dec 12 10:10:38 CET 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 7 11:19:36 CET 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. + - Fix more race conditions in setting file permissions and owner, + removing output files, following symbolic links, and dealing with + special files. + - Remove most of the code working around ENAMETOOLONG deficiencies. + Systems with those deficiencies are long-dead, and the workarounds + had race conditions on modern hosts. + - Catch CPU time and file size limit signals, too. + - Check for read errors when closing files. + - Fix a core dump caused by a stray abort mistakenly introduced in 1.3.6. + * Fix some gzexe problems: + - Improve resistance to denial-of-service attacks. + - Fix some quoting and escaping bugs. + - Do not assume /tmp is sticky (though it should be!). + - Do not assume the working directory can be written. + - 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 4 13:08:18 CET 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. + * When gzip exits due to a signal, it exits with the signal's status, not 1. + * gzip now restores file time stamps to the resolution supported by the + time-setting primitives of the operating system, typically 1 microsecond. + Formerly it restored them only to the nearest second. + * gzip -r no longer attempts to reset the last-access times of directories + it reads, as this messes up when other processes are reading the directories. + * The options --version and --help now work on all gzip-installed executables, + and now use a format similar to other GNU programs. + * 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 11:11:47 CEST 2006 - schwab@suse.de + +- Verify hash tables when unpacking [#202365]. + +------------------------------------------------------------------- +Mon Mar 13 17:53:27 CET 2006 - schwab@suse.de + +- Add rsyncable patch [#155442]. + +------------------------------------------------------------------- +Wed Jan 25 21:30:22 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Nov 11 11:56:29 CET 2005 - pth@suse.de + +- Don't obsolete compress. + +------------------------------------------------------------------- +Mon Oct 31 18:15:55 CET 2005 - dmueller@suse.de + +- build with non-executable stack + +------------------------------------------------------------------- +Tue Jul 26 14:56:47 CEST 2005 - schwab@suse.de + +- Ignore directory part on saved file name [#79292]. + +------------------------------------------------------------------- +Tue Apr 19 14:59:23 CEST 2005 - kukuk@suse.de + +- Remove uncompress symlink [#78331] + +------------------------------------------------------------------- +Thu Mar 24 13:33:56 CET 2005 - werner@suse.de + +- Add support for bzip2 and simply pager options to zmore + +------------------------------------------------------------------- +Mon May 3 13:59:40 CEST 2004 - schwab@suse.de + +- Fix quoting issues in zgrep [#39329]. + +------------------------------------------------------------------- +Fri Feb 27 17:44:02 CET 2004 - schwab@suse.de + +- Add %defattr. + +------------------------------------------------------------------- +Tue Dec 2 10:12:06 CET 2003 - pthomas@suse.de + +- Remove the patch for tail syntax as it's wrong and unnecessary. + +------------------------------------------------------------------- +Thu Sep 18 15:18:43 CEST 2003 - mmj@suse.de + +- Fix tail syntax in gzexe [#31229] + +------------------------------------------------------------------- +Thu Aug 28 16:00:22 CEST 2003 - kukuk@suse.de + +- Make sure we have no hardlinks from /bin to /usr/bin [Bug #29522] + +------------------------------------------------------------------- +Tue Jun 17 13:47:17 CEST 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. + - zforce no longer assumes 14-byte file name length limit. + - zless is now implemented using less and LESSOPEN, not zmore and PAGER. + - assembly-language speedups reenabled; were mistakenly disabled in 1.3. + - 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 4 18:20:32 CEST 2003 - jh@suse.de + +- Enable profile feedback + +------------------------------------------------------------------- +Thu Apr 24 12:20:23 CEST 2003 - ro@suse.de + +- fix install_info --delete call and move from preun to postun + +------------------------------------------------------------------- +Tue Apr 15 17:31:41 CEST 2003 - coolo@suse.de + +- use BuildRoot + +------------------------------------------------------------------- +Sat Feb 8 10:58:53 CET 2003 - kukuk@suse.de + +- Readded prereq for install-info, else we cannot install info + pages +- Add dir entry to info page + +------------------------------------------------------------------- +Sat Feb 8 01:43:07 CET 2003 - ro@suse.de + +- removed prereq for texinfo to avoid prereq-cycle + +------------------------------------------------------------------- +Fri Feb 7 02:24:31 CET 2003 - ro@suse.de + +- added install_info macros + +------------------------------------------------------------------- +Wed Jan 29 15:13:10 CET 2003 - kukuk@suse.de + +- Remove mimencode requires, it is optional + +------------------------------------------------------------------- +Tue Dec 17 15:25:56 CET 2002 - werner@suse.de + +- The `:' line of zgrep will be removed by configure +- zgrep requzires mimencode from metamail + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Thu Mar 14 18:26:33 CET 2002 - kukuk@suse.de + +- Add uncompress compat link + +------------------------------------------------------------------- +Wed Feb 6 11:15:08 CET 2002 - coolo@suse.de + +- use %suse_update_config + +------------------------------------------------------------------- +Thu Jan 24 11:35:18 CET 2002 - okir@suse.de + +- fixed tempfile race in zdiff (current code used bash noclobber + which is inherently racey) + +------------------------------------------------------------------- +Wed Jun 6 16:28:07 CEST 2001 - werner@suse.de + +- Make zgrep knowing about bzip2 + +------------------------------------------------------------------- +Tue Apr 3 18:42:46 CEST 2001 - uli@suse.de + +- fixed for gcc >2.96 + +------------------------------------------------------------------- +Tue Mar 27 03:07:13 CEST 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 18:17:05 CET 2000 - aj@suse.de + +- Update to gzip 1.3. + +------------------------------------------------------------------- +Wed Aug 23 16:41:25 CEST 2000 - werner@suse.de + +- Security changes for the znew script + +------------------------------------------------------------------- +Mon May 1 18:50:20 CEST 2000 - kukuk@suse.de + +- LSB-FHS requires /bin/gunzip and /bin/zcat to /bin/gzip + +------------------------------------------------------------------- +Tue Apr 18 10:42:52 CEST 2000 - kukuk@suse.de + +- Add /bin/zcat (required by FHS 2.1) + +------------------------------------------------------------------- +Fri Feb 25 12:29:21 CET 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 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Fri Mar 6 18:47:20 MET 1998 - florian@suse.de + +- fixed security bug posted on Dez 27 to bugtraq + +------------------------------------------------------------------- +Thu Jan 8 17:24:05 MET 1998 - bs@suse.de + +- fixed "double" /bin/gzip & /usr/bin/gzip + +---------------------------------------------------------------------------- +Thu Apr 24 10:15:54 CEST 1997 - bs@suse.de + + +- added symlink /bin/gunzip + +---------------------------------------------------------------------------- +Sun Apr 13 23:04:29 MEST 1997 - florian@suse.de + + +- add bug-fixes from gnu.utils.bugs + + diff --git a/gzip.keyring b/gzip.keyring new file mode 100644 index 0000000..d1933d6 --- /dev/null +++ b/gzip.keyring @@ -0,0 +1,72 @@ +pub 4096R/000BEEEE 2010-06-14 +uid Jim Meyering +uid Jim Meyering +uid Jim Meyering +uid [ opphevet] Jim Meyering + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +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 +=Q4hV +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gzip.spec b/gzip.spec new file mode 100644 index 0000000..7f0d1d6 --- /dev/null +++ b/gzip.spec @@ -0,0 +1,161 @@ +# +# spec file for package gzip +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: gzip +Version: 1.13 +Release: 0 +Summary: GNU Zip Compression Utilities +License: GPL-3.0-or-later +Group: Productivity/Archiving/Compression +URL: https://www.gnu.org/software/gzip/ +Source: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +Source2: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig +Source3: %{name}.keyring +Patch0: zgrep.diff +Patch2: zmore.diff +Patch3: non-exec-stack.diff +Patch6: zdiff.diff +# PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files +Patch7: xz_lzma_zstd.patch +Patch8: manpage-no-date.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: makeinfo +BuildRequires: xz +Requires(post): %{install_info_prereq} +Requires(preun):%{install_info_prereq} +Conflicts: alternative(gzip) +Provides: alternative(gzip) + +%description +Gzip reduces the size of the named files using Lempel-Ziv coding LZ77. +Whenever possible, each file is replaced by one with the extension .gz, +while keeping the same ownership modes and access and modification +times. + +%prep +%setup -q +%patch0 +%patch2 -p1 +%patch3 +%patch6 +%patch7 -p1 +%patch8 -p1 + +%build +export CFLAGS="%{optflags} -fomit-frame-pointer \ +%ifarch s390x +-Dalignas=_Alignas \ +%endif +-W -Wall -Wno-unused-parameter -Wstrict-prototypes -Wpointer-arith -fPIE" +export LDFLAGS="-pie" +# added because of gzip-1.10-ibm_dfltcc_support.patch [jsc#SLE-5818] +%ifarch s390x +autoreconf -f -i +export CFLAGS="$CFLAGS -DDFLTCC_LEVEL_MASK=0x7e" +%endif +# Avoid text relocations on i386 as the assembler code (in +# lib/match.c) is not prepared for PIE (bsc#1143125). +export DEFS=NO_ASM +export CONFIG_SHELL=/bin/sh +%configure --disable-silent-rules \ + gl_cv_func_printf_directive_n=yes \ + gl_cv_func_printf_infinite_long_double=yes \ +%ifarch s390x + --enable-dfltcc \ +%endif + +profile_gzip() +{ + tmpfile=$(mktemp) + trap "rm -f $tmpfile $tmpfile.gz" EXIT + xz -cd %{SOURCE0} > $tmpfile + time ./gzip < $tmpfile > $tmpfile.gz + time ./gzip -d < $tmpfile.gz > /dev/null +} +%if %{do_profiling} +%make_build CFLAGS="$CFLAGS -fprofile-generate" LDFLAGS="-pie" +profile_gzip +%make_build clean +%make_build CFLAGS="$CFLAGS -fprofile-use" LDFLAGS="-pie" +%else +%make_build LDFLAGS="-pie" +%endif + +%check +for i in $(seq 1 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_install +%if 0%{?suse_version} < 1550 +mkdir -p %{buildroot}/bin +ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat %{buildroot}/bin +%endif +ln -sf zmore %{buildroot}%{_bindir}/zless +ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1 + +%post +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} + +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} + +%files +%license COPYING +%doc README AUTHORS ChangeLog TODO NEWS THANKS +%if 0%{?suse_version} < 1550 +/bin/gunzip +/bin/gzip +/bin/zcat +%endif +%{_bindir}/gunzip +%{_bindir}/gzexe +%{_bindir}/gzip +%{_bindir}/uncompress +%{_bindir}/zcat +%{_bindir}/zcmp +%{_bindir}/zdiff +%{_bindir}/zegrep +%{_bindir}/zfgrep +%{_bindir}/zforce +%{_bindir}/zgrep +%{_bindir}/zless +%{_bindir}/zmore +%{_bindir}/znew +%{_infodir}/gzip.info%{?ext_info} +%{_mandir}/man1/gunzip.1%{?ext_man} +%{_mandir}/man1/gzexe.1%{?ext_man} +%{_mandir}/man1/gzip.1%{?ext_man} +%{_mandir}/man1/zcat.1%{?ext_man} +%{_mandir}/man1/zcmp.1%{?ext_man} +%{_mandir}/man1/zdiff.1%{?ext_man} +%{_mandir}/man1/zforce.1%{?ext_man} +%{_mandir}/man1/zgrep.1%{?ext_man} +%{_mandir}/man1/zless.1%{?ext_man} +%{_mandir}/man1/zmore.1%{?ext_man} +%{_mandir}/man1/znew.1%{?ext_man} + +%changelog diff --git a/manpage-no-date.patch b/manpage-no-date.patch new file mode 100644 index 0000000..592438a --- /dev/null +++ b/manpage-no-date.patch @@ -0,0 +1,21 @@ +Index: gzip-1.12/doc/gzip.texi +=================================================================== +--- gzip-1.12.orig/doc/gzip.texi ++++ gzip-1.12/doc/gzip.texi +@@ -9,7 +9,7 @@ + @c %**end of header + @copying + This manual is for GNU Gzip +-(version @value{VERSION}, @value{UPDATED}), ++(version @value{VERSION}), + and documents commands for compressing and decompressing data. + + Copyright @copyright{} 1998--1999, 2001--2002, 2006--2007, 2009--2023 Free +@@ -47,7 +47,6 @@ Free Documentation License''. + @title GNU gzip + @subtitle The data compression program + @subtitle for Gzip version @value{VERSION} +-@subtitle @value{UPDATED} + @author by Jean-loup Gailly + + @page diff --git a/non-exec-stack.diff b/non-exec-stack.diff new file mode 100644 index 0000000..53779b4 --- /dev/null +++ b/non-exec-stack.diff @@ -0,0 +1,9 @@ +Index: lib/match.c +=================================================================== +--- lib/match.c.orig ++++ lib/match.c +@@ -772,3 +772,4 @@ match_init: + # endif /* __ia64__ */ + #endif /* mc68000 || mc68020 */ + #endif /* i386 || _I386 */ ++ .section .note.GNU-stack,"",@progbits diff --git a/xz_lzma_zstd.patch b/xz_lzma_zstd.patch new file mode 100644 index 0000000..f645ac2 --- /dev/null +++ b/xz_lzma_zstd.patch @@ -0,0 +1,33 @@ +Index: gzip-1.12/zgrep.1 +=================================================================== +--- gzip-1.12.orig/zgrep.1 ++++ gzip-1.12/zgrep.1 +@@ -11,7 +11,7 @@ The + .B zgrep + command invokes + .B grep +-on compressed or gzipped files. ++on compressed, xz'ed, lzma'ed, zstd'ed, bzip2'ed or gzipped files. + All options specified are passed directly to + .BR grep . + If no file is specified, then the standard input is decompressed +Index: gzip-1.12/zgrep.in +=================================================================== +--- gzip-1.12.orig/zgrep.in ++++ gzip-1.12/zgrep.in +@@ -215,6 +215,15 @@ do + *.bz2) + uncompress=bzip2 + ;; ++ *.xz) ++ uncompress=xz ++ ;; ++ *.lzma) ++ uncompress=lzma ++ ;; ++ *.zst) ++ uncompress=zstd ++ ;; + *) + uncompress=gzip + ;; diff --git a/zdiff.diff b/zdiff.diff new file mode 100644 index 0000000..7000a1e --- /dev/null +++ b/zdiff.diff @@ -0,0 +1,17 @@ +Index: zdiff.in +=================================================================== +--- zdiff.in.orig ++++ zdiff.in +@@ -133,9 +133,9 @@ case $file2 in + 5<&0 + then + gzip_status=$( +- exec 4>&1 +- ('gzip' -cdfq -- "$file1" 4>&-; echo $? >&4) 3>&- | +- (('gzip' -cdfq -- "$file2" 4>&- ++ exec 4>&1 6<&0 ++ ('gzip' -cdfq -- "$file1" 4>&-; echo $? >&4) 3>&- 6<&- | ++ (('gzip' -cdfq -- "$file2" 4>&- 0<&6 6<&- + echo $? >&4) 3>&- 5<&- &3) 5<&0 + ) diff --git a/zgrep.diff b/zgrep.diff new file mode 100644 index 0000000..1e446ac --- /dev/null +++ b/zgrep.diff @@ -0,0 +1,24 @@ +Index: zgrep.in +=================================================================== +--- zgrep.in.orig ++++ zgrep.in +@@ -211,10 +211,18 @@ res=1 + + for i + do ++ case "$i" in ++ *.bz2) ++ uncompress=bzip2 ++ ;; ++ *) ++ uncompress=gzip ++ ;; ++ esac + # Fail if gzip or grep (or sed) fails. + gzip_status=$( + exec 5>&1 +- ('gzip' -cdfq -- "$i" 5>&-; echo $? >&5) 3>&- | ++ ($uncompress -cdfq -- "$i" 5>&-; echo $? >&5) 3>&- | + if test $files_with_matches -eq 1; then + eval "$grep$args" >/dev/null && { printf '%s\n' "$i" || exit 2; } + elif test $files_without_matches -eq 1; then diff --git a/zmore.diff b/zmore.diff new file mode 100644 index 0000000..7c5bec7 --- /dev/null +++ b/zmore.diff @@ -0,0 +1,44 @@ +--- + zmore.in | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +Index: gzip-1.12/zmore.in +=================================================================== +--- gzip-1.12.orig/zmore.in ++++ gzip-1.12/zmore.in +@@ -38,6 +38,29 @@ case $1 in + exit 1;; + esac + ++opt= ++pager () ++{ ++ eval ${PAGER-more} \$opt ++ cat > /dev/null ++} ++ ++while :; do ++ case $1 in ++ --) ++ shift ++ break ++ ;; ++ [-+]*) ++ opt="$opt $1" ++ shift ++ ;; ++ *) ++ break ++ ;; ++ esac ++done ++ + if test $# = 0; then + if test -t 0; then + printf >&2 '%s\n' "$0: missing operands; try '$0 --help' for help" +@@ -51,4 +74,4 @@ do + test $# -lt 2 || + printf '::::::::::::::\n%s\n::::::::::::::\n' "$FILE" || break + 'gzip' -cdfq -- "$FILE" +-done 2>&1 | eval ${PAGER-more} ++done 2>&1 | pager