- Update to 0.8.5

- Adjust COMMENT
- Add UID and GID entries for net/ladvd

PR:		ports/138734
Submitted by:	Sten Spans <sten AT blinkenlights.nl> (maintainer)
Feature safe:	yes

5 files changed, 7 insertions, 89 deletions

diff --git a/GIDs b/GIDs
index a79ac7e52113..d13de34be339 100644
--- a/GIDs
+++ b/GIDs
@@ -68,6 +68,7 @@ freeradius:*:133:
 undernet:*:134:
 rabbitmq:*:135:
 dhcpd:*:136:
+ladvd:*:142:
 dovecot:*:143:
 rbldns:*:153:
 sfs:*:171:
diff --git a/UIDs b/UIDs
index c053aec24e91..f52a74c35088 100644
--- a/UIDs
+++ b/UIDs
@@ -77,6 +77,7 @@ undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistent:/usr/sbin/nologin
 rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin
 dhcpd:*:136:136::0:0:ISC DHCP daemon:/nonexistent:/usr/sbin/nologin
 cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin
+ladvd:*:142:142::0:0:Ladvd User:/var/empty:/usr/sbin/nologin
 dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin
 rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin
 sfs:*:171:171::0:0:Self-Certifying File System:/nonexistent:/usr/sbin/nologin
diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile
index 8371b2c5b9d8..daff303087e9 100644
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	ladvd
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	net
 MASTER_SITES=	http://blinkenlights.nl/software/ladvd/
 
 MAINTAINER=	sten@blinkenlights.nl
-COMMENT=	A minimal CDP/LLDP sender
+COMMENT=	A minimal CDP/LLDP daemon
 
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
diff --git a/net/ladvd/distinfo b/net/ladvd/distinfo
index 61c50086d5f1..767a07ca61cd 100644
--- a/net/ladvd/distinfo
+++ b/net/ladvd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ladvd-0.8.tar.gz) = 9a80b45ac830faf0151d23623aed5494
-SHA256 (ladvd-0.8.tar.gz) = d05453d3f18f76056e8764c3933fb3abe922b51dc5eb87ccfa5b4e6c754562c7
-SIZE (ladvd-0.8.tar.gz) = 398595
+MD5 (ladvd-0.8.5.tar.gz) = f5e6ce1d95406e18d31e84ce1fec508d
+SHA256 (ladvd-0.8.5.tar.gz) = 6097ae7eb079c2a7556dcd0e7097dd515fc29071cbf6fe69448b8205a18fe6bd
+SIZE (ladvd-0.8.5.tar.gz) = 414545
diff --git a/net/ladvd/files/patch-backport b/net/ladvd/files/patch-backport
deleted file mode 100644
index 84290b8194c4..000000000000
--- a/net/ladvd/files/patch-backport
+++ /dev/null
@@ -1,83 +0,0 @@
---- ./src/netif.c.orig	2009-06-21 12:36:07.000000000 -0700
-+++ ./src/netif.c	2009-07-28 19:03:00.229811057 -0700
-@@ -399,6 +399,12 @@
-     memset(&drvinfo, 0, sizeof(drvinfo));
- #endif
- 
-+#ifdef HAVE_NET_IF_LAGG_H
-+    struct lagg_reqall ra;
-+#elif HAVE_NET_IF_TRUNK_H
-+    struct trunk_reqall ra;
-+#endif
-+
- #ifdef HAVE_SYSFS
-     if (snprintf(path, SYSFS_PATH_MAX,
- 	    SYSFS_CLASS_NET "/%s/device", ifaddr->ifa_name) > 0) {
-@@ -442,13 +448,17 @@
-     if (if_data->ifi_type == IFT_ETHER) {
- 
- 	// bonding
-+#if defined(HAVE_NET_IF_LAGG_H) || defined(HAVE_NET_IF_TRUNK_H)
-+	memset(&ra, 0, sizeof(ra));
-+	strlcpy(ra.ra_ifname, ifaddr->ifa_name, sizeof(ra.ra_ifname));
- #ifdef HAVE_NET_IF_LAGG_H
--	if (ioctl(sockfd, SIOCGLAGG, (caddr_t)ifr) >= 0)
-+	if (ioctl(sockfd, SIOCGLAGG, &ra) >= 0)
- 	    return(NETIF_BONDING);
- #elif HAVE_NET_IF_TRUNK_H
--	if (ioctl(sockfd, SIOCGTRUNK, (caddr_t)ifr) == 0)
-+	if (ioctl(sockfd, SIOCGTRUNK, &ra) == 0)
- 	    return(NETIF_BONDING);
- #endif
-+#endif
- 
- 	// accept regular devices
- 	return(NETIF_REGULAR);
-@@ -459,8 +469,9 @@
- 	return(NETIF_BRIDGE);
- #endif
- #ifdef IFT_IEEE8023ADLAG
-+    // trunk ports have a special type
-     } else if (if_data->ifi_type == IFT_IEEE8023ADLAG) {
--	return(NETIF_BONDING);
-+	return(NETIF_REGULAR);
- #endif
-     }
- 
-@@ -548,7 +559,7 @@
- 		my_log(INFO, "found slave %s", subif->name);
- 		subif->slave = 1;
- 		subif->master = master;
--		subif->lacp_index = i++;
-+		subif->lacp_index = i;
- 		csubif->subif = subif;
- 		csubif = subif;
- 	    }
---- ./configure.orig	2009-06-21 12:44:00.000000000 -0700
-+++ ./configure	2009-07-28 19:04:14.275354033 -0700
-@@ -20062,15 +20062,12 @@
- 
- 	;;
-     freebsd*)
--	case "$target" in
--	    x86_64-*-freebsd7.*)
--		use_pie=no
--	esac
- 
- cat >>confdefs.h <<\_ACEOF
- #define TARGET_IS_FREEBSD 1
- _ACEOF
- 
-+	use_pie=no
- 	;;
-     openbsd*)
- 
-@@ -20479,7 +20476,7 @@
- { echo "$as_me:$LINENO: result: $ssp_cv_cc" >&5
- echo "${ECHO_T}$ssp_cv_cc" >&6; }
-     if test $ssp_cv_cc = yes; then
--      WFLAGS="$WFLAGS -fstack-protector"
-+      WCFLAGS="$WCFLAGS -fstack-protector"
- 
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_SSP_CC 1