svn commit: r414706 - in head/net/isboot-kmod: . files

[Kurt Jaeger]

Author: pi
Date: Fri May  6 14:34:57 2016
New Revision: 414706
URL: https://svnweb.freebsd.org/changeset/ports/414706

Log:
  net/isboot-kmod: fix build on 11-current
  
  Commit r293886 removed rtrequest() from sys/net/route.c in 11-CURRENT.
  This update patches isboot.c to call rtrequest_fib() instead. I
  have already sent the patch to the isboot maintainer, so hopefully
  this is only needed until the next point release.
  
  This allows the port to build on 11-CURRENT as well as 10.x.
  
  PR:		209024
  Submitted by:	John Nielsen <john at jnielsen.net> (maintainer)

Added:
  head/net/isboot-kmod/files/patch-isboot.c   (contents, props changed)
Modified:
  head/net/isboot-kmod/Makefile

Modified: head/net/isboot-kmod/Makefile
==============================================================================
--- head/net/isboot-kmod/Makefile	Fri May  6 14:27:51 2016	(r414705)
+++ head/net/isboot-kmod/Makefile	Fri May  6 14:34:57 2016	(r414706)
@@ -2,6 +2,7 @@
 
 PORTNAME=	isboot-kmod
 PORTVERSION=	0.2.13
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.peach.ne.jp/archives/isboot/
 DISTNAME=	isboot-${PORTVERSION}

Added: head/net/isboot-kmod/files/patch-isboot.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/isboot-kmod/files/patch-isboot.c	Fri May  6 14:34:57 2016	(r414706)
@@ -0,0 +1,50 @@
+--- isboot.c.orig	2015-11-05 16:50:51 UTC
++++ isboot.c
+@@ -347,9 +347,9 @@ isboot_set_v4gw(struct sockaddr_in *gate
+ 	netmask.sin_addr.s_addr = htonl(0);
+ 
+ 	/* delete gateway if exists */
+-	error = rtrequest(RTM_DELETE, (struct sockaddr *)&dst,
++	error = rtrequest_fib(RTM_DELETE, (struct sockaddr *)&dst,
+ 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
+-	    0, NULL);
++	    0, NULL, RT_DEFAULT_FIB);
+ 	if (error) {
+ 		if (error != ESRCH) {
+ 			printf("rtrequest RTM_DELETE error %d\n",
+@@ -359,9 +359,9 @@ isboot_set_v4gw(struct sockaddr_in *gate
+ 	}
+ 
+ 	/* set new default gateway */
+-	error = rtrequest(RTM_ADD, (struct sockaddr *)&dst,
++	error = rtrequest_fib(RTM_ADD, (struct sockaddr *)&dst,
+ 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
+-	    RTF_GATEWAY | RTF_STATIC, NULL);
++	    RTF_GATEWAY | RTF_STATIC, NULL, RT_DEFAULT_FIB);
+ 	if (error) {
+ 		printf("rtrequest RTM_ADD error %d\n", error);
+ 		return (error);
+@@ -391,9 +391,9 @@ isboot_set_v6gw(struct sockaddr_in6 *gat
+ 	memset(&netmask.sin6_addr, 0, 16);
+ 
+ 	/* delete gateway if exists */
+-	error = rtrequest(RTM_DELETE, (struct sockaddr *)&dst,
++	error = rtrequest_fib(RTM_DELETE, (struct sockaddr *)&dst,
+ 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
+-	    0, NULL);
++	    0, NULL, RT_DEFAULT_FIB);
+ 	if (error) {
+ 		if (error != ESRCH) {
+ 			printf("rtrequest RTM_DELETE error %d\n",
+@@ -403,9 +403,9 @@ isboot_set_v6gw(struct sockaddr_in6 *gat
+ 	}
+ 
+ 	/* set new default gateway */
+-	error = rtrequest(RTM_ADD, (struct sockaddr *)&dst,
++	error = rtrequest_fib(RTM_ADD, (struct sockaddr *)&dst,
+ 	    (struct sockaddr *)gateway, (struct sockaddr *)&netmask,
+-	    RTF_GATEWAY | RTF_STATIC, NULL);
++	    RTF_GATEWAY | RTF_STATIC, NULL, RT_DEFAULT_FIB);
+ 	if (error) {
+ 		printf("rtrequest RTM_ADD error %d\n", error);
+ 		return (error);