rpms/gzip/devel gzip-1.3.12-zdiff.patch, NONE, 1.1 gzip.spec, 1.46, 1.47

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/gzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29220

Modified Files:
	gzip.spec 
Added Files:
	gzip-1.3.12-zdiff.patch 
Log Message:
- fix #484213 - zdiff shows no output


gzip-1.3.12-zdiff.patch:

--- NEW FILE gzip-1.3.12-zdiff.patch ---
diff -up gzip-1.3.12/zdiff.in.pom gzip-1.3.12/zdiff.in
--- gzip-1.3.12/zdiff.in.pom	2007-02-08 23:54:59.000000000 +0100
+++ gzip-1.3.12/zdiff.in	2009-03-13 15:07:18.000000000 +0100
@@ -104,8 +104,9 @@ elif test $# -eq 2; then
 			  exec 4>&1
 			  (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- |
 			    ( (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null |
-			       eval "$cmp" /dev/fd/5 -) 5<&0
+			       eval "$cmp" /dev/fd/5 - >&3 ) 5<&0
 			)
+			gzip_status=$?
 			case $gzip_status in
 			  *[1-9]*) gzip_status=1;;
 			  *) gzip_status=0;;


Index: gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gzip.spec	25 Feb 2009 03:12:48 -0000	1.46
+++ gzip.spec	13 Mar 2009 14:29:04 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 8%{?dist}
+Release: 9%{?dist}
 # info pages are under GFDL license
 License: GPLv2 and GFDL
 Group: Applications/File
@@ -16,6 +16,7 @@
 Patch15: gzip-1.3.9-cve-2006-4337.patch
 Patch16: gzip-1.3.5-cve-2006-4337_len.patch
 Patch17: gzip-1.3.12-futimens.patch
+Patch18: gzip-1.3.12-zdiff.patch
 URL: http://www.gzip.org/
 Requires: /sbin/install-info
 Requires: mktemp less
@@ -41,6 +42,7 @@
 %patch15 -p1 -b .4337
 %patch16 -p1 -b .4337l
 %patch17 -p1 -b .futimens
+%patch18 -p1 -b .ret
 %build
 export DEFS="NO_ASM"
 export CPPFLAGS="-DHAVE_LSTAT"
@@ -87,6 +89,9 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Fri Mar 13 2009 Ivana Varekova <varekova at redhat.com> - 1.3.12-9
+- fix #484213 - zdiff shows no output
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild