Hi all, Here's an update to net/ladvd, bringing it to 1.1.1.
There's one issue though, and I could use some pointers here. The Makefile as it is now fetches a different tarball (same name) than the one that should be used (which is fetched from https://github.com/sspans/ladvd/files/1065794/ladvd-1.1.1.tar.gz ) Is this something I should ask upstream about? Any feedback appreciated. Cheers, Paul 'WEiRD' de Weerd Index: Makefile =================================================================== RCS file: /cvs/ports/net/ladvd/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 5 Oct 2015 16:29:02 -0000 1.18 +++ Makefile 14 Jun 2017 12:05:57 -0000 @@ -2,10 +2,12 @@ COMMENT = link advertisement (LLDP/CDP etc) daemon -DISTNAME = ladvd-1.0.4 -REVISION = 3 CATEGORIES = net +GH_ACCOUNT = sspans +GH_PROJECT = ladvd +GH_TAGNAME = v1.1.1 + HOMEPAGE = http://blinkenlights.nl/software/ladvd/ MAINTAINER = Paul de Weerd <[email protected]> @@ -13,10 +15,7 @@ MAINTAINER = Paul de Weerd <weerd@weird # ISC PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${HOMEPAGE} - -AUTOCONF_VERSION = 2.65 -CONFIGURE_STYLE = autoconf +CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --with-user=_ladvd --with-chroot-dir=/var/empty WANTLIB = c event pcap Index: distinfo =================================================================== RCS file: /cvs/ports/net/ladvd/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 18 Jan 2015 03:14:41 -0000 1.7 +++ distinfo 14 Jun 2017 12:05:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (ladvd-1.0.4.tar.gz) = kAM9BABL0w4Fj6ypbA5jIADUSy7wplxw+dlyq9pKIro= -SIZE (ladvd-1.0.4.tar.gz) = 463939 +SHA256 (ladvd-1.1.1.tar.gz) = ovVVONhAz2gfX5hYxhVU6HfHEoA0mjAgh6Hrtkh48fQ= +SIZE (ladvd-1.1.1.tar.gz) = 553402 Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- patches/patch-configure_ac 16 Apr 2017 19:53:20 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.4 2017/04/16 19:53:20 sthen Exp $ -Disable PIE on ARM and HPPA ---- configure.ac.orig Sat Feb 18 15:37:24 2012 -+++ configure.ac Sun Apr 16 20:52:19 2017 -@@ -35,6 +35,10 @@ case "$target_os" in - use_pie=no - ;; - openbsd*) -+ case "$target" in -+ arm-*-openbsd*) use_pie=no;; -+ hppa-*-openbsd*) use_pie=no;; -+ esac - ;; - *) - AC_MSG_ERROR([Unsupported operating system]) -@@ -42,7 +46,7 @@ case "$target_os" in - esac - - # enable warnings/errors/security --AX_CFLAGS_GCC_OPTION(-Wall -Werror, WCFLAGS) -+AX_CFLAGS_GCC_OPTION(-Wall, WCFLAGS) - AX_CFLAGS_GCC_OPTION(-Wformat -Wformat-security, WCFLAGS) - AX_CFLAGS_GCC_OPTION(-D_FORTIFY_SOURCE=2, WCFLAGS) - AX_CFLAGS_GCC_OPTION(-fno-delete-null-pointer-checks, WCFLAGS) Index: patches/patch-src_netif_bsd_c =================================================================== RCS file: patches/patch-src_netif_bsd_c diff -N patches/patch-src_netif_bsd_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_netif_bsd_c 14 Jun 2017 12:22:33 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +We have 64-bit media_list. + +Index: src/netif_bsd.c +--- src/netif_bsd.c.orig ++++ src/netif_bsd.c +@@ -474,7 +474,7 @@ static int netif_physical(int sockfd, struct netif *ne + + #if HAVE_NET_IF_MEDIA_H + struct ifmediareq ifmr = {}; +- int *media_list; ++ uint64_t *media_list; + + strlcpy(ifmr.ifm_name, netif->name, sizeof(ifmr.ifm_name)); + +@@ -498,7 +498,7 @@ static int netif_physical(int sockfd, struct netif *ne + return(EXIT_FAILURE); + } + +- media_list = my_malloc(ifmr.ifm_count * sizeof(int)); ++ media_list = my_malloc(ifmr.ifm_count * sizeof(uint64_t)); + ifmr.ifm_ulist = media_list; + + if (ioctl(sockfd, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { Index: patches/patch-src_netif_c =================================================================== RCS file: patches/patch-src_netif_c diff -N patches/patch-src_netif_c --- patches/patch-src_netif_c 11 Sep 2015 15:13:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_netif_c,v 1.1 2015/09/11 15:13:35 sthen Exp $ ---- src/netif.c.orig Fri Sep 11 09:11:24 2015 -+++ src/netif.c Fri Sep 11 09:11:49 2015 -@@ -1068,7 +1068,7 @@ int netif_media(struct netif *netif) { - - #if HAVE_NET_IF_MEDIA_H - struct ifmediareq ifmr = {}; -- int *media_list; -+ uint64_t *media_list; - #endif /* HAVE_HAVE_NET_IF_MEDIA_H */ - - if (sockfd == -1) -@@ -1219,7 +1219,7 @@ int netif_media(struct netif *netif) { - return(EXIT_FAILURE); - } - -- media_list = my_malloc(ifmr.ifm_count * sizeof(int)); -+ media_list = my_malloc(ifmr.ifm_count * sizeof(uint64_t)); - ifmr.ifm_ulist = media_list; - - if (ioctl(sockfd, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/ladvd/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 23 Apr 2011 17:40:34 -0000 1.5 +++ pkg/PLIST 14 Jun 2017 12:02:51 -0000 @@ -6,7 +6,6 @@ @bin sbin/ladvd @bin sbin/ladvdc share/doc/ladvd/ -share/doc/ladvd/ChangeLog share/doc/ladvd/HACKING share/doc/ladvd/LICENSE share/doc/ladvd/README -- >++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+ +++++++++++>-]<.>++[<------------>-]<+.--------------.[-] http://www.weirdnet.nl/
