Fix broken build on gcc-4.1.

(Portage version: 2.1.1)

4 files changed, 73 insertions, 3 deletions

diff --git a/net-proxy/middleman/ChangeLog b/net-proxy/middleman/ChangeLog
index 13d82c963b1f..6ae6cb7442a7 100644
--- a/net-proxy/middleman/ChangeLog
+++ b/net-proxy/middleman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/middleman
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/ChangeLog,v 1.5 2006/04/14 09:20:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/ChangeLog,v 1.6 2006/09/24 09:27:51 mrness Exp $
+
+  24 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  -files/middleman-2.0.1-gcc-34.patch, +files/middleman-2.0.1-gcc41.patch,
+  middleman-2.0.1-r2.ebuild:
+  Fix broken build on gcc-4.1.
 
   14 Apr 2006; Alin Nastac <mrness@gentoo.org> middleman-2.0.1-r2.ebuild:
   Simplify dependencies.
diff --git a/net-proxy/middleman/files/digest-middleman-2.0.1-r2 b/net-proxy/middleman/files/digest-middleman-2.0.1-r2
index 05e783e77584..51552b4c26df 100644
--- a/net-proxy/middleman/files/digest-middleman-2.0.1-r2
+++ b/net-proxy/middleman/files/digest-middleman-2.0.1-r2
@@ -1 +1,3 @@
 MD5 8bf596a4810184c8f7534d63b1e94cf1 middleman-2.0.1.tar.gz 743404
+RMD160 8139602064976c3280a629255f0dafb6e6a1837c middleman-2.0.1.tar.gz 743404
+SHA256 c1a90e62aaec6b7ccfab03259536835f5eeee10fc9ed6a0aa9da083bdf87502a middleman-2.0.1.tar.gz 743404
diff --git a/net-proxy/middleman/files/middleman-2.0.1-gcc41.patch b/net-proxy/middleman/files/middleman-2.0.1-gcc41.patch
new file mode 100644
index 000000000000..6139eeb51ecb
--- /dev/null
+++ b/net-proxy/middleman/files/middleman-2.0.1-gcc41.patch
@@ -0,0 +1,63 @@
+diff -Nru middleman-2.0.1.orig/src/forward.c middleman-2.0.1/src/forward.c
+--- middleman-2.0.1.orig/src/forward.c	2004-03-12 00:27:16.000000000 +0200
++++ middleman-2.0.1/src/forward.c	2006-09-24 12:23:44.378288750 +0300
+@@ -237,12 +237,12 @@
+ 	/* this proxy's address */
+ 	icppacket.hostaddr = 0;
+ 	if (connection->interface != NULL)
+-		inet_pton(AF_INET, connection->interface, (struct addr_in *) &icppacket.hostaddr);
++		inet_pton(AF_INET, connection->interface, &icppacket.hostaddr);
+ 
+ 	/* client's address */
+ 	memset(icppacket.payload, 0, 4);
+ 	if (connection->ip != NULL)
+-		inet_pton(AF_INET, connection->ip, (struct addr_in *) &icppacket.payload);
++		inet_pton(AF_INET, connection->ip, &icppacket.payload);
+ 
+ 	s_strncpy((char *) &icppacket.payload[4], connection->header->url, ICP_MESSAGE_MAX - 4);
+ 
+diff -Nru middleman-2.0.1.orig/src/main.c middleman-2.0.1/src/main.c
+--- middleman-2.0.1.orig/src/main.c	2004-03-12 00:28:57.000000000 +0200
++++ middleman-2.0.1/src/main.c	2005-04-06 21:12:10.580927424 +0300
+@@ -407,7 +407,7 @@
+ #else
+ 	pcre_free = xfree;
+ 	// grr... argument to malloc is int on some systems, and long on others
+-	(void *) pcre_malloc = (void *) xmalloc;
++	pcre_malloc = (void* (*)(size_t)) xmalloc;
+ #endif
+ 
+ 	global->dns_cache = hash_create(DNS_HASH_SIZE);
+diff -Nru middleman-2.0.1.orig/src/stats.c middleman-2.0.1/src/stats.c
+--- middleman-2.0.1.orig/src/stats.c	2004-03-12 00:27:16.000000000 +0200
++++ middleman-2.0.1/src/stats.c	2005-04-06 21:11:29.636151976 +0300
+@@ -175,7 +175,7 @@
+ 
+ 	sc.name = stat;
+ 	sc.type = type | StatCounter::CALLBACK;
+-	(void *)sc.value.callback = (void *)cb;
++	sc.value.callback = (void* (*)())cb;
+ 
+ 	counter_list.push_back(sc);
+ 
+@@ -193,7 +193,7 @@
+ 
+ 	sc.name = stat;
+ 	sc.type = type | StatCounter::CALLBACK;
+-	(void *)sc.value.callback = (void *)cb;
++	sc.value.callback = (void* (*)())cb;
+ 
+ 	counter_list.push_back(sc);
+ 
+diff -Nru middleman-2.0.1.orig/src/template.c middleman-2.0.1/src/template.c
+--- middleman-2.0.1.orig/src/template.c	2004-03-12 00:27:16.000000000 +0200
++++ middleman-2.0.1/src/template.c	2006-09-24 12:05:30.900516250 +0300
+@@ -132,7 +132,7 @@
+ 	if (ret != NULL && parsable == TRUE)
+ 		template_parse(connection, ret);
+ 
+-	if (templ != NULL && ret != NULL && code != NULL)
++	if (ret != NULL && code != NULL)
+ 		*code = templ->code;
+ 
+       out:
diff --git a/net-proxy/middleman/middleman-2.0.1-r2.ebuild b/net-proxy/middleman/middleman-2.0.1-r2.ebuild
index f3692b11935e..bcae9e616e53 100644
--- a/net-proxy/middleman/middleman-2.0.1-r2.ebuild
+++ b/net-proxy/middleman/middleman-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.4 2006/04/14 09:20:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.5 2006/09/24 09:27:51 mrness Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-putlog-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc-34.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {