diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-05-06 14:34:57 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-05-06 14:34:57 +0000 |
| commit | 1f2da4d299a0c24660632671c04cb92bffbcecd1 (patch) | |
| tree | e5f9ea3153454bdb24efb81e76596808d9435c51 /net | |
| parent | Update to b39. (diff) | |
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@jnielsen.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=414706
Diffstat (limited to 'net')
| -rw-r--r-- | net/isboot-kmod/Makefile | 1 | ||||
| -rw-r--r-- | net/isboot-kmod/files/patch-isboot.c | 50 |
2 files changed, 51 insertions, 0 deletions
diff --git a/net/isboot-kmod/Makefile b/net/isboot-kmod/Makefile index bd12e79a47c4..abdb6b181447 100644 --- a/net/isboot-kmod/Makefile +++ b/net/isboot-kmod/Makefile @@ -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} diff --git a/net/isboot-kmod/files/patch-isboot.c b/net/isboot-kmod/files/patch-isboot.c new file mode 100644 index 000000000000..de80988bb9c0 --- /dev/null +++ b/net/isboot-kmod/files/patch-isboot.c @@ -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); |