packages: gzip/gzip-noppid.patch, gzip/gzip-rsyncable.patch, gzip/gzip-stde...
qboosh
qboosh at pld-linux.org
Fri Jun 22 17:48:19 CEST 2012
Author: qboosh Date: Fri Jun 22 15:48:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.5
- updated stderr,noppid,rsyncable patches
- removed obsolete CVE-2006-433x patch (slightly different fixes applied
upstream in 1.3.7-1.3.8)
---- Files affected:
packages/gzip:
gzip-noppid.patch (1.6 -> 1.7) , gzip-rsyncable.patch (1.3 -> 1.4) , gzip-stderr.patch (1.5 -> 1.6) , gzip.spec (1.111 -> 1.112) , gzip-CVE-2006-433x.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/gzip/gzip-noppid.patch
diff -u packages/gzip/gzip-noppid.patch:1.6 packages/gzip/gzip-noppid.patch:1.7
--- packages/gzip/gzip-noppid.patch:1.6 Wed Apr 18 11:18:38 2007
+++ packages/gzip/gzip-noppid.patch Fri Jun 22 17:48:13 2012
@@ -1,6 +1,6 @@
---- 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 @@
+--- gzip-1.5/znew.in.orig 2012-01-01 09:53:58.000000000 +0100
++++ gzip-1.5/znew.in 2012-06-18 19:27:59.507710749 +0200
+@@ -59,9 +59,9 @@
# block is the disk block size (best guess, need not be exact)
warn="(does not preserve modes and timestamp)"
@@ -12,7 +12,7 @@
if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then
cpmod=${CPMOD-cpmod}
warn=""
-@@ -113,6 +113,7 @@
+@@ -117,6 +117,7 @@
for i do
n=`echo $i | sed 's/.Z$//'`
@@ -20,51 +20,49 @@
if test ! -f "$n.Z" ; then
echo $n.Z not found
res=1; continue
-@@ -128,7 +129,7 @@
+@@ -132,7 +133,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
- :
++ if cp -p "$n.Z" "$ntmp" 2> /dev/null || cp "$n.Z" "$ntmp"; then
+ :
else
- echo cannot backup "$n.Z"
-@@ -138,7 +139,7 @@
+ echo cannot backup "$n.Z"
+@@ -142,7 +143,7 @@
if gzip -d "$n.Z"; then
:
else
- test $check -eq 1 && mv "$n.$$" "$n.Z"
-+ test $check -eq 1 && mv $ntmp "$n.Z"
++ test $check -eq 1 && mv "$ntmp" "$n.Z"
echo error while uncompressing $n.Z
res=1; continue
fi
-@@ -146,7 +147,7 @@
+@@ -150,7 +151,7 @@
:
else
if test $check -eq 1; then
-- mv "$n.$$" "$n.Z" && rm -f "$n"
-+ mv $ntmp "$n.Z" && rm -f "$n"
+- 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)
-@@ -161,7 +162,7 @@
+ # compress $n (might be dangerous if disk full)
+@@ -165,15 +166,15 @@
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"
+- mv "$n.$$" "$n.Z" && rm -f "$n$ext"
++ mv "$ntmp" "$n.Z" && rm -f "$n$ext"
fi
-@@ -169,9 +170,9 @@
+ echo "$n.Z smaller than $n$ext -- unchanged"
elif test $check -eq 1; then
if gzip -t "$n$ext" ; then
- rm -f "$n.$$" "$n.Z"
-+ rm -f $ntmp "$n.Z"
++ rm -f "$ntmp" "$n.Z"
else
- test $pipe -eq 0 && mv "$n.$$" "$n.Z"
-+ test $pipe -eq 0 && mv $ntmp "$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
================================================================
Index: packages/gzip/gzip-rsyncable.patch
diff -u packages/gzip/gzip-rsyncable.patch:1.3 packages/gzip/gzip-rsyncable.patch:1.4
--- packages/gzip/gzip-rsyncable.patch:1.3 Thu Nov 30 00:41:49 2006
+++ packages/gzip/gzip-rsyncable.patch Fri Jun 22 17:48:13 2012
@@ -4,9 +4,9 @@
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 @@
+--- gzip-1.5/deflate.c.orig 2012-04-24 18:25:28.000000000 +0200
++++ gzip-1.5/deflate.c 2012-06-18 19:36:09.127690198 +0200
+@@ -131,6 +131,14 @@
#endif
/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
@@ -21,8 +21,8 @@
/* ===========================================================================
* Local data used by the "longest match" routines.
*/
-@@ -216,6 +224,8 @@
- unsigned near good_match;
+@@ -212,6 +220,8 @@
+ unsigned good_match;
/* Use a faster search when the previous match is longer than this */
+local ulg rsync_sum; /* rolling sum of rsync window */
@@ -50,7 +50,7 @@
block_start -= (long) WSIZE;
-@@ -577,13 +593,46 @@
+@@ -579,13 +595,46 @@
}
}
@@ -98,7 +98,7 @@
/* ===========================================================================
* Processes a new input file and return its compressed length. This
-@@ -594,7 +643,7 @@
+@@ -596,7 +645,7 @@
local off_t deflate_fast()
{
IPos hash_head; /* head of the hash chain */
@@ -107,30 +107,30 @@
unsigned match_length = 0; /* length of best match */
prev_length = MIN_MATCH-1;
-@@ -624,6 +673,7 @@
+@@ -626,6 +675,7 @@
lookahead -= match_length;
+ RSYNC_ROLL(strstart, match_length);
- /* Insert new strings in the hash table only if the match length
+ /* Insert new strings in the hash table only if the match length
* is not too large. This saves time but degrades compression.
*/
-@@ -652,9 +702,14 @@
+@@ -654,9 +704,14 @@
/* No match, output a literal byte */
Tracevv((stderr,"%c",window[strstart]));
flush = ct_tally (0, window[strstart]);
+ RSYNC_ROLL(strstart, 1);
lookahead--;
- strstart++;
+ 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
-@@ -728,6 +783,7 @@
+@@ -730,6 +785,7 @@
*/
lookahead -= prev_length-1;
prev_length -= 2;
@@ -138,7 +138,7 @@
do {
strstart++;
INSERT_STRING(strstart, hash_head);
-@@ -740,24 +796,39 @@
+@@ -742,24 +798,39 @@
match_available = 0;
match_length = MIN_MATCH-1;
strstart++;
@@ -182,25 +182,25 @@
strstart++;
lookahead--;
}
---- 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 @@
+--- gzip-1.5/gzip.c.orig 2012-04-24 18:25:28.000000000 +0200
++++ gzip-1.5/gzip.c 2012-06-18 19:37:13.954354148 +0200
+@@ -213,6 +213,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[] =
- {
-@@ -247,6 +248,7 @@
+ static int handled_sig[] =
+ {
+@@ -270,6 +271,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 }
};
-
-@@ -329,6 +331,7 @@
+@@ -353,6 +355,7 @@
" -Z, --lzw produce output compatible with old compress",
" -b, --bits=BITS max number of bits per code (implies -Z)",
#endif
@@ -208,19 +208,19 @@
"",
"With no FILE, or when FILE is -, read standard input.",
"",
-@@ -469,6 +472,9 @@
- recursive = 1;
+@@ -482,6 +485,9 @@
+ recursive = 1;
#endif
- break;
+ break;
+ case 'R':
+ rsync = 1;
+ break;
- case 'S':
+ case 'S':
#ifdef NO_MULTIPLE_DOTS
if (*optarg == '.') optarg++;
---- 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 @@
+--- gzip-1.5/gzip.h.orig 2012-01-01 09:53:58.000000000 +0100
++++ gzip-1.5/gzip.h 2012-06-18 19:36:31.987689240 +0200
+@@ -140,6 +140,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 */
@@ -228,15 +228,15 @@
extern off_t bytes_in; /* number of input bytes */
extern off_t bytes_out; /* number of output bytes */
-@@ -281,7 +282,7 @@
+@@ -287,7 +288,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));
+ extern void ct_init (ush *attr, int *method);
+ extern int ct_tally (int dist, int lc);
+-extern off_t flush_block (char *buf, ulg stored_len, int eof);
++extern off_t flush_block (char *buf, ulg stored_len, int pad, int eof);
/* in bits.c */
- void bi_init OF((file_t zipfile));
+ extern void bi_init (file_t zipfile);
--- 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 @@
================================================================
Index: packages/gzip/gzip-stderr.patch
diff -u packages/gzip/gzip-stderr.patch:1.5 packages/gzip/gzip-stderr.patch:1.6
--- packages/gzip/gzip-stderr.patch:1.5 Wed Apr 18 11:18:38 2007
+++ packages/gzip/gzip-stderr.patch Fri Jun 22 17:48:13 2012
@@ -9,36 +9,3 @@
exit 1
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 @@
- Report bugs to <bug-gzip at gnu.org>."
-
- if test $# = 0; then
-- echo "$usage"
-+ echo "$usage" >&2
- exit 1
- fi
-
---- gzip-1.3.6/zmore.in.orig 2006-11-20 09:40:34.000000000 +0100
-+++ gzip-1.3.6/zmore.in 2006-11-29 23:55:22.423886250 +0100
-@@ -54,7 +54,7 @@
-
- if test $# = 0; then
- if test -t 0; then
-- echo "$usage"
-+ echo "$usage" >&2
- else
- gzip -cdfq | eval ${PAGER-more}
- fi
---- gzip-1.3.6/znew.in.orig 2006-11-20 09:40:34.000000000 +0100
-+++ gzip-1.3.6/znew.in 2006-11-29 23:55:43.157182000 +0100
-@@ -94,7 +94,7 @@
- done
-
- if test $# -eq 0; then
-- echo "$usage"
-+ echo "$usage" >&2
- exit 1
- fi
-
================================================================
Index: packages/gzip/gzip.spec
diff -u packages/gzip/gzip.spec:1.111 packages/gzip/gzip.spec:1.112
--- packages/gzip/gzip.spec:1.111 Mon Feb 8 20:07:48 2010
+++ packages/gzip/gzip.spec Fri Jun 22 17:48:13 2012
@@ -9,12 +9,12 @@
Summary(tr.UTF-8): GNU gzip dosya sıkıştırma aracı
Summary(uk.UTF-8): Програма компресії даних GNU gzip
Name: gzip
-Version: 1.4
-Release: 3
-License: GPL
+Version: 1.5
+Release: 1
+License: GPL v3+
Group: Applications/Archiving
-Source0: http://ftp.gnu.org/gnu/gzip/%{name}-%{version}.tar.gz
-# Source0-md5: e381b8506210c794278f5527cba0e765
+Source0: http://ftp.gnu.org/gnu/gzip/%{name}-%{version}.tar.xz
+# Source0-md5: 2a431e169b6f62f7332ef6d47cc53bae
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: ea70155215d7b7d413ff476b668bcbbd
Patch0: %{name}-mktemp.patch
@@ -23,7 +23,6 @@
Patch3: %{name}-zgreppipe.patch
Patch4: %{name}-noppid.patch
Patch5: %{name}-rsyncable.patch
-Patch6: %{name}-CVE-2006-433x.patch
URL: http://www.gnu.org/software/gzip/
BuildRequires: autoconf >= 2.60
%if "%{pld_release}" == "ac"
@@ -32,7 +31,9 @@
BuildRequires: automake >= 1:1.11
%endif
BuildRequires: rpm >= 4.4.9-56
+BuildRequires: tar >= 1:1.22
BuildRequires: texinfo
+BuildRequires: xz
Requires: mktemp
Provides: gzip(rsyncable)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -80,7 +81,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%if "%{pld_release}" == "ac"
%{__sed} -i -e '/AM_SILENT_RULES/d' configure.ac
@@ -106,7 +106,7 @@
DESTDIR=$RPM_BUILD_ROOT
mv -f $RPM_BUILD_ROOT%{_bindir}/gzip $RPM_BUILD_ROOT/bin
-rm -f $RPM_BUILD_ROOT%{_bindir}/gunzip $RPM_BUILD_ROOT%{_bindir}/zcat
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/gunzip $RPM_BUILD_ROOT%{_bindir}/zcat
cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GZIP
#GZIP="-5"
@@ -124,31 +124,54 @@
ln -sf /bin/gunzip $RPM_BUILD_ROOT%{_bindir}/gunzip
# conflicts with ncompress
-rm -f $RPM_BUILD_ROOT%{_bindir}/uncompress
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/uncompress
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
mv $RPM_BUILD_ROOT%{_mandir}/pt/*.1 $RPM_BUILD_ROOT%{_mandir}/pt/man1
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.gzip-non-english-man-pages*
-rm -f $RPM_BUILD_ROOT%{_mandir}/gzip-da_de_gzip.patch*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.gzip-non-english-man-pages*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/gzip-da_de_gzip.patch*
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/postshell
+%post -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun -p /sbin/postshell
+%postun -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README* THANKS TODO
-%attr(755,root,root) /bin/*
-%attr(755,root,root) %{_bindir}/*
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
-%{_mandir}/man1/*
+%attr(755,root,root) /bin/gzip
+%attr(755,root,root) /bin/gunzip
+%attr(755,root,root) /bin/zcat
+%attr(755,root,root) %{_bindir}/gzexe
+%attr(755,root,root) %{_bindir}/gzip
+%attr(755,root,root) %{_bindir}/gunzip
+%attr(755,root,root) %{_bindir}/zcmp
+%attr(755,root,root) %{_bindir}/zdiff
+%attr(755,root,root) %{_bindir}/zegrep
+%attr(755,root,root) %{_bindir}/zfgrep
+%attr(755,root,root) %{_bindir}/zforce
+%attr(755,root,root) %{_bindir}/zgrep
+%attr(755,root,root) %{_bindir}/zless
+%attr(755,root,root) %{_bindir}/zmore
+%attr(755,root,root) %{_bindir}/znew
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/GZIP
+%{_mandir}/man1/gzexe.1*
+%{_mandir}/man1/gzip.1*
+%{_mandir}/man1/gunzip.1*
+%{_mandir}/man1/zcat.1*
+%{_mandir}/man1/zcmp.1*
+%{_mandir}/man1/zdiff.1*
+%{_mandir}/man1/zforce.1*
+%{_mandir}/man1/zgrep.1*
+%{_mandir}/man1/zless.1*
+%{_mandir}/man1/zmore.1*
+%{_mandir}/man1/znew.1*
%lang(de) %{_mandir}/de/man1/*
%lang(es) %{_mandir}/es/man1/*
%lang(fi) %{_mandir}/fi/man1/*
@@ -168,6 +191,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.112 2012/06/22 15:48:13 qboosh
+- updated to 1.5
+- updated stderr,noppid,rsyncable patches
+- removed obsolete CVE-2006-433x patch (slightly different fixes applied
+ upstream in 1.3.7-1.3.8)
+
Revision 1.111 2010/02/08 19:07:48 qboosh
- updated info patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gzip/gzip-noppid.patch?r1=1.6&r2=1.7
http://cvs.pld-linux.org/packages/gzip/gzip-rsyncable.patch?r1=1.3&r2=1.4
http://cvs.pld-linux.org/packages/gzip/gzip-stderr.patch?r1=1.5&r2=1.6
http://cvs.pld-linux.org/packages/gzip/gzip.spec?r1=1.111&r2=1.112
More information about the pld-cvs-commit
mailing list