Date: Fri, 11 Sep 2009 14:27:34 +0200 (CEST) From: Sten Spans <sten@blinkenlights.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138734: net/ladvd: update to 0.8.5 Message-ID: <20090911122734.B74EA3F41E@mx1.blinkenlights.nl> Resent-Message-ID: <200909111230.n8BCU2U2055628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138734 >Category: ports >Synopsis: net/ladvd: update to 0.8.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 11 12:30:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sten Spans >Release: FreeBSD 6.4-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD towel.blinkenlights.nl 6.4-RELEASE-p3 FreeBSD 6.4-RELEASE-p3 #3: Sat Mar 28 01:11:22 CET 2009 root@towel.blinkenlights.nl:/usr/obj/usr/src/sys/TOWEL i386 >Description: The following patch updates the port to 0.8.5 >How-To-Repeat: >Fix: diff -Nru ladvd.orig/Makefile ladvd/Makefile --- ladvd.orig/Makefile 2009-07-29 07:58:49.000000000 +0200 +++ ladvd/Makefile 2009-09-10 20:29:33.000000000 +0200 @@ -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 -Nru ladvd.orig/distinfo ladvd/distinfo --- ladvd.orig/distinfo 2009-06-23 22:09:31.000000000 +0200 +++ ladvd/distinfo 2009-09-10 20:31:47.000000000 +0200 @@ -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 -Nru ladvd.orig/files/patch-backport ladvd/files/patch-backport --- ladvd.orig/files/patch-backport 2009-07-29 07:58:49.000000000 +0200 +++ ladvd/files/patch-backport 1970-01-01 01:00:00.000000000 +0100 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090911122734.B74EA3F41E>