gcc 3.4 fixes

5 files changed, 39 insertions, 3 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 873055bbdbbb..bb2c4eaed561 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.51 2004/03/29 22:05:49 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.52 2004/04/22 11:22:43 lv Exp $
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/shadow-4.0.3-gcc34-xmalloc.patch,
+  +files/shadow-4.0.4.1-gcc34-xmalloc.patch, shadow-4.0.3-r9.ebuild,
+  shadow-4.0.4.1.ebuild:
+  fixes for compiling with gcc 3.4 - bug #47455
 
   29 Mar 2004; Jon Portnoy <avenj@gentoo.org> shadow-4.0.3-r9.ebuild,
   shadow-4.0.3-r10.ebuild, shadow-4.0.4.1.ebuild :
diff --git a/sys-apps/shadow/files/shadow-4.0.3-gcc34-xmalloc.patch b/sys-apps/shadow/files/shadow-4.0.3-gcc34-xmalloc.patch
new file mode 100644
index 000000000000..bec4e62d2e63
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.3-gcc34-xmalloc.patch
@@ -0,0 +1,11 @@
+--- ./libmisc/xmalloc.c.old	2004-04-22 07:05:35.260248320 -0400
++++ ./libmisc/xmalloc.c	2004-04-22 07:06:35.775048672 -0400
+@@ -16,7 +16,7 @@
+ 
+ #include "defines.h"
+ 
+-extern char *malloc();
++extern void *malloc (size_t size);
+ 
+ char *
+ xmalloc(size_t size)
diff --git a/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch b/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch
new file mode 100644
index 000000000000..9ea7d23f3230
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch
@@ -0,0 +1,11 @@
+--- libmisc/old/xmalloc.c	2004-04-21 09:15:20.000000000 +0000
++++ libmisc/xmalloc.c	2004-04-21 09:32:50.000000000 +0000
+@@ -13,7 +13,7 @@
+ RCSID ("$Id: shadow-4.0.4.1-gcc34-xmalloc.patch,v 1.1 2004/04/22 11:22:43 lv Exp $")
+ #include <stdio.h>
+ #include "defines.h"
+-extern char *malloc ();
++extern void *malloc (size_t size);
+ 
+ char *xmalloc (size_t size)
+ {
diff --git a/sys-apps/shadow/shadow-4.0.3-r9.ebuild b/sys-apps/shadow/shadow-4.0.3-r9.ebuild
index e5e00f1d91a1..c33eee0a6ab1 100644
--- a/sys-apps/shadow/shadow-4.0.3-r9.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r9.ebuild,v 1.11 2004/03/29 22:05:49 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r9.ebuild,v 1.12 2004/04/22 11:22:43 lv Exp $
 
 IUSE="pam selinux nls"
 
@@ -57,6 +57,10 @@ src_unpack() {
 	# Patch the useradd manpage to be a bit more clear, closing bug #13203.
 	# Thanks to Guy <guycad@mindspring.com>.
 	epatch ${FILESDIR}/${P}-useradd-manpage-update.patch
+
+	# Patch to correct the definition if malloc, so that shadow can compile
+	# using gcc 3.4. see bug #47455 for more information
+	epatch ${FILESDIR}/shadow-4.0.3-gcc34-xmalloc.patch
 }
 
 src_compile() {
diff --git a/sys-apps/shadow/shadow-4.0.4.1.ebuild b/sys-apps/shadow/shadow-4.0.4.1.ebuild
index e1ccb95e03ef..9e7fd1c7a059 100644
--- a/sys-apps/shadow/shadow-4.0.4.1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1.ebuild,v 1.8 2004/03/29 22:05:49 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1.ebuild,v 1.9 2004/04/22 11:22:43 lv Exp $
 
 inherit eutils libtool gnuconfig
 
@@ -53,6 +53,10 @@ src_unpack() {
 	# Patch the useradd manpage to be a bit more clear, closing bug #13203.
 	# Thanks to Guy <guycad@mindspring.com>.
 	epatch ${FILESDIR}/${P}-useradd-manpage-update.patch
+
+    # Patch to correct the definition if malloc, so that shadow can compile
+	# using gcc 3.4. see bug #47455 for more information
+	epatch ${FILESDIR}/${P}-gcc34-xmalloc.patch
 }
 
 src_compile() {