[97255] trunk/dports/archivers/gzip

mww at macports.org mww at macports.org
Sat Sep 1 04:28:50 PDT 2012


Revision: 97255
          https://trac.macports.org/changeset/97255
Author:   mww at macports.org
Date:     2012-09-01 04:28:47 -0700 (Sat, 01 Sep 2012)
Log Message:
-----------
gzip: version 1.5

Modified Paths:
--------------
    trunk/dports/archivers/gzip/Portfile
    trunk/dports/archivers/gzip/files/patch-gzip-rsyncable.diff

Modified: trunk/dports/archivers/gzip/Portfile
===================================================================
--- trunk/dports/archivers/gzip/Portfile	2012-09-01 11:00:10 UTC (rev 97254)
+++ trunk/dports/archivers/gzip/Portfile	2012-09-01 11:28:47 UTC (rev 97255)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name            gzip
-version         1.4
+version         1.5
 categories      archivers
 license         GPL-3+
 installs_libs   no
@@ -18,8 +18,8 @@
 homepage        http://www.gzip.org/
 master_sites    gnu
 
-checksums           rmd160  a74f782960387e3f05373acc258becb564eda82d \
-                    sha256  d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
+checksums           rmd160  641a4a095a44174e924569c051a089c86081c7ac \
+                    sha256  b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3
 
 depends_build       port:texinfo
 

Modified: trunk/dports/archivers/gzip/files/patch-gzip-rsyncable.diff
===================================================================
--- trunk/dports/archivers/gzip/files/patch-gzip-rsyncable.diff	2012-09-01 11:00:10 UTC (rev 97254)
+++ trunk/dports/archivers/gzip/files/patch-gzip-rsyncable.diff	2012-09-01 11:28:47 UTC (rev 97255)
@@ -1,23 +1,23 @@
-diff -u -r ../gzip-1.3.12.orig/deflate.c ./deflate.c
---- ../gzip-1.3.12.orig/deflate.c	2006-12-07 17:53:00.000000000 -0600
-+++ ./deflate.c	2008-09-01 20:49:37.000000000 -0500
-@@ -135,6 +135,14 @@
+diff -u -r deflate.c gzip/deflate.c
+--- deflate.c	2012-04-24 10:25:28.000000000 -0600
++++ 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 4096
++#  define RSYNC_WIN 8192
 +#endif
 +/* Size of rsync window, must be < MAX_DIST */
 +
-+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0)
 +/* Whether window sum matches magic value */
 +
  /* ===========================================================================
   * Local data used by the "longest match" routines.
   */
-@@ -216,6 +224,8 @@
- unsigned near good_match;
+@@ -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 */
@@ -36,7 +36,15 @@
      /* Set the default configuration parameters:
       */
      max_lazy_match   = configuration_table[pack_level].max_lazy;
-@@ -550,6 +564,8 @@
+@@ -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: */
@@ -45,7 +53,7 @@
  
          block_start -= (long) WSIZE;
  
-@@ -577,13 +593,46 @@
+@@ -579,6 +596,39 @@
      }
  }
  
@@ -85,47 +93,36 @@
  /* ===========================================================================
   * 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))
+@@ -626,7 +676,8 @@
  
- /* ===========================================================================
-  * Processes a new input file and return its compressed length. This
-@@ -594,7 +643,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;
-@@ -624,6 +673,7 @@
- 
              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
++	    /* Insert new strings in the hash table only if the match length
               * is not too large. This saves time but degrades compression.
               */
-@@ -652,9 +702,14 @@
+             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);
++	    RSYNC_ROLL(strstart, 1);
              lookahead--;
- 	    strstart++;
+             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;
-+            flush = 2;
 +        }
          if (flush) FLUSH_BLOCK(0), block_start = strstart;
  
          /* Make sure that we always have enough lookahead, except
-@@ -728,6 +783,7 @@
+@@ -730,6 +790,7 @@
               */
              lookahead -= prev_length-1;
              prev_length -= 2;
@@ -133,15 +130,19 @@
              do {
                  strstart++;
                  INSERT_STRING(strstart, hash_head);
-@@ -740,24 +796,39 @@
+@@ -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 = 2;
++		flush = 1;
 +	    }
 +            if (flush) FLUSH_BLOCK(0), block_start = strstart;
          } else if (match_available) {
@@ -155,8 +156,13 @@
 -            }
 +	    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 = 2;
++
++		flush = 1;
 +	    }
 +            if (flush) FLUSH_BLOCK(0), block_start = strstart;
 +	    RSYNC_ROLL(strstart, 1);
@@ -167,9 +173,12 @@
               * 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 = 2;
++
 +		FLUSH_BLOCK(0), block_start = strstart;
 +	    }
              match_available = 1;
@@ -177,64 +186,93 @@
              strstart++;
              lookahead--;
          }
-diff -u -r ../gzip-1.3.12.orig/doc/gzip.texi ./doc/gzip.texi
---- ../gzip-1.3.12.orig/doc/gzip.texi	2007-02-05 17:29:04.000000000 -0600
-+++ ./doc/gzip.texi	2008-09-01 20:55:58.000000000 -0500
-@@ -350,6 +350,14 @@
+diff -u -r doc/gzip.texi gzip/doc/gzip.texi
+--- doc/gzip.texi	2012-01-01 01:53:58.000000000 -0700
++++ 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 reduces compression by about 1 percent most cases, but
-+means that the @command{rsync} program can take advantage of similarities
++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.  @command{gunzip} cannot tell the difference between a
++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 -u -r ../gzip-1.3.12.orig/gzip.c ./gzip.c
---- ../gzip-1.3.12.orig/gzip.c	2007-03-20 00:09:51.000000000 -0500
-+++ ./gzip.c	2008-09-01 20:45:28.000000000 -0500
-@@ -231,6 +231,7 @@
+--- gzip.c	2012-04-24 10:25:28.000000000 -0600
++++ 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 */
  
- struct option longopts[] =
- {
-@@ -260,6 +261,7 @@
+ 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 }
  };
  
-@@ -341,6 +343,7 @@
+@@ -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",
++ "  --rsyncable       Make rsync-friendly archive",
   "",
   "With no FILE, or when FILE is -, read standard input.",
   "",
-@@ -469,6 +472,8 @@
- 	    recursive = 1;
+@@ -481,8 +483,11 @@
+ #else
+             recursive = 1;
  #endif
- 	    break;
-+	case 'R':
+-            break;
+-        case 'S':
++	    break;
++        case 'R':
 +	    rsync = 1; break;
- 	case 'S':
++
++	case 'S':
  #ifdef NO_MULTIPLE_DOTS
              if (*optarg == '.') optarg++;
-diff -u -r ../gzip-1.3.12.orig/gzip.h ./gzip.h
---- ../gzip-1.3.12.orig/gzip.h	2007-03-20 00:09:51.000000000 -0500
-+++ ./gzip.h	2008-09-01 20:43:35.000000000 -0500
-@@ -158,6 +158,7 @@
+ #endif
+diff -u -r gzip.h gzip/gzip.h
+--- gzip.h	2012-01-01 01:53:58.000000000 -0700
++++ 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 */
@@ -242,38 +280,3 @@
  
  extern off_t bytes_in;   /* number of input bytes */
  extern off_t bytes_out;  /* number of output bytes */
-@@ -306,7 +307,7 @@
-         /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--off_t flush_block OF((char *buf, ulg stored_len, int eof));
-+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
- 
-         /* in bits.c */
- void     bi_init    OF((file_t zipfile));
-diff -u -r ../gzip-1.3.12.orig/trees.c ./trees.c
---- ../gzip-1.3.12.orig/trees.c	2006-11-20 02:40:33.000000000 -0600
-+++ ./trees.c	2008-09-01 20:53:37.000000000 -0500
-@@ -860,9 +860,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 */
-@@ -955,6 +956,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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120901/21141c5e/attachment-0001.html>


More information about the macports-changes mailing list