Clifford Wolf
18 years ago
9 changed files with 81 additions and 493 deletions
Split View
Diff Options
-
+8 -8package/base/gzip/gzip-1.3.11-addsuffix.patch
-
+57 -76package/base/gzip/gzip-1.3.11-rsyncable.patch
-
+11 -10package/base/gzip/gzip-1.3.11-zgreppipe.patch
-
+0 -30package/base/gzip/gzip-1.3.5-gunzip-dir.patch
-
+0 -79package/base/gzip/gzip-1.3.5-gzip-perm.patch
-
+0 -174package/base/gzip/gzip-1.3.5-openbsd-owl-tmp.patch
-
+0 -114package/base/gzip/gzip-1.3.5-stderr.patch
-
+3 -0package/base/gzip/gzip.conf
-
+2 -2package/base/gzip/gzip.desc
@ -1,30 +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.3.5-gunzip-dir.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 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.3.5/gzip.c.pom 2005-04-29 14:25:23.000000000 +0200
|
|||
+++ gzip-1.3.5/gzip.c 2005-04-29 14:24:42.000000000 +0200
|
|||
@@ -1344,6 +1344,8 @@
|
|||
error("corrupted input -- file name too large"); |
|||
} |
|||
} |
|||
+ char *base2 = base_name (base); /* there should be problem with file name */
|
|||
+ strcpy(base, base2); /* in this name there can't be path */
|
|||
/* If necessary, adapt the name to local OS conventions: */ |
|||
if (!list) { |
|||
MAKE_LEGAL_NAME(base); |
|||
@ -1,79 +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.3.5-gzip-perm.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 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.3.5/gzip.c.perm 2005-04-26 14:22:58.211395152 +0200
|
|||
+++ gzip-1.3.5/gzip.c 2005-04-26 14:24:10.414418624 +0200
|
|||
@@ -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)) { |
|||
@ -1,174 +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.3.5-openbsd-owl-tmp.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 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.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";; |
|||
@ -1,114 +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.3.5-stderr.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 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.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 |
|||
|
|||