From yb@hsc.fr  Wed Sep  1 11:56:43 2004
Return-Path: <yb@hsc.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 180BE16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Sep 2004 11:56:43 +0000 (GMT)
Received: from itesec.hsc.fr (itesec.hsc.fr [192.70.106.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 84D7F43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Sep 2004 11:56:42 +0000 (GMT)
	(envelope-from yb@hsc.fr)
Received: from taz.hsc.fr (taz.hsc.fr [192.70.106.75])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "taz.hsc.fr", Issuer "HSC CA" (verified OK))
	by itesec.hsc.fr (Postfix) with ESMTP id 7DC0420F52
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Sep 2004 13:56:41 +0200 (CEST)
Received: by taz.hsc.fr (Postfix, from userid 1001)
	id 146FD45EA; Wed,  1 Sep 2004 13:56:42 +0200 (CEST)
Message-Id: <20040901115642.146FD45EA@taz.hsc.fr>
Date: Wed,  1 Sep 2004 13:56:42 +0200 (CEST)
From: Yann Berthier <yb@sainte-barbe.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] net/arpd: fix the build with gcc 3.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71239
>Category:       ports
>Synopsis:       [MAINTAINER] net/arpd: fix the build with gcc 3.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 01 12:00:44 GMT 2004
>Closed-Date:    Thu Sep 02 07:36:49 GMT 2004
>Last-Modified:  Thu Sep 02 07:36:49 GMT 2004
>Originator:     Yann Berthier
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD taz.hsc.fr 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sat Aug 28 22:35:37 CEST 2004
>Description:
Fix the gcc 3.4 build: __FUNCTION_ is now treated as a variable 
(thx to ecu@ipv42.net)

Added file(s):
- files/patch-arpd.c

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- arpd-0.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/arpd/files/patch-arpd.c /usr/home/yb/tmp/ports/net/arpd/files/patch-arpd.c
--- /usr/ports/net/arpd/files/patch-arpd.c	Thu Jan  1 01:00:00 1970
+++ /usr/home/yb/tmp/ports/net/arpd/files/patch-arpd.c	Wed Sep  1 13:40:28 2004
@@ -0,0 +1,42 @@
+--- arpd.c.orig	Sun Feb  9 05:20:40 2003
++++ arpd.c	Wed Sep  1 13:38:11 2004
+@@ -265,7 +265,7 @@
+ 	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);
+ 	
+ 	if (op == ARP_OP_REQUEST) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
++		syslog(LOG_DEBUG, "%s: who-has %s tell %s", __FUNCTION__,
+ 		    addr_ntoa(tpa), addr_ntoa(spa));
+ 	} else if (op == ARP_OP_REPLY) {
+ 		syslog(LOG_INFO, "arp reply %s is-at %s",
+@@ -282,7 +282,7 @@
+ 	int error;
+ 
+ 	if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++		syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
+ 		    addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
+ 		return (0);
+ 	}
+@@ -291,10 +291,10 @@
+ 	error = arp_get(arpd_arp, &arpent);
+ 	
+ 	if (error == -1) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
++		syslog(LOG_DEBUG, "%s: no entry for %s", __FUNCTION__,
+ 		    addr_ntoa(addr));
+ 	} else {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++		syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
+ 		    addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
+ 	}
+ 	return (error);
+@@ -423,7 +423,7 @@
+ 		if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
+ 			addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
+ 			    ethip->ar_sha, ETH_ADDR_LEN);
+-			syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++			syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
+ 			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
+ 			
+ 			/* This address is claimed */
--- arpd-0.2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Thu Sep 2 07:36:43 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71239 
>Unformatted:
