SF.net SVN: gar:[26546] csw/mgar/pkg/gzip/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jul 4 12:11:06 CEST 2019


Revision: 26546
          http://sourceforge.net/p/gar/code/26546
Author:   dmichelsen
Date:     2019-07-04 10:10:50 +0000 (Thu, 04 Jul 2019)
Log Message:
-----------
gzip/trunk: Update to 1.10, general rework

Modified Paths:
--------------
    csw/mgar/pkg/gzip/trunk/Makefile
    csw/mgar/pkg/gzip/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch
    csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
    csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff

Modified: csw/mgar/pkg/gzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gzip/trunk/Makefile	2019-07-04 09:12:39 UTC (rev 26545)
+++ csw/mgar/pkg/gzip/trunk/Makefile	2019-07-04 10:10:50 UTC (rev 26546)
@@ -3,7 +3,8 @@
 #     http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16876
 
 NAME = gzip
-VERSION = 1.6
+#VERSION = 1.6
+VERSION = 1.10
 GARTYPE = v2
 
 DESCRIPTION = GNU zip
@@ -15,9 +16,9 @@
   decompression code.
 endef
 
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-#PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
+MASTER_SITES += $(GNU_MIRROR)
+MASTER_SITES += http://meyering.net/gzip/
+DISTFILES  = $(NAME)-$(VERSION).tar.xz
 
 # From TODO:
 # - Add a block size (-b) option to improve error recovery in case of
@@ -27,13 +28,10 @@
 # For one possible approach to this, please see:
 #   http://www.samba.org/netfilter/diary/gzip.rsync.patch
 
-# Reformatted version of debian_patches_rsyncable.diff
-PATCHFILES += 0001-Debian-patch-for-rsyncable.patch
-
 PACKAGES += CSWgzip
 CATALOGNAME_CSWgzip = gzip
 SPKG_DESC_CSWgzip = GNU zip
-PKGFILES_CSWgzip  = $(bindir)/gzip
+PKGFILES_CSWgzip += $(bindir)/gzip
 PKGFILES_CSWgzip += $(bindir)/gunzip
 PKGFILES_CSWgzip += $(bindir)/uncompress
 PKGFILES_CSWgzip += $(mandir)/man1/gzip\.1
@@ -44,11 +42,17 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWgzip-extras += CSWgzip
 RUNTIME_DEP_PKGS_CSWgzip-extras += CSWggrep
+CHECKPKG_OVERRIDES_CSWgzip-extras += surplus-dependency|CSWggrep
+CHECKPKG_OVERRIDES_CSWgzip-extras += surplus-dependency|CSWgzip
+
 OBSOLETED_BY_CSWgzip-extras = CSWgzipextras
 CATALOGNAME_CSWgzipextras = gzip_extras_stub
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
+# We want a grep which understands -E
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
 # The 'z'-prefix commands now belong to zutils whereas the gzip-commands are prefixed with 'gz' instead:
 #   http://lists.nongnu.org/archive/html/zutils-bug/2012-10/msg00002.html
 EXTRA_CONFIGURE_ARGS += --program-transform-name='s/^z/gz/'

Modified: csw/mgar/pkg/gzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/gzip/trunk/checksums	2019-07-04 09:12:39 UTC (rev 26545)
+++ csw/mgar/pkg/gzip/trunk/checksums	2019-07-04 10:10:50 UTC (rev 26546)
@@ -1 +1 @@
-38603cb2843bf5681ff41aab3bcd6a20  gzip-1.6.tar.gz
+691b1221694c3394f1c537df4eee39d3  gzip-1.10.tar.xz

Deleted: csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch	2019-07-04 09:12:39 UTC (rev 26545)
+++ csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch	2019-07-04 10:10:50 UTC (rev 26546)
@@ -1,332 +0,0 @@
-From aa32d7c565dd4aa13c5fa0f12e93f9851be6cc20 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 25 Feb 2014 10:21:27 +0100
-Subject: [PATCH] Debian patch for rsyncable
-
----
- deflate.c     | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- doc/gzip.texi | 25 +++++++++++++++
- gzip.1        | 11 +++++++
- gzip.c        | 11 +++++--
- gzip.h        |  1 +
- 5 files changed, 138 insertions(+), 8 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index f0f2394..8e539d2 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -131,6 +131,14 @@
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
- 
-+#ifndef RSYNC_WIN
-+#  define RSYNC_WIN 8192
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0)
-+/* Whether window sum matches magic value */
-+
- /* ===========================================================================
-  * Local data used by the "longest match" routines.
-  */
-@@ -212,6 +220,8 @@ local int compr_level;
- 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 @@ void lm_init (pack_level, flags)
- #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;
-@@ -331,6 +345,7 @@ void lm_init (pack_level, flags)
- 
-     strstart = 0;
-     block_start = 0L;
-+    rsync_chunk_end = 0xFFFFFFFFUL;
- #ifdef ASMV
-     match_init(); /* initialize the asm code */
- #endif
-@@ -550,6 +565,8 @@ local void fill_window()
-         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,6 +596,39 @@ local void fill_window()
-     }
- }
- 
-+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.
-@@ -626,7 +676,8 @@ local off_t deflate_fast()
- 
-             lookahead -= match_length;
- 
--            /* Insert new strings in the hash table only if the 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.
-              */
-             if (match_length <= max_insert_length) {
-@@ -654,9 +705,18 @@ local off_t deflate_fast()
-             /* 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) {
-+            ush  attr = 0;          /* ascii/binary flag */
-+
-+            flush = 1;
-+            /* Reset huffman tree */
-+            ct_init(&attr, &method);
-+            rsync_chunk_end = 0xFFFFFFFFUL;
-+        }
-         if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-         /* Make sure that we always have enough lookahead, except
-@@ -730,6 +790,7 @@ off_t deflate()
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+	    RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -742,24 +803,51 @@ off_t deflate()
-             match_available = 0;
-             match_length = MIN_MATCH-1;
-             strstart++;
--            if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		ush  attr = 0;          /* ascii/binary flag */
-+
-+		/* Reset huffman tree */
-+		ct_init(&attr, &method);
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 1;
-+	    }
-+            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) {
-+		ush  attr = 0;          /* ascii/binary flag */
-+
-+		/* Reset huffman tree */
-+		ct_init(&attr, &method);
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+
-+		flush = 1;
-+	    }
-+            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) {
-+		ush  attr = 0;          /* ascii/binary flag */
-+
-+		/* Reset huffman tree */
-+		ct_init(&attr, &method);
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+
-+		FLUSH_BLOCK(0), block_start = strstart;
-+	    }
-             match_available = 1;
-+	    RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         }
-diff --git a/doc/gzip.texi b/doc/gzip.texi
-index 3de3063..7ff37ad 100644
---- a/doc/gzip.texi
-+++ b/doc/gzip.texi
-@@ -208,6 +208,7 @@ Mandatory arguments to long options are mandatory for short options too.
-   -V, --version     display version number
-   -1, --fast        compress faster
-   -9, --best        compress better
-+    --rsyncable   Make rsync-friendly archive
- 
- With no FILE, or when FILE is -, read standard input.
- 
-@@ -358,6 +359,30 @@ specified on the command line are directories, @command{gzip} will descend
- into the directory and compress all the files it finds there (or
- decompress them in the case of @command{gunzip}).
- 
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This can reduce the compression slightly in some 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.
-+
-+ 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 @command{rsync} program can much more efficiently
-+synchronize files compressed with this flag.  @command{gunzip}
-+cannot tell the difference between a compressed file created
-+with this option, and one created without it.
-+
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This can reduce the compression slightly in some 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 @var{suf} instead of @samp{.gz}.  Any suffix can be
-diff --git a/gzip.1 b/gzip.1
-index 71e097c..faee860 100644
---- a/gzip.1
-+++ b/gzip.1
-@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files
- .ll +8
- .B gzip
- .RB [ " \-acdfhklLnNrtvV19 " ]
-+.RB [ --rsyncable ]
- .RB [ \-S\ suffix ]
- [
- .I "name \&..."
-@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there
- .I gunzip
- ).
- .TP
-+.B --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
-+.BR rsync (1)
-+program can take advantage of similarities in the uncompressed input
-+when syncronizing two files compressed with this flag.
-+.I gunzip
-+cannot tell the difference between a compressed file created with this option,
-+and one created without it.
-+.TP
- .B \-S .suf   --suffix .suf
- When compressing, use suffix .suf instead of .gz.
- Any non-empty suffix can be given, but suffixes
-diff --git a/gzip.c b/gzip.c
-index 93cc738..971d3f0 100644
---- a/gzip.c
-+++ b/gzip.c
-@@ -215,6 +215,7 @@ int  ofd;                  /* output file descriptor */
- 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[] =
-   {
-@@ -275,7 +276,7 @@ static const struct option longopts[] =
-     {"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 }
- };
- 
-@@ -359,6 +360,7 @@ local void help()
-  "  -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.",
-  "",
-@@ -489,8 +491,11 @@ int main (int argc, char **argv)
- #else
-             recursive = 1;
- #endif
--            break;
--        case 'S':
-+	    break;
-+        case 'R':
-+	    rsync = 1; break;
-+
-+	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
- #endif
-diff --git a/gzip.h b/gzip.h
-index 648073e..70ccaa9 100644
---- a/gzip.h
-+++ b/gzip.h
-@@ -140,6 +140,7 @@ EXTERN(uch, window);         /* Sliding window and suffix table (unlzw) */
- 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 */
--- 
-1.8.4.1
-

Deleted: csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch	2019-07-04 09:12:39 UTC (rev 26545)
+++ csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch	2019-07-04 10:10:50 UTC (rev 26546)
@@ -1,25 +0,0 @@
-From 1cfa061d805fa9b65113df02030a1460b62b90e5 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 25 Jan 2010 13:33:28 +0100
-Subject: [PATCH] Force ggrep as Solaris grep doesn't understand the flags
-
----
- zgrep.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/zgrep.in b/zgrep.in
-index a828bbc..94d04da 100644
---- a/zgrep.in
-+++ b/zgrep.in
-@@ -26,7 +26,7 @@ case $1 in
- esac
- PATH=$bindir:$PATH
- 
--grep='${GREP-grep}'
-+grep='${GREP-/opt/csw/bin/ggrep}'
- 
- version='zgrep (gzip) @VERSION@
- Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
--- 
-1.6.6
-

Deleted: csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff	2019-07-04 09:12:39 UTC (rev 26545)
+++ csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff	2019-07-04 10:10:50 UTC (rev 26546)
@@ -1,311 +0,0 @@
-diff -u -r gzip-1.5/deflate.c /home/bdale/debian/gzip/deflate.c
---- gzip-1.5/deflate.c	2012-04-24 10:25:28.000000000 -0600
-+++ /home/bdale/debian/gzip/deflate.c	2012-06-19 14:01:41.885498670 -0600
-@@ -131,6 +131,14 @@
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
- 
-+#ifndef RSYNC_WIN
-+#  define RSYNC_WIN 8192
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 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;
-@@ -331,6 +345,7 @@
- 
-     strstart = 0;
-     block_start = 0L;
-+    rsync_chunk_end = 0xFFFFFFFFUL;
- #ifdef ASMV
-     match_init(); /* initialize the asm code */
- #endif
-@@ -550,6 +565,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,6 +596,39 @@
-     }
- }
- 
-+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.
-@@ -626,7 +676,8 @@
- 
-             lookahead -= match_length;
- 
--            /* Insert new strings in the hash table only if the 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.
-              */
-             if (match_length <= max_insert_length) {
-@@ -654,9 +705,18 @@
-             /* 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) {
-+            ush  attr = 0;          /* ascii/binary flag */
-+
-+            flush = 1;
-+            /* Reset huffman tree */
-+            ct_init(&attr, &method);
-+            rsync_chunk_end = 0xFFFFFFFFUL;
-+        }
-         if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-         /* Make sure that we always have enough lookahead, except
-@@ -730,6 +790,7 @@
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+	    RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -742,24 +803,51 @@
-             match_available = 0;
-             match_length = MIN_MATCH-1;
-             strstart++;
--            if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		ush  attr = 0;          /* ascii/binary flag */
-+
-+		/* Reset huffman tree */
-+		ct_init(&attr, &method);
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 1;
-+	    }
-+            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) {
-+		ush  attr = 0;          /* ascii/binary flag */
-+
-+		/* Reset huffman tree */
-+		ct_init(&attr, &method);
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+
-+		flush = 1;
-+	    }
-+            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) {
-+		ush  attr = 0;          /* ascii/binary flag */
-+
-+		/* Reset huffman tree */
-+		ct_init(&attr, &method);
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+
-+		FLUSH_BLOCK(0), block_start = strstart;
-+	    }
-             match_available = 1;
-+	    RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         }
-diff -u -r gzip-1.5/doc/gzip.texi /home/bdale/debian/gzip/doc/gzip.texi
---- gzip-1.5/doc/gzip.texi	2012-01-01 01:53:58.000000000 -0700
-+++ /home/bdale/debian/gzip/doc/gzip.texi	2012-06-19 14:09:36.041559612 -0600
-@@ -207,6 +207,7 @@
-   -V, --version     display version number
-   -1, --fast        compress faster
-   -9, --best        compress better
-+    --rsyncable   Make rsync-friendly archive
- 
- With no FILE, or when FILE is -, read standard input.
- 
-@@ -353,6 +354,30 @@
- into the directory and compress all the files it finds there (or
- decompress them in the case of @command{gunzip}).
- 
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This can reduce the compression slightly in some 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.
-+
-+ 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 @command{rsync} program can much more efficiently
-+synchronize files compressed with this flag.  @command{gunzip}
-+cannot tell the difference between a compressed file created
-+with this option, and one created without it.
-+
-+ at item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This can reduce the compression slightly in some 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 @var{suf} instead of @samp{.gz}.  Any suffix can be
---- gzip-1.5/gzip.c	2012-04-24 10:25:28.000000000 -0600
-+++ /home/bdale/debian/gzip/gzip.c	2012-06-19 14:00:43.283873180 -0600
-@@ -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,7 +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 +354,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.",
-  "",
-@@ -481,8 +483,11 @@
- #else
-             recursive = 1;
- #endif
--            break;
--        case 'S':
-+	    break;
-+        case 'R':
-+	    rsync = 1; break;
-+
-+	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
- #endif
-diff -u -r gzip-1.5/gzip.h /home/bdale/debian/gzip/gzip.h
---- gzip-1.5/gzip.h	2012-01-01 01:53:58.000000000 -0700
-+++ /home/bdale/debian/gzip/gzip.h	2012-06-19 13:57:36.833883093 -0600
-@@ -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 */
-diff --git a/gzip.1 b/gzip.1
-index 71e097c..faee860 100644
---- a/gzip.1
-+++ b/gzip.1
-@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files
- .ll +8
- .B gzip
- .RB [ " \-acdfhklLnNrtvV19 " ]
-+.RB [ --rsyncable ]
- .RB [ \-S\ suffix ]
- [
- .I "name \&..."
-@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there
- .I gunzip
- ).
- .TP
-+.B --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
-+.BR rsync (1)
-+program can take advantage of similarities in the uncompressed input
-+when syncronizing two files compressed with this flag.
-+.I gunzip
-+cannot tell the difference between a compressed file created with this option,
-+and one created without it.
-+.TP
- .B \-S .suf   --suffix .suf
- When compressing, use suffix .suf instead of .gz.
- Any non-empty suffix can be given, but suffixes

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list