From 9009c4d978459109dbc9be522e60bdd183bdcdeb Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <pavel@raiskup.cz>
Date: Sun, 3 Mar 2013 09:59:07 +0100
Subject: [PATCH] rebase cont (patch7): remove upstreamed patch

Version: 4.2.4.4-1
---
 ncompress-4.2.4-uncheckedmalloc.patch | 34 ---------------------------
 ncompress.spec                        |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 ncompress-4.2.4-uncheckedmalloc.patch

diff --git a/ncompress-4.2.4-uncheckedmalloc.patch b/ncompress-4.2.4-uncheckedmalloc.patch
deleted file mode 100644
index 729ef07..0000000
--- a/ncompress-4.2.4-uncheckedmalloc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urNp ncompress-4.2.4-orig/compress42.c ncompress-4.2.4/compress42.c
---- ncompress-4.2.4-orig/compress42.c	2008-12-01 13:50:17.000000000 +0100
-+++ ncompress-4.2.4/compress42.c	2008-12-01 13:53:03.000000000 +0100
-@@ -132,6 +132,7 @@
-  */
- #include	<unistd.h>
- #include	<stdio.h>
-+#include  <stdlib.h>
- #include	<fcntl.h>
- #include	<ctype.h>
- #include	<signal.h>
-@@ -696,7 +697,13 @@ main(argc, argv)
-             }
-         }
- 
--        filelist = fileptr = (char **)malloc(argc*sizeof(char *));
-+        filelist = (char **)malloc(argc*sizeof(char *));
-+        if (filelist == NULL)
-+          {
-+             fprintf(stderr, "Cannot allocate memory for file list.\n");
-+             exit (1);
-+          }
-+        fileptr = filelist;
-     	*filelist = NULL;
- 
-     	if((progname = rindex(argv[0], '/')) != 0)
-@@ -836,6 +843,7 @@ nextarg:	continue;
- 				decompress(0, 1);
- 		}
-         
-+    free(filelist);
- 		exit((exit_code== -1) ? 1:exit_code);
-                 return 0;
- 	}
diff --git a/ncompress.spec b/ncompress.spec
index 8202389..7365d82 100644
--- a/ncompress.spec
+++ b/ncompress.spec
@@ -29,7 +29,6 @@ Patch3: ncompress-4.2.4.4-2GB.patch
 # ~> #207001
 Patch4: ncompress-4.2.4.4-endians.patch
 
-Patch7: ncompress-4.2.4-uncheckedmalloc.patch
 Patch8: ncompress-4.2.4-memmove.patch
 BuildRequires: gcc glibc-devel fileutils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,7 +64,6 @@ sed "s/\$(ARCH_FLAGS)/$ARCH_FLAGS/" Makefile.def > Makefile
 %patch2 -p1 -b .filenamelen
 %patch3 -p1 -b .2GB
 %patch4 -p1 -b .endians
-%patch7 -p1 -b .malloccheck
 
 %build
 make CFLAGS="%{optflags} %{?nc_endian} %{?nc_align}"