Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9ccacc09a6ac70b4e60e2c9e13b318b639ed052d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9ccacc09a6ac70b4e60e2c9e13b318b639ed052d)
  • Date: Sun, 10 Dec 2006 07:52:31 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

archive/gzip/DETAILS | 5
archive/gzip/HISTORY | 4
archive/gzip/patches/gzip-1.3.5-asm-execstack.patch | 15
archive/gzip/patches/gzip-1.3.5-debian.patch | 121 -------
archive/gzip/patches/gzip-1.3.5-gunzip-dir.patch | 17 -
archive/gzip/patches/gzip-1.3.5-gzip-perm.patch | 68 ----
archive/gzip/patches/gzip-1.3.5-infodir.patch | 38 --
archive/gzip/patches/gzip-1.3.5-rsync.patch | 279
------------------
archive/gzip/patches/gzip-1.3.5-zgrep-sed.patch | 33 --
archive/gzip/patches/gzip-1.3.5-znew-tempfile-2.patch | 73 ----
10 files changed, 6 insertions(+), 647 deletions(-)

New commits:
commit 9ccacc09a6ac70b4e60e2c9e13b318b639ed052d
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

gzip-1.3.8

diff --git a/archive/gzip/DETAILS b/archive/gzip/DETAILS
index 5d04dde..b76d50f 100755
--- a/archive/gzip/DETAILS
+++ b/archive/gzip/DETAILS
@@ -1,12 +1,11 @@
SPELL=gzip
- VERSION=1.3.5
+ VERSION=1.3.8
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=ftp://alpha.gnu.org/gnu/gzip/${SOURCE}
WEB_SITE=http://www.gzip.org
ENTERED=20010922
- UPDATED=20050501
-
SOURCE_HASH=sha512:bd76691451a86140cd481f954b0471ff80a98dccc21934bf74cc66b1a8ce79958413339268c1298b171bab686c2448fc513965593e3979c37ed2fda02bc905ef
+
SOURCE_HASH=sha512:2007ac036f10e93f3e8a9e581109c859192b8461b6e20c86f08fe1c62a77bc142e9d14e12c8c7b32000fb9ca4aea3ccabd0948eefa33728f3c80ae6f6397fe16
LICENSE[0]=GPL
KEYWORDS="archive"
SHORT="gzip is a compression utility designed to replace
compress."
diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 96155f0..3f30af8 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,7 @@
+2006-12-10 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.3.8
+ * PRE_BUILD, patches/*: deleted
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/archive/gzip/patches/gzip-1.3.5-asm-execstack.patch
b/archive/gzip/patches/gzip-1.3.5-asm-execstack.patch
deleted file mode 100644
index 40cda59..0000000
--- a/archive/gzip/patches/gzip-1.3.5-asm-execstack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ripped from Fedora.
-Include stack markings in the asm code so the final binary
-isn't assumed to require executable markings.
---- gzip-1.3.5/match.c
-+++ gzip-1.3.5/match.c
-@@ -54,6 +54,9 @@
- .globl _match_init
- .globl _longest_match
-
-+ .section .note.GNU-stack, "", @progbits
-+ .previous
-+
- .text
-
- _match_init:
diff --git a/archive/gzip/patches/gzip-1.3.5-debian.patch
b/archive/gzip/patches/gzip-1.3.5-debian.patch
deleted file mode 100644
index 0e4908f..0000000
--- a/archive/gzip/patches/gzip-1.3.5-debian.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Hunks ripped from Debian's patchset.
-
---- gzip-1.3.5.orig/gzexe.in
-+++ gzip-1.3.5/gzexe.in
-@@ -42,8 +42,10 @@
- exit 1
- fi
-
-+set -C
- tmp=gz$$
--trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15
-+trap "rm -f $tmp; exit 1" HUP INT QUIT TRAP USR1 PIPE TERM
-+: > $tmp || exit 1
-
- decomp=0
- res=0
-@@ -53,8 +55,8 @@
- shift
- fi
-
--echo hi > zfoo1$$
--echo hi > zfoo2$$
-+echo hi > zfoo1$$ || exit 1
-+echo hi > zfoo2$$ || exit 1
- if test -z "`(${CPMOD-cpmod} zfoo1$$ zfoo2$$) 2>&1`"; then
- cpmod=${CPMOD-cpmod}
- fi
-@@ -110,26 +112,28 @@
- writable=0
- chmod u+w $tmp 2>/dev/null
- fi
-+ : >| $tmp # truncate the file, ignoring set -C
- fi
- if test $decomp -eq 0; then
-- sed 1q $0 > $tmp
-+ sed 1q $0 >> $tmp
- sed "s|^if tail|if $tail|" >> $tmp <<'EOF'
--skip=22
-+skip=23
- set -C
- umask=`umask`
- umask 77
--if tail +$skip "$0" | "BINDIR"/gzip -cd > /tmp/gztmp$$; then
-+tmpfile=`tempfile -p gztmp -d /tmp` || exit 1
-+if tail +$skip "$0" | /bin/gzip -cd >> $tmpfile; then
- umask $umask
-- /bin/chmod 700 /tmp/gztmp$$
-+ /bin/chmod 700 $tmpfile
- prog="`echo $0 | /bin/sed 's|^.*/||'`"
-- if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then
-- trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0
-- (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null &
-+ if /bin/ln $tmpfile "/tmp/$prog" 2>/dev/null; then
-+ trap '/bin/rm -f $tmpfile "/tmp/$prog"; exit $res' 0
-+ (/bin/sleep 5; /bin/rm -f $tmpfile "/tmp/$prog") 2>/dev/null &
- /tmp/"$prog" ${1+"$@"}; res=$?
- else
-- trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0
-- (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null &
-- /tmp/gztmp$$ ${1+"$@"}; res=$?
-+ trap '/bin/rm -f $tmpfile; exit $res' 0
-+ (/bin/sleep 5; /bin/rm -f $tmpfile) 2>/dev/null &
-+ $tmpfile ${1+"$@"}; res=$?
- fi
- else
- echo Cannot decompress $0; exit 1
-@@ -144,8 +148,8 @@
-
- else
- # decompression
-- skip=22
-- if sed -e 1d -e 2q "$i" | grep "^skip=[0-9][0-9]*$" >/dev/null; then
-+ skip=23
-+ if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then
- eval `sed -e 1d -e 2q "$i"`
- fi
- if tail +$skip "$i" | gzip -cd > $tmp; then
---- gzip-1.3.5.orig/zmore.in
-+++ gzip-1.3.5/zmore.in
-@@ -34,16 +34,16 @@
- cb='min 1 -icanon'; ncb='icanon eof ^d'
- fi
- if test $? -eq 0 && test -n "$oldtty"; then
-- trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
-+ trap 'stty $oldtty 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
- else
-- trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
-+ trap 'stty $ncb echo 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
- fi
-
- if test $# = 0; then
- if test -t 0; then
- echo usage: ${ZMORE_PROGRAM_NAME-zmore} files...
- else
-- gzip -cdfq | eval ${PAGER-more}
-+ gzip -cdfq | eval more
- fi
- else
- FIRST=1
-@@ -62,7 +62,7 @@
- fi
- if test "$ANS" != 's'; then
- echo "------> $FILE <------"
-- gzip -cdfq "$FILE" | eval ${PAGER-more}
-+ gzip -cdfq "$FILE" | more
- fi
- if test -t 1; then
- FIRST=0
---- gzip-1.3.5.orig/znew.in
-+++ gzip-1.3.5/znew.in
-@@ -16,8 +16,8 @@
- warn="(does not preserve modes and timestamp)"
- tmp=/tmp/zfoo.$$
- set -C
--echo hi > $tmp.1
--echo hi > $tmp.2
-+echo hi > $tmp.1 || exit 1
-+echo hi > $tmp.2 || exit 1
- if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
- cpmod=${CPMOD-cpmod}
- warn=""
diff --git a/archive/gzip/patches/gzip-1.3.5-gunzip-dir.patch
b/archive/gzip/patches/gzip-1.3.5-gunzip-dir.patch
deleted file mode 100644
index 5f0e4ab..0000000
--- a/archive/gzip/patches/gzip-1.3.5-gunzip-dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix a bug reported by Ulf Harnhammar (patch by him too):
-gzip: dir traversal bug when using "gunzip -N"
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=305255
-http://bugs.gentoo.org/show_bug.cgi?id=89946
-
---- gzip-1.3.5/gzip.c
-+++ gzip-1.3.5/gzip.c
-@@ -1344,6 +1344,8 @@
- error("corrupted input -- file name too large");
- }
- }
-+ char *base2 = base_name (base); /* strip any paths that may
exists */
-+ strcpy(base, base2); /* in the output name */
- /* If necessary, adapt the name to local OS conventions: */
- if (!list) {
- MAKE_LEGAL_NAME(base);
diff --git a/archive/gzip/patches/gzip-1.3.5-gzip-perm.patch
b/archive/gzip/patches/gzip-1.3.5-gzip-perm.patch
deleted file mode 100644
index 1ee4aee..0000000
--- a/archive/gzip/patches/gzip-1.3.5-gzip-perm.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Ripped from Fedora.
-
-Get rid of a possible race condition:
- - close output file
- - bad man plays with output file
- - try to chmod output file
-Run the chmod on the file descriptor before we close it instead.
-
---- gzip-1.3.5/gzip.c
-+++ gzip-1.3.5/gzip.c
-@@ -881,6 +881,20 @@
- }
-
- close(ifd);
-+ /* ofd ownership and permissions have to be set before close(ofd)*/
-+ if (!to_stdout) {
-+ if (fchmod(ofd, istat.st_mode & 07777)) {
-+ int e = errno;
-+ WARN((stderr, "%s: ", progname));
-+ if (!quiet) {
-+ errno = e;
-+ perror(ofname);
-+ }
-+ }
-+#ifndef NO_CHOWN
-+ fchown(ofd, istat.st_uid, istat.st_gid); /* Copy ownership */
-+#endif
-+ }
- if (!to_stdout && close(ofd)) {
- write_error();
- }
-@@ -902,7 +916,7 @@
- }
- fprintf(stderr, "\n");
- }
-- /* Copy modes, times, ownership, and remove the input file */
-+ /* Copy times and remove the input file */
- if (!to_stdout) {
- copy_stat(&istat);
- }
-@@ -1715,7 +1729,7 @@
-
-
- /* ========================================================================
-- * Copy modes, times, ownership from input file to output file.
-+ * Copy times from input file to output file.
- * IN assertion: to_stdout is false.
- */
- local void copy_stat(ifstat)
-@@ -1730,18 +1744,6 @@
- }
- reset_times(ofname, ifstat);
- #endif
-- /* Copy the protection modes */
-- if (chmod(ofname, ifstat->st_mode & 07777)) {
-- int e = errno;
-- WARN((stderr, "%s: ", progname));
-- if (!quiet) {
-- errno = e;
-- perror(ofname);
-- }
-- }
--#ifndef NO_CHOWN
-- chown(ofname, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */
--#endif
- remove_ofname = 0;
- /* It's now safe to remove the input file: */
- if (xunlink (ifname)) {
diff --git a/archive/gzip/patches/gzip-1.3.5-infodir.patch
b/archive/gzip/patches/gzip-1.3.5-infodir.patch
deleted file mode 100644
index bbe3c0d..0000000
--- a/archive/gzip/patches/gzip-1.3.5-infodir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Taken from Debian.
-
---- gzip-1.3.5/gzip.texi
-+++ gzip-1.3.5/gzip.texi
-@@ -6,7 +6,14 @@
- @finalout
- @setchapternewpage odd
- @c %**end of header
-+@dircategory Utilities
-+@direntry
-+* gzip: (gzip). The gzip command for compressing files.
-+@end direntry
-+
- @copying
-+This file documents the GNU `gzip' command for compressing files.
-+
- This manual is for Gzip
- (version @value{VERSION}, @value{UPDATED}),
- and documents commands for compressing and decompressing data.
-@@ -31,18 +38,6 @@
- @end quotation
- @end copying
-
--@c Debian install-info (up through at least version 1.9.20) uses only the
--@c first dircategory. Put this one first, as it is more useful in practice.
--@dircategory Individual utilities
--@direntry
--* gzip: (gzip)Invoking gzip. Compress files.
--@end direntry
--
--@dircategory Utilities
--@direntry
--* Gzip: (gzip). The gzip command for compressing files.
--@end direntry
--
- @titlepage
- @title gzip
- @subtitle The data compression program
diff --git a/archive/gzip/patches/gzip-1.3.5-rsync.patch
b/archive/gzip/patches/gzip-1.3.5-rsync.patch
deleted file mode 100644
index 6f4d7f2..0000000
--- a/archive/gzip/patches/gzip-1.3.5-rsync.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-Patch by Rusty Russell that adds --rsyncable option to gzip.
-
-Debian & Fedora use this, so let's join the party :p.
-
---- gzip-1.3.2/deflate.c
-+++ gzip-1.3.2/deflate.c
-@@ -122,6 +122,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.
- */
-@@ -203,6 +211,8 @@
- unsigned near 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
-@@ -301,6 +311,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;
-@@ -537,6 +551,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;
-
-@@ -564,13 +580,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
-@@ -581,7 +630,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;
-@@ -610,6 +659,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.
- */
-@@ -638,9 +688,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
-@@ -713,6 +768,7 @@
- */
- lookahead -= prev_length-1;
- prev_length -= 2;
-+ RSYNC_ROLL(strstart, prev_length+1);
- do {
- strstart++;
- INSERT_STRING(strstart, hash_head);
-@@ -725,24 +781,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.3.2/gzip.c
-+++ gzip-1.3.2/gzip.c
-@@ -249,6 +249,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[] =
- {
-@@ -278,6 +279,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 }
- };
-
-@@ -368,6 +370,7 @@
- " -Z --lzw produce output compatible with old compress",
- " -b --bits maxbits max number of bits per code (implies -Z)",
- #endif
-+ " --rsyncable Make rsync-friendly archive",
- " file... files to (de)compress. If none given, use standard
input.",
- "Report bugs to <bug-gzip AT gnu.org>.",
- 0};
-@@ -546,6 +549,9 @@
- #else
- recursive = 1; break;
- #endif
-+ case 'R':
-+ rsync = 1; break;
-+
- case 'S':
- #ifdef NO_MULTIPLE_DOTS
- if (*optarg == '.') optarg++;
---- gzip-1.3.2/gzip.h
-+++ gzip-1.3.2/gzip.h
-@@ -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 */
-+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 */
-@@ -281,7 +282,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));
---- gzip-1.3.2/gzip.texi
-+++ gzip-1.3.2/gzip.texi
-@@ -340,6 +340,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 reduces compression by about 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.2/trees.c
-+++ gzip-1.3.2/trees.c
-@@ -847,9 +847,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 +942,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/archive/gzip/patches/gzip-1.3.5-zgrep-sed.patch
b/archive/gzip/patches/gzip-1.3.5-zgrep-sed.patch
deleted file mode 100644
index 9681818..0000000
--- a/archive/gzip/patches/gzip-1.3.5-zgrep-sed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Ripped from Fedora.
-
-http://bugs.gentoo.org/90626
-
---- zgrep.in
-+++ zgrep.in
-@@ -24,7 +24,7 @@
-
- PATH="BINDIR:$PATH"; export PATH
-
--prog=`echo $0 | sed 's|.*/||'`
-+prog=`echo "$0" | sed 's|.*/||'`
- case "$prog" in
- *egrep) grep=${EGREP-egrep -a} ;;
- *fgrep) grep=${FGREP-fgrep -a} ;;
-@@ -112,12 +112,15 @@
- fi
- $uncompress -cdfq "$i" |
- if test $files_with_matches -eq 1; then
-- $grep $opt "$pat" > /dev/null && echo $i
-+ $grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
- elif test $files_without_matches -eq 1; then
-- $grep $opt "$pat" > /dev/null || echo $i
-+ $grep $opt "$pat" > /dev/null || printf "%s\n" "$i"
- elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename
-eq 1; }; then
- $grep $opt "$pat"
- else
-+ i=${i//\\/\\\\}
-+ i=${i//|/\\|}
-+ i=${i//&/\\&}
- if test $with_filename -eq 1; then
- sed_script="s|^[^:]*:|${i}:|"
- else
diff --git a/archive/gzip/patches/gzip-1.3.5-znew-tempfile-2.patch
b/archive/gzip/patches/gzip-1.3.5-znew-tempfile-2.patch
deleted file mode 100644
index 334e6a1..0000000
--- a/archive/gzip/patches/gzip-1.3.5-znew-tempfile-2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- znew.in.orig 2004-12-12 23:22:11.668680240 -0500
-+++ znew.in 2004-12-12 23:23:48.827909792 -0500
-@@ -14,7 +14,7 @@
- # block is the disk block size (best guess, need not be exact)
-
- warn="(does not preserve modes and timestamp)"
--tmp=/tmp/zfoo.$$
-+tmp=`mktemp /tmp/zfoo.XXXXXX`
- set -C
- echo hi > $tmp.1 || exit 1
- echo hi > $tmp.2 || exit 1
-@@ -77,6 +77,7 @@
-
- for i do
- n=`echo $i | sed 's/.Z$//'`
-+ ntmp=`mktemp $n.XXXXXX`
- if test ! -f "$n.Z" ; then
- echo $n.Z not found
- res=1; continue
-@@ -92,7 +93,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"
-@@ -102,7 +103,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
-@@ -110,7 +111,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)
-@@ -125,7 +126,7 @@
- if test $pipe -eq 1; then
- rm -f "$n$ext"
- elif test $check -eq 1; then
-- mv "$n.$$" "$n.Z" && rm -f "$n$ext"
-+ mv "$ntmp" "$n.Z" && rm -f "$n$ext"
- else
- gzip -d "$n$ext" && compress "$n" && rm -f "$n$ext"
- fi
-@@ -133,9 +134,9 @@
-
- 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
-@@ -144,4 +145,5 @@
- rm -f "$n.Z"
- fi
- done
-+rm -f "$ntmp"
- exit $res



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9ccacc09a6ac70b4e60e2c9e13b318b639ed052d), Treeve Jelbert, 12/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page