diff --git a/package/base/gzip/configure_sysconfdir.patch b/package/base/gzip/configure_sysconfdir.patch deleted file mode 100644 index 23a387181..000000000 --- a/package/base/gzip/configure_sysconfdir.patch +++ /dev/null @@ -1,32 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gzip/configure_sysconfdir.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure.orig Fri Nov 24 20:30:31 2000 -+++ ./configure Fri Nov 24 20:33:07 2000 -@@ -3,6 +3,10 @@ - # Generated automatically using autoconf. - # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. - -+# This is a hack arround another hack ... :-) -+# Now Build-Pkg thinks that this script knows about --sysconfdir=... -+# (Also Build-Pkg doesn't touch a patched ./configure script. :-) -+ - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 2, or (at your option) diff --git a/package/base/gzip/gcc34.patch b/package/base/gzip/gcc34.patch deleted file mode 100644 index dde0f6aab..000000000 --- a/package/base/gzip/gcc34.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gzip/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ruN gzip-1.2.4a/getopt.c gzip-1.2.4a-new/getopt.c ---- gzip-1.2.4a/getopt.c 1993-08-17 20:24:08.000000000 +0200 -+++ gzip-1.2.4a-new/getopt.c 2004-05-18 22:01:12.830713688 +0200 -@@ -172,7 +172,7 @@ - #if __STDC__ || defined(PROTO) - extern char *getenv(const char *name); - extern int strcmp (const char *s1, const char *s2); --extern int strncmp(const char *s1, const char *s2, int n); -+extern int strncmp(const char *s1, const char *s2, size_t n); - - static int my_strlen(const char *s); - static char *my_index (const char *str, int chr); diff --git a/package/base/gzip/gzip-1.2.4b.patch b/package/base/gzip/gzip-1.2.4b.patch deleted file mode 100644 index a1d2a3ff5..000000000 --- a/package/base/gzip/gzip-1.2.4b.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gzip/gzip-1.2.4b.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- gzip-1.2.4/gzip.c Thu Aug 19 15:39:43 1993 -+++ gzip-1.2.4b/gzip.c Tue Jan 8 21:44:18 2002 -@@ -1005,7 +1005,14 @@ - #ifdef NO_MULTIPLE_DOTS - char *dot; /* pointer to ifname extension, or NULL */ - #endif -+ int max_suffix_len = (z_len > 3 ? z_len : 3); - -+ /* Leave enough room in ifname or ofname for suffix: */ -+ if (strlen(iname) >= sizeof(ifname) - max_suffix_len) { -+ strncpy(ifname, iname, sizeof(ifname) - 1); -+ /* last byte of ifname is already zero and never overwritten */ -+ error("file name too long"); -+ } - strcpy(ifname, iname); - - /* If input file exists, return OK. */ diff --git a/package/base/gzip/rsyncable.patch b/package/base/gzip/gzip-1.3-rsync.patch similarity index 75% rename from package/base/gzip/rsyncable.patch rename to package/base/gzip/gzip-1.3-rsync.patch index c5a05aee4..8058acf74 100644 --- a/package/base/gzip/rsyncable.patch +++ b/package/base/gzip/gzip-1.3-rsync.patch @@ -1,40 +1,6 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gzip/rsyncable.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -< http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff > - -From: Rusty Russell - -[NOTE: this patch is for _gzip_! --Wayne] - -It's pending for actual gzip inclusion! The maintainer was dug up and -everything: it'll even be on by default. - -But here's the old patch, -Rusty. --- - Anyone who quotes me in their sig is an idiot. -- Rusty Russell. - ---- gzip-1.2.4.orig/deflate.c Fri Aug 13 22:35:31 1993 -+++ gzip-1.2.4-rsync/deflate.c Sat Dec 30 15:33:25 2000 -@@ -121,6 +121,14 @@ +--- gzip-1.3.2/deflate.c.rsync Fri Oct 8 08:46:28 1999 ++++ gzip-1.3.2/deflate.c Sun Mar 10 12:35:00 2002 +@@ -122,6 +122,14 @@ #endif /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ @@ -49,7 +15,7 @@ Rusty. /* =========================================================================== * Local data used by the "longest match" routines. */ -@@ -202,6 +210,8 @@ +@@ -203,6 +211,8 @@ unsigned near good_match; /* Use a faster search when the previous match is longer than this */ @@ -58,7 +24,7 @@ Rusty. /* 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 -@@ -300,6 +310,10 @@ +@@ -301,6 +311,10 @@ #endif /* prev will be initialized on the fly */ @@ -69,7 +35,7 @@ Rusty. /* Set the default configuration parameters: */ max_lazy_match = configuration_table[pack_level].max_lazy; -@@ -536,6 +550,8 @@ +@@ -537,6 +551,8 @@ memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); match_start -= WSIZE; strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ @@ -78,7 +44,7 @@ Rusty. block_start -= (long) WSIZE; -@@ -563,13 +579,46 @@ +@@ -564,13 +580,46 @@ } } @@ -126,8 +92,8 @@ Rusty. /* =========================================================================== * Processes a new input file and return its compressed length. This -@@ -580,7 +629,7 @@ - local ulg deflate_fast() +@@ -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 */ @@ -135,7 +101,7 @@ Rusty. unsigned match_length = 0; /* length of best match */ prev_length = MIN_MATCH-1; -@@ -609,6 +658,7 @@ +@@ -610,6 +659,7 @@ lookahead -= match_length; @@ -143,7 +109,7 @@ Rusty. /* Insert new strings in the hash table only if the match length * is not too large. This saves time but degrades compression. */ -@@ -637,9 +687,14 @@ +@@ -638,9 +688,14 @@ /* No match, output a literal byte */ Tracevv((stderr,"%c",window[strstart])); flush = ct_tally (0, window[strstart]); @@ -158,7 +124,7 @@ Rusty. if (flush) FLUSH_BLOCK(0), block_start = strstart; /* Make sure that we always have enough lookahead, except -@@ -715,6 +770,7 @@ +@@ -713,6 +768,7 @@ */ lookahead -= prev_length-1; prev_length -= 2; @@ -166,7 +132,7 @@ Rusty. do { strstart++; INSERT_STRING(strstart, hash_head); -@@ -727,24 +783,39 @@ +@@ -725,24 +781,39 @@ match_available = 0; match_length = MIN_MATCH-1; strstart++; @@ -210,9 +176,9 @@ Rusty. strstart++; lookahead--; } ---- gzip-1.2.4.orig/gzip.c Thu Aug 19 23:39:43 1993 -+++ gzip-1.2.4-rsync/gzip.c Fri Dec 29 21:20:54 2000 -@@ -239,6 +239,7 @@ +--- gzip-1.3.2/gzip.c.rsync Mon Oct 1 07:28:16 2001 ++++ gzip-1.3.2/gzip.c Sun Mar 10 12:35:00 2002 +@@ -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 */ @@ -220,7 +186,7 @@ Rusty. struct option longopts[] = { -@@ -268,6 +269,7 @@ +@@ -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) */ @@ -228,15 +194,15 @@ Rusty. { 0, 0, 0, 0 } }; -@@ -357,6 +359,7 @@ +@@ -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 .", 0}; - char **p = help_msg; -@@ -516,6 +519,9 @@ +@@ -546,6 +549,9 @@ #else recursive = 1; break; #endif @@ -246,28 +212,28 @@ Rusty. case 'S': #ifdef NO_MULTIPLE_DOTS if (*optarg == '.') optarg++; ---- gzip-1.2.4.orig/gzip.h Fri Aug 13 22:35:33 1993 -+++ gzip-1.2.4-rsync/gzip.h Sat Dec 30 15:26:56 2000 -@@ -131,6 +131,7 @@ +--- gzip-1.3.2/gzip.h.rsync Mon Oct 1 07:24:52 2001 ++++ gzip-1.3.2/gzip.h Sun Mar 10 12:36:12 2002 +@@ -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 long bytes_in; /* number of input bytes */ - extern long bytes_out; /* number of output bytes */ -@@ -282,7 +283,7 @@ + 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)); --ulg flush_block OF((char *buf, ulg stored_len, int eof)); -+ulg flush_block OF((char *buf, ulg stored_len, int pad, int eof)); +-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.2.4.orig/gzip.texi Thu Aug 19 06:42:50 1993 -+++ gzip-1.2.4-rsync/gzip.texi Fri Dec 29 21:20:54 2000 -@@ -316,6 +316,14 @@ +--- gzip-1.3.2/gzip.texi.rsync Sun Nov 4 08:39:35 2001 ++++ gzip-1.3.2/gzip.texi Sun Mar 10 12:35:00 2002 +@@ -340,6 +340,14 @@ into the directory and compress all the files it finds there (or decompress them in the case of @code{gunzip}). @@ -282,22 +248,22 @@ Rusty. @item --suffix @var{suf} @itemx -S @var{suf} Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be ---- gzip-1.2.4.orig/trees.c Wed Aug 18 03:36:32 1993 -+++ gzip-1.2.4-rsync/trees.c Sat Dec 30 15:37:00 2000 -@@ -850,9 +850,10 @@ +--- gzip-1.3.2/trees.c.rsync Wed Oct 6 07:00:00 1999 ++++ gzip-1.3.2/trees.c Sun Mar 10 12:37:05 2002 +@@ -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. */ --ulg flush_block(buf, stored_len, eof) -+ulg flush_block(buf, stored_len, pad, eof) +-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 */ -@@ -944,6 +967,10 @@ - Assert (input_len == isize, "bad input size"); +@@ -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) { @@ -305,5 +271,5 @@ Rusty. + compressed_len = (compressed_len + 3 + 7) & ~7L; + copy_block(buf, 0, 1); /* with header */ } - Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3, - compressed_len-7*eof)); + + return compressed_len >> 3; diff --git a/package/base/gzip/gzip-1.3.1-zgreppipe.patch b/package/base/gzip/gzip-1.3.1-zgreppipe.patch new file mode 100644 index 000000000..031102806 --- /dev/null +++ b/package/base/gzip/gzip-1.3.1-zgreppipe.patch @@ -0,0 +1,19 @@ +--- gzip-1.3.1/zgrep.in ++++ gzip-1.3.1/zgrep.in +@@ -92,6 +92,7 @@ + fi + + res=0 ++trap break SIGPIPE + for i do + gzip -cdfq "$i" | + if test $files_with_matches -eq 1; then +@@ -110,5 +111,8 @@ + fi + r=$? + test $res -lt $r && res=$r ++ # SIGPIPE + 128 ++ test "$r" -eq 141 && exit $res + done ++trap - SIGPIPE + exit $res diff --git a/package/base/gzip/gzip-1.3.3-addsuffix.patch b/package/base/gzip/gzip-1.3.3-addsuffix.patch new file mode 100644 index 000000000..bd33ca9f5 --- /dev/null +++ b/package/base/gzip/gzip-1.3.3-addsuffix.patch @@ -0,0 +1,19 @@ +--- gzip-1.3.3/zmore.in.addsuffix 2004-12-13 09:55:48.000000000 +0100 ++++ gzip-1.3.3/zmore.in 2004-12-13 09:58:24.641766288 +0100 +@@ -50,7 +50,7 @@ + FIRST=1 + for FILE + do +- < "$FILE" || continue ++ if test -e $FILE || test -e $FILE.gz; then + if test $FIRST -eq 0; then + echo $n1 "--More--(Next file: $FILE)$n2" + stty $cb -echo 2>/dev/null +@@ -68,5 +68,7 @@ + if test -t; then + FIRST=0 + fi ++ else < $FILE ++ fi + done + fi diff --git a/package/base/gzip/gzip-1.3.3-window-size.patch b/package/base/gzip/gzip-1.3.3-window-size.patch new file mode 100644 index 000000000..d2e957d73 --- /dev/null +++ b/package/base/gzip/gzip-1.3.3-window-size.patch @@ -0,0 +1,11 @@ +--- gzip-1.3.3/gzip.c.orig Thu Jan 30 21:19:36 2003 ++++ gzip-1.3.3/gzip.c Thu Jan 30 21:09:52 2003 +@@ -198,7 +198,7 @@ + DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA); + DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); + DECLARE(ush, d_buf, DIST_BUFSIZE); +-DECLARE(uch, window, 2L*WSIZE); ++DECLARE(uch, window, 2L*WSIZE + 4096); + #ifndef MAXSEG_64K + DECLARE(ush, tab_prefix, 1L<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/package/base/gzip/gzip-1.3.5-openbsd-owl-tmp.patch b/package/base/gzip/gzip-1.3.5-openbsd-owl-tmp.patch new file mode 100644 index 000000000..5be4aaf97 --- /dev/null +++ b/package/base/gzip/gzip-1.3.5-openbsd-owl-tmp.patch @@ -0,0 +1,155 @@ +--- gzip-1.3.5/znew.in.owl-tmp 2002-09-27 08:17:09.000000000 +0200 ++++ gzip-1.3.5/znew.in 2005-03-21 18:15:37.956717675 +0100 +@@ -14,29 +14,27 @@ + # block is the disk block size (best guess, need not be exact) + + warn="(does not preserve modes and timestamp)" +-tmp=/tmp/zfoo.$$ +-set -C +-echo hi > $tmp.1 +-echo hi > $tmp.2 +-if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then +- cpmod=${CPMOD-cpmod} ++cpmod= ++cpmodarg= ++if type ${CPMOD:-cpmod} 2>/dev/null; then ++ cpmod=${CPMOD:-cpmod} + warn="" + fi + +-if test -z "$cpmod" && ${TOUCH-touch} -r $tmp.1 $tmp.2 2>/dev/null; then +- cpmod="${TOUCH-touch}" ++if test -z "$cpmod"; then ++ cpmod=touch + cpmodarg="-r" + warn="(does not preserve file modes)" + fi + +-# check if GZIP env. variable uses -S or --suffix +-gzip -q $tmp.1 +-ext=`echo $tmp.1* | sed "s|$tmp.1||"` +-rm -f $tmp.[12]* +-if test -z "$ext"; then +- echo znew: error determining gzip extension +- exit 1 +-fi ++case "$GZIP" in ++ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'` ++ ;; ++ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'` ++ ;; ++ *) ext='.gz' ++ ;; ++esac + if test "$ext" = ".Z"; then + echo znew: cannot use .Z as gzip extension. + exit 1 +--- gzip-1.3.5/gzexe.in.owl-tmp 2002-09-28 08:18:11.000000000 +0200 ++++ gzip-1.3.5/gzexe.in 2005-03-21 18:25:32.932597213 +0100 +@@ -34,7 +34,7 @@ + + + PATH="BINDIR:$PATH" +-x=`basename $0` ++x=`basename "$0"` + if test $# = 0; then + echo compress executables. original file foo is renamed to foo~ + echo usage: ${x} [-d] files... +@@ -42,8 +42,9 @@ + exit 1 + fi + +-tmp=gz$$ +-trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15 ++tmp=`/bin/mktemp ${TMPDIR:-/tmp}/gzexe.XXXXXXXXXX` || exit 1 ++trap "rm -f $tmp; exit 1" HUP INT QUIT PIPE TERM ++trap "rm -f $tmp; exit 0" EXIT + + decomp=0 + res=0 +@@ -53,12 +54,10 @@ + shift + fi + +-echo hi > zfoo1$$ +-echo hi > zfoo2$$ +-if test -z "`(${CPMOD-cpmod} zfoo1$$ zfoo2$$) 2>&1`"; then +- cpmod=${CPMOD-cpmod} ++cpmod= ++if type ${CPMOD:-cpmod} 2>/dev/null; then ++ cpmod=${CPMOD:-cpmod} + fi +-rm -f zfoo[12]$$ + + tail="" + IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" +@@ -99,7 +98,7 @@ + continue + fi + case "`basename $i`" in +- gzip | tail | sed | chmod | ln | sleep | rm) ++ bash | chmod | gzip | ln | mktemp | rm | sed | sh | tail) + echo "${x}: $i would depend on itself"; continue ;; + esac + if test -z "$cpmod"; then +@@ -112,27 +111,19 @@ + fi + 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 +-set -C +-umask=`umask` +-umask 77 +-if tail +$skip "$0" | "BINDIR"/gzip -cd > /tmp/gztmp$$; then +- umask $umask +- /bin/chmod 700 /tmp/gztmp$$ +- 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 & +- /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=$? +- fi ++skip=14 ++tmpdir=`/bin/mktemp -d ${TMPDIR:-/tmp}/gzexe.XXXXXXXXXX` || exit 1 ++prog="${tmpdir}/`echo \"$0\" | sed 's|^.*/||'`" ++if tail +$skip "$0" | "BINDIR"/gzip -cd > "$prog"; then ++ /bin/chmod 700 "$prog" ++ trap '/bin/rm -rf $tmpdir; exit $res' EXIT ++ "$prog" ${1+"$@"}; res=$? + else +- echo Cannot decompress $0; exit 1 ++ echo "Cannot decompress $0" ++ /bin/rm -rf $tmpdir ++ exit 1 + fi; exit $res + EOF + gzip -cv9 "$i" >> $tmp || { +--- gzip-1.3.5/zdiff.in.owl-tmp 2002-09-26 10:33:24.000000000 +0200 ++++ gzip-1.3.5/zdiff.in 2005-03-21 18:35:36.669875653 +0100 +@@ -46,13 +46,13 @@ + case "$2" in + *[-.]gz* | *[-.][zZ] | *.t[ga]z) + F=`echo "$2" | sed 's|.*/||;s|[-.][zZtga]*||'` +- set -C +- trap 'rm -f /tmp/"$F".$$; exit 2' HUP INT PIPE TERM 0 +- gzip -cdfq "$2" > /tmp/"$F".$$ || exit +- gzip -cdfq "$1" | $comp $OPTIONS - /tmp/"$F".$$ ++ TF=`/bin/mktemp ${TMPDIR:-/tmp}/"$F".XXXXXXXXXX` || exit 1 ++ trap 'rm -f "$TF"; exit 2' EXIT HUP INT PIPE TERM ++ gzip -cdfq "$2" > "$TF" || exit ++ gzip -cdfq "$1" | $comp $OPTIONS - "$TF" + STAT="$?" +- /bin/rm -f /tmp/"$F".$$ || STAT=2 +- trap - HUP INT PIPE TERM 0 ++ rm -f "$TF" || STAT=2 ++ trap - EXIT HUP INT PIPE TERM + exit $STAT;; + + *) gzip -cdfq "$1" | $comp $OPTIONS - "$2";; diff --git a/package/base/gzip/gzip-1.3.5-stderr.patch b/package/base/gzip/gzip-1.3.5-stderr.patch new file mode 100644 index 000000000..4216cca13 --- /dev/null +++ b/package/base/gzip/gzip-1.3.5-stderr.patch @@ -0,0 +1,95 @@ +--- gzip-1.3/gzexe.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/gzexe.in Thu Nov 9 15:09:09 2000 +@@ -15,9 +15,9 @@ + + x=`basename $0` + if test $# = 0; then +- echo compress executables. original file foo is renamed to foo~ +- echo usage: ${x} [-d] files... +- echo " -d decompress the executables" ++ echo compress executables. original file foo is renamed to foo~ 1&>2 ++ echo usage: ${x} [-d] files... 1>&2 ++ echo " -d decompress the executables" 1>&2 + exit 1 + fi + +--- gzip-1.3/zdiff.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zdiff.in Thu Nov 9 15:09:29 2000 +@@ -32,7 +32,7 @@ + esac + done + if test -z "$FILES"; then +- echo "Usage: $prog [${comp}_options] file [file]" ++ echo "Usage: $prog [${comp}_options] file [file]" 1>&2 + exit 2 + fi + set $FILES +@@ -64,6 +64,6 @@ + esac;; + esac + else +- echo "Usage: $prog [${comp}_options] file [file]" ++ echo "Usage: $prog [${comp}_options] file [file]" 1>&2 + exit 2 + fi +--- gzip-1.3/zforce.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zforce.in Thu Nov 9 15:09:47 2000 +@@ -9,8 +9,8 @@ + PATH="BINDIR:$PATH"; export PATH + x=`basename $0` + if test $# = 0; then +- echo "force a '.gz' extension on all gzip files" +- echo usage: $x files... ++ echo "force a '.gz' extension on all gzip files" 1>&2 ++ echo usage: $x files... 1>&2 + exit 1 + fi + +--- gzip-1.3/zgrep.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zgrep.in Thu Nov 9 15:12:21 2000 +@@ -31,8 +31,8 @@ + done + + if test -z "$pat"; then +- echo "grep through gzip files" +- echo "usage: $prog [grep_options] pattern [files]" ++ echo "grep through gzip files" 1>&2 ++ echo "usage: $prog [grep_options] pattern [files]" 1>&2 + exit 2 + fi + +--- gzip-1.3/zmore.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zmore.in Thu Nov 9 15:13:49 2000 +@@ -23,7 +23,8 @@ + + if test $# = 0; then + if test -t 0; then +- echo usage: ${ZMORE_PROGRAM_NAME-zmore} files... ++ echo usage: ${ZMORE_PROGRAM_NAME-zmore} files... 1>&2 ++ exit 1 + else + gzip -cdfq | eval ${PAGER-more} + fi +--- gzip-1.3/znew.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/znew.in Thu Nov 9 15:14:20 2000 +@@ -51,13 +51,13 @@ + done + + if test $# -eq 0; then +- echo "recompress .Z files into $ext (gzip) files" +- echo usage: `echo $0 | sed 's,^.*/,,'` "[-tv9KP]" file.Z... +- echo " -t tests the new files before deleting originals" +- echo " -v be verbose" +- echo " -9 use the slowest compression method (optimal compression)" +- echo " -K keep a .Z file when it is smaller than the $ext file" +- echo " -P use pipes for the conversion $warn" ++ echo "recompress .Z files into $ext (gzip) files" 1>&2 ++ echo usage: `echo $0 | sed 's,^.*/,,'` "[-tv9KP]" file.Z... 1>&2 ++ echo " -t tests the new files before deleting originals" 1>&2 ++ echo " -v be verbose" 1>&2 ++ echo " -9 use the slowest compression method (optimal compression)" 1>&2 ++ echo " -K keep a .Z file when it is smaller than the $ext file" 1>&2 ++ echo " -P use pipes for the conversion $warn" 1>&2 + exit 1 + fi + diff --git a/package/base/gzip/gzip-1.3.5-zforce.patch b/package/base/gzip/gzip-1.3.5-zforce.patch new file mode 100644 index 000000000..12488b0f5 --- /dev/null +++ b/package/base/gzip/gzip-1.3.5-zforce.patch @@ -0,0 +1,11 @@ +--- gzip-1.2.4/zforce.in.sopwith Thu Feb 3 18:06:30 2000 ++++ gzip-1.2.4/zforce.in Thu Feb 3 18:07:37 2000 +@@ -25,7 +25,7 @@ + test `expr "$i" : '.*[.-]gz$'` -eq 0 || continue + test `expr "$i" : '.*[.]t[ag]z$'` -eq 0 || continue + +- if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then ++ if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then + + if test `expr "$i" : '^............'` -eq 12; then + new=`expr "$i" : '\(.*\)...$`.gz diff --git a/package/base/gzip/gzip.desc b/package/base/gzip/gzip.desc index 827f6e256..e082ecc13 100644 --- a/package/base/gzip/gzip.desc +++ b/package/base/gzip/gzip.desc @@ -40,9 +40,9 @@ [F] CORE [L] GPL -[S] Stable -[V] 1.2.4a +[S] Alpha +[V] 1.3.5 [P] X X1---5---9 100.800 -[D] 2285515917 gzip-1.2.4a.tar.gz ftp://ftp.gnu.org/pub/gnu/gzip/ +[D] 4282551372 gzip-1.3.5.tar.gz ftp://alpha.gnu.org/gnu/gzip/ diff --git a/package/base/gzip/no_basename.patch b/package/base/gzip/no_basename.patch deleted file mode 100644 index 9352ab7bf..000000000 --- a/package/base/gzip/no_basename.patch +++ /dev/null @@ -1,70 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gzip/no_basename.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -That's not a nice but working patch to let gzip compile with glibc. - - - Clifford - -diff -urN gzip-1.2.4a-orig/gzip.c gzip-1.2.4a/gzip.c ---- gzip-1.2.4a-orig/gzip.c 1993-08-19 15:39:43.000000000 +0200 -+++ gzip-1.2.4a/gzip.c 2004-11-19 01:20:54.656587992 +0100 -@@ -53,6 +53,7 @@ - #include - #include - #include -+#include - - #include "tailor.h" - #include "gzip.h" -diff -urN gzip-1.2.4a-orig/gzip.h gzip-1.2.4a/gzip.h ---- gzip-1.2.4a-orig/gzip.h 1993-08-13 14:35:33.000000000 +0200 -+++ gzip-1.2.4a/gzip.h 2004-11-19 01:20:15.383558400 +0100 -@@ -301,7 +301,7 @@ - extern void flush_window OF((void)); - extern void write_buf OF((int fd, voidp buf, unsigned cnt)); - extern char *strlwr OF((char *s)); --extern char *basename OF((char *fname)); -+extern char *Xbasename OF((char *fname)); - extern void make_simple_name OF((char *name)); - extern char *add_envopt OF((int *argcp, char ***argvp, char *env)); - extern void error OF((char *m)); -diff -urN gzip-1.2.4a-orig/util.c gzip-1.2.4a/util.c ---- gzip-1.2.4a-orig/util.c 1993-08-13 14:35:40.000000000 +0200 -+++ gzip-1.2.4a/util.c 2004-11-19 01:20:15.384558248 +0100 -@@ -178,7 +178,7 @@ - * any version suffix). For systems with file names that are not - * case sensitive, force the base name to lower case. - */ --char *basename(fname) -+char *Xbasename(fname) - char *fname; - { - char *p; -diff -urN gzip-1.2.4a-orig/zip.c gzip-1.2.4a/zip.c ---- gzip-1.2.4a-orig/zip.c 1993-08-13 14:35:40.000000000 +0200 -+++ gzip-1.2.4a/zip.c 2004-11-19 01:21:21.653483840 +0100 -@@ -10,6 +10,7 @@ - - #include - #include -+#include - - #include "tailor.h" - #include "gzip.h"