aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Liske <thomas@fiasko-nw.net>2021-08-13 10:28:43 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-08-13 18:03:02 +0000
commit8eb1377c61697fa73a170528cab7a7fba96cea3b (patch)
tree70111d0efdf45704b44edfbd4d87c123a5d6bf61
parentf6dad08a7b9897c4353bea000747874dc8c6059a (diff)
downloadaports-8eb1377c61697fa73a170528cab7a7fba96cea3b.tar.gz
aports-8eb1377c61697fa73a170528cab7a7fba96cea3b.tar.bz2
aports-8eb1377c61697fa73a170528cab7a7fba96cea3b.tar.xz
community/frr: fix reload script and add checkpath to initd
-rw-r--r--community/frr/APKBUILD8
-rw-r--r--community/frr/frr-reload-py3.patch20
-rwxr-xr-xcommunity/frr/frr.initd2
3 files changed, 27 insertions, 3 deletions
diff --git a/community/frr/APKBUILD b/community/frr/APKBUILD
index 442a1057b5..b45388bba7 100644
--- a/community/frr/APKBUILD
+++ b/community/frr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Corbe <daniel@corbe.net>
pkgname=frr
pkgver=7.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="Free Range Routing is a fork of Quagga"
pkgusers="frr"
pkggroups="frr frrvty"
@@ -36,6 +36,7 @@ subpackages="$pkgname-dbg
source="https://github.com/FRRouting/frr/archive/frr-$pkgver.tar.gz
frr.initd
allow-invalid-nlri-attributes.patch
+ frr-reload-py3.patch
"
builddir="$srcdir"/$pkgname-$pkgname-$pkgver
@@ -126,5 +127,6 @@ snmp() {
}
sha512sums="cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e frr-7.5.1.tar.gz
-b495b2be9f2cbb065104ccc0c3474471e870b53ac62ed4fba40020c8d50866e637a99ef3d7af5de1018ff659c4757baac4f40d7648a9de99ed14db33c8992b54 frr.initd
-8c4e498d9a0496d23e2a95a1004e062f6838007a1c0eb52d7873e675c5587b69b51cbff73202e38231221d164c75f7a1e25b0621b20c78a5e7635aaa0c586053 allow-invalid-nlri-attributes.patch"
+f86bdf8f6dd89ba69d03a69bbe645b3b752d3fbb38913c5155536b8043b0493901ab078b7acb6ac463d3473c6492900d8a695582f66610955246052b19c0d70c frr.initd
+8c4e498d9a0496d23e2a95a1004e062f6838007a1c0eb52d7873e675c5587b69b51cbff73202e38231221d164c75f7a1e25b0621b20c78a5e7635aaa0c586053 allow-invalid-nlri-attributes.patch
+94b0809b0de84fa56579a42e64684abbd7494679016b55c2285e5ed59b9074530d4104076fa40bcb98bfe688d101f614b805c2a2a141eabb325ae8b0239c8960 frr-reload-py3.patch"
diff --git a/community/frr/frr-reload-py3.patch b/community/frr/frr-reload-py3.patch
new file mode 100644
index 0000000000..521d17970c
--- /dev/null
+++ b/community/frr/frr-reload-py3.patch
@@ -0,0 +1,20 @@
+Purpose: Fix to work with python3
+Upstream: Shebang is still python
+
+--- a/tools/frr-reload.py
++++ b/tools/frr-reload.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Frr Reloader
+ # Copyright (C) 2014 Cumulus Networks, Inc.
+ #
+@@ -802,7 +802,7 @@
+ add_exit_vrf = False
+
+ if ctx_keys[0].startswith('vrf') and line:
+- if line is not "exit-vrf":
++ if line != "exit-vrf":
+ add_exit_vrf = True
+ prior_ctx_key = (ctx_keys[0])
+ else:
diff --git a/community/frr/frr.initd b/community/frr/frr.initd
index ed908bbbbb..6613af1eb8 100755
--- a/community/frr/frr.initd
+++ b/community/frr/frr.initd
@@ -4,6 +4,8 @@ description="FRRouting"
extra_started_commands="reload"
start() {
+ checkpath --owner frr:frr --directory /etc/frr
+ checkpath --file /etc/frr/vtysh.conf
/usr/lib/frr/frrinit.sh start
}