[Pkg-shadow-commits] sid/debian/patches 321_remove_malloc_definition.dpatch,NONE,1.1 006_libmisc.dpatch,1.3,1.4 00list,1.6,1.7

[Nicolas FRAN??OIS]

Update of /cvsroot/pkg-shadow/sid/debian/patches
In directory haydn:/tmp/cvs-serv12556

Modified Files:
	006_libmisc.dpatch 00list 
Added Files:
	321_remove_malloc_definition.dpatch 
Log Message:
Move the removal of the malloc definition from 006_libmisc to
321_remove_malloc_definition.


Index: 00list
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/00list,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 00list	17 Apr 2005 18:20:17 -0000	1.6
+++ 00list	17 Apr 2005 18:35:09 -0000	1.7
@@ -54,6 +54,7 @@
 318_passwd_src_warning
 319_time_structures
 320_nscd_header
+321_remove_malloc_definition
 401_cppw_src
 #402_missing_debian_man_pages
 403_sg_symlink_162339_163652

Index: 006_libmisc.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/006_libmisc.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 006_libmisc.dpatch	17 Apr 2005 18:20:16 -0000	1.3
+++ 006_libmisc.dpatch	17 Apr 2005 18:35:09 -0000	1.4
@@ -3311,15 +3311,3 @@
  	pam_end(pamh, PAM_SUCCESS);
  }
  #else /* !USE_PAM */
-diff -Nru shadow-4.0.3/libmisc/xmalloc.c shadow-4.0.3_30.4/libmisc/xmalloc.c
---- shadow-4.0.3/libmisc/xmalloc.c	1998-12-28 21:34:56.000000000 +0100
-+++ shadow-4.0.3_30.4/libmisc/xmalloc.c	2004-11-02 22:17:35.000000000 +0100
-@@ -16,8 +16,6 @@
- 
- #include "defines.h"
- 
--extern char *malloc();
--
- char *
- xmalloc(size_t size)
- {

--- NEW FILE: 321_remove_malloc_definition.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 321_remove_malloc_definition.dpatch by Nicolas FRANCOIS <nicolas.francois@centraliens.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove the malloc definition (which conflicts with libc).
## DP: It fixed #259827.
## DP: It is also applied upstream.

@DPATCH@
diff -urNad shadow-4.0.3/libmisc/xmalloc.c /tmp/dpep.KdKuFh/shadow-4.0.3/libmisc/xmalloc.c
--- shadow-4.0.3/libmisc/xmalloc.c	2005-04-17 20:27:46.627048000 +0200
+++ /tmp/dpep.KdKuFh/shadow-4.0.3/libmisc/xmalloc.c	2005-04-17 20:29:36.977048000 +0200
@@ -16,8 +16,6 @@
 
 #include "defines.h"
 
-extern char *malloc();
-
 char *
 xmalloc(size_t size)
 {