quagga: Remove, as is no longer being developed
authorMarek Küthe <m.k@mk16.de>
Fri, 21 Jul 2023 11:00:42 +0000 (13:00 +0200)
committerMoritz Warning <moritzwarning@web.de>
Sat, 22 Jul 2023 17:09:10 +0000 (19:09 +0200)
Closes https://github.com/openwrt/routing/issues/994

Signed-off-by: Marek Küthe <m.k@mk16.de>
quagga/Makefile [deleted file]
quagga/files/quagga [deleted file]
quagga/files/quagga.conf [deleted file]
quagga/files/quagga.init [deleted file]
quagga/patches/140-holdtimer-set.patch [deleted file]
quagga/patches/170-use-supported-pagers.patch [deleted file]
quagga/patches/200-gcc10.patch [deleted file]

diff --git a/quagga/Makefile b/quagga/Makefile
deleted file mode 100644 (file)
index a509591..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-#
-# Copyright (C) 2006-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=quagga
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SAVANNAH/quagga/
-PKG_HASH:=e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3
-
-PKG_MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
-PKG_LICENSE:=GPL-2.0-or-later
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-PKG_CONFIG_DEPENDS:= \
-       CONFIG_IPV6 \
-       CONFIG_PACKAGE_quagga-watchquagga \
-       CONFIG_PACKAGE_quagga-zebra \
-       CONFIG_PACKAGE_quagga-libzebra \
-       CONFIG_PACKAGE_quagga-libospf \
-       CONFIG_PACKAGE_quagga-bgpd \
-       CONFIG_PACKAGE_quagga-isisd \
-       CONFIG_PACKAGE_quagga-ospf6d \
-       CONFIG_PACKAGE_quagga-ripd \
-       CONFIG_PACKAGE_quagga-ripngd \
-       CONFIG_PACKAGE_quagga-vtysh
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/quagga/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Routing and Redirection
-  DEPENDS:=quagga
-  TITLE:=The Quagga Software Routing Suite
-  URL:=https://www.quagga.net
-endef
-
-define Package/quagga
-  $(call Package/quagga/Default)
-  DEPENDS:=+librt
-  MENU:=1
-endef
-
-define Package/quagga/description
-  A routing software package that provides TCP/IP based routing services
-  with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
-  OSPFv3, BGP-4, and BGP-4+
-endef
-
-define Package/quagga-watchquagga
-  $(call Package/quagga/Default)
-  TITLE:=Quagga watchdog
-  DEPENDS+=+quagga-libzebra
-  DEFAULT:=y if PACKAGE_quagga
-endef
-
-define Package/quagga-zebra
-  $(call Package/quagga/Default)
-  TITLE:=Zebra daemon
-  DEPENDS+=+quagga-libzebra
-  DEFAULT:=y if PACKAGE_quagga
-endef
-
-define Package/quagga-libzebra
-  $(call Package/quagga/Default)
-  TITLE:=zebra library
-endef
-
-define Package/quagga-libospf
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=OSPF library
-endef
-
-define Package/quagga-bgpd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=BGPv4, BGPv4+, BGPv4- routing engine
-endef
-
-define Package/quagga-isisd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=IS-IS routing engine
-endef
-
-define Package/quagga-ospfd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf
-  TITLE:=OSPFv2 routing engine
-endef
-
-define Package/quagga-ospf6d
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libospf @IPV6
-  TITLE:=OSPFv3 routing engine
-endef
-
-define Package/quagga-ripd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra
-  TITLE:=RIP routing engine
-endef
-
-define Package/quagga-ripngd
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra @IPV6
-  TITLE:=RIPNG routing engine
-endef
-
-define Package/quagga-vtysh
-  $(call Package/quagga/Default)
-  DEPENDS+=+quagga-libzebra +libreadline +libncurses
-  TITLE:=integrated shell for Quagga routing software
-endef
-
-define Package/quagga-zebra/conffiles
-/etc/quagga/zebra.conf
-endef
-
-define Package/quagga-bgpd/conffiles
-/etc/quagga/bgpd.conf
-endef
-
-define Package/quagga-isisd/conffiles
-/etc/quagga/isisd.conf
-endef
-
-define Package/quagga-ospfd/conffiles
-/etc/quagga/ospfd.conf
-endef
-
-define Package/quagga-ospf6d/conffiles
-/etc/quagga/ospf6d.conf
-endef
-
-define Package/quagga-ripd/conffiles
-/etc/quagga/ripd.conf
-endef
-
-define Package/quagga-ripngd/conffiles
-/etc/quagga/ripngd.conf
-endef
-
-ifneq ($(SDK),)
-CONFIG_PACKAGE_quagga-libzebra:=m
-CONFIG_PACKAGE_quagga-libospf:=m
-CONFIG_PACKAGE_quagga-watchquagga:=m
-CONFIG_PACKAGE_quagga-zebra:=m
-CONFIG_PACKAGE_quagga-bgpd:=m
-CONFIG_PACKAGE_quagga-isisd:=m
-CONFIG_PACKAGE_quagga-ospf6d:=m
-CONFIG_PACKAGE_quagga-ripd:=m
-CONFIG_PACKAGE_quagga-ripngd:=m
-CONFIG_PACKAGE_quagga-vtysh:=m
-endif
-
-CONFIGURE_ARGS+= \
-       --localstatedir=/var/run/quagga \
-       --sysconfdir=/etc/quagga/ \
-       --enable-shared \
-       --disable-static \
-       --enable-user=network \
-       --enable-group=network \
-       --enable-multipath=8 \
-       --disable-ospfclient \
-       --disable-capabilities \
-       --disable-doc \
-       --disable-nhrpd \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-libzebra,zebra) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-libospf,ospfd) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-bgpd,bgpd) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-isisd,isisd) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-ospf6d,ospf6d) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-ripd,ripd) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-ripngd,ripngd) \
-       $(call autoconf_bool,CONFIG_PACKAGE_quagga-vtysh,vtysh) \
-
-MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
-
-define Package/quagga/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga
-endef
-
-define Package/quagga-watchquagga/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
-endef
-
-define Package/quagga-zebra/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/zebra.conf
-endef
-
-define Package/quagga-bgpd/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
-endef
-
-define Package/quagga-isisd/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
-endef
-
-define Package/quagga-ospfd/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
-endef
-
-define Package/quagga-ospf6d/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
-endef
-
-define Package/quagga-ripd/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
-endef
-
-define Package/quagga-ripngd/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc/quagga
-       chmod 0750 $(1)/etc/quagga
-       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
-endef
-
-define Package/quagga-vtysh/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
-endef
-
-define Package/quagga-libospf/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(1)/usr/lib/
-endef
-
-define Package/quagga-libzebra/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,quagga))
-$(eval $(call BuildPackage,quagga-libzebra))
-$(eval $(call BuildPackage,quagga-libospf))
-$(eval $(call BuildPackage,quagga-watchquagga))
-$(eval $(call BuildPackage,quagga-zebra))
-$(eval $(call BuildPackage,quagga-bgpd))
-$(eval $(call BuildPackage,quagga-isisd))
-$(eval $(call BuildPackage,quagga-ospfd))
-$(eval $(call BuildPackage,quagga-ospf6d))
-$(eval $(call BuildPackage,quagga-ripd))
-$(eval $(call BuildPackage,quagga-ripngd))
-$(eval $(call BuildPackage,quagga-vtysh))
diff --git a/quagga/files/quagga b/quagga/files/quagga
deleted file mode 100644 (file)
index b172090..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-#!/bin/sh
-#
-# quagga       Starts/stops quagga daemons and watchquagga.
-#              Create a daemon.conf file to have that routing daemon
-#              started/stopped automagically when using this script
-#              without any daemon names as args.
-#              If watchquagga is available, it will also be
-#              started/stopped if the script is called without
-#              any daemon names.
-#
-
-ME=$(basename $0)
-
-usage() {
-       echo "Usage: ${ME} {start|stop|restart} [daemon ...]"
-       exit 2
-}
-
-if [ -z "$1" ]
-then
-       usage
-else
-       COMMAND=$1
-fi
-shift
-ARG_DAEMONS=$*
-BINDIR=/usr/sbin
-CONFDIR=/etc/quagga
-STATEDIR=/var/run/quagga
-RUNUSER=network
-RUNGROUP=$RUNUSER
-DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
-DAEMON_FLAGS=-d
-WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
-WATCHQUAGGA_CMD="$0 watchrestart"
-if [ ${COMMAND} != "watchrestart" -a -x "${BINDIR}/watchquagga" ]
-then
-       DAEMONS="${DAEMONS} watchquagga"
-fi
-DAEMONS_STARTSEQ=${DAEMONS}
-
-reverse()
-{
-       local revlist r
-        revlist=
-        for r
-       do
-                revlist="$r $revlist"
-        done
-        echo $revlist
-}
-
-DAEMONS_STOPSEQ=$(reverse ${DAEMONS_STARTSEQ})
-
-#pidof() {
-#      ps ax | awk 'match($5, "(^|/)'"$1"'$") > 0 { printf " %s", $1 }'
-#}
-
-quit() {
-       echo "${ME}: $1"
-       exit 0
-}
-
-die() {
-       echo "${ME}: $1"
-       exit 1
-}
-
-is_in() {
-       local i
-       for i in $2
-       do
-               [ "$1" = "$i" ] && return 0
-       done
-       return 1
-}
-
-select_subset() {
-       local unknown i j
-       unknown=
-       RESULT=
-       for i in $1
-       do
-               is_in $i "$2" || unknown="$unknown $i"
-       done
-       if [ -n "$unknown" ]
-       then
-               RESULT=$unknown
-               return 1
-       else
-               for j in $2
-               do
-                       is_in $j "$1" && RESULT="$RESULT $j"
-               done
-               return 0
-       fi
-}
-
-# check command
-
-case ${COMMAND}
-in
-       start|stop|restart)
-               ;;
-       watchrestart)
-               if [ -n "$ARG_DAEMONS" ]
-               then
-                       echo "${ME}: watchrestart mode is only for use by watchquagga"
-                       exit 2
-               fi
-               ;;
-       *)
-               usage
-               ;;
-esac
-
-# select daemons to start
-
-case ${COMMAND}
-in
-       start|restart|watchrestart)
-               START_DAEMONS=
-               for d in ${DAEMONS_STARTSEQ}
-               do
-                       [ -x "${BINDIR}/${d}" -a -f "${CONFDIR}/${d}.conf" ] \
-                       && START_DAEMONS="${START_DAEMONS}${d} "
-               done
-               WATCHQUAGGA_DAEMONS=${START_DAEMONS}
-               if is_in watchquagga "${DAEMONS_STARTSEQ}"
-               then
-                       START_DAEMONS="${START_DAEMONS} watchquagga"
-               fi
-               if [ -n "${ARG_DAEMONS}" ]
-               then
-                       if select_subset "${ARG_DAEMONS}" "${DAEMONS}"
-                       then
-                               if select_subset "${ARG_DAEMONS}" "${START_DAEMONS}"
-                               then
-                                       START_DAEMONS=${RESULT}
-                               else
-                                       die "these daemons are not startable:${RESULT}."
-                               fi
-                       else
-                               die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
-                       fi
-               fi
-               ;;
-esac
-
-# select daemons to stop
-
-case ${COMMAND}
-in
-       stop|restart|watchrestart)
-               STOP_DAEMONS=${DAEMONS_STOPSEQ}
-               if [ -n "${ARG_DAEMONS}" ]
-               then
-                       if select_subset "${ARG_DAEMONS}" "${STOP_DAEMONS}"
-                       then
-                               STOP_DAEMONS=${RESULT}
-                       else
-                               die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
-                       fi
-               fi
-               stop_daemons=
-               for d in ${STOP_DAEMONS}
-               do
-                       pidfile=${STATEDIR}/${d}.pid
-                       if [ -f "${pidfile}" -o -n "$(pidof ${d})" ]
-                       then
-                               stop_daemons="${stop_daemons}${d} "
-                       elif [ -n "${ARG_DAEMONS}" ]
-                       then
-                               echo "${ME}: found no ${d} process running."
-                       fi
-               done
-               STOP_DAEMONS=${stop_daemons}
-               ;;
-esac
-
-# stop daemons
-
-for d in $STOP_DAEMONS
-do
-       echo -n "${ME}: Stopping ${d} ... "
-       pidfile=${STATEDIR}/${d}.pid
-       if [ -f "${pidfile}" ]
-       then
-               file_pid=$(cat ${pidfile})
-               if [ -z "${file_pid}" ]
-               then
-                       echo -n "no pid file entry found ... "
-               fi
-       else
-               file_pid=
-               echo -n "no pid file found ... "
-       fi
-       proc_pid=$(pidof ${d})
-       if [ -z "${proc_pid}" ]
-       then
-               echo -n "found no ${d} process running ... "
-       else
-               count=0
-               notinpidfile=
-               for p in ${proc_pid}
-               do
-                       count=$((${count}+1))
-                       if kill ${p}
-                       then
-                               echo -n "killed ${p} ... "
-                       else
-                               echo -n "failed to kill ${p} ... "
-                       fi
-                       [ "${p}" = "${file_pid}" ] \
-                       || notinpidfile="${notinpidfile} ${p}"
-               done
-               [ ${count} -le 1 ] \
-               || echo -n "WARNING: ${count} ${d} processes were found running ... "
-               for n in ${notinpidfile}
-               do
-                       echo -n "WARNING: process ${n} was not in pid file ... "
-               done
-       fi
-       count=0
-       survivors=$(pidof ${d})
-       while [ -n "${survivors}" ]
-       do
-               sleep 1
-               count=$((${count}+1))
-               survivors=$(pidof ${d})
-               [ -z "${survivors}" -o ${count} -gt 5 ] && break
-               for p in ${survivors}
-               do
-                       sleep 1
-                       echo -n "${p} "
-                       kill ${p}
-               done
-       done
-       survivors=$(pidof ${d})
-       [ -n "${survivors}" ] && \
-       if kill -KILL ${survivors}
-       then
-               echo -n "KILLed ${survivors} ... "
-       else
-               echo -n "failed to KILL ${survivors} ... "
-       fi
-       sleep 1
-       survivors=$(pidof ${d})
-       if [ -z "${survivors}" ]
-       then
-               echo -n "done."
-               if [ -f "${pidfile}" ]
-               then
-                       rm -f ${pidfile} \
-                       || echo -n " Failed to remove pidfile."
-               fi
-       else
-               echo -n "failed to stop ${survivors} - giving up."
-               if [ "${survivors}" != "${file_pid}" ]
-               then
-                       if echo "${survivors}" > ${pidfile}
-                       then
-                               chown ${RUNUSER}:${RUNGROUP} ${pidfile}
-                               echo -n " Wrote ${survivors} to pidfile."
-                       else
-                               echo -n " Failed to write ${survivors} to pidfile."
-                       fi
-               fi
-       fi
-       echo
-done
-
-# start daemons
-
-if [ -n "$START_DAEMONS" ]
-then
-       [ -d ${CONFDIR} ] \
-       || quit "${ME}: no config directory ${CONFDIR} - exiting."
-       chown -R ${RUNUSER}:${RUNGROUP} ${CONFDIR}
-       [ -d ${STATEDIR} ] || mkdir -p ${STATEDIR} \
-       || die "${ME}: could not create state directory ${STATEDIR} - exiting."
-       chown -R ${RUNUSER}:${RUNGROUP} ${STATEDIR}
-
-       for d in $START_DAEMONS
-       do
-               echo -n "${ME}: Starting ${d} ... "
-               proc_pid=$(pidof ${d})
-               pidfile=${STATEDIR}/${d}.pid
-               file_pid=
-               if [ -f "${pidfile}" ]
-               then
-                       file_pid=$(cat ${pidfile})
-                       if [ -n "${file_pid}" ]
-                       then
-                               echo -n "found old pid file entry ${file_pid} ... "
-                       fi
-               fi
-               if [ -n "${proc_pid}" ]
-               then
-                       echo -n "found ${d} running (${proc_pid}) - skipping ${d}."
-                       if [ "${proc_pid}" != "${file_pid}" ]
-                       then
-                               if echo "${proc_pid}" > ${pidfile}
-                               then
-                                       chown ${RUNUSER}:${RUNGROUP} ${pidfile}
-                                       echo -n " Wrote ${proc_pid} to pidfile."
-                               else
-                                       echo -n " Failed to write ${proc_pid} to pidfile."
-                               fi
-                       fi
-               elif rm -f "${pidfile}"
-               then
-                       if [ "${d}" = "watchquagga" ]
-                       then
-                               "${BINDIR}/${d}" \
-                                       ${WATCHQUAGGA_FLAGS} \
-                                       "${WATCHQUAGGA_CMD}" \
-                                       ${WATCHQUAGGA_DAEMONS}
-                               status=$?
-                       else
-                               "${BINDIR}/${d}" ${DAEMON_FLAGS}
-                               status=$?
-                       fi
-                       if [ $status -eq 0 ]
-                       then
-                               echo -n "done."
-                       else
-                               echo -n "failed."
-                       fi
-               else
-                       echo -n " failed to remove pidfile."
-               fi
-               echo
-       done
-fi
diff --git a/quagga/files/quagga.conf b/quagga/files/quagga.conf
deleted file mode 100644 (file)
index fb7a54e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-password zebra
-!
-access-list vty permit 127.0.0.0/8
-access-list vty deny any
-!
-line vty
- access-class vty
diff --git a/quagga/files/quagga.init b/quagga/files/quagga.init
deleted file mode 100644 (file)
index 21fbf2c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=60
-start() {
-       /usr/sbin/quagga.init start
-}
-
-stop() {
-       /usr/sbin/quagga.init stop
-}
diff --git a/quagga/patches/140-holdtimer-set.patch b/quagga/patches/140-holdtimer-set.patch
deleted file mode 100644 (file)
index 2494ad8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/bgpd/bgp_network.c
-+++ b/bgpd/bgp_network.c
-@@ -255,8 +255,7 @@ bgp_accept (struct thread *thread)
-     /* Config state that should affect OPEN packet must be copied over */
-     peer->local_id = peer1->local_id;
--    peer->v_holdtime = peer1->v_holdtime;
--    peer->v_keepalive = peer1->v_keepalive;
-+    peer->v_holdtime = BGP_LARGE_HOLDTIME;
-     peer->local_as = peer1->local_as;
-     peer->change_local_as = peer1->change_local_as;
-     peer->flags = peer1->flags;
---- a/bgpd/bgpd.h
-+++ b/bgpd/bgpd.h
-@@ -754,6 +754,7 @@ struct bgp_nlri
- /* BGP timers default value.  */
- #define BGP_INIT_START_TIMER                     1
-+#define BGP_LARGE_HOLDTIME                     240
- #define BGP_DEFAULT_HOLDTIME                   180
- #define BGP_DEFAULT_KEEPALIVE                   60 
- #define BGP_DEFAULT_EBGP_ROUTEADV                3
diff --git a/quagga/patches/170-use-supported-pagers.patch b/quagga/patches/170-use-supported-pagers.patch
deleted file mode 100644 (file)
index 250837f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/vtysh/vtysh.c
-+++ b/vtysh/vtysh.c
-@@ -253,7 +253,7 @@ vtysh_pager_init (void)
-   if (pager_defined)
-     vtysh_pager_name = strdup (pager_defined);
-   else
--    vtysh_pager_name = strdup ("more");
-+    vtysh_pager_name = strdup ("cat");
- }
- /* Command execution over the vty interface. */
-@@ -2214,7 +2214,7 @@ DEFUN (vtysh_terminal_length,
- {
-   int lines;
-   char *endptr = NULL;
--  char default_pager[10];
-+  char default_pager[12];
-   lines = strtol (argv[0], &endptr, 10);
-   if (lines < 0 || lines > 512 || *endptr != '\0')
-@@ -2231,7 +2231,7 @@ DEFUN (vtysh_terminal_length,
-   if (lines != 0)
-     {
--      snprintf(default_pager, 10, "more -%i", lines);
-+      snprintf(default_pager, 12, "head -n %i", lines);
-       vtysh_pager_name = strdup (default_pager);
-     }
diff --git a/quagga/patches/200-gcc10.patch b/quagga/patches/200-gcc10.patch
deleted file mode 100644 (file)
index e9b3adb..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/lib/prefix.h
-+++ b/lib/prefix.h
-@@ -44,7 +44,7 @@
-  */
- struct ethaddr {
-     u_char octet[ETHER_ADDR_LEN];
--} __packed;
-+} __attribute__((packed));
- /*
---- a/pimd/pim_version.h
-+++ b/pimd/pim_version.h
-@@ -25,6 +25,6 @@
- #define PIMD_VERSION_STR "0.166"
--const char * const PIMD_VERSION;
-+extern const char * const PIMD_VERSION;
- #endif /* PIM_VERSION_H */
---- a/pimd/pimd.h
-+++ b/pimd/pimd.h
-@@ -68,39 +68,39 @@
- #define PIM_MASK_PIM_J_P             (1 << 12)
- #define PIM_MASK_STATIC              (1 << 13)
--const char *const PIM_ALL_SYSTEMS;
--const char *const PIM_ALL_ROUTERS;
--const char *const PIM_ALL_PIM_ROUTERS;
--const char *const PIM_ALL_IGMP_ROUTERS;
-+extern const char *const PIM_ALL_SYSTEMS;
-+extern const char *const PIM_ALL_ROUTERS;
-+extern const char *const PIM_ALL_PIM_ROUTERS;
-+extern const char *const PIM_ALL_IGMP_ROUTERS;
--struct thread_master     *master;
--uint32_t                  qpim_debugs;
--int                       qpim_mroute_socket_fd;
--int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
--struct thread            *qpim_mroute_socket_reader;
--int                       qpim_mroute_oif_highest_vif_index;
--struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
--struct in_addr            qpim_all_pim_routers_addr;
--int                       qpim_t_periodic; /* Period between Join/Prune Messages */
--struct list              *qpim_upstream_list; /* list of struct pim_upstream */
--struct zclient           *qpim_zclient_update;
--struct zclient           *qpim_zclient_lookup;
--struct pim_assert_metric  qpim_infinite_assert_metric;
--long                      qpim_rpf_cache_refresh_delay_msec;
--struct thread            *qpim_rpf_cache_refresher;
--int64_t                   qpim_rpf_cache_refresh_requests;
--int64_t                   qpim_rpf_cache_refresh_events;
--int64_t                   qpim_rpf_cache_refresh_last;
--struct in_addr            qpim_inaddr_any;
--struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
--struct in_addr            qpim_ssmpingd_group_addr;
--int64_t                   qpim_scan_oil_events;
--int64_t                   qpim_scan_oil_last;
--int64_t                   qpim_mroute_add_events;
--int64_t                   qpim_mroute_add_last;
--int64_t                   qpim_mroute_del_events;
--int64_t                   qpim_mroute_del_last;
--struct list              *qpim_static_route_list; /* list of routes added statically */
-+extern struct thread_master     *master;
-+extern uint32_t                  qpim_debugs;
-+extern int                       qpim_mroute_socket_fd;
-+extern int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
-+extern struct thread            *qpim_mroute_socket_reader;
-+extern int                       qpim_mroute_oif_highest_vif_index;
-+extern struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
-+static struct in_addr            qpim_all_pim_routers_addr;
-+extern int                       qpim_t_periodic; /* Period between Join/Prune Messages */
-+extern struct list              *qpim_upstream_list; /* list of struct pim_upstream */
-+extern struct zclient           *qpim_zclient_update;
-+extern struct zclient           *qpim_zclient_lookup;
-+extern struct pim_assert_metric  qpim_infinite_assert_metric;
-+extern long                      qpim_rpf_cache_refresh_delay_msec;
-+extern struct thread            *qpim_rpf_cache_refresher;
-+extern int64_t                   qpim_rpf_cache_refresh_requests;
-+extern int64_t                   qpim_rpf_cache_refresh_events;
-+extern int64_t                   qpim_rpf_cache_refresh_last;
-+extern struct in_addr            qpim_inaddr_any;
-+extern struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
-+extern struct in_addr            qpim_ssmpingd_group_addr;
-+extern int64_t                   qpim_scan_oil_events;
-+extern int64_t                   qpim_scan_oil_last;
-+extern int64_t                   qpim_mroute_add_events;
-+extern int64_t                   qpim_mroute_add_last;
-+extern int64_t                   qpim_mroute_del_events;
-+extern int64_t                   qpim_mroute_del_last;
-+extern struct list              *qpim_static_route_list; /* list of routes added statically */
- #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2)