Update 1.4 patch
(Portage version: 2.2.0_alpha123/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
This commit is contained in:
Mario Fetka
parent
2137457196
commit
6c37d6e57e
@ -2,6 +2,10 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
17 Oct 2012; Mario Fetka <mario.fetka@gmail.com>
|
||||
files/gzip-1.4-rsyncable.patch:
|
||||
Update 1.4 patch
|
||||
|
||||
*gzip-1.5 (17 Oct 2012)
|
||||
|
||||
17 Oct 2012; Mario Fetka <mario.fetka@gmail.com> gzip-1.4.ebuild,
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
AUX gzip-1.3.8-install-symlinks.patch 280 SHA256 f8b8c8548ae32975ba8e5bbc79add0f951954e1b4a21de55575274de177925d1 SHA512 b804a4d4ef9294a8f241b75a06ee6464d932330824dc95f2fa1f67bb6f22f4d66287e4f47dcafce4e59e68fa3d11ac61cdbca55ab0939747d8a17464d2aa29c1 WHIRLPOOL 13a5806a61a565a5a1de4d07b7aa252743016e559fe72752f2e7130d414eba0c6167608f3485f2fadf21a592cd15aa36c8e58682ca5309aa28ea874a8b7bdcb5
|
||||
AUX gzip-1.4-assembler.patch 1703 SHA256 4d05f0c6df2fcca0dcc6f72f4545ea89e0cdcb92d1f6b9e9e2bd1942da46cf81 SHA512 8a501a03263b2cf2e4c87d0f8736bfe598ecf3f32c0e76b508d88504888405fb75ce97614a2c138a49d18f516fe3dd6d9440b8d04c8f67f7b4c1833d5cb25413 WHIRLPOOL f40b81cb1ed1b3566fa3e27503ae5d8dc3fa28b15b72c1278da894190ddbf1fbeca4d158bb78d913b02edd6c9ad83f149149a40633b451cb0395194eb844a4e3
|
||||
AUX gzip-1.4-rsyncable.patch 10256 SHA256 8487d91ad4c843aa6248d0d0697cb7bff7f08accb8451711f4078355f6a5ff6e SHA512 4bf2020665e7bbe409f301146ccd021aeda7106c0307640a0731b900e6a5871ffe3410258cd35127395730579389abe8b5c999ee11685d28fc45b2a4b826e1d2 WHIRLPOOL 8db82783c9ee06038f7ce3e0e0cff0b678b0110f4e8275a6e94fae7bf243b62657e2f65c2594b7eeb65e8f9f487b71523eee014fd350289ce0b8f42618fc1afe
|
||||
AUX gzip-1.4-rsyncable.patch 10852 SHA256 59e0788c611a7d19ecd48b876db31d9b311244b912087fd4d74f92f3ed4a080a SHA512 bfcd26a81e2bbdecaa3599d2896d6ebbf6dfefa787809de08174881e3665e5a8b57ea78a1634ffb55233a6b84d9c4d23c19df2c7709576594e1e89359753a4d5 WHIRLPOOL bd22fd6d19dc413d9bb65166a827092d9eb62a36cf76e90ca82f700a9818bc60e296ca42832591b1f9bff15b56449af139d6ffe91a2dfd40c0967245a345d283
|
||||
AUX gzip-1.5-rsyncable.patch 10912 SHA256 c9024df8719d42b0b0f133f829865ccab2d5b58a0b5847a9425314d03fa8c9b6 SHA512 9d853058938eeb7ec1578b4ccd3dd1a062c79aac474f04567891b4b4a414171d92e6cbe41c348f9d0835fff56613e603e6aa05b03d312022e01902e5e5a8d0c7 WHIRLPOOL 8882f39fee56e7848922f55fefb902f110cc0202a4c1c833eec052541491419ae322b10840a1e0aa34fc1d3ff87ba12a29b1154bd17265760c68c005f60a04dc
|
||||
DIST gzip-1.4.tar.gz 907411 SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
|
||||
DIST gzip-1.5.tar.xz 720956 SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173 SHA512 27b1b9c1ab75331b5368abb54541f3f251009a3bc6e49e42cda13bc088673d9f8c89c55caa63da60c1ea70fac2e6de24203b7aeaaaad4bc54302edbe275f46ea WHIRLPOOL c718e5e4e0e6f29de285380c25564997615b7213fa32604922436c3c6221bb9531d01518a6cc4e0a80b4694bb040768654d4bf07bb48290f90e61f13962e96ab
|
||||
EBUILD gzip-1.4.ebuild 1358 SHA256 8f489d2726cb4a44fc3ad7a369f2ee0a0ba3476e5aa4052a2486cc1f8eaec26c SHA512 5d190ee0faedbf4ec25b88aaa00813b080dbedea82ab7f037383938f8737d7dc1dbd7de6bb17541b2174d5c6a73d2dff05a04efc51feb96948842c005b77e705 WHIRLPOOL 3c65eb219ec250b676979ad4976c4a18b1ec7069e3174be7d098c9aaded73526bab5536ecb499605d13c6033b15cb8582267139d10d57d521aaac901bb9eba09
|
||||
EBUILD gzip-1.5.ebuild 1272 SHA256 fc73bf16decd7c1bc20be86ee1117376dca3e6422c8d1515e3961857c54887bb SHA512 13debf71fadea7ad32479c80f38a5ee833b50faa4faf687a6ee9a24a1af7e456130bca2fc08c7be74da4c0f690de05df18039ae5e69eff487b77f9db3afa7a38 WHIRLPOOL 5eae5bbe9752804f4a86e9d2af0d84b1ab6d2b3ba8ad304cf11346fe1c04d445b151c8a5def5a7ee5a6984b4082446662eae3f136b511a44ddc7b531673f815a
|
||||
MISC ChangeLog 616 SHA256 4ee7892dab8236d0c37c4b94c46a2a6a4333338a0ea74b9f31562ba26ea8575f SHA512 b10c692c1e1ebe2050f9f0343bdcc2c84a1ec9ee32be3a4b61feee18ef5c6a79c67da5eddae516e865a3b764b6b64b5b818ead09f62e3aa81ae8623f31c26631 WHIRLPOOL 149d001b5a739720bb8bbced980c80a62960fb1856a099cd1f7e9205c1b2fd66eb84dff3542dc8715237b26da7bab73bde6f197a977c978be2ee19629f3bc90a
|
||||
MISC ChangeLog 721 SHA256 537fb9e63fc90bbe671a3e6f19dd22bdee0c6ca30d25726300e4439276f7d64d SHA512 00a34599ce07e8625c0e26358a0b2c634aaab7cb1e6b0cebc86c6554be4e8c0094a29d7529f73e7bc1a5cc91a25f57363c56789271d9fa263faf384675ab5fa8 WHIRLPOOL ab776e5199840eab698d7bc1cecbeec9dfdfc1a46b75dec702da8c2caabebe6d941398012d221f6537b6d477070d94ccaf06bfc480c44984d500d5558968c227
|
||||
MISC metadata.xml 258 SHA256 3e8d2c98025402bd29168f46db0e4ed14ae2d64ee8e75508d87b136d06ba044c SHA512 fe541f144f9f9f14e041cd9481c964cc55c38579475221a76599dd81b2bd3e902c6c4b043d7897fd50c36d4e4efe38e51cc736d018b95341fee0b58d919bc985 WHIRLPOOL 8edc342ed57308000e6131785fb4401a4cf013a3b55dd498c4cd0ee73e2d3302d8da1e1d5b86a8845ccfd059a0b2b46cc00fb7e736d241633e9e827d31256e93
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
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
|
||||
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.3.6/deflate.c.orig 2006-11-30 00:13:22.863409500 +0100
|
||||
+++ gzip-1.3.6/deflate.c 2006-11-30 00:14:14.346627000 +0100
|
||||
@@ -135,6 +135,14 @@
|
||||
#endif
|
||||
/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
|
||||
@ -114,14 +119,14 @@ diff -u -r ../gzip-1.3.12.orig/deflate.c ./deflate.c
|
||||
/* 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++;
|
||||
}
|
||||
+ if (rsync && strstart > rsync_chunk_end) {
|
||||
+ rsync_chunk_end = 0xFFFFFFFFUL;
|
||||
+ flush = 2;
|
||||
+ }
|
||||
+ 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
|
||||
@ -177,28 +182,9 @@ diff -u -r ../gzip-1.3.12.orig/deflate.c ./deflate.c
|
||||
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 @@
|
||||
into the directory and compress all the files it finds there (or
|
||||
decompress them in the case of @command{gunzip}).
|
||||
|
||||
+@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
|
||||
+in the uncompressed input when syncronizing two files compressed with
|
||||
+this flag. @command{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-1.3.6/gzip.c.orig 2006-11-20 09:40:33.000000000 +0100
|
||||
+++ gzip-1.3.6/gzip.c 2006-11-30 00:15:31.387441750 +0100
|
||||
@@ -218,6 +218,7 @@
|
||||
unsigned insize; /* valid bytes in inbuf */
|
||||
unsigned inptr; /* index of next byte to be processed in inbuf */
|
||||
unsigned outcnt; /* bytes in output buffer */
|
||||
@ -206,7 +192,7 @@ diff -u -r ../gzip-1.3.12.orig/gzip.c ./gzip.c
|
||||
|
||||
struct option longopts[] =
|
||||
{
|
||||
@@ -260,6 +261,7 @@
|
||||
@@ -247,6 +248,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) */
|
||||
@ -214,27 +200,27 @@ diff -u -r ../gzip-1.3.12.orig/gzip.c ./gzip.c
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
@@ -341,6 +343,7 @@
|
||||
@@ -329,6 +331,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 @@
|
||||
@@ -469,6 +472,9 @@
|
||||
recursive = 1;
|
||||
#endif
|
||||
break;
|
||||
+ case 'R':
|
||||
+ rsync = 1; break;
|
||||
+ rsync = 1;
|
||||
+ break;
|
||||
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 @@
|
||||
--- gzip-1.3.5/gzip.h 2001-09-30 23:53:41 -0700
|
||||
+++ rsyncable/gzip.h 2005-02-05 09:40:33 -0800
|
||||
@@ -133,6 +133,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,7 +228,7 @@ diff -u -r ../gzip-1.3.12.orig/gzip.h ./gzip.h
|
||||
|
||||
extern off_t bytes_in; /* number of input bytes */
|
||||
extern off_t bytes_out; /* number of output bytes */
|
||||
@@ -306,7 +307,7 @@
|
||||
@@ -281,7 +282,7 @@
|
||||
/* in trees.c */
|
||||
void ct_init OF((ush *attr, int *method));
|
||||
int ct_tally OF((int dist, int lc));
|
||||
@ -251,10 +237,44 @@ diff -u -r ../gzip-1.3.12.orig/gzip.h ./gzip.h
|
||||
|
||||
/* 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 @@
|
||||
--- 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}).
|
||||
|
||||
+@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.
|
||||
*/
|
||||
@ -266,7 +286,7 @@ diff -u -r ../gzip-1.3.12.orig/trees.c ./trees.c
|
||||
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 @@
|
||||
@@ -941,6 +943,10 @@
|
||||
Assert (input_len == bytes_in, "bad input size");
|
||||
bi_windup();
|
||||
compressed_len += 7; /* align on byte boundary */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user