From e59c2c747405bd503c481172fe8c9b2d3af28580 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 3 Mar 2013 09:45:26 +0100 Subject: [PATCH] rebase cont (patch4): remove upstreamed patch Version: 4.2.4.4-1 --- ncompress-4.2.4-zerobyteforce.patch | 24 ------------------------ ncompress.spec | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 ncompress-4.2.4-zerobyteforce.patch diff --git a/ncompress-4.2.4-zerobyteforce.patch b/ncompress-4.2.4-zerobyteforce.patch deleted file mode 100644 index 465d67e..0000000 --- a/ncompress-4.2.4-zerobyteforce.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ncompress-4.2.4/compress42.c.zerobyteforce 2006-04-14 14:18:28.000000000 +0200 -+++ ncompress-4.2.4/compress42.c 2006-04-14 14:20:15.000000000 +0200 -@@ -1145,10 +1145,12 @@ - if (fdout != 1 && close(fdout)) - write_error(); - -- if (bytes_in == 0) -+ if ( (bytes_in == 0) && (force == 0 ) ) - { - if (remove_ofname) - { -+ if(!quiet) -+ fprintf(stderr, "No compression -- %s unchanged\n", ifname); - if (unlink(ofname)) /* Remove input file */ - { - fprintf(stderr, "\nunlink error (ignored) "); -@@ -1157,6 +1159,7 @@ - } - - remove_ofname = 0; -+ exit_code = 2; - } - } - else diff --git a/ncompress.spec b/ncompress.spec index 8389580..72cbbcb 100644 --- a/ncompress.spec +++ b/ncompress.spec @@ -25,7 +25,6 @@ Patch2: ncompress-4.2.4.4-filenamelen.patch # ~> #126775 Patch3: ncompress-4.2.4.4-2GB.patch -Patch4: ncompress-4.2.4-zerobyteforce.patch Patch5: ncompress-4.2.4-bssUnderflow.patch Patch6: ncompress-4.2.4-endians.patch Patch7: ncompress-4.2.4-uncheckedmalloc.patch @@ -63,7 +62,6 @@ sed "s/\$(ARCH_FLAGS)/$ARCH_FLAGS/" Makefile.def > Makefile %patch1 -p1 -b .lfs %patch2 -p1 -b .filenamelen %patch3 -p1 -b .2GB -%patch4 -p1 -b .zerobyteforce %patch5 -p1 -b .bssUnderflow %patch6 -p1 -b .endians %patch7 -p1 -b .malloccheck