[packages/gzip] - updated to 1.7 - removed obsolete zgreppipe,noppid,rsyncable patches
qboosh
qboosh at pld-linux.org
Sun Apr 24 18:04:28 CEST 2016
commit 10c699647085e8bc29db1b49f35873c1258f2ce6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 24 18:04:58 2016 +0200
- updated to 1.7
- removed obsolete zgreppipe,noppid,rsyncable patches
gzip-noppid.patch | 68 ------------
gzip-rsyncable.patch | 299 ---------------------------------------------------
gzip-zgreppipe.patch | 16 ---
gzip.spec | 25 ++---
4 files changed, 7 insertions(+), 401 deletions(-)
---
diff --git a/gzip.spec b/gzip.spec
index 45742c3..d5a90e2 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -8,24 +8,21 @@ Summary(ru.UTF-8): Программа сжатия данных GNU gzip
Summary(tr.UTF-8): GNU gzip dosya sıkıştırma aracı
Summary(uk.UTF-8): Програма компресії даних GNU gzip
Name: gzip
-Version: 1.6
-Release: 2
+Version: 1.7
+Release: 1
License: GPL v3+
Group: Applications/Archiving
Source0: http://ftp.gnu.org/gnu/gzip/%{name}-%{version}.tar.xz
-# Source0-md5: da981f86677d58a106496e68de6f8995
+# Source0-md5: d9ae97206a703a20e6c1c868deb3eb47
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: ea70155215d7b7d413ff476b668bcbbd
Patch0: %{name}-mktemp.patch
Patch1: %{name}-info.patch
Patch2: %{name}-stderr.patch
-Patch3: %{name}-zgreppipe.patch
-Patch4: %{name}-noppid.patch
-Patch5: %{name}-rsyncable.patch
URL: http://www.gnu.org/software/gzip/
BuildRequires: autoconf >= 2.60
%if "%{pld_release}" == "ac"
-BuildRequires: automake >= 1:1.7
+BuildRequires: automake >= 1:1.10
%else
BuildRequires: automake >= 1:1.11
%endif
@@ -77,9 +74,6 @@ Оброблені нею файли мають розширення .gz.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%if "%{pld_release}" == "ac"
%{__sed} -i -e '/AM_SILENT_RULES/d' configure.ac
@@ -100,18 +94,14 @@ Оброблені нею файли мають розширення .gz.
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/bin,%{_mandir}/pt/man1,/etc/env.d}
+install -d $RPM_BUILD_ROOT{/bin,%{_mandir}/pt/man1}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT%{_bindir}/gzip $RPM_BUILD_ROOT/bin
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/gzip $RPM_BUILD_ROOT/bin
%{__rm} $RPM_BUILD_ROOT%{_bindir}/gunzip $RPM_BUILD_ROOT%{_bindir}/zcat
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GZIP
-#GZIP="-5"
-EOF
-
cat > $RPM_BUILD_ROOT/bin/gunzip <<'EOF'
#!/bin/sh
exec /bin/gzip -d "$@"
@@ -127,7 +117,7 @@ ln -sf /bin/gunzip $RPM_BUILD_ROOT%{_bindir}/gunzip
%{__rm} $RPM_BUILD_ROOT%{_bindir}/uncompress
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT%{_mandir}/pt/*.1 $RPM_BUILD_ROOT%{_mandir}/pt/man1
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/pt/*.1 $RPM_BUILD_ROOT%{_mandir}/pt/man1
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.gzip-non-english-man-pages*
@@ -160,7 +150,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/zless
%attr(755,root,root) %{_bindir}/zmore
%attr(755,root,root) %{_bindir}/znew
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/GZIP
%{_mandir}/man1/gzexe.1*
%{_mandir}/man1/gzip.1*
%{_mandir}/man1/gunzip.1*
diff --git a/gzip-noppid.patch b/gzip-noppid.patch
deleted file mode 100644
index a18f4a4..0000000
--- a/gzip-noppid.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- gzip-1.5/znew.in.orig 2012-01-01 09:53:58.000000000 +0100
-+++ gzip-1.5/znew.in 2012-06-18 19:27:59.507710749 +0200
-@@ -59,9 +59,9 @@
- # block is the disk block size (best guess, need not be exact)
-
- warn="(does not preserve modes and timestamp)"
--tmp=${TMPDIR-/tmp}/zfoo.$$
-+tmp=`mktemp ${TMPDIR-/tmp}/zfoo.XXXXXX` || exit 1
- set -C
--echo hi > $tmp || exit
-+echo hi >| $tmp || exit
- if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then
- cpmod=${CPMOD-cpmod}
- warn=""
-@@ -117,6 +117,7 @@
-
- for i do
- n=`echo $i | sed 's/.Z$//'`
-+ ntmp=`mktemp ${TMPDIR:-/tmp}/$n.XXXXXX` || exit 1
- if test ! -f "$n.Z" ; then
- echo $n.Z not found
- res=1; continue
-@@ -132,7 +133,7 @@
- fi
- else
- if test $check -eq 1; then
-- if cp -p "$n.Z" "$n.$$" 2> /dev/null || cp "$n.Z" "$n.$$"; then
-+ if cp -p "$n.Z" "$ntmp" 2> /dev/null || cp "$n.Z" "$ntmp"; then
- :
- else
- echo cannot backup "$n.Z"
-@@ -142,7 +143,7 @@
- if gzip -d "$n.Z"; then
- :
- else
-- test $check -eq 1 && mv "$n.$$" "$n.Z"
-+ test $check -eq 1 && mv "$ntmp" "$n.Z"
- echo error while uncompressing $n.Z
- res=1; continue
- fi
-@@ -150,7 +151,7 @@
- :
- else
- if test $check -eq 1; then
-- mv "$n.$$" "$n.Z" && rm -f "$n"
-+ mv "$ntmp" "$n.Z" && rm -f "$n"
- echo error while recompressing $n
- else
- # compress $n (might be dangerous if disk full)
-@@ -165,15 +166,15 @@
- if test $pipe -eq 1; then
- rm -f "$n$ext"
- else
-- mv "$n.$$" "$n.Z" && rm -f "$n$ext"
-+ mv "$ntmp" "$n.Z" && rm -f "$n$ext"
- fi
- echo "$n.Z smaller than $n$ext -- unchanged"
-
- elif test $check -eq 1; then
- if gzip -t "$n$ext" ; then
-- rm -f "$n.$$" "$n.Z"
-+ rm -f "$ntmp" "$n.Z"
- else
-- test $pipe -eq 0 && mv "$n.$$" "$n.Z"
-+ test $pipe -eq 0 && mv "$ntmp" "$n.Z"
- rm -f "$n$ext"
- echo error while testing $n$ext, $n.Z unchanged
- res=1; continue
diff --git a/gzip-rsyncable.patch b/gzip-rsyncable.patch
deleted file mode 100644
index f8d84ce..0000000
--- a/gzip-rsyncable.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-NOTE: this patch is for _gzip_!
-
-This is pending for actual inclusion in gzip. It is currently being
-tried out in the default gzip for Debian Sarge, and may go into the
-upstream gzip at somepoint in the not-too-distant future.
-
---- gzip-1.5/deflate.c.orig 2012-04-24 18:25:28.000000000 +0200
-+++ gzip-1.5/deflate.c 2012-06-18 19:36:09.127690198 +0200
-@@ -131,6 +131,14 @@
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-+#ifndef RSYNC_WIN
-+# define RSYNC_WIN 4096
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
-+/* Whether window sum matches magic value */
-+
- /* ===========================================================================
- * Local data used by the "longest match" routines.
- */
-@@ -212,6 +220,8 @@
- unsigned good_match;
- /* Use a faster search when the previous match is longer than this */
-
-+local ulg rsync_sum; /* rolling sum of rsync window */
-+local ulg rsync_chunk_end; /* next rsync sequence point */
-
- /* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
-@@ -314,6 +324,10 @@
- #endif
- /* prev will be initialized on the fly */
-
-+ /* rsync params */
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ rsync_sum = 0;
-+
- /* Set the default configuration parameters:
- */
- max_lazy_match = configuration_table[pack_level].max_lazy;
-@@ -550,6 +564,8 @@
- memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
- match_start -= WSIZE;
- strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */
-+ if (rsync_chunk_end != 0xFFFFFFFFUL)
-+ rsync_chunk_end -= WSIZE;
-
- block_start -= (long) WSIZE;
-
-@@ -579,13 +595,46 @@
- }
- }
-
-+local void rsync_roll(start, num)
-+ unsigned start;
-+ unsigned num;
-+{
-+ unsigned i;
-+
-+ if (start < RSYNC_WIN) {
-+ /* before window fills. */
-+ for (i = start; i < RSYNC_WIN; i++) {
-+ if (i == start + num) return;
-+ rsync_sum += (ulg)window[i];
-+ }
-+ num -= (RSYNC_WIN - start);
-+ start = RSYNC_WIN;
-+ }
-+
-+ /* buffer after window full */
-+ for (i = start; i < start+num; i++) {
-+ /* New character in */
-+ rsync_sum += (ulg)window[i];
-+ /* Old character out */
-+ rsync_sum -= (ulg)window[i - RSYNC_WIN];
-+ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
-+ rsync_chunk_end = i;
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Set rsync_chunk_end if window sum matches magic value.
-+ */
-+#define RSYNC_ROLL(s, n) \
-+ do { if (rsync) rsync_roll((s), (n)); } while(0)
-+
- /* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
- #define FLUSH_BLOCK(eof) \
- flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
-- (char*)NULL, (long)strstart - block_start, (eof))
-+ (char*)NULL, (long)strstart - block_start, flush-1, (eof))
-
- /* ===========================================================================
- * Processes a new input file and return its compressed length. This
-@@ -596,7 +645,7 @@
- local off_t deflate_fast()
- {
- IPos hash_head; /* head of the hash chain */
-- int flush; /* set if current block must be flushed */
-+ int flush; /* set if current block must be flushed, 2=>and padded */
- unsigned match_length = 0; /* length of best match */
-
- prev_length = MIN_MATCH-1;
-@@ -626,6 +675,7 @@
-
- lookahead -= match_length;
-
-+ RSYNC_ROLL(strstart, match_length);
- /* Insert new strings in the hash table only if the match length
- * is not too large. This saves time but degrades compression.
- */
-@@ -654,9 +704,14 @@
- /* No match, output a literal byte */
- Tracevv((stderr,"%c",window[strstart]));
- flush = ct_tally (0, window[strstart]);
-+ RSYNC_ROLL(strstart, 1);
- lookahead--;
- strstart++;
- }
-+ if (rsync && strstart > rsync_chunk_end) {
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ }
- if (flush) FLUSH_BLOCK(0), block_start = strstart;
-
- /* Make sure that we always have enough lookahead, except
-@@ -730,6 +785,7 @@
- */
- lookahead -= prev_length-1;
- prev_length -= 2;
-+ RSYNC_ROLL(strstart, prev_length+1);
- do {
- strstart++;
- INSERT_STRING(strstart, hash_head);
-@@ -742,24 +798,39 @@
- match_available = 0;
- match_length = MIN_MATCH-1;
- strstart++;
-- if (flush) FLUSH_BLOCK(0), block_start = strstart;
-
-+ if (rsync && strstart > rsync_chunk_end) {
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ }
-+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
- } else if (match_available) {
- /* If there was no match at the previous position, output a
- * single literal. If there was a match but the current match
- * is longer, truncate the previous match to a single literal.
- */
- Tracevv((stderr,"%c",window[strstart-1]));
-- if (ct_tally (0, window[strstart-1])) {
-- FLUSH_BLOCK(0), block_start = strstart;
-- }
-+ flush = ct_tally (0, window[strstart-1]);
-+ if (rsync && strstart > rsync_chunk_end) {
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ }
-+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
-+ RSYNC_ROLL(strstart, 1);
- strstart++;
- lookahead--;
- } else {
- /* There is no previous match to compare with, wait for
- * the next step to decide.
- */
-+ if (rsync && strstart > rsync_chunk_end) {
-+ /* Reset huffman tree */
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ FLUSH_BLOCK(0), block_start = strstart;
-+ }
- match_available = 1;
-+ RSYNC_ROLL(strstart, 1);
- strstart++;
- lookahead--;
- }
---- gzip-1.5/gzip.c.orig 2012-04-24 18:25:28.000000000 +0200
-+++ gzip-1.5/gzip.c 2012-06-18 19:37:13.954354148 +0200
-@@ -213,6 +213,7 @@
- unsigned insize; /* valid bytes in inbuf */
- unsigned inptr; /* index of next byte to be processed in inbuf */
- unsigned outcnt; /* bytes in output buffer */
-+int rsync = 0; /* make ryncable chunks */
-
- static int handled_sig[] =
- {
-@@ -270,6 +271,7 @@
- {"best", 0, 0, '9'}, /* compress better */
- {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */
- {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */
-+ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */
-
- { 0, 0, 0, 0 }
- };
-@@ -353,6 +355,7 @@
- " -Z, --lzw produce output compatible with old compress",
- " -b, --bits=BITS max number of bits per code (implies -Z)",
- #endif
-+ " --rsyncable make rsync-friendly archive",
- "",
- "With no FILE, or when FILE is -, read standard input.",
- "",
-@@ -482,6 +485,9 @@
- recursive = 1;
- #endif
- break;
-+ case 'R':
-+ rsync = 1;
-+ break;
- case 'S':
- #ifdef NO_MULTIPLE_DOTS
- if (*optarg == '.') optarg++;
---- gzip-1.5/gzip.h.orig 2012-01-01 09:53:58.000000000 +0100
-+++ gzip-1.5/gzip.h 2012-06-18 19:36:31.987689240 +0200
-@@ -140,6 +140,7 @@
- extern unsigned insize; /* valid bytes in inbuf */
- extern unsigned inptr; /* index of next byte to be processed in inbuf */
- extern unsigned outcnt; /* bytes in output buffer */
-+extern int rsync; /* deflate into rsyncable chunks */
-
- extern off_t bytes_in; /* number of input bytes */
- extern off_t bytes_out; /* number of output bytes */
-@@ -287,7 +288,7 @@
- /* in trees.c */
- extern void ct_init (ush *attr, int *method);
- extern int ct_tally (int dist, int lc);
--extern off_t flush_block (char *buf, ulg stored_len, int eof);
-+extern off_t flush_block (char *buf, ulg stored_len, int pad, int eof);
-
- /* in bits.c */
- extern void bi_init (file_t zipfile);
---- gzip-1.3.6/doc/gzip.texi 2002-09-29 23:57:29 -0700
-+++ rsyncable/doc/gzip.texi 2005-02-05 09:40:33 -0800
-@@ -334,6 +334,14 @@
- into the directory and compress all the files it finds there (or
- decompress them in the case of @code{gunzip}).
-
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input. This increases size by less than 1 percent most cases, but
-+means that the @code{rsync} program can take advantage of similarities
-+in the uncompressed input when syncronizing two files compressed with
-+this flag. @code{gunzip} cannot tell the difference between a
-+compressed file created with this option, and one created without it.
-+
- @item --suffix @var{suf}
- @itemx -S @var{suf}
- Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
---- gzip-1.3.5/trees.c 1999-10-05 22:00:00 -0700
-+++ rsyncable/trees.c 2005-02-05 09:40:33 -0800
-@@ -46,12 +46,13 @@
- * void ct_tally (int dist, int lc);
- * Save the match info and tally the frequency counts.
- *
-- * off_t flush_block (char *buf, ulg stored_len, int eof)
-+ * off_t flush_block (char *buf, ulg stored_len, int pad, int eof)
- * Determine the best encoding for the current block: dynamic trees,
- * static trees or store, and output the encoded block to the zip
-- * file. Returns the total compressed length for the file so far.
-- *
-- */
-+ * file. If pad is set, pads the block to the next
-+ * byte. Returns the total compressed length for the file so
-+ * far.
-+ * */
-
- #include <config.h>
- #include <ctype.h>
-@@ -847,9 +848,10 @@
- * trees or store, and output the encoded block to the zip file. This function
- * returns the total compressed length for the file so far.
- */
--off_t flush_block(buf, stored_len, eof)
-+off_t flush_block(buf, stored_len, pad, eof)
- char *buf; /* input block, or NULL if too old */
- ulg stored_len; /* length of input block */
-+ int pad; /* pad output to byte boundary */
- int eof; /* true if this is the last block for a file */
- {
- ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-@@ -941,6 +943,10 @@
- Assert (input_len == bytes_in, "bad input size");
- bi_windup();
- compressed_len += 7; /* align on byte boundary */
-+ } else if (pad && (compressed_len % 8) != 0) {
-+ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */
-+ compressed_len = (compressed_len + 3 + 7) & ~7L;
-+ copy_block(buf, 0, 1); /* with header */
- }
-
- return compressed_len >> 3;
diff --git a/gzip-zgreppipe.patch b/gzip-zgreppipe.patch
deleted file mode 100644
index f5f1381..0000000
--- a/gzip-zgreppipe.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gzip-1.3.12/zgrep.in.orig 2007-02-05 21:54:26.000000000 +0100
-+++ gzip-1.3.12/zgrep.in 2007-04-18 10:58:17.990402427 +0200
-@@ -141,6 +141,7 @@
- exec 3>&1
- res=0
-
-+trap break PIPE
- for i
- do
- # Fail if gzip or grep (or sed) fails.
-@@ -185,4 +186,5 @@
- test "$gzip_status" -eq 0 || test "$gzip_status" -eq 2 || r=2
- test $res -lt $r && res=$r
- done
-+trap - PIPE
- exit $res
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gzip.git/commitdiff/10c699647085e8bc29db1b49f35873c1258f2ce6
More information about the pld-cvs-commit
mailing list