From 13bede1e9bc6a0902aa58f615b17b34719e3637e Mon Sep 17 00:00:00 2001 From: Olivier Cochard Date: Sat, 2 Jun 2018 07:42:45 +0000 Subject: [PATCH] Due to regression detected on FRR 4.0, preparing re-introduction of FRR 3 branch by renaming frr to frr4. Fixed a typo regarding my last modification into MOVED file too. --- MOVED | 3 ++- UPDATING | 10 ++++++++++ net/Makefile | 2 +- net/{frr => frr4}/Makefile | 3 ++- net/{frr => frr4}/distinfo | 0 net/{frr => frr4}/files/frr.in | 0 net/{frr => frr4}/files/patch-Makefile.am | 0 net/{frr => frr4}/files/patch-configure.ac | 0 net/{frr => frr4}/files/patch-lib_vty.h | 0 net/{frr => frr4}/files/watchfrr.in | 0 net/{frr => frr4}/pkg-descr | 0 net/{frr => frr4}/pkg-message | 4 ++-- net/{frr => frr4}/pkg-plist | 0 13 files changed, 17 insertions(+), 5 deletions(-) rename net/{frr => frr4}/Makefile (99%) rename net/{frr => frr4}/distinfo (100%) rename net/{frr => frr4}/files/frr.in (100%) rename net/{frr => frr4}/files/patch-Makefile.am (100%) rename net/{frr => frr4}/files/patch-configure.ac (100%) rename net/{frr => frr4}/files/patch-lib_vty.h (100%) rename net/{frr => frr4}/files/watchfrr.in (100%) rename net/{frr => frr4}/pkg-descr (100%) rename net/{frr => frr4}/pkg-message (81%) rename net/{frr => frr4}/pkg-plist (100%) diff --git a/MOVED b/MOVED index 29435f1b224e..3dde8035c701 100644 --- a/MOVED +++ b/MOVED @@ -10199,7 +10199,7 @@ editors/lazarus-lcl-nogui||2018-05-25|Removed, no longer needed editors/lazarus-lcl-qt|editors/lazarus-qt4|2018-05-25|Removed, no longer needed editors/lazarus-lcl-qt5|editors/lazarus-qt5|2018-05-25|Removed, no longer needed editors/lazarus-lcl-units||2018-05-25|Removed, no longer needed -net/bird-devel|net/bird2|2018-05-25|There are now muliple versions of bird +net/bird-devel|net/bird2|2018-05-25|There are now multiple versions of bird devel/hs-BNFC||2018-05-25|Removed, no longer supported graphics/hs-HGL||2018-05-25|Removed, no longer supported devel/hs-DrIFT||2018-05-25|Removed, no longer supported @@ -10222,3 +10222,4 @@ textproc/kibana43||2018-06-01|Has expired: End of Life was 2017-05-24, depends o textproc/kibana44||2018-06-01|Has expired: End of Life was 2017-08-02, depends on expired www/node4 textproc/kibana45||2018-06-01|Has expired: End of Life was 2017-09-30, depends on expired www/node4 www/node4|www/node|2018-06-01|Has expired: Node.js v4.x reaches end-of-life on 2018-04-30, see https://github.com/nodejs/Release +net/frr|net/frr4|2018-06-02|Will introduce multiple versions of frr diff --git a/UPDATING b/UPDATING index 71bb68721b50..f55a10c8aa33 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20180602: + AFFECTS: users of net/frr + AUTHOR: olivier@FreeBSD.org + + Due to regression detected in FRR version 4.0, port was renamed to frr4 + to prepare re-introduction of frr3 port version. + + To rename the installed package to match the new naming scheme, run: + # pkg set -n frr:frr4 + 20180529: AFFECTS: users of textproc/ibus-typing-booster AUTHOR: thierry@FreeBSD.org diff --git a/net/Makefile b/net/Makefile index 1db689fa401a..74dc07b34d5e 100644 --- a/net/Makefile +++ b/net/Makefile @@ -166,7 +166,7 @@ SUBDIR += freerdp1 SUBDIR += freeswitch SUBDIR += freevrrpd - SUBDIR += frr + SUBDIR += frr4 SUBDIR += fspclient SUBDIR += fspd SUBDIR += fsplib diff --git a/net/frr/Makefile b/net/frr4/Makefile similarity index 99% rename from net/frr/Makefile rename to net/frr4/Makefile index 3b6bcf305469..b96a25ebc244 100644 --- a/net/frr/Makefile +++ b/net/frr4/Makefile @@ -2,9 +2,10 @@ PORTNAME= frr PORTVERSION= 4.0 -PORTREVISION= 1 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 CATEGORIES= net ipv6 +PKGNAMESUFFIX= 4 MAINTAINER= olivier@FreeBSD.org COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP diff --git a/net/frr/distinfo b/net/frr4/distinfo similarity index 100% rename from net/frr/distinfo rename to net/frr4/distinfo diff --git a/net/frr/files/frr.in b/net/frr4/files/frr.in similarity index 100% rename from net/frr/files/frr.in rename to net/frr4/files/frr.in diff --git a/net/frr/files/patch-Makefile.am b/net/frr4/files/patch-Makefile.am similarity index 100% rename from net/frr/files/patch-Makefile.am rename to net/frr4/files/patch-Makefile.am diff --git a/net/frr/files/patch-configure.ac b/net/frr4/files/patch-configure.ac similarity index 100% rename from net/frr/files/patch-configure.ac rename to net/frr4/files/patch-configure.ac diff --git a/net/frr/files/patch-lib_vty.h b/net/frr4/files/patch-lib_vty.h similarity index 100% rename from net/frr/files/patch-lib_vty.h rename to net/frr4/files/patch-lib_vty.h diff --git a/net/frr/files/watchfrr.in b/net/frr4/files/watchfrr.in similarity index 100% rename from net/frr/files/watchfrr.in rename to net/frr4/files/watchfrr.in diff --git a/net/frr/pkg-descr b/net/frr4/pkg-descr similarity index 100% rename from net/frr/pkg-descr rename to net/frr4/pkg-descr diff --git a/net/frr/pkg-message b/net/frr4/pkg-message similarity index 81% rename from net/frr/pkg-message rename to net/frr4/pkg-message index b9c5d5f65e1a..e6a20ccd10b6 100644 --- a/net/frr/pkg-message +++ b/net/frr4/pkg-message @@ -4,5 +4,5 @@ messages like: To prevent such message kern.ipc.maxsockbuf can be increased: sysctl kern.ipc.maxsockbuf=16777216 -Error messages like "if_ioctl(SIOCGIFMEDIA) failed: Invalid argument" are -under investigation but seems harmless. +Error messages like "if_ioctl(SIOCGIFMEDIA) failed: Invalid argument" and + crashs with tun,gre or gif interfaces are under investigation. diff --git a/net/frr/pkg-plist b/net/frr4/pkg-plist similarity index 100% rename from net/frr/pkg-plist rename to net/frr4/pkg-plist