summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Werner2019-07-13 23:23:01 +0200
committerJuergen Werner2019-07-13 23:23:01 +0200
commitaf644279d299602e8df684b8861b5e9590e59a73 (patch)
treec386c80b0ad8981a27909e00e5d58d96b9a816ca
parentb5698fb807fc9036ed046e3158b849dbd52e6966 (diff)
downloadaur-af644279d299602e8df684b8861b5e9590e59a73.tar.gz
Remove patch files from pre-fork frr package
-rw-r--r--frr_6.0_systemd_arch.patch303
-rw-r--r--frr_7.0_Archlinux.patch109
2 files changed, 0 insertions, 412 deletions
diff --git a/frr_6.0_systemd_arch.patch b/frr_6.0_systemd_arch.patch
deleted file mode 100644
index a05d313fa33..00000000000
--- a/frr_6.0_systemd_arch.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -Naupr frr-frr-6.0_orig/redhat/babeld.service frr-frr-6.0/redhat/babeld.service
---- frr-frr-6.0_orig/redhat/babeld.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/babeld.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=Babel routing daemon
-+Documentation=man:babeld(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/babeld.pid
-+ExecStart=/usr/bin/babeld -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/bfdd.service frr-frr-6.0/redhat/bfdd.service
---- frr-frr-6.0_orig/redhat/bfdd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/bfdd.service 2018-10-12 10:05:33.009496639 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=Communication failure detection daemon
-+Documentation=man:bfdd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/bfdd.pid
-+ExecStart=/usr/bin/bfdd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/bgpd.service frr-frr-6.0/redhat/bgpd.service
---- frr-frr-6.0_orig/redhat/bgpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/bgpd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=BGP routing daemon
-+Documentation=man:bgpd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/bgpd.pid
-+ExecStart=/usr/bin/bgpd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/eigrpd.service frr-frr-6.0/redhat/eigrpd.service
---- frr-frr-6.0_orig/redhat/eigrpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/eigrpd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=EIGRP routing daemon
-+Documentation=man:eigrpd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/eigrpd.pid
-+ExecStart=/usr/bin/eigrpd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/isisd.service frr-frr-6.0/redhat/isisd.service
---- frr-frr-6.0_orig/redhat/isisd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/isisd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=IS-IS routing daemon
-+Documentation=man:isis(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/isisd.pid
-+ExecStart=/usr/bin/isisd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/ldpd.service frr-frr-6.0/redhat/ldpd.service
---- frr-frr-6.0_orig/redhat/ldpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/ldpd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=LDP engine
-+Documentation=man:ldpd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/ldpd.pid
-+ExecStart=/usr/bin/ldpd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/nhrpd.service frr-frr-6.0/redhat/nhrpd.service
---- frr-frr-6.0_orig/redhat/nhrpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/nhrpd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=NHRP daemon
-+Documentation=man:nhrpd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/nhrpd.pid
-+ExecStart=/usr/bin/nhrpd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/ospf6d.service frr-frr-6.0/redhat/ospf6d.service
---- frr-frr-6.0_orig/redhat/ospf6d.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/ospf6d.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=OSPF routing daemon for IPv6
-+Documentation=man:ospfd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/ospf6d.pid
-+ExecStart=/usr/bin/ospf6d -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/ospfd-instance@.service frr-frr-6.0/redhat/ospfd-instance@.service
---- frr-frr-6.0_orig/redhat/ospfd-instance@.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/ospfd-instance@.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=OSPF routing daemon instance %i
-+Documentation=man:ospfd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service ospfd.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/ospfd-%i.pid
-+ExecStart=/usr/bin/ospfd -n %i -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/ospfd.service frr-frr-6.0/redhat/ospfd.service
---- frr-frr-6.0_orig/redhat/ospfd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/ospfd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=OSPF routing daemon
-+Documentation=man:ospfd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/ospfd.pid
-+ExecStart=/usr/bin/ospfd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/pbrd.service frr-frr-6.0/redhat/pbrd.service
---- frr-frr-6.0_orig/redhat/pbrd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/pbrd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=PBR routing daemon
-+Documentation=man:pbrd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/pbrd.pid
-+ExecStart=/usr/bin/pbrd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/pimd.service frr-frr-6.0/redhat/pimd.service
---- frr-frr-6.0_orig/redhat/pimd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/pimd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,14 @@
-+[Unit]
-+Description=PIM multicast routing engine
-+Documentation=man:pimd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/pimd.pid
-+ExecStart=/usr/bin/pimd -d
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/ripd.service frr-frr-6.0/redhat/ripd.service
---- frr-frr-6.0_orig/redhat/ripd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/ripd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=RIP routing daemon
-+Documentation=man:ripd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/ripd.pid
-+ExecStart=/usr/bin/ripd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/ripngd.service frr-frr-6.0/redhat/ripngd.service
---- frr-frr-6.0_orig/redhat/ripngd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/ripngd.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=RIP routing daemon for IPv6
-+Documentation=man:ripngd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/ripngd.pid
-+ExecStart=/usr/bin/ripngd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/staticd.service frr-frr-6.0/redhat/staticd.service
---- frr-frr-6.0_orig/redhat/staticd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/staticd.service 2018-10-12 10:13:47.017305494 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=Zebra daemon responsible for management of static routes
-+Documentation=man:staticd(8) man:zebra(8)
-+BindTo=zebra.service
-+After=network.target zebra.service
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/staticd.pid
-+ExecStart=/usr/bin/staticd -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -Naupr frr-frr-6.0_orig/redhat/zebra.service frr-frr-6.0/redhat/zebra.service
---- frr-frr-6.0_orig/redhat/zebra.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-6.0/redhat/zebra.service 2018-10-12 09:58:16.424665052 +0700
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=GNU Zebra routing manager
-+Documentation=man:zebra(8)
-+After=network.target
-+
-+[Service]
-+Type=forking
-+PIDFile=/run/frr/zebra.pid
-+ExecStartPre=/usr/bin/ip route flush proto zebra
-+ExecStart=/usr/bin/zebra -d
-+ExecReload=/bin/kill -HUP $MAINPID
-+Restart=on-abort
-+
-+[Install]
-+WantedBy=multi-user.target
diff --git a/frr_7.0_Archlinux.patch b/frr_7.0_Archlinux.patch
deleted file mode 100644
index fa96bc7bbd3..00000000000
--- a/frr_7.0_Archlinux.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Naupr frr-frr-7.0_orig/tools/etc/frr/daemons frr-frr-7.0/tools/etc/frr/daemons
---- frr-frr-7.0_orig/tools/etc/frr/daemons 2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/etc/frr/daemons 2019-05-10 14:52:18.395888041 +0700
-@@ -29,6 +29,8 @@ sharpd=no
- pbrd=no
- bfdd=no
- fabricd=no
-+zebra=yes
-+#ospfd_instances="1,2,3"
-
- #
- # If this option is set the /etc/init.d/frr script automatically loads
-@@ -36,26 +38,27 @@ fabricd=no
- # Check /etc/pam.d/frr if you intend to use "vtysh"!
- #
- vtysh_enable=yes
--zebra_options=" -A 127.0.0.1 -s 90000000"
--bgpd_options=" -A 127.0.0.1"
--ospfd_options=" -A 127.0.0.1"
--ospf6d_options=" -A ::1"
--ripd_options=" -A 127.0.0.1"
--ripngd_options=" -A ::1"
--isisd_options=" -A 127.0.0.1"
--pimd_options=" -A 127.0.0.1"
--ldpd_options=" -A 127.0.0.1"
--nhrpd_options=" -A 127.0.0.1"
--eigrpd_options=" -A 127.0.0.1"
--babeld_options=" -A 127.0.0.1"
--sharpd_options=" -A 127.0.0.1"
--pbrd_options=" -A 127.0.0.1"
--staticd_options="-A 127.0.0.1"
--bfdd_options=" -A 127.0.0.1"
--fabricd_options="-A 127.0.0.1"
-+zebra_options=" -A 127.0.0.1 -s 90000000 -d"
-+bgpd_options=" -A 127.0.0.1 -d"
-+ospfd_options=" -A 127.0.0.1 -d"
-+ospf6d_options=" -A ::1 -d"
-+ripd_options=" -A 127.0.0.1 -d"
-+ripngd_options=" -A ::1 -d"
-+isisd_options=" -A 127.0.0.1 -d"
-+pimd_options=" -A 127.0.0.1 -d"
-+ldpd_options=" -A 127.0.0.1 -d"
-+nhrpd_options=" -A 127.0.0.1 -d"
-+eigrpd_options=" -A 127.0.0.1 -d"
-+babeld_options=" -A 127.0.0.1 -d"
-+sharpd_options=" -A 127.0.0.1 -d"
-+pbrd_options=" -A 127.0.0.1 -d"
-+staticd_options="-A 127.0.0.1 -d"
-+bfdd_options=" -A 127.0.0.1 -d"
-+fabricd_options="-A 127.0.0.1 -d"
-
- # The list of daemons to watch is automatically generated by the init script.
--#watchfrr_options=""
-+watchfrr_enable=yes
-+watchfrr_options="-d -r '/usr/bin/frr restart %s' -s '/usr/bin/frr start %s' -k '/usr/bin/frr stop %s'"
-
- # for debugging purposes, you can specify a "wrap" command to start instead
- # of starting the daemon directly, e.g. to use valgrind on ospfd:
-diff -Naupr frr-frr-7.0_orig/tools/frrcommon.sh.in frr-frr-7.0/tools/frrcommon.sh.in
---- frr-frr-7.0_orig/tools/frrcommon.sh.in 2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/frrcommon.sh.in 2019-05-10 14:32:51.919090139 +0700
-@@ -270,7 +270,7 @@ load_old_config() {
- [ -s "$oldcfg" ] || return 0
- grep -v '^[[:blank:]]*\(#\|$\)' "$oldcfg" > /dev/null || return 0
-
-- log_warning_msg "Reading deprecated $oldcfg. Please move its settings to $C_PATH/daemons and remove it."
-+ log_warning_msg "Reading deprecated $oldcfg. Please move its settings to $C_PATH/daemons.conf and remove it."
-
- # save off settings from daemons for the OR below
- for dmn in $DAEMONS; do eval "_new_$dmn=\${$dmn:-no}"; done
-@@ -281,8 +281,8 @@ load_old_config() {
- for dmn in $DAEMONS; do eval "test \$_new_$dmn != no && $dmn=\$_new_$dmn; unset _new_$dmn"; done
- }
-
--[ -r "$C_PATH/daemons" ] || {
-- log_failure_msg "cannot run $@: $C_PATH/daemons does not exist"
-+[ -r "$C_PATH/daemons.conf" ] || {
-+ log_failure_msg "cannot run $@: $C_PATH/daemons.conf does not exist"
- exit 1
- }
- . "$C_PATH/daemons"
-diff -Naupr frr-frr-7.0_orig/tools/frr.in frr-frr-7.0/tools/frr.in
---- frr-frr-7.0_orig/tools/frr.in 2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/frr.in 2019-05-10 14:32:51.919090139 +0700
-@@ -500,10 +500,9 @@ check_status()
- #########################################################
-
- # Config broken but script must exit silently.
--[ ! -r "$C_PATH/daemons" ] && exit 0
-+[ ! -r "$C_PATH/daemons.conf" ] && exit 0
-
- # Load configuration
--. "$C_PATH/daemons"
- . "$C_PATH/daemons.conf"
-
- # Read configuration variable file if it is present
-diff -Naupr frr-frr-7.0_orig/tools/frr-reload frr-frr-7.0/tools/frr-reload
---- frr-frr-7.0_orig/tools/frr-reload 2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/frr-reload 2019-05-10 14:32:51.919090139 +0700
-@@ -1,7 +1,7 @@
- #!/bin/sh
-
--if test -e /usr/lib/frr/frr-reload.py; then
-- exec /usr/lib/frr/frr-reload.py --reload /etc/frr/frr.conf
-+if test -e /usr/bin/frr-reload.py; then
-+ exec /usr/bin/frr-reload.py --reload /etc/frr/frr.conf
- fi
- >&2 echo "Please install frr-pythontools package. Required for reload"
- exit 1