diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-20 01:06:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-20 01:06:22 +0000 |
| commit | 878a8b95fcc4a391d36e3cad715ef6f20f790433 (patch) | |
| tree | 2274192aa11d0cb6f5aa2eee32b9eb1a0c8a9eea | |
| parent | 875d86835ff467e4eb0b5cf5b02fcf831d0e1231 (diff) | |
| download | pkgsrc-878a8b95fcc4a391d36e3cad715ef6f20f790433.tar.gz | |
Fix GCC 3.4+: __FUNCTION__ doesn't permit string concat, like __func__.
| -rw-r--r-- | security/honeyd-arpd/distinfo | 4 | ||||
| -rw-r--r-- | security/honeyd-arpd/patches/patch-ab | 46 |
2 files changed, 45 insertions, 5 deletions
diff --git a/security/honeyd-arpd/distinfo b/security/honeyd-arpd/distinfo index 530e0a00ff0..f09452bc803 100644 --- a/security/honeyd-arpd/distinfo +++ b/security/honeyd-arpd/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:10:07 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/01/20 01:06:22 joerg Exp $ SHA1 (arpd-0.2.tar.gz) = e827ada394aff91f9c539cee35e946e81152426c RMD160 (arpd-0.2.tar.gz) = 777ef6789e2882cf0e0958951377f65f6362d816 Size (arpd-0.2.tar.gz) = 49437 bytes SHA1 (patch-aa) = 5f89c08d7d93a6f47cde95b6a139695c6ad1e694 -SHA1 (patch-ab) = 28347af42b90d4f422c1c7be407d2579ae2e33ef +SHA1 (patch-ab) = c23bed6c274ba8559f1f715a5e5c6892057253d2 diff --git a/security/honeyd-arpd/patches/patch-ab b/security/honeyd-arpd/patches/patch-ab index 61d62ba5dcf..f7896683575 100644 --- a/security/honeyd-arpd/patches/patch-ab +++ b/security/honeyd-arpd/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/04/20 09:15:53 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2006/01/20 01:06:22 joerg Exp $ ---- arpd.c.orig Fri Jun 6 21:47:35 2003 -+++ arpd.c Fri Jun 6 21:48:13 2003 +--- arpd.c.orig 2003-02-09 04:20:40.000000000 +0000 ++++ arpd.c @@ -33,7 +33,7 @@ #define ARPD_MAX_ACTIVE 600 #define ARPD_MAX_INACTIVE 300 @@ -11,3 +11,43 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/20 09:15:53 xtraeme Exp $ struct arp_req { struct addr pa; +@@ -265,7 +265,7 @@ arpd_send(eth_t *eth, int op, + 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 @@ arpd_lookup(struct addr *addr) + 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 @@ arpd_lookup(struct addr *addr) + 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 @@ arpd_recv_cb(u_char *u, const struct pca + 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 */ |