rpms/ncompress/devel ncompress-4.2.4-zerobyteforce.patch, NONE, 1.1 ncompress.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25294

Modified Files:
	ncompress.spec 
Added Files:
	ncompress-4.2.4-zerobyteforce.patch 
Log Message:
 compress zero-sized files when -f is used(#167615)


ncompress-4.2.4-zerobyteforce.patch:
 compress42.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncompress-4.2.4-zerobyteforce.patch ---
--- ncompress-4.2.4/compress42.c.zerobyteforce	2005-09-02 18:42:56.000000000 +0530
+++ ncompress-4.2.4/compress42.c	2005-09-02 18:43:55.000000000 +0530
@@ -1145,7 +1145,7 @@
 			if (fdout != 1 && close(fdout))
 				write_error();
 
-			if (bytes_in == 0)
+			if ( (bytes_in == 0) && (force == 0 ) )
 			{
 				if (remove_ofname)
 				{


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ncompress.spec	18 Mar 2005 08:56:23 -0000	1.14
+++ ncompress.spec	22 Sep 2005 10:19:13 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 42
+Release: 43
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
@@ -9,6 +9,7 @@
 Patch1: ncompress-4.2.4-lfs2.patch
 Patch2: ncompress-4.2.4-filenamelen.patch
 Patch3: ncompress-2GB.patch
+Patch4: ncompress-4.2.4-zerobyteforce.patch
 BuildRequires: gcc glibc-devel fileutils
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .lfs
 %patch2 -p1 -b .filenamelen
 %patch3 -p1 -b .2GB
+%patch4 -p1 -b .zerobyteforce
 
 %build
 
@@ -67,6 +69,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Thu Sep 22 2005 Peter Vrabec <pvrabec at redhat.com> 4.2.4-43
+- compress zero-sized files when -f is used(#167615)
+
 * Fri Mar 18 2005 Peter Vrabec <pvrabec at redhat.com>
 - rebuilt