svn commit: r498095 - in head/net/ndproxy: . files

[Luca Pizzamiglio]

Author: pizzamig
Date: Sat Apr  6 13:30:30 2019
New Revision: 498095
URL: https://svnweb.freebsd.org/changeset/ports/498095

Log:
  net/ndproxy: Update to 3.2
  
  This release contains fixes for API changes to pfil hooks in CURRENT
  
  PR:		235864
  Submitted by:	maintainer

Modified:
  head/net/ndproxy/Makefile
  head/net/ndproxy/distinfo
  head/net/ndproxy/files/ndproxy.in

Modified: head/net/ndproxy/Makefile
==============================================================================
--- head/net/ndproxy/Makefile	Sat Apr  6 13:29:32 2019	(r498094)
+++ head/net/ndproxy/Makefile	Sat Apr  6 13:30:30 2019	(r498095)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ndproxy
-PORTVERSION=	2.0
-DISTVERSIONPREFIX=	v
-CATEGORIES=	net ipv6
+PORTVERSION=	3.2
+CATEGORIES=	net
 
 MAINTAINER=	fbsd.bugzilla at fenyo.net
 COMMENT=	Implementation of IPv6 Neighbor Discovery proxy
@@ -11,16 +10,17 @@ COMMENT=	Implementation of IPv6 Neighbor Discovery pro
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_mips=		fails to build: ndproxy.c:51: function declaration isn't a prototype
-BROKEN_mips64=		fails to build: ndproxy.c:51: function declaration isn't a prototype
-BROKEN_powerpc64=	fails to build: ndproxy.c:51: function declaration isn't a prototype
+USES=		kmod
 
 SUB_FILES=	pkg-message
 
-USES=		kmod
 USE_RC_SUBR=	ndproxy
 USE_GITHUB=	yes
 GH_ACCOUNT=	AlexandreFenyo
+GH_TAGNAME=	v${PORTVERSION}
+
+# build for a kernel with 'options VIMAGE'
+CFLAGS+=	-DVIMAGE
 
 PLIST_FILES=	${KMODDIR}/${PORTNAME}.ko man/man4/${PORTNAME}.4.gz
 

Modified: head/net/ndproxy/distinfo
==============================================================================
--- head/net/ndproxy/distinfo	Sat Apr  6 13:29:32 2019	(r498094)
+++ head/net/ndproxy/distinfo	Sat Apr  6 13:30:30 2019	(r498095)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502146291
-SHA256 (AlexandreFenyo-ndproxy-v2.0_GH0.tar.gz) = 29c626355d91fef9c13281d668b2a1f79618758c44c4aaf4b0434977ceb38588
-SIZE (AlexandreFenyo-ndproxy-v2.0_GH0.tar.gz) = 8274107
+TIMESTAMP = 1550596032
+SHA256 (AlexandreFenyo-ndproxy-3.2-v3.2_GH0.tar.gz) = 8ea72bb12b26bb1ca4df31bc1bd86b3eea52d42fe2d014d890a1a067721c63dd
+SIZE (AlexandreFenyo-ndproxy-3.2-v3.2_GH0.tar.gz) = 10172863

Modified: head/net/ndproxy/files/ndproxy.in
==============================================================================
--- head/net/ndproxy/files/ndproxy.in	Sat Apr  6 13:29:32 2019	(r498094)
+++ head/net/ndproxy/files/ndproxy.in	Sat Apr  6 13:30:30 2019	(r498095)
@@ -17,8 +17,10 @@ stop_cmd="ndproxy_stop"
 ndproxy_start()
 {
     echo "Starting ndproxy:"
-    if ! sysctl net.inet6.ndproxyconf_uplink_interface > /dev/null 2>&1; then
-	if ! kldload ndproxy > /dev/null 2>&1; then
+    sysctl net.inet6.ndproxyconf_uplink_interface > /dev/null 2>&1
+    if [ $? -eq 1 ]; then
+	kldload ndproxy > /dev/null 2>&1
+	if [ $? -eq 1 ]; then
 	    echo Failure loading ndproxy.
 	    return;
 	fi
@@ -26,31 +28,33 @@ ndproxy_start()
 
     sysctl net.inet6.ndproxycount=0
 
+    sysctl net.inet6.ndproxyconf_uplink_interface=${ndproxy_uplink_interface}
+    sysctl net.inet6.ndproxyconf_downlink_mac_address=${ndproxy_downlink_mac_address}
+    sysctl net.inet6.ndproxyconf_exception_ipv6_addresses=${ndproxy_exception_ipv6_addresses}
+    sysctl net.inet6.ndproxyconf_uplink_ipv6_addresses=${ndproxy_uplink_ipv6_addresses}
+
     if [ -z "${ndproxy_uplink_interface}" ]; then
 	echo "Warning: ndproxy_uplink_interface should be defined in rc.conf (see ndproxy(4))."
     fi
-    sysctl net.inet6.ndproxyconf_uplink_interface=${ndproxy_uplink_interface}
 
     if [ -z "${ndproxy_downlink_mac_address}" ]; then
 	echo "Warning: ndproxy_downlink_mac_address should be defined in rc.conf (see ndproxy(4))."
     fi
-    sysctl net.inet6.ndproxyconf_downlink_mac_address=${ndproxy_downlink_mac_address}
 
     if [ -z "${ndproxy_uplink_ipv6_addresses}" ]; then
 	echo "Warning: ndproxy_uplink_ipv6_addresses should be defined in rc.conf (see ndproxy(4))."
     fi
-    sysctl net.inet6.ndproxyconf_exception_ipv6_addresses=${ndproxy_exception_ipv6_addresses}
 
     # Note that ndproxy_exception_ipv6_addresses may be left empty.
-
+    
     if [ -n "${ndproxy_uplink_interface}" ]; then
-	if ! ifconfig ${ndproxy_uplink_interface} | head -1 | grep -q PPROMISC; then
+	ifconfig ${ndproxy_uplink_interface} | head -1 | grep PPROMISC > /dev/null
+	if [ $? -eq 1 ]; then
 	    echo "Putting interface ${ndproxy_uplink_interface} into permanently promiscuous mode."
 	    ifconfig ${ndproxy_uplink_interface} promisc
 	fi
     fi
-    sysctl net.inet6.ndproxyconf_uplink_ipv6_addresses=${ndproxy_uplink_ipv6_addresses}
-
+    
     echo Done.
 }
 
@@ -58,10 +62,12 @@ ndproxy_stop()
 {
     echo "Stopping ndproxy:"
 
-    if ! sysctl net.inet6.ndproxyconf_uplink_interface > /dev/null 2>&1; then
+    sysctl net.inet6.ndproxyconf_uplink_interface > /dev/null 2>&1
+    if [ $? -eq 1 ]; then
 	echo Failure unloading ndproxy.
     else
-	if ! kldunload ndproxy > /dev/null 2>&1; then
+	kldunload ndproxy > /dev/null 2>&1
+	if [ $? -eq 1 ]; then
 	    echo Failure unloading ndproxy.
 	else
 	    echo Done.