Index: head/net/bird2/Makefile =================================================================== --- head/net/bird2/Makefile (revision 489700) +++ head/net/bird2/Makefile (revision 489701) @@ -1,61 +1,62 @@ # Created by: Alexander V. Chernikov # $FreeBSD$ PORTNAME= bird -DISTVERSION= 2.0.2 -PORTREVISION= 3 +DISTVERSION= 2.0.3 CATEGORIES= net MASTER_SITES= ftp://bird.network.cz/pub/bird/ PKGNAMESUFFIX= 2 MAINTAINER= olivier@FreeBSD.org COMMENT= Dynamic IP routing daemon LICENSE= GPLv2 USES= bison gmake ncurses readline CONFLICTS= bird-[0-9]* CONFLICTS+= bird6-[0-9]* USE_CSTD= gnu99 GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var USE_RC_SUBR= bird SUB_FILES= pkg-message +GROUPS= birdvty + MAKE_JOBS_UNSAFE= yes OPTIONS_MULTI= RP RP_DESC= Routing Protocols OPTIONS_MULTI_RP= BFD BABEL BGP OSPF PIPE RADV RIP RPKI STATIC OPTIONS_DEFAULT= ${OPTIONS_MULTI_RP} BFD_DESC= Bidirectional Forwarding Detection BABEL_DESC= Babel routing protocol BGP_DESC= Border Gateway Protocol OSPF_DESC= Open Short Path First PIPE_DESC= PIPE routing RADV_DESC= Router Advertisement RIP_DESC= Routing Information Protocol RPKI_DESC= Resource Public Key Infrastructure STATIC_DESC= Static routing BFD_VARS= rt_prot+=bfd BABEL_VARS= rt_prot+=babel BGP_VARS= rt_prot+=bgp OSPF_VARS= rt_prot+=ospf PIPE_VARS= rt_prot+=pipe RADV_VARS= rt_prot+=radv RIP_VARS= rt_prot+=rip RPKI_VARS= rt_prot+=rpki STATIC_VARS= rt_prot+=static CONFIGURE_ARGS+=--with-protocols="${RT_PROT}" RPKI_LIB_DEPENDS= libssh.so:security/libssh post-patch: - ${REINPLACE_CMD} -e 's|\.example|\.sample|g' ${WRKSRC}/Makefile.in - ${MV} ${WRKSRC}/doc/bird.conf.example ${WRKSRC}/doc/bird.conf.sample + #${REINPLACE_CMD} -e 's|\.example|\.sample|g' ${WRKSRC}/Makefile.in + #${MV} ${WRKSRC}/doc/bird.conf ${WRKSRC}/doc/bird.conf.sample .include Index: head/net/bird2/distinfo =================================================================== --- head/net/bird2/distinfo (revision 489700) +++ head/net/bird2/distinfo (revision 489701) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521724692 -SHA256 (bird-2.0.2.tar.gz) = 035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f -SIZE (bird-2.0.2.tar.gz) = 1015224 +TIMESTAMP = 1546923619 +SHA256 (bird-2.0.3.tar.gz) = 0f49b38327d3109553acfa662ac0cf0377719226a03c124cd2e0ea2265ecb1de +SIZE (bird-2.0.3.tar.gz) = 1141917 Index: head/net/bird2/files/patch-sysdep_bsd_setkey.h =================================================================== --- head/net/bird2/files/patch-sysdep_bsd_setkey.h (revision 489700) +++ head/net/bird2/files/patch-sysdep_bsd_setkey.h (nonexistent) @@ -1,19 +0,0 @@ ---- sysdep/bsd/setkey.h.orig 2018-01-16 09:46:07 UTC -+++ sysdep/bsd/setkey.h -@@ -160,12 +160,14 @@ sk_set_md5_in_sasp_db(sock *s, ip_addr local, ip_addr - if (len > TCP_KEYLEN_MAX) - ERR_MSG("The password for TCP MD5 Signature is too long"); - -- if (setkey_md5(&src, &dst, pxlen, passwd, SADB_ADD) < 0) -+ if (setkey_md5(&src, &dst, pxlen, passwd, SADB_ADD) < 0 || -+ setkey_md5(&dst, &src, pxlen, passwd, SADB_ADD) < 0) - ERR_MSG("Cannot add TCP-MD5 password into the IPsec SA/SP database"); - } - else - { -- if (setkey_md5(&src, &dst, pxlen, NULL, SADB_DELETE) < 0) -+ if (setkey_md5(&src, &dst, pxlen, NULL, SADB_DELETE) < 0 || -+ setkey_md5(&dst, &src, pxlen, NULL, SADB_DELETE) < 0) - ERR_MSG("Cannot delete TCP-MD5 password from the IPsec SA/SP database"); - } - return 0; Property changes on: head/net/bird2/files/patch-sysdep_bsd_setkey.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/bird2/files/bird.in =================================================================== --- head/net/bird2/files/bird.in (revision 489700) +++ head/net/bird2/files/bird.in (revision 489701) @@ -1,32 +1,33 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: bird # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # bird_enable (bool): Set to NO by default. # Set it to YES to enable bird. # bird_config (path): Set to %%PREFIX%%/etc/bird.conf # by default. # . /etc/rc.subr name="bird" rcvar=bird_enable command=%%PREFIX%%/sbin/${name} load_rc_config $name : ${bird_enable="NO"} : ${bird_config="%%PREFIX%%/etc/bird.conf"} +: ${bird_group="birdvty"} -command_args="-c $bird_config" +command_args="-c $bird_config -g $bird_group" run_rc_command "$1" Index: head/net/bird2/files/patch-Makefile.in =================================================================== --- head/net/bird2/files/patch-Makefile.in (revision 489700) +++ head/net/bird2/files/patch-Makefile.in (revision 489701) @@ -1,15 +1,15 @@ ---- Makefile.in.orig 2017-04-29 22:26:04 UTC -+++ Makefile.in -@@ -163,11 +163,7 @@ install: all - if test -n "@CLIENT@" ; then \ - $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ; \ - fi +--- Makefile.in.orig 2019-01-08 06:06:39.654833000 +0100 ++++ Makefile.in 2019-01-08 06:06:53.077532000 +0100 +@@ -188,11 +188,7 @@ + for BIN in bird @CLIENT@ ; do \ + $(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ; \ + done - if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \ - $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \ - else \ - echo "Not overwriting old bird.conf" ; \ - fi -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.example ++ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.sample ; \ install-docs: $(INSTALL) -d $(DESTDIR)/$(docdir)