From nobody Mon Feb 21 15:05:51 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 03EAF19CE6FA; Mon, 21 Feb 2022 15:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K2Qbg6j6nz4T7D; Mon, 21 Feb 2022 15:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2733pXA4EtVX5mkJVKlOr6oNI1yuDT9eAgrhsrOT/s=; b=AoUR2GcRcW0/yFAEhbeQgrcMMPIqrf5M2ZJJEVJ7066DuzQVpm+3BB21JtSZWkupBhWv+s lpvsRI0MxhnwQG3qhN7S5y+ejm0SHQiHxv571AaBO5JrfkMWDp6eGN/zFxR7H7duQt3jv2 SNZdHZ9XizuwmOJquUN9M2QAeeDyy1hiWgAss5NtxdJXABg+OiCvZSZMiLyO7P2PPu3cod Gcpn9qLy14qxSeuoUWMeRbGt74CR46h5EjvKrlSHWkFLDKHisdO8hIhwXKCVRJGWjYXTZb EhRvxEe7aNRgarVU5ltqC97r3IpPcn+SOWkXORVLIxXeuTXAdIsEQavo8CG4QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C293712815; Mon, 21 Feb 2022 15:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LF5p1D000232; Mon, 21 Feb 2022 15:05:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LF5pkg000231; Mon, 21 Feb 2022 15:05:51 GMT (envelope-from git) Date: Mon, 21 Feb 2022 15:05:51 GMT Message-Id: <202202211505.21LF5pkg000231@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 05ab0b7b59aa - main - net/bird2: Update to 2.0.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05ab0b7b59aad904120f6a07d31a359a50b91b2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2733pXA4EtVX5mkJVKlOr6oNI1yuDT9eAgrhsrOT/s=; b=bCaFLK85wIEiD01KUqPzmlnrWv254RkmY7zI+owQDwjWuZf0dQj1IZfp6qdniOny/ZmK44 hEMb+owUFW6FmASxbwcBSMN46usk50kJTw6G+O3c84Mrx2pE8krGoZGb1ExmUNjmmhjGjH xDH+kcj/P5Ihd0d+mINnhFqp+h5VXXvN7zwt6Mx4l+aX55Ee1cWk6ksdoHMGawDS70FoO9 jPHa2ONuJO3JlZZwKvTXhHTRvzfer6kxaN6FjuOvaf5dpz44isz1Gtn9ddiHDEk7EeA6hs 7DRpyIJVEFRo44X+YzXT1ak5KwBSKRrGycFb6dK9DkgBNKDrNIB186JgKW1UAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645455951; a=rsa-sha256; cv=none; b=VRkO8cy6fw/VC+oha8rPBNkx1NNF0+m8g+la3PrMkbZkTVzzBndBDxG1aR9+b5v4sOmRv5 sD+ci3iw+LJEI1/5SPSwLyDTJBspibLk2xs/+uQHc0Bq20u3Vvz2N/2JApzPCVenjFdIkm 5TL3TJvMfI6Ih98hbKgiiPSJTawbl2V5ftPzPVCOxEU7kSKmk4aq4HOTvP4kK9fN6FG9av y7eJWx05y7RVwrgw+hm9f6QRcplJejpmt7K3PfdZVkdwMRYKBA5zYk8gQNxTpQM/mr4XCS iWKSFFaPLVG42pyhOeTR4KL08y9d52Pv9nLzn/EN08tS7DBt9JmLb0ESF7tgzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=05ab0b7b59aad904120f6a07d31a359a50b91b2b commit 05ab0b7b59aad904120f6a07d31a359a50b91b2b Author: Olivier Cochard AuthorDate: 2022-02-21 15:00:54 +0000 Commit: Olivier Cochard CommitDate: 2022-02-21 15:04:35 +0000 net/bird2: Update to 2.0.9 Sponsored by: Netflix --- net/bird2/Makefile | 7 +------ net/bird2/distinfo | 6 +++--- net/bird2/files/patch-Makefile.in | 18 +++++++----------- net/bird2/files/patch-proto_babel_babel.c | 24 ------------------------ 4 files changed, 11 insertions(+), 44 deletions(-) diff --git a/net/bird2/Makefile b/net/bird2/Makefile index 0ba12f96d705..db523094a910 100644 --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -1,8 +1,7 @@ # Created by: Alexander V. Chernikov PORTNAME= bird -DISTVERSION= 2.0.8 -PORTREVISION= 1 +DISTVERSION= 2.0.9 CATEGORIES= net MASTER_SITES= https://bird.network.cz/download/ PKGNAMESUFFIX= 2 @@ -59,8 +58,4 @@ 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 ${WRKSRC}/doc/bird.conf.sample - .include diff --git a/net/bird2/distinfo b/net/bird2/distinfo index 64f0806f6e4d..b7b8b6f8c8a0 100644 --- a/net/bird2/distinfo +++ b/net/bird2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616395075 -SHA256 (bird-2.0.8.tar.gz) = 19d2de83ee25a307b9e5b9e58797dd68766d439bcee33e3ac617ed502370e7f6 -SIZE (bird-2.0.8.tar.gz) = 1135228 +TIMESTAMP = 1645441068 +SHA256 (bird-2.0.9.tar.gz) = 76786bbcded3061e1bb221b011f2cc00221ec063de9cda004a7d9b061a096d5e +SIZE (bird-2.0.9.tar.gz) = 1282045 diff --git a/net/bird2/files/patch-Makefile.in b/net/bird2/files/patch-Makefile.in index 8bddd6d09554..2f8db6f96b66 100644 --- a/net/bird2/files/patch-Makefile.in +++ b/net/bird2/files/patch-Makefile.in @@ -1,15 +1,11 @@ ---- Makefile.in.orig 2021-03-21 22:29:42 UTC +--- Makefile.in.orig 2022-02-21 11:12:46 UTC +++ Makefile.in -@@ -206,11 +206,7 @@ install: all - for BIN in bird @CLIENT@ ; do \ +@@ -207,7 +207,7 @@ install: all $(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ; \ done -- if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \ + 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@.sample ; \ - - install-docs: - $(INSTALL) -d $(DESTDIR)/$(docdir) ++ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.sample ; \ + else \ + echo "Not overwriting old bird.conf" ; \ + fi diff --git a/net/bird2/files/patch-proto_babel_babel.c b/net/bird2/files/patch-proto_babel_babel.c deleted file mode 100644 index 25cee54f7edc..000000000000 --- a/net/bird2/files/patch-proto_babel_babel.c +++ /dev/null @@ -1,24 +0,0 @@ ---- proto/babel/babel.c.orig 2021-04-16 21:18:15 UTC -+++ proto/babel/babel.c -@@ -1658,10 +1658,6 @@ babel_if_notify(struct proto *P, unsigned flags, struc - if (!(iface->flags & IF_UP)) - return; - -- /* We only speak multicast */ -- if (!(iface->flags & IF_MULTICAST)) -- return; -- - /* Ignore ifaces without link-local address */ - if (!iface->llv6) - return; -@@ -1734,10 +1730,6 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct - WALK_LIST(iface, iface_list) - { - if (!(iface->flags & IF_UP)) -- continue; -- -- /* Ignore non-multicast ifaces */ -- if (!(iface->flags & IF_MULTICAST)) - continue; - - /* Ignore ifaces without link-local address */