Fix gcc 4.2 build.

Approved by:	portmgr (pav)

13 files changed, 282 insertions, 4 deletions

diff --git a/irc/ircd-rusnet/Makefile b/irc/ircd-rusnet/Makefile
index e07bf5974ea8..4cc638dd50b0 100644
--- a/irc/ircd-rusnet/Makefile
+++ b/irc/ircd-rusnet/Makefile
@@ -21,6 +21,7 @@ COMMENT=	RusNet Internet Relay Chat Server
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	irc_cv_mathlib=-lm
 
 USER=		ircd
 GROUP=		${USER}
@@ -75,10 +76,6 @@ CONFIGURE_ARGS+=--enable-dsm
 BROKEN=		"Does not build on amd64"
 .endif
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 pre-configure:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-CONFIGURE
 
diff --git a/irc/ircd-rusnet/files/patch-ircd-channel.c b/irc/ircd-rusnet/files/patch-ircd-channel.c
new file mode 100644
index 000000000000..229aeb0d79f4
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-channel.c
@@ -0,0 +1,11 @@
+--- ircd/channel.c.orig	2007-11-14 03:02:17.000000000 +0600
++++ ircd/channel.c	2007-11-14 03:02:27.000000000 +0600
+@@ -2111,7 +2111,7 @@
+ 		if (*chptr->chname == '!' && close_chid(chptr->chname+1))
+ 			cache_chid(chptr);
+ 		else
+-			MyFree((char *)chptr);
++			MyFree(chptr);
+ 	    }
+ }
+ 
diff --git a/irc/ircd-rusnet/files/patch-ircd-hash.c b/irc/ircd-rusnet/files/patch-ircd-hash.c
new file mode 100644
index 000000000000..c53d3937b8d8
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-hash.c
@@ -0,0 +1,38 @@
+--- ircd/hash.c.orig	2007-11-14 03:03:11.000000000 +0600
++++ ircd/hash.c	2007-11-14 03:04:18.000000000 +0600
+@@ -139,7 +139,7 @@
+ {
+ 	if (!collnum)
+ 	{
+-		MyFree((char *)collmap);
++		MyFree(collmap);
+ 		collmap = NULL;
+ 		collsize = 0;
+ 		Debug((DEBUG_DEBUG, "Collision map is empty"));
+@@ -526,7 +526,7 @@
+ 		channelTable = table;
+ 		for (chptr = channel; chptr; chptr = chptr->nextch)
+ 			(void)add_to_channel_hash_table(chptr->chname, chptr);
+-		MyFree((void *)otab);
++		MyFree(otab);
+ 	    }
+ 	else if (otab == clientTable)
+ 	    {
+@@ -551,7 +551,7 @@
+ 					cptr);
+ 			    }
+ 		    }
+-		MyFree((void *)otab);
++		MyFree(otab);
+ 	    }
+ 	else if (otab == serverTable)
+ 	    {
+@@ -563,7 +563,7 @@
+ 		serverTable = table;
+ 		for (sptr = svrtop; sptr; sptr = sptr->nexts)
+ 			(void)add_to_server_hash_table(sptr, sptr->bcptr);
+-		MyFree((void *)otab);
++		MyFree(otab);
+ 	    }
+ 	return;
+ }
diff --git a/irc/ircd-rusnet/files/patch-ircd-list.c b/irc/ircd-rusnet/files/patch-ircd-list.c
new file mode 100644
index 000000000000..d4e4b502acc4
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-list.c
@@ -0,0 +1,69 @@
+--- ircd/list.c.orig	2007-11-14 03:04:31.000000000 +0600
++++ ircd/list.c	2007-11-14 03:05:38.000000000 +0600
+@@ -146,7 +146,7 @@
+ 		istat.is_auth -= 1;
+ 		MyFree(cptr->auth);
+ 	}
+-	MyFree((char *)cptr);
++	MyFree(cptr);
+ }
+ 
+ /*
+@@ -251,7 +251,7 @@
+ 		    {
+ 			istat.is_away--;
+ 			istat.is_awaymem -= (strlen(user->away) + 1);
+-			MyFree((char *)user->away);
++			MyFree(user->away);
+ 		    }
+ 		/*
+ 		 * sanity check
+@@ -297,7 +297,7 @@
+ 					    user->username, user->host, buf);
+ #endif
+ 		    }
+-		MyFree((char *)user);
++		MyFree(user);
+ #ifdef	DEBUGMODE
+ 		users.inuse--;
+ #endif
+@@ -327,7 +327,7 @@
+ 				    cptr, cptr ? cptr->name : "<noname>", buf);
+ #endif
+ 		    }
+-		MyFree((char *)serv);
++		MyFree(serv);
+ 	    }
+ }
+ 
+@@ -518,7 +518,7 @@
+ void	free_link(lp)
+ Reg	Link	*lp;
+ {
+-	MyFree((char *)lp);
++	MyFree(lp);
+ #ifdef	DEBUGMODE
+ 	links.inuse--;
+ #endif
+@@ -539,7 +539,7 @@
+ void	free_class(tmp)
+ Reg	aClass	*tmp;
+ {
+-	MyFree((char *)tmp);
++	MyFree(tmp);
+ #ifdef	DEBUGMODE
+ 	classs.inuse--;
+ #endif
+@@ -601,10 +601,10 @@
+ 	if (aconf->passwd)
+ 		bzero(aconf->passwd, strlen(aconf->passwd));
+ 	if (aconf->ping)
+-		MyFree((char *)aconf->ping);
++		MyFree(aconf->ping);
+ 	MyFree(aconf->passwd);
+ 	MyFree(aconf->name);
+-	MyFree((char *)aconf);
++	MyFree(aconf);
+ #ifdef	DEBUGMODE
+ 	aconfs.inuse--;
+ #endif
diff --git a/irc/ircd-rusnet/files/patch-ircd-res.c b/irc/ircd-rusnet/files/patch-ircd-res.c
new file mode 100644
index 000000000000..7895bbbf711d
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-res.c
@@ -0,0 +1,51 @@
+--- ircd/res.c.orig	2007-11-14 03:06:21.000000000 +0600
++++ ircd/res.c	2007-11-14 03:07:15.000000000 +0600
+@@ -193,13 +193,13 @@
+ #endif
+ 	r2ptr = old;
+ 	if (r2ptr->he.h_name)
+-		MyFree((char *)r2ptr->he.h_name);
++		MyFree(r2ptr->he.h_name);
+ 	for (i = 0; i < MAXALIASES; i++)
+ 		if ((s = r2ptr->he.h_aliases[i]))
+ 			MyFree(s);
+ 	if (r2ptr->name)
+ 		MyFree(r2ptr->name);
+-	MyFree((char *)r2ptr);
++	MyFree(r2ptr);
+ 
+ 	return;
+ }
+@@ -1505,7 +1505,7 @@
+ 		if (*cpp == cp)
+ 		    {
+ 			*cpp = cp->list_next;
+-			MyFree((char *)cp);
++			MyFree(cp);
+ 			break;
+ 		    }
+ 	return cr;
+@@ -1592,7 +1592,7 @@
+ 	    {
+ 		for (hashv = 0; hp->h_aliases[hashv]; hashv++)
+ 			MyFree(hp->h_aliases[hashv]);
+-		MyFree((char *)hp->h_aliases);
++		MyFree(hp->h_aliases);
+ 	    }
+ 
+ 	/*
+@@ -1601,11 +1601,11 @@
+ 	if (hp->h_addr_list)
+ 	    {
+ 		if (*hp->h_addr_list)
+-			MyFree((char *)*hp->h_addr_list);
+-		MyFree((char *)hp->h_addr_list);
++			MyFree(*hp->h_addr_list);
++		MyFree(hp->h_addr_list);
+ 	    }
+ 
+-	MyFree((char *)ocp);
++	MyFree(ocp);
+ 
+ 	incache--;
+ 	cainfo.ca_dels++;
diff --git a/irc/ircd-rusnet/files/patch-ircd-s_auth.c b/irc/ircd-rusnet/files/patch-ircd-s_auth.c
new file mode 100644
index 000000000000..b6ddd26d9b7f
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-s_auth.c
@@ -0,0 +1,20 @@
+--- ircd/s_auth.c.orig	2007-11-14 03:07:39.000000000 +0600
++++ ircd/s_auth.c	2007-11-14 03:07:56.000000000 +0600
+@@ -260,7 +260,7 @@
+ 				{
+ 				    iauth_conf = iauth_conf->next;
+ 				    MyFree(ectmp->line);
+-				    MyFree((void *)ectmp);
++				    MyFree(ectmp);
+ 				}
+ 			    /* little lie.. ;) */
+ 			    sendto_flag(SCH_AUTH, "New iauth configuration.");
+@@ -287,7 +287,7 @@
+ 				{
+ 				    iauth_stats = iauth_stats->next;
+ 				    MyFree(ectmp->line);
+-				    MyFree((void *)ectmp);
++				    MyFree(ectmp);
+ 				}
+ 			    iauth_stats = (aExtData *)
+ 				    MyMalloc(sizeof(aExtData));
diff --git a/irc/ircd-rusnet/files/patch-ircd-s_bsd.c b/irc/ircd-rusnet/files/patch-ircd-s_bsd.c
new file mode 100644
index 000000000000..e199871d21b7
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-s_bsd.c
@@ -0,0 +1,11 @@
+--- ircd/s_bsd.c.orig	2007-11-14 03:08:12.000000000 +0600
++++ ircd/s_bsd.c	2007-11-14 03:08:19.000000000 +0600
+@@ -1540,7 +1540,7 @@
+ 		    {
+ 			blptr= *blscn;
+ 			*blscn=blptr->next;
+-			MyFree((char *)blptr);
++			MyFree(blptr);
+ 		    }
+ 		else
+ 			blscn = &(*blscn)->next;
diff --git a/irc/ircd-rusnet/files/patch-ircd-s_id.c b/irc/ircd-rusnet/files/patch-ircd-s_id.c
new file mode 100644
index 000000000000..a44ceca3e7cc
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-s_id.c
@@ -0,0 +1,20 @@
+--- ircd/s_id.c.orig	2007-11-14 03:08:39.000000000 +0600
++++ ircd/s_id.c	2007-11-14 03:08:52.000000000 +0600
+@@ -140,7 +140,7 @@
+     if (chptr->history == 0 ||
+ 	(timeofday - chptr->history) >LDELAYCHASETIMELIMIT+DELAYCHASETIMELIMIT)
+ 	{
+-	    MyFree((char *)chptr);
++	    MyFree(chptr);
+ 	    return;
+ 	}
+ 
+@@ -182,7 +182,7 @@
+ 		    *chptr = del->nextch;
+ 		    istat.is_cchan--;
+ 		    istat.is_cchanmem -= sizeof(aChannel) +strlen(del->chname);
+-		    MyFree((char *)del);
++		    MyFree(del);
+ 		}
+ 	    else
+ 		    chptr = &((*chptr)->nextch);
diff --git a/irc/ircd-rusnet/files/patch-ircd-s_misc.c b/irc/ircd-rusnet/files/patch-ircd-s_misc.c
new file mode 100644
index 000000000000..2c37719b7dab
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-s_misc.c
@@ -0,0 +1,11 @@
+--- ircd/s_misc.c.orig	2007-11-14 03:09:05.000000000 +0600
++++ ircd/s_misc.c	2007-11-14 03:09:14.000000000 +0600
+@@ -1032,7 +1032,7 @@
+ 	    {
+ 		last = motd->next;
+ 		MyFree(motd->line);
+-		MyFree((char *)motd);
++		MyFree(motd);
+ 	    }
+ 	motd_tm = *localtime(&Sb.st_mtime);
+ 	(void)dgets(-1, line, 0, &head, &tail); /* initialize line */
diff --git a/irc/ircd-rusnet/files/patch-ircd-s_service.c b/irc/ircd-rusnet/files/patch-ircd-s_service.c
new file mode 100644
index 000000000000..eeee18c8cb3e
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-s_service.c
@@ -0,0 +1,11 @@
+--- ircd/s_service.c.orig	2007-11-14 03:09:34.000000000 +0600
++++ ircd/s_service.c	2007-11-14 03:09:42.000000000 +0600
+@@ -70,7 +70,7 @@
+ 			free_server(serv->servp, cptr);
+ 		if (serv->server)
+ 			MyFree(serv->server);
+-		MyFree((char *)serv);
++		MyFree(serv);
+ 		cptr->service = NULL;
+ 	    }
+ }
diff --git a/irc/ircd-rusnet/files/patch-ircd-s_zip.c b/irc/ircd-rusnet/files/patch-ircd-s_zip.c
new file mode 100644
index 000000000000..d7d4c5c3ff8f
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-s_zip.c
@@ -0,0 +1,17 @@
+--- ircd/s_zip.c.orig	2007-11-14 03:09:57.000000000 +0600
++++ ircd/s_zip.c	2007-11-14 03:10:26.000000000 +0600
+@@ -116,11 +116,11 @@
+ 	    {
+ 		if (cptr->zip->in)
+ 			inflateEnd(cptr->zip->in);
+-		MyFree((char *)cptr->zip->in);
++		MyFree(cptr->zip->in);
+ 		if (cptr->zip->out)
+ 			deflateEnd(cptr->zip->out);
+-		MyFree((char *)cptr->zip->out);
+-		MyFree((char *)cptr->zip);
++		MyFree(cptr->zip->out);
++		MyFree(cptr->zip);
+ 		cptr->zip = NULL;
+ 	    }
+ }
diff --git a/irc/ircd-rusnet/files/patch-ircd-whowas.c b/irc/ircd-rusnet/files/patch-ircd-whowas.c
new file mode 100644
index 000000000000..3bb04a0bcc83
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-ircd-whowas.c
@@ -0,0 +1,11 @@
+--- ircd/whowas.c.orig	2007-11-14 03:10:38.000000000 +0600
++++ ircd/whowas.c	2007-11-14 03:10:44.000000000 +0600
+@@ -331,7 +331,7 @@
+ 		if (lk_index)
+ 			memcpy((aLock *)nlp,(aLock *)lp,
+ 					sizeof(*lp) * lk_index);
+-		MyFree((void *)locked);
++		MyFree(locked);
+ 		locked = nlp;
+ 		return (1);
+ 	}
diff --git a/irc/ircd-rusnet/files/patch-rusnet-rusnet_codepages.c b/irc/ircd-rusnet/files/patch-rusnet-rusnet_codepages.c
new file mode 100644
index 000000000000..2f75baea8093
--- /dev/null
+++ b/irc/ircd-rusnet/files/patch-rusnet-rusnet_codepages.c
@@ -0,0 +1,11 @@
+--- rusnet/rusnet_codepages.c.orig	2007-11-14 03:11:10.000000000 +0600
++++ rusnet/rusnet_codepages.c	2007-11-14 03:11:19.000000000 +0600
+@@ -79,7 +79,7 @@
+ 	  
+           MyFree(temp->incoming);
+           MyFree(temp->outgoing);
+-          MyFree((void *)temp);
++          MyFree(temp);
+     }
+ 
+     translator_list = NULL;