diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2009-04-24 18:23:02 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2009-04-24 18:23:02 +0000 |
| commit | 7ff1f59cf082a6cb4e3ad9683fd021b280cd4acd (patch) | |
| tree | dea7f7b435d5837a3909f0091cde228053cb7dfe /net/openbgpd | |
| parent | 991bbfcb7f8a53173cf928b837a635dcdd4220e5 (diff) | |
| download | ports-7ff1f59cf082a6cb4e3ad9683fd021b280cd4acd.tar.gz ports-7ff1f59cf082a6cb4e3ad9683fd021b280cd4acd.zip | |
Fix build on -CURRENT.
Notes
Notes:
svn path=/head/; revision=232673
Diffstat (limited to 'net/openbgpd')
| -rw-r--r-- | net/openbgpd/Makefile | 9 | ||||
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_kroute.c | 24 |
2 files changed, 5 insertions, 28 deletions
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile index 3d57b7d23863..e8c2be74fa83 100644 --- a/net/openbgpd/Makefile +++ b/net/openbgpd/Makefile @@ -68,7 +68,6 @@ post-patch: ${WRKSRC}/bgpd/rde_attr.c \ ${WRKSRC}/bgpd/rde_rib.c \ ${WRKSRC}/bgpd/rde_update.c - @${REINPLACE_CMD} -e "s|rtm_fmask|rtm_use|" ${WRKSRC}/bgpd/kroute.c @${REINPLACE_CMD} -e "s|RTLABEL_LEN|PFTABLE_LEN|" ${WRKSRC}/bgpd/bgpd.h @${REINPLACE_CMD} -e "s|ulong|unsigned\ long|" ${WRKSRC}/bgpctl/irr_parser.c @@ -86,10 +85,4 @@ post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 800059 -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/openbgpd/files/patch-bgpd_kroute.c b/net/openbgpd/files/patch-bgpd_kroute.c index 4dddba4398f4..4f97f3cdd400 100644 --- a/net/openbgpd/files/patch-bgpd_kroute.c +++ b/net/openbgpd/files/patch-bgpd_kroute.c @@ -1,5 +1,5 @@ ---- bgpd/kroute.c 2007-05-11 13:27:59.000000000 +0200 -+++ bgpd/kroute.c 2008-05-28 11:04:19.000000000 +0200 +--- bgpd/kroute.c.orig 2007-05-11 13:27:59.000000000 +0200 ++++ bgpd/kroute.c 2009-04-23 05:14:47.000000000 +0200 @@ -1738,7 +1738,9 @@ struct sockaddr_in prefix; struct sockaddr_in nexthop; @@ -10,7 +10,7 @@ int iovcnt = 0; if (kr_state.fib_sync == 0) -@@ -1748,14 +1750,16 @@ +@@ -1748,7 +1750,9 @@ bzero(&hdr, sizeof(hdr)); hdr.rtm_version = RTM_VERSION; hdr.rtm_type = action; @@ -20,14 +20,6 @@ hdr.rtm_flags = RTF_PROTO1; if (kroute->flags & F_BLACKHOLE) hdr.rtm_flags |= RTF_BLACKHOLE; - if (kroute->flags & F_REJECT) - hdr.rtm_flags |= RTF_REJECT; - if (action == RTM_CHANGE) /* reset these flags on change */ -- hdr.rtm_fmask = RTF_REJECT|RTF_BLACKHOLE; -+ hdr.rtm_use = RTF_REJECT|RTF_BLACKHOLE; - hdr.rtm_seq = kr_state.rtseq++; /* overflow doesn't matter */ - hdr.rtm_msglen = sizeof(hdr); - /* adjust iovec */ @@ -1799,6 +1803,7 @@ iov[iovcnt++].iov_len = sizeof(mask); @@ -54,7 +46,7 @@ int iovcnt = 0; if (kr_state.fib_sync == 0) -@@ -1860,14 +1868,16 @@ +@@ -1860,7 +1868,9 @@ bzero(&hdr, sizeof(hdr)); hdr.rtm_version = RTM_VERSION; hdr.rtm_type = action; @@ -64,14 +56,6 @@ hdr.rtm_flags = RTF_PROTO1; if (kroute->flags & F_BLACKHOLE) hdr.rtm_flags |= RTF_BLACKHOLE; - if (kroute->flags & F_REJECT) - hdr.rtm_flags |= RTF_REJECT; - if (action == RTM_CHANGE) /* reset these flags on change */ -- hdr.rtm_fmask = RTF_REJECT|RTF_BLACKHOLE; -+ hdr.rtm_use = RTF_REJECT|RTF_BLACKHOLE; - hdr.rtm_seq = kr_state.rtseq++; /* overflow doesn't matter */ - hdr.rtm_msglen = sizeof(hdr); - /* adjust iovec */ @@ -1914,6 +1924,7 @@ iov[iovcnt++].iov_len = sizeof(mask); |