Index: branches/2019Q1/dns/gdnsd2/Makefile
===================================================================
--- branches/2019Q1/dns/gdnsd2/Makefile	(revision 490576)
+++ branches/2019Q1/dns/gdnsd2/Makefile	(revision 490577)
@@ -1,64 +1,65 @@
 # Created by: Allan Jude <allanjude@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	gdnsd
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/gdnsd/gdnsd/releases/download/v${PORTVERSION}/ \
 		ZI \
 		http://gdnsd.scaleengine.net/gdnsd/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Authoritative-only GeoIP-aware DNS server
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libev.so:devel/libev
 BUILD_DEPENDS=	ragel>0:devel/ragel
 
 FETCH_ARGS=	-Fpr
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_LDCONFIG=	yes
 USES=		pkgconfig libtool tar:xz perl5 gmake
 USE_PERL5=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFLICTS_INSTALL=	gdnsd-1.[0-9]*
 
 USE_RC_SUBR=	gdnsd
 
 USERS?=		gdnsd
 GROUPS?=	gdnsd
 
 OPTIONS_DEFINE=	DOCS URCU
 OPTIONS_DEFAULT=MAXMINDDB
 
 OPTIONS_RADIO=		GEOLIB
 OPTIONS_RADIO_GEOLIB=	GEOIP MAXMINDDB
 GEOLIB_DESC=		GeoIP backend
 
 GEOIP_DESC=		Enable GeoIP1 Support
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 MAXMINDDB_DESC=		Enable GeoIP1 + GeoIP2 Support
 MAXMINDDB_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
 URCU_LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${localstatedir}/lib/$${PACKAGE_NAME}|/var/db/${PORTNAME}|g' \
 		${WRKSRC}/configure
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libgdnsd.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugin_*.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdnsd/geoip \
 		${STAGEDIR}${PREFIX}/etc/gdnsd/zones \
 		${STAGEDIR}/var/run/gdnsd
 
 .include <bsd.port.mk>
Index: branches/2019Q1/dns/gdnsd2/distinfo
===================================================================
--- branches/2019Q1/dns/gdnsd2/distinfo	(revision 490576)
+++ branches/2019Q1/dns/gdnsd2/distinfo	(revision 490577)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544042714
-SHA256 (gdnsd-2.4.0.tar.xz) = 3d56ccbb27054dc155839d94df136d760ac361abe868aa6a8c3dbfc9e464bb99
-SIZE (gdnsd-2.4.0.tar.xz) = 641820
+TIMESTAMP = 1547511962
+SHA256 (gdnsd-2.4.1.tar.xz) = 843c9c6f8a935eff66620eb38ceadda93cae1f42877315e64ba58b199c4643b5
+SIZE (gdnsd-2.4.1.tar.xz) = 639656
Index: branches/2019Q1/dns/gdnsd2/files/patch-src_dnsio__udp.c
===================================================================
--- branches/2019Q1/dns/gdnsd2/files/patch-src_dnsio__udp.c	(nonexistent)
+++ branches/2019Q1/dns/gdnsd2/files/patch-src_dnsio__udp.c	(revision 490577)
@@ -0,0 +1,44 @@
+--- src/dnsio_udp.c.orig	2019-01-16 15:44:43 UTC
++++ src/dnsio_udp.c
+@@ -296,13 +296,16 @@ static void mainloop(const int fd, void*
+         .iov_len  = 0
+     };
+     struct msghdr msg_hdr;
+-    char cmsg_buf[cmsg_size];
+-    memset(cmsg_buf, 0, sizeof(cmsg_buf));
++    union {
++	char cbuf[CMSG_BUFSIZE];
++	struct cmsghdr align;
++    } cmsg_buf;
++    memset(cmsg_buf.cbuf, 0, sizeof(cmsg_buf.cbuf));
+     memset(&msg_hdr, 0, sizeof(struct msghdr));
+     msg_hdr.msg_name       = &asin.sa;
+     msg_hdr.msg_iov        = &iov;
+     msg_hdr.msg_iovlen     = 1;
+-    msg_hdr.msg_control    = use_cmsg ? cmsg_buf : NULL;
++    msg_hdr.msg_control    = use_cmsg ? cmsg_buf.cbuf : NULL;
+ 
+ #if GDNSD_B_QSBR
+     const struct timeval tmout_short = { .tv_sec = 0, .tv_usec = PRCU_DELAY_US };
+@@ -341,6 +344,21 @@ static void mainloop(const int fd, void*
+         recvmsg_rv = recvmsg(fd, &msg_hdr, 0);
+ #endif
+ 
++#if defined __FreeBSD__ && defined IPV6_PKTINFO
++        if(asin.sa.sa_family == AF_INET6) {
++            struct cmsghdr* cmsg;
++            for(cmsg = (struct cmsghdr *)CMSG_FIRSTHDR(&msg_hdr); cmsg;
++                cmsg = (struct cmsghdr *)CMSG_NXTHDR(&msg_hdr, cmsg)) {
++                if((cmsg->cmsg_level == IPPROTO_IPV6) && (cmsg->cmsg_type == IPV6_PKTINFO)) {
++                    struct in6_pktinfo* pi = (void*)CMSG_DATA((struct cmsghdr*)cmsg_buf.cbuf);
++                    if(!IN6_IS_ADDR_LINKLOCAL(&pi->ipi6_addr))
++                        pi->ipi6_ifindex = 0;
++                    continue;
++                }
++            }
++        }
++#endif
++
+         if(unlikely(
+                (asin.sa.sa_family == AF_INET && !asin.sin.sin_port)
+             || (asin.sa.sa_family == AF_INET6 && !asin.sin6.sin6_port)

Property changes on: branches/2019Q1/dns/gdnsd2/files/patch-src_dnsio__udp.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 490576)
+++ branches/2019Q1	(revision 490577)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r490324,490326,490503