From aff01339aeff554573235b938f87c279e2c63507e5e9d646e4614f526bda91a4 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 11 Jun 2013 12:44:23 +0000 Subject: [PATCH] Accepting request 178436 from home:jengelh:branches:Base:System - Update to new upstream release 1.6 OBS-URL: https://build.opensuse.org/request/show/178436 OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=27 --- gzip-1.5.tar.gz | 3 -- gzip-1.6.tar.xz | 3 ++ gzip-1.6.tar.xz.sig | 19 ++++++++++++ gzip.changes | 16 ++++++++++ gzip.keyring | 72 +++++++++++++++++++++++++++++++++++++++++++++ gzip.spec | 15 +++++++--- zmore.diff | 39 +++++++++++------------- 7 files changed, 138 insertions(+), 29 deletions(-) delete mode 100644 gzip-1.5.tar.gz create mode 100644 gzip-1.6.tar.xz create mode 100644 gzip-1.6.tar.xz.sig create mode 100644 gzip.keyring diff --git a/gzip-1.5.tar.gz b/gzip-1.5.tar.gz deleted file mode 100644 index 2f17f19..0000000 --- a/gzip-1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3 -size 1114684 diff --git a/gzip-1.6.tar.xz b/gzip-1.6.tar.xz new file mode 100644 index 0000000..a4f3a3f --- /dev/null +++ b/gzip-1.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847 +size 725084 diff --git a/gzip-1.6.tar.xz.sig b/gzip-1.6.tar.xz.sig new file mode 100644 index 0000000..7f710d7 --- /dev/null +++ b/gzip-1.6.tar.xz.sig @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.13 (GNU/Linux) + +iQJ8BAABCgBmBQJRtREaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 +RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7upigP/AwQtlAaGTR0xGk0BGuM537R +ucSzRKO7buIEgeS9zl5UkrdoKtt3r+SDRlV3R7SuBFPERg98ZJxwQ4h9bHPsi6OK +4DNkSrqJQq5f8qCI6bfcQ86NX17XgPYgo+Hg+zb+48jcXOO70cyS588ZV14a9p0T +EQHSO7ur9PFSmonPH77WHqvF15PrczIzwHxHDRVyEQEufIxtGOsZaS+JiZ7U8biB +18wNviZMcXsrM36Wfq/okHJMnvly6pegE0SoMIExNRN3pFgjZNJUopiW/lLThHmI +jna/XOyLoOJVvRdMaQc8Zp7wrzfOJVNGcJIFVhJaRZ3MMk/UxSeGOUUWJ/Du8n5r +2tizxqOwOgGuoPGCGO66f53iUytklOA8rwufF3GmaF/YvtYFgpH75pFTqmJPeh2h +66TnFBDLbjnTKUQXhzEaXSY1o2J+IExwMOYVhB5ONbMliuquOtMT4mjYQ9AsTFXM +6hVwSHSE4Wbu6PT2pXzJdF207xOjD0q63sSkHRPBfOapkYZl7xeIWhEcogQ5E6HZ +GmPca1apkGRHoCU13+DQJGAAWMFV8iLg9ljaLQwTiMMljLsTI86m6suij7XyHgPg +slWBqWPWC+vv83tVrUSh/ICHgNby0Bkos1rIlHkdgqlaUijhBWaOgi+Xec5Bwnj3 +q/9pT4zyqOgNAGvwWwDU +=hSUh +-----END PGP SIGNATURE----- diff --git a/gzip.changes b/gzip.changes index 6358b0a..e3aca33 100644 --- a/gzip.changes +++ b/gzip.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 diff --git a/gzip.keyring b/gzip.keyring new file mode 100644 index 0000000..b3b8b88 --- /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) + +mQINBEwWvdkBEACyOXTiLBZ5MFNM6jmm83ui3MqW0/eD8TcAI4gt0gwOvd/jXerI +ros8dRVook7FBoNiFSiJSMVOiNPUMfv5h5wZm0bje33qTJPL7IanSKXtk/I7Za1G +EJfEnfgZI/d4EIV8wrl0WI1lPEteTgRJbo76zfLIUOHpynVC2Wm5gALJ4oeJIS0A +hYSzbFmHD9dFI7m3sO/HmbhxTiMISy0FbmoqE/cpo8ZX6eahND2UrS2oGNC0Ok8/ +nN8XLPPsikx35FKx6bDTfoAK/svx6PK1sSPfAdoZFZ5Jy6Ti4zubebUD+5I8+bOn +6R9I7P0HerCTqMBLnf9LJHTPhTk8fHEwlAeH+WfpEmN9/4YORb84WY97tFbVK4f/ +icEjnYBc0Ozl4qMGI1g/1R5Q9Z8qxLGsW9tNWyIfAf+2BhLA08RfA0wxmEf2Gnfp +J379s5c0U8xLZegOGRF1tOAEIC+5wRKFN/qU9zpLbUZIGrB+ysVeTlDuCDnTnyUe +WBQeRnfItl4taEN0/axNGB/NuHvxShyzxez/flbyqKwsxc35/a2OCbwmADeUh+ct +sYUGZya/GuXfejWbCuaqZLLkP6Ed9k4+LY+ww6jA7uNPRXpCYoXFo2WN9OaIqfb/ +RDk6zW708qbxvcWKe6j9f8R0lPMYdtUzZhyxZxeZ0/2BdDyXAj1Wvnw1UwARAQAB +tB5KaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT6JAjcEEwECACEFAlDwG/0C +Gy8FCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQf9n8ywAL7u75Ag/+IzQ1hoL/ +qwCsVjhFdi2WloZ3+HREC1aeyAKiOduQijWg3dd4YZQeMGFHMgIqaHHOxWAijJP/ +Qi5Y/k5cotE/gUSPX2lEldF+bA1ZpzgZbOiqfjpTFmsy8nXAeDRLusc8Tn/+vQVa +l9ZzcfG21CUEZaDLk+8OFpj8poqczPMsNpmsuy7CjK8TRIoHMVJk+h/P1AYaQpQw +qRg8+/Fzn1AnnNcVnRTE13lcfrG9EmCfF1A+Auy9BsPe2j0LlZHhXGOrK2JGUGO6 +er+yQLy1STsRFw0b/jVp3hbsT8qcLxYx+Ekhli4OeF1pXZRlvbKHQcguuRgBdFtF +nnpcWkHyAVUP4Mpwf3eZRcQnbdDIf42VdAVoh8DKHc3Fxr+NABlj+851SuKoNn4/ +liAOxBku4Za6flHM7EMPLgpkzoB934s1HNNTrfPS6f+9G+C1p7kWuGl/lBq0pWho +t1v8ojQci2UHnxQu+RY4PTpBH2TwqwolpxZERG/pFADsw/peoTgTNdeY059amgvZ +mKk29krXgV4OW083GTM2UTtnrycNvLF4d93EcIZX3Rot0uxYg6g0Btu1ifRJFmzi +XflYoBnIc//971j2Ty7oM1xq+lUiG1oCYKwfbc4ewFjMrLfqtlO/OV2T2spm9cVy +w3e78u3DDEUaTxa4oKt2W2B/XTJb4fx0VCi0H0ppbSBNZXllcmluZyA8amltQG1l +eWVyaW5nLm5ldD6JAjoEEwEIACQCGy8FCwkIBwMFFQoJCAsFFgIDAQACHgECF4AF +AkwXdFQCGQEACgkQf9n8ywAL7u6hfQ/+J5VFGee4r5JF3M+ImCzLmidwRk7Ah2Gu +a1Xv8MvH05kSxUGXp83a3F3Zgo60sRzQ569EBjhCu2Hewz3p3nfWgYqnkKuCIOhg +7oq7dirEaFatdTHgN7tuACI2m60ncdgQa9S13tmmEy407iZqYQJNtLFDe/r6Fcf6 +cDFnjiIsVdk1WPyw3gLs/gjgh+MmyQRtotULAHFPSuq1v2SdE3umaillGH9gSfoa +U8PUdnKRgyaOHA7mC0EHdgHk8Fte+5ZtpbAnWJL7IlZw5ul6br4q3Ry/5UL9GbbR +/ma9AMAYEt42NMhLLnaOHbiVC7iyNqSoVsoLY8VFWprHxd3xe+WtzdEMSLqd6lvm +CF9B+IAsLvvQaas2v+FtOKuDDRcWMFm/ulyPxa5ewSabgB/xhr1n2KROBJuyGXuI +BCzj2XTt2mCjfs6aMV7COoLiDoVDrc3SjM7SIUvndgemQ7dCGmWEAJsRHHU1KW7X +H3ycYi2waiFPL16hTaUGi0sjIR50OOMbzA/JBwUj1rocK5OM1RbdZk4vu1GQwZuD +BGsVvL6eciXPFEWrJNbdqaCYiSKVGByPVUUgLC6qPcVYezCOcdJTrBae9Y+me8B4 +K8hNAU3t/fGlOFxt8Ka5daoPLHbyw9EWo9QNWEHlTOhqhB3w04YJBwrxeI07uRm0 +UhqufTRftUG0H0ppbSBNZXllcmluZyA8bWV5ZXJpbmdAZ251Lm9yZz6JAjcEEwEI +ACEFAkwXc5MCGy8FCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQf9n8ywAL7u7d +Xg//TD0dsvwMl5gGSJspUHz08vwcM9zp2fldabi1GMC0q73nYnoUH9wHLVcPJ77C +Rqh+9lyvd230hnHPPbMksg/L6YetnVAo0NUz8pxx1hZBw8fJDvl4NxTgs8FbwtxL +/ZnAs/RHzEEiECbWWnxaEWYuZAGD4S8u6fnzNfPCYbf/dCEdO4O+FIumPoJCJF9o +rHd3rvtB+P41YKaY1+K8lM02BoY3fXRwbCvX1Rn965/BtIJiUDJLxEXUk2Gq6pZ9 +zPcHKQjHcGs+2zS/Z6wmhuTEhFmpCw0jIt9rzMs5i5JOB0eqLtKD9C6tURA1KK1e +XUvE4X8F7kaXkfPXhLzdLZskTt0kbNr+YU5AZtEDWplaw71t376JKOyn7yLqYLJL +R0KMmn1DpU4kFSMK+zufLGo0gmp0054hwBqM0q8V69AhfJQB/AV9MnpJ4h23N1kI +RxfYMThZr29PBFR0xkq6hOW7sfbZmQDL8j6NaMKWVJx7cFDzMkXXGozuBltjFGa+ +q0Vf9QpDGiMPXIUz9elRZQ/pPP6ha6pycpElp9LJ9DumBAtG2bimhhlEXNP0L7H5 +TQefDCgmfVY2DuyxbPP5knAmvEW4pEXd+UZ+epsRve5mu8yAHp+vznGM+SuBp1sG +UL5VmkFtNnpXhW6hco2s3egz7hZOlsH+L8BbAmw5E+tGfP60IkppbSBNZXllcmlu +ZyA8bWV5ZXJpbmdAcmVkaGF0LmNvbT6JAh8EMAEIAAkFAlCBOrICHSAACgkQf9n8 +ywAL7u7aJQ/+IJqpTT55uVMvnvVGsSnSGEm0Fbirbra3yncsV/9DF5iNpYj3deCf +A4YdKLrcn+F7sep+62rMtk+Pwik1rbU98bbcd/rH0Zg92ePlS2gingyi166XkQs8 +Vgx1WsUH9gGA/vRmtSdso4Gbod1ucmePliMxIxDF3a7zRte9T8GuYFW/cD/yozHi +JrL2k7nVor6+YbIvePToEP/p0XLGeYUn2iZ1XCEp9na2Odw7/g9Z/78aJAXsCvWN +MVXYbKv67lx+4p2u5kwg34gOpnoBfFVMDy+xQYYRM8XrOrcRMnUlBNdFDYue7EB+ +E65PfKfzPaTLPBI2eeeyrBg72H9PG9IY5TDFdvm2KCO7GMnd4Kjg9h9d+r1kfZAX +zXHpzkHMpxarvNoAovaxAr8Xh0lP5PwlMA0GkZXpSTXImYrobwLeR2sowGbwXazq +ozsroO7LGwaI8cRcGmXtCMQR+iS/c2gp80tzKazP+7ao+C/AZr67gzrnJY5uO000 +Vd5lRaTG1T11feTbAhnxFSmQUE5TnUIOfss2dCCO6CMqcrlac6QTYEolgWRBN/Fo +3zAVAPpbXsqY+OEPnHwwWJeCv9ZprW36PRIjktfw4igP38wTimZ0onI4j0SlKLIT +V1KlGZVpG2onBn/Ly5HGepqZd7VbRQTruLXpWEpn56YN+vtrthw1wcM= +=Q4hV +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gzip.spec b/gzip.spec index 253db27..bcb73c8 100644 --- a/gzip.spec +++ b/gzip.spec @@ -18,13 +18,15 @@ Name: gzip Url: http://www.gzip.org/ -PreReq: %{install_info_prereq} update-alternatives -Version: 1.5 +Version: 1.6 Release: 0 Summary: GNU Zip Compression Utilities License: GPL-2.0+ Group: Productivity/Archiving/Compression -Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz + +Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig +Source3: %name.keyring Patch: zgrep.diff Patch1: tempfile.diff Patch2: zmore.diff @@ -34,6 +36,9 @@ Patch6: zdiff.diff # PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files Patch7: xz_lzma.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: makeinfo +BuildRequires: xz +PreReq: %{install_info_prereq} update-alternatives %description Gzip reduces the size of the named files using Lempel-Ziv coding LZ77. @@ -42,10 +47,11 @@ while keeping the same ownership modes and access and modification times. %prep +%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %patch %patch1 -%patch2 +%patch -P 2 -p1 %patch3 %patch4 -p1 %patch6 @@ -84,6 +90,7 @@ for i in 1 2 3 4 5 6 7 8 9; do done %install +make install DESTDIR="%buildroot" %makeinstall #UsrMerge mkdir -p $RPM_BUILD_ROOT/bin diff --git a/zmore.diff b/zmore.diff index 21e196c..4e17fb5 100644 --- a/zmore.diff +++ b/zmore.diff @@ -1,10 +1,14 @@ -Index: zmore.in +--- + zmore.in | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +Index: gzip-1.6/zmore.in =================================================================== ---- zmore.in.orig 2012-01-01 09:53:58.000000000 +0100 -+++ zmore.in 2012-10-16 13:34:42.842966614 +0200 -@@ -55,11 +55,34 @@ else - trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15 - fi +--- gzip-1.6.orig/zmore.in ++++ gzip-1.6/zmore.in +@@ -44,6 +44,29 @@ case $1 in + exit 1;; + esac +opt= +pager () @@ -31,19 +35,10 @@ Index: zmore.in + if test $# = 0; then if test -t 0; then - echo >&2 "$0: invalid number of operands; try \`$0 --help' for help" - else -- gzip -cdfq | eval ${PAGER-more} -+ gzip -cdfq | pager - fi - else - FIRST=1 -@@ -83,7 +106,7 @@ else - fi - if test "$ANS" != 's'; then - echo "------> $FILE <------" -- gzip -cdfq -- "$FILE" | eval ${PAGER-more} -+ gzip -cdfq -- "$FILE" | pager - fi - if test -t 1; then - FIRST=0 + printf >&2 '%s\n' "$0: missing operands; try '$0 --help' for help" +@@ -57,4 +80,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