Tue Dec 10 17:56:23 2013 UTC ()
Add SIOCGLIFHWADDR support on newer SunOS.  Bump PKGREVISION.


(jperkin)
diff -r1.15 -r1.16 pkgsrc/net/ucarp/Makefile
diff -r1.5 -r1.6 pkgsrc/net/ucarp/distinfo
diff -r1.1 -r1.2 pkgsrc/net/ucarp/patches/patch-src_fillmac.c
cvs diff -r1.15 -r1.16 pkgsrc/net/ucarp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ucarp/Makefile 2013/02/06 19:31:02 1.15
+++ pkgsrc/net/ucarp/Makefile 2013/12/10 17:56:23 1.16
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2013/02/06 19:31:02 jperkin Exp $ 1# $NetBSD: Makefile,v 1.16 2013/12/10 17:56:23 jperkin Exp $
2# 2#
3 3
4DISTNAME= ucarp-1.5.2 4DISTNAME= ucarp-1.5.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ftp://ftp.ucarp.org/pub/ucarp/ 7MASTER_SITES= ftp://ftp.ucarp.org/pub/ucarp/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joel@carnat.net 10MAINTAINER= joel@carnat.net
11HOMEPAGE= http://www.ucarp.org/project/ucarp 11HOMEPAGE= http://www.ucarp.org/project/ucarp
12COMMENT= Common Address Redundancy Protocol (CARP) for Unix 12COMMENT= Common Address Redundancy Protocol (CARP) for Unix
13 13
14USE_PKGLOCALEDIR= YES 14USE_PKGLOCALEDIR= YES
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_TOOLS+= msgfmt 16USE_TOOLS+= msgfmt
17 17
18# pcap_freecode with one argument only 18# pcap_freecode with one argument only
cvs diff -r1.5 -r1.6 pkgsrc/net/ucarp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ucarp/distinfo 2012/06/14 17:16:22 1.5
+++ pkgsrc/net/ucarp/distinfo 2013/12/10 17:56:23 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2012/06/14 17:16:22 fhajny Exp $ 1$NetBSD: distinfo,v 1.6 2013/12/10 17:56:23 jperkin Exp $
2 2
3SHA1 (ucarp-1.5.2.tar.bz2) = 0326fa7460eacd23b59216878524487265051cba 3SHA1 (ucarp-1.5.2.tar.bz2) = 0326fa7460eacd23b59216878524487265051cba
4RMD160 (ucarp-1.5.2.tar.bz2) = 83f54644abddf4b27f1b829c2a3a0fc98861027b 4RMD160 (ucarp-1.5.2.tar.bz2) = 83f54644abddf4b27f1b829c2a3a0fc98861027b
5Size (ucarp-1.5.2.tar.bz2) = 315414 bytes 5Size (ucarp-1.5.2.tar.bz2) = 315414 bytes
6SHA1 (patch-aa) = ef0d7b65f6a964607a695c7a33891d45fd116569 6SHA1 (patch-aa) = ef0d7b65f6a964607a695c7a33891d45fd116569
7SHA1 (patch-src_fillmac.c) = 9870a6613bfb7c7eff7c6c9d164c8bf32bbe6454 7SHA1 (patch-src_fillmac.c) = c8d862d5e222aae283f1311735dff1f7be32f4af
cvs diff -r1.1 -r1.2 pkgsrc/net/ucarp/patches/patch-src_fillmac.c (expand / switch to unified diff)

--- pkgsrc/net/ucarp/patches/patch-src_fillmac.c 2012/06/14 17:16:23 1.1
+++ pkgsrc/net/ucarp/patches/patch-src_fillmac.c 2013/12/10 17:56:23 1.2
@@ -1,14 +1,30 @@ @@ -1,14 +1,30 @@
1$NetBSD: patch-src_fillmac.c,v 1.1 2012/06/14 17:16:23 fhajny Exp $ 1$NetBSD: patch-src_fillmac.c,v 1.2 2013/12/10 17:56:23 jperkin Exp $
 2
 3Add SIOCGLIFHWADDR support on newer SunOS.
2 4
3SIOCGIFHWADDR defined on recent SunOS, doesn't have the usual structure. 
4--- src/fillmac.c.orig 2007-07-04 13:34:59.000000000 +0000 5--- src/fillmac.c.orig 2007-07-04 13:34:59.000000000 +0000
5+++ src/fillmac.c 6+++ src/fillmac.c
6@@ -43,7 +43,7 @@ int fill_mac_address(void) 7@@ -43,7 +43,22 @@ int fill_mac_address(void)
7 strerror(errno)); 8 strerror(errno));
8 return -1; 9 return -1;
9 } 10 }
10-#ifdef SIOCGIFHWADDR 11-#ifdef SIOCGIFHWADDR
11+#if defined(SIOCGIFHWADDR) && !defined(__sun) 12+#if defined(SIOCGLIFHWADDR) && defined(__sun)
 13+ {
 14+ struct lifreq lifr;
 15+ struct sockaddr_dl *sdl;
 16+ strncpy(lifr.lifr_name, interface, sizeof lifr.lifr_name);
 17+ if (ioctl(s, SIOCGLIFHWADDR, &lifr) != 0) {
 18+ logfile(LOG_ERR,
 19+ _("Unable to get hardware info about an interface: %s"),
 20+ strerror(errno));
 21+ (void) close(s);
 22+ return -1;
 23+ }
 24+ sdl = (struct sockaddr_dl *)&lifr.lifr_addr;
 25+ memcpy(hwaddr, LLADDR(sdl), sdl->sdl_alen);
 26+ }
 27+#elif defined(SIOCGIFHWADDR)
12 { 28 {
13 struct ifreq ifr; 29 struct ifreq ifr;
14  30