From 7f795fd35eaff003b830fe1fc6014f228b566195 Mon Sep 17 00:00:00 2001
From: Thibaut Notteboom <thibaut.notteboom@gmail.com>
Date: Wed, 20 May 2020 00:19:16 +0700
Subject: network/frr: Updated for version 7.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/frr/frr.SlackBuild | 22 ++++++++--------------
 network/frr/frr.info       |  8 ++++----
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'network/frr')

diff --git a/network/frr/frr.SlackBuild b/network/frr/frr.SlackBuild
index 701fd9696a..ac17db4098 100644
--- a/network/frr/frr.SlackBuild
+++ b/network/frr/frr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for frr
 
-# Copyright 2018 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2018-2020 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=frr
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -110,6 +110,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-fpm \
   --enable-vtysh \
   --enable-watchfrr \
+  --enable-doc \
+  --enable-doc-html \
   --disable-systemd \
   --disable-static \
   --without-libpam \
@@ -120,21 +122,13 @@ make install-strip DESTDIR=$PKG
 
 install -d -m 750 -o frr -g frr $PKG/etc/frr $PKG/var/log/frr $PKG/var/run/frr
 
-install -D -m 640 -o frr -g frr redhat/daemons $PKG/etc/frr/daemons.new
+install -D -m 640 -o frr -g frr tools/etc/frr/daemons $PKG/etc/frr/daemons.new
 install -D -m 640 -o frr -g frrvty tools/etc/frr/vtysh.conf $PKG/etc/frr/vtysh.conf.new
 
-install -D -m 644 redhat/frr.init $PKG/etc/rc.d/rc.frr.new
+install -D -m 644 $PKG/usr/sbin/frrinit.sh $PKG/etc/rc.d/rc.frr.new
 install -D -m 644 redhat/frr.logrotate $PKG/etc/logrotate.d/frr.new
 
-install -D -m 644 bgpd/BGP4-MIB.txt $PKG/usr/share/snmp/mibs/BGP4-MIB.txt
-install -D -m 644 eigrpd/EIGRP-MIB.txt $PKG/usr/share/snmp/mibs/EIGRP-MIB.txt
-install -D -m 644 ospf6d/OSPFv3-MIB.txt $PKG/usr/share/snmp/mibs/OSPFv3-MIB.txt
-install -D -m 644 ospfd/OSPF-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-MIB.txt
-install -D -m 644 ospfd/OSPF-TRAP-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-TRAP-MIB.txt
-install -D -m 644 ripd/RIPv2-MIB.txt $PKG/usr/share/snmp/mibs/RIPv2-MIB.txt
-
-# Fix paths
-sed -i 's|usr/lib/frr|usr/sbin|g' $PKG/etc/rc.d/rc.frr.new $PKG/etc/frr/daemons.new
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' $PKG/usr/sbin/{frr-reload.py,generate_support_bundle.py}
 
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
@@ -148,7 +142,7 @@ gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README* \
+  COPYING* README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/frr/frr.info b/network/frr/frr.info
index d653abc141..f7493bc3bf 100644
--- a/network/frr/frr.info
+++ b/network/frr/frr.info
@@ -1,10 +1,10 @@
 PRGNAM="frr"
-VERSION="6.0"
+VERSION="7.3"
 HOMEPAGE="https://frrouting.org/"
-DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-6.0/frr-frr-6.0.tar.gz"
-MD5SUM="f7584302a8837194021b82ae646d5e2d"
+DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-7.3/frr-frr-7.3.tar.gz"
+MD5SUM="5e4c3bc7146ad7988724f7543a46f93b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib"
+REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib libyang"
 MAINTAINER="Thibaut Notteboom"
 EMAIL="thibaut.notteboom@gmail.com"
-- 
cgit v1.2.3