diff --git a/net/radvd/Makefile b/net/radvd/Makefile index e7299ea3d615..38b1f1f59fb0 100644 --- a/net/radvd/Makefile +++ b/net/radvd/Makefile @@ -1,34 +1,33 @@ PORTNAME= radvd -PORTVERSION= 2.19 -PORTREVISION= 4 +PORTVERSION= 2.20 CATEGORIES= net MASTER_SITES= http://www.litech.org/radvd/dist/ -PATCH_SITES= https://github.com/${PORTNAME}-project/${PORTNAME}/commit/ -PATCHFILES= 3f1aeb2.patch:-p1 +#PATCH_SITES= https://github.com/${PORTNAME}-project/${PORTNAME}/commit/ +#PATCHFILES= 3f1aeb2.patch:-p1 MAINTAINER= farrokhi@FreeBSD.org COMMENT= Linux/BSD IPv6 router advertisement daemon WWW= http://www.litech.org/radvd/ LICENSE= RADVD LICENSE_NAME= RADVD License LICENSE_FILE= ${WRKSRC}/COPYRIGHT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share USES= gmake pkgconfig CONFIGURE_ARGS= --program-transform-name= USE_RC_SUBR= radvd PORTDOCS= CHANGES COPYRIGHT INTRO.html README TODO OPTIONS_DEFINE= DOCS post-install: ${INSTALL_DATA} ${WRKSRC}/radvd.conf.example ${STAGEDIR}${PREFIX}/etc/radvd.conf.sample ${INSTALL} -d ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S.^.${WRKSRC}/.} ${STAGEDIR}${DOCSDIR} .include diff --git a/net/radvd/distinfo b/net/radvd/distinfo index 481924fcc88a..df34b5717b9a 100644 --- a/net/radvd/distinfo +++ b/net/radvd/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1707290399 -SHA256 (radvd-2.19.tar.gz) = c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0 -SIZE (radvd-2.19.tar.gz) = 222794 +TIMESTAMP = 1735751085 +SHA256 (radvd-2.20.tar.gz) = af37c5a81d59f3bdc00d83056606ffa1810d4550beed6caa4f81181246494220 +SIZE (radvd-2.20.tar.gz) = 243189 SHA256 (3f1aeb2.patch) = 8130a1f6e04292629c2c2cd9613beb4d4b085f0c08005e15b139bae10467f84c SIZE (3f1aeb2.patch) = 3699 diff --git a/net/radvd/files/patch-device-bsd44.c b/net/radvd/files/patch-device-bsd44.c deleted file mode 100644 index 003e0a30de5f..000000000000 --- a/net/radvd/files/patch-device-bsd44.c +++ /dev/null @@ -1,40 +0,0 @@ ---- device-bsd44.c.orig 2019-07-20 03:58:19 UTC -+++ device-bsd44.c -@@ -126,8 +126,29 @@ ret: - return -1; - } - --int setup_allrouters_membership(int sock, struct Interface *iface) { return 0; } -+int setup_allrouters_membership(int sock, struct Interface *iface) -+{ -+ struct ipv6_mreq mreq; - -+ memset(&mreq, 0, sizeof(mreq)); -+ mreq.ipv6mr_interface = iface->props.if_index; -+ -+ /* all-routers multicast address */ -+ if (inet_pton(AF_INET6, "ff02::2", -+ &mreq.ipv6mr_multiaddr.s6_addr) != 1) { -+ flog(LOG_ERR, "inet_pton failed"); -+ return (-1); -+ } -+ -+ if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, -+ &mreq, sizeof(mreq)) < 0 && errno != EADDRINUSE) { -+ flog(LOG_ERR, "can't join ipv6-allrouters on %s", iface->props.name); -+ return (-1); -+ } -+ -+ return 0; -+} -+ - int set_interface_linkmtu(const char *iface, uint32_t mtu) - { - dlog(LOG_DEBUG, 4, "setting LinkMTU (%u) for %s is not supported", mtu, iface); -@@ -161,5 +182,5 @@ int check_ip6_forwarding(void) - int check_ip6_iface_forwarding(const char *iface) - { - dlog(LOG_DEBUG, 4, "checking ipv6 forwarding of interface not supported"); -- return -1; -+ return 1; - }