SOURCES: gzip-info.patch, gzip-noppid.patch, gzip-stderr.patch, gz...
qboosh
qboosh at pld-linux.org
Wed Apr 18 11:18:44 CEST 2007
Author: qboosh Date: Wed Apr 18 09:18:44 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.3.12
---- Files affected:
SOURCES:
gzip-info.patch (1.4 -> 1.5) , gzip-noppid.patch (1.5 -> 1.6) , gzip-stderr.patch (1.4 -> 1.5) , gzip-zgreppipe.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/gzip-info.patch
diff -u SOURCES/gzip-info.patch:1.4 SOURCES/gzip-info.patch:1.5
--- SOURCES/gzip-info.patch:1.4 Thu Nov 30 00:41:49 2006
+++ SOURCES/gzip-info.patch Wed Apr 18 11:18:38 2007
@@ -1,20 +1,22 @@
---- gzip-1.3.6/doc/gzip.texi.orig Mon Sep 30 08:57:29 2002
-+++ gzip-1.3.6/doc/gzip.texi Sat Jan 18 23:41:52 2003
-@@ -31,16 +31,9 @@
+--- gzip-1.3.12/doc/gzip.texi.orig 2007-02-06 00:29:04.000000000 +0100
++++ gzip-1.3.12/doc/gzip.texi 2007-04-18 10:55:20.596293313 +0200
+@@ -26,18 +26,9 @@
@end quotation
@end copying
- at c Debian install-info (up through at least version 1.9.20) uses only the
-- at c first dircategory. Put this one first, as it is more useful in practice.
-- at dircategory Individual utilities
+- at c first dircategory. But install-info 1.10.28 rejects any attempt to
+- at c put the more-useful individual utility first. So put the less-useful
+- at c general category first.
+- at dircategory Utilities
+ at dircategory File utilities:
@direntry
--* gzip: (gzip)Invoking gzip. Compress files.
+-* Gzip: (gzip). The gzip command for compressing files.
- at end direntry
-
-- at dircategory Utilities
+- at dircategory Individual utilities
- at direntry
--* Gzip: (gzip). The gzip command for compressing files.
+-* gzip: (gzip)Invoking gzip. Compress files.
+* Gzip: (gzip). The gzip command for compressing files
@end direntry
================================================================
Index: SOURCES/gzip-noppid.patch
diff -u SOURCES/gzip-noppid.patch:1.5 SOURCES/gzip-noppid.patch:1.6
--- SOURCES/gzip-noppid.patch:1.5 Wed Dec 13 00:35:22 2006
+++ SOURCES/gzip-noppid.patch Wed Apr 18 11:18:38 2007
@@ -1,37 +1,18 @@
---- gzip-1.3.6/zdiff.in.orig 2006-11-29 23:57:02.078114250 +0100
-+++ gzip-1.3.6/zdiff.in 2006-11-30 00:06:39.394194250 +0100
-@@ -60,11 +60,12 @@
- *[-.]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".$$
-+ tmpfile=`mktemp ${TMPDIR:-/tmp}/gz.XXXXXX` || exit 1
-+ trap 'rm -f $tmpfile; exit 2' HUP INT PIPE TERM 0
-+ gzip -cdfq -- "$2" >| $tmpfile || exit
-+ gzip -cdfq -- "$1" | $comp $OPTIONS - $tmpfile
- STAT="$?"
-- /bin/rm -f /tmp/"$F".$$ || STAT=2
-+ /bin/rm -f $tmpfile || STAT=2
- trap - HUP INT PIPE TERM 0
- exit $STAT;;
-
---- gzip-1.3.6/znew.in.orig 2006-11-29 23:57:02.082114500 +0100
-+++ gzip-1.3.6/znew.in 2006-11-30 00:09:00.795031250 +0100
-@@ -56,9 +56,9 @@
+--- gzip-1.3.12/znew.in.orig 2007-04-18 10:59:07.713235970 +0200
++++ gzip-1.3.12/znew.in 2007-04-18 11:02:12.715778664 +0200
+@@ -55,9 +55,9 @@
# block is the disk block size (best guess, need not be exact)
warn="(does not preserve modes and timestamp)"
--tmp=/tmp/zfoo.$$
-+tmp=`mktemp ${TMPDIR:-/tmp}/zfoo.XXXXXX` || exit 1
+-tmp=${TMPDIR-/tmp}/zfoo.$$
++tmp=`mktemp ${TMPDIR-/tmp}/zfoo.XXXXXX` || exit 1
set -C
-echo hi > $tmp || exit
+echo hi >| $tmp || exit
if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then
cpmod=${CPMOD-cpmod}
warn=""
-@@ -114,6 +114,7 @@
+@@ -113,6 +113,7 @@
for i do
n=`echo $i | sed 's/.Z$//'`
@@ -39,7 +20,7 @@
if test ! -f "$n.Z" ; then
echo $n.Z not found
res=1; continue
-@@ -129,7 +130,7 @@
+@@ -128,7 +129,7 @@
fi
else
if test $check -eq 1; then
@@ -48,7 +29,7 @@
:
else
echo cannot backup "$n.Z"
-@@ -139,7 +140,7 @@
+@@ -138,7 +139,7 @@
if gzip -d "$n.Z"; then
:
else
@@ -57,7 +38,7 @@
echo error while uncompressing $n.Z
res=1; continue
fi
-@@ -147,7 +148,7 @@
+@@ -146,7 +147,7 @@
:
else
if test $check -eq 1; then
@@ -66,7 +47,7 @@
echo error while recompressing $n
else
# compress $n (might be dangerous if disk full)
-@@ -162,7 +163,7 @@
+@@ -161,7 +162,7 @@
if test $pipe -eq 1; then
rm -f "$n$ext"
elif test $check -eq 1; then
@@ -75,7 +56,7 @@
else
gzip -d "$n$ext" && compress "$n" && rm -f "$n$ext"
fi
-@@ -170,9 +171,9 @@
+@@ -169,9 +170,9 @@
elif test $check -eq 1; then
if gzip -t "$n$ext" ; then
================================================================
Index: SOURCES/gzip-stderr.patch
diff -u SOURCES/gzip-stderr.patch:1.4 SOURCES/gzip-stderr.patch:1.5
--- SOURCES/gzip-stderr.patch:1.4 Wed Dec 13 00:35:22 2006
+++ SOURCES/gzip-stderr.patch Wed Apr 18 11:18:38 2007
@@ -9,16 +9,6 @@
exit 1
fi
---- gzip-1.3.6/zdiff.in.orig 2006-11-20 09:40:34.000000000 +0100
-+++ gzip-1.3.6/zdiff.in 2006-11-29 23:54:17.383821500 +0100
-@@ -77,6 +77,6 @@
- esac;;
- esac
- else
-- echo "$usage"
-+ echo "$usage" >&2
- exit 2
- fi
--- gzip-1.3.6/zforce.in.orig 2006-11-20 09:40:34.000000000 +0100
+++ gzip-1.3.6/zforce.in 2006-11-29 23:54:45.833599500 +0100
@@ -41,7 +41,7 @@
@@ -28,17 +18,6 @@
- echo "$usage"
+ echo "$usage" >&2
exit 1
- fi
-
---- gzip-1.3.6/zgrep.in.orig 2006-11-20 09:40:34.000000000 +0100
-+++ gzip-1.3.6/zgrep.in 2006-11-29 23:55:01.078552250 +0100
-@@ -97,7 +97,7 @@
- done
-
- if test -z "$pat"; then
-- echo "$usage"
-+ echo "$usage" >&2
- exit 2
fi
--- gzip-1.3.6/zmore.in.orig 2006-11-20 09:40:34.000000000 +0100
================================================================
Index: SOURCES/gzip-zgreppipe.patch
diff -u SOURCES/gzip-zgreppipe.patch:1.4 SOURCES/gzip-zgreppipe.patch:1.5
--- SOURCES/gzip-zgreppipe.patch:1.4 Tue Aug 13 13:54:03 2002
+++ SOURCES/gzip-zgreppipe.patch Wed Apr 18 11:18:38 2007
@@ -1,15 +1,15 @@
---- zgrep.in.orig Thu Mar 14 00:42:21 2002
-+++ zgrep.in Thu Mar 14 00:46:52 2002
-@@ -92,6 +92,7 @@
- fi
-
+--- gzip-1.3.12/zgrep.in.orig 2007-02-05 21:54:26.000000000 +0100
++++ gzip-1.3.12/zgrep.in 2007-04-18 10:58:17.990402427 +0200
+@@ -141,6 +141,7 @@
+ exec 3>&1
res=0
+
+trap break PIPE
- for i do
- gzip -cdfq "$i" |
- if test $files_with_matches -eq 1; then
-@@ -111,4 +112,5 @@
- r=$?
+ for i
+ do
+ # Fail if gzip or grep (or sed) fails.
+@@ -185,4 +186,5 @@
+ test "$gzip_status" -eq 0 || test "$gzip_status" -eq 2 || r=2
test $res -lt $r && res=$r
done
+trap - PIPE
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gzip-info.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/gzip-noppid.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/gzip-stderr.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/gzip-zgreppipe.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list