aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED3
-rw-r--r--UPDATING10
-rw-r--r--net/Makefile2
-rw-r--r--net/frr4/Makefile (renamed from net/frr/Makefile)3
-rw-r--r--net/frr4/distinfo (renamed from net/frr/distinfo)0
-rw-r--r--net/frr4/files/frr.in (renamed from net/frr/files/frr.in)0
-rw-r--r--net/frr4/files/patch-Makefile.am (renamed from net/frr/files/patch-Makefile.am)0
-rw-r--r--net/frr4/files/patch-configure.ac (renamed from net/frr/files/patch-configure.ac)0
-rw-r--r--net/frr4/files/patch-lib_vty.h (renamed from net/frr/files/patch-lib_vty.h)0
-rw-r--r--net/frr4/files/watchfrr.in (renamed from net/frr/files/watchfrr.in)0
-rw-r--r--net/frr4/pkg-descr (renamed from net/frr/pkg-descr)0
-rw-r--r--net/frr4/pkg-message (renamed from net/frr/pkg-message)4
-rw-r--r--net/frr4/pkg-plist (renamed from net/frr/pkg-plist)0
13 files changed, 17 insertions, 5 deletions
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
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
index e2d687c67061..e2d687c67061 100644
--- a/net/frr/distinfo
+++ b/net/frr4/distinfo
diff --git a/net/frr/files/frr.in b/net/frr4/files/frr.in
index 20dbdd3248e8..20dbdd3248e8 100644
--- a/net/frr/files/frr.in
+++ b/net/frr4/files/frr.in
diff --git a/net/frr/files/patch-Makefile.am b/net/frr4/files/patch-Makefile.am
index 8efb340367b4..8efb340367b4 100644
--- a/net/frr/files/patch-Makefile.am
+++ b/net/frr4/files/patch-Makefile.am
diff --git a/net/frr/files/patch-configure.ac b/net/frr4/files/patch-configure.ac
index 6b59462eead0..6b59462eead0 100644
--- a/net/frr/files/patch-configure.ac
+++ b/net/frr4/files/patch-configure.ac
diff --git a/net/frr/files/patch-lib_vty.h b/net/frr4/files/patch-lib_vty.h
index 44a8c40eb372..44a8c40eb372 100644
--- a/net/frr/files/patch-lib_vty.h
+++ b/net/frr4/files/patch-lib_vty.h
diff --git a/net/frr/files/watchfrr.in b/net/frr4/files/watchfrr.in
index 253214c8bc8f..253214c8bc8f 100644
--- a/net/frr/files/watchfrr.in
+++ b/net/frr4/files/watchfrr.in
diff --git a/net/frr/pkg-descr b/net/frr4/pkg-descr
index 6ac4ad877355..6ac4ad877355 100644
--- a/net/frr/pkg-descr
+++ b/net/frr4/pkg-descr
diff --git a/net/frr/pkg-message b/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
index d1342eef998a..d1342eef998a 100644
--- a/net/frr/pkg-plist
+++ b/net/frr4/pkg-plist