[gentoo-commits] repo/gentoo:master commit in: net-misc/quagga/files/, net-misc/quagga/, profiles/, ...

[Jakov Smolić]

commit:     a0b4caeebfee75547a7525cbe8c3a112402ed395
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 11:19:51 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 11:23:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b4caee

net-misc/quagga: treeclean

Bug: https://bugs.gentoo.org/825358
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-misc/quagga/Manifest                           |   2 -
 .../files/quagga-0.99.22.4-ipctl-forwarding.patch  |  22 ----
 net-misc/quagga/files/quagga-services.init.3       |  43 -------
 net-misc/quagga/files/quagga.pam                   |  26 ----
 net-misc/quagga/files/systemd/bgpd.service         |  16 ---
 net-misc/quagga/files/systemd/isisd.service        |  16 ---
 net-misc/quagga/files/systemd/nhrpd.service        |  16 ---
 net-misc/quagga/files/systemd/ospf6d.service       |  16 ---
 net-misc/quagga/files/systemd/ospfd.service        |  16 ---
 net-misc/quagga/files/systemd/pimd.service         |  17 ---
 net-misc/quagga/files/systemd/quagga.conf          |   1 -
 net-misc/quagga/files/systemd/ripd.service         |  16 ---
 net-misc/quagga/files/systemd/ripngd.service       |  16 ---
 net-misc/quagga/files/systemd/zebra.service        |  16 ---
 net-misc/quagga/metadata.xml                       |  53 --------
 net-misc/quagga/quagga-1.2.4-r2.ebuild             | 135 ---------------------
 profiles/package.mask                              |   7 --
 17 files changed, 434 deletions(-)

diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
deleted file mode 100644
index 579eea17a844..000000000000
--- a/net-misc/quagga/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
-DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd

diff --git a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
deleted file mode 100644
index f6b726b591f7..000000000000
--- a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix for missing definitions on some Hardened configurations
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292
-
-diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
---- quagga-0.99.16.orig/zebra/ipforward_sysctl.c	2010-03-11 12:11:32.000000000 -0500
-+++ quagga-0.99.16/zebra/ipforward_sysctl.c	2010-03-11 12:11:39.000000000 -0500
-@@ -31,6 +31,15 @@
- 
- #define MIB_SIZ 4
- 
-+/* Fix for recent (2.6.14) kernel headers */
-+#ifndef IPCTL_FORWARDING
-+    #define IPCTL_FORWARDING       NET_IPV4_FORWARD
-+#endif
-+
-+#ifndef IP6CTL_FORWARDING
-+    #define IP6CTL_FORWARDING      NET_IPV6_FORWARDING
-+#endif
-+
- extern struct zebra_privs_t zserv_privs;
- 
- /* IPv4 forwarding control MIB. */

diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3
deleted file mode 100644
index e613b26abb03..000000000000
--- a/net-misc/quagga/files/quagga-services.init.3
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${CFGFILE:=/etc/quagga/${SVCNAME}.conf}
-
-pidfile=/run/quagga/${SVCNAME}.pid
-
-command=/usr/sbin/${SVCNAME}
-command_args="-d -f ${CFGFILE} ${EXTRA_OPTS} --pid_file ${pidfile}"
-
-get_service_config() {
-	[ -e "$CFGFILE" ] || return
-
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-depend() {
-	config "$CFGFILE"
-
-    [ ${SVCNAME} = "zebra" ] && need net || need zebra
-
-	[ "$(get_service_config log)" = "syslog" ] && \
-		use logger
-}
-
-start_pre() {
-    if [ ! -e "${CFGFILE}" ] ; then
-        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
-        eerror "a ${CFGFILE} file."
-        eerror ""
-        eerror "A sample file has been installed in `echo /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample*`"
-        return 1
-    fi
-
-	checkpath -d -m 0750 -o quagga:quagga /run/quagga
-
-	if [ ${SVCNAME} = "zebra" ]; then
-		ebegin "Cleaning up stale zebra routes..."
-		ip route flush proto zebra
-		eend $?
-	fi
-}

diff --git a/net-misc/quagga/files/quagga.pam b/net-misc/quagga/files/quagga.pam
deleted file mode 100644
index 9a91ad852fbd..000000000000
--- a/net-misc/quagga/files/quagga.pam
+++ /dev/null
@@ -1,26 +0,0 @@
-#%PAM-1.0
-#
-
-##### if running quagga as root:
-# Only allow root (and possibly wheel) to use this because enable access
-# is unrestricted.
-auth       sufficient   pam_rootok.so
-
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth       sufficient   pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth       required     pam_wheel.so use_uid
-###########################################################
-
-# If using quagga privileges and with a seperate group for vty access, then
-# access can be controlled via the vty access group, and pam can simply
-# check for valid user/password, eg:
-#
-# only allow local users.
-#auth       required     pam_securetty.so
-#auth       include      system-auth
-#auth       required     pam_nologin.so
-#account    include      system-auth
-#password   include      system-auth
-#session    include      system-auth
-#session    optional     pam_console.so

diff --git a/net-misc/quagga/files/systemd/bgpd.service b/net-misc/quagga/files/systemd/bgpd.service
deleted file mode 100644
index f5db0b2510ec..000000000000
--- a/net-misc/quagga/files/systemd/bgpd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=BGP routing daemon
-Documentation=man:bgpd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/bgpd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/bgpd.pid
-ExecStart=/usr/sbin/bgpd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/isisd.service b/net-misc/quagga/files/systemd/isisd.service
deleted file mode 100644
index 10eb0a8fe1d8..000000000000
--- a/net-misc/quagga/files/systemd/isisd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=IS-IS routing daemon
-Documentation=man:isis(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/isisd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/isisd.pid
-ExecStart=/usr/sbin/isisd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/nhrpd.service b/net-misc/quagga/files/systemd/nhrpd.service
deleted file mode 100644
index 1a93bae61b14..000000000000
--- a/net-misc/quagga/files/systemd/nhrpd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NHRP daemon
-Documentation=man:nhrpd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/nhrpd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/nhrpd.pid
-ExecStart=/usr/sbin/nhrpd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/ospf6d.service b/net-misc/quagga/files/systemd/ospf6d.service
deleted file mode 100644
index b6372d10d898..000000000000
--- a/net-misc/quagga/files/systemd/ospf6d.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OSPF routing daemon for IPv6
-Documentation=man:ospfd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospf6d.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ospf6d.pid
-ExecStart=/usr/sbin/ospf6d -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/ospfd.service b/net-misc/quagga/files/systemd/ospfd.service
deleted file mode 100644
index 310d219c0014..000000000000
--- a/net-misc/quagga/files/systemd/ospfd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OSPF routing daemon
-Documentation=man:ospfd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospfd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ospfd.pid
-ExecStart=/usr/sbin/ospfd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/pimd.service b/net-misc/quagga/files/systemd/pimd.service
deleted file mode 100644
index d39f59696c51..000000000000
--- a/net-misc/quagga/files/systemd/pimd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=PIM-SSM routing daemon
-Documentation=man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/pimd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/pimd.pid
-ExecStart=/usr/sbin/pimd -d
-ExecReload=/bin/kill -HUP $MAINPID
-SuccessExitStatus=1
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/quagga.conf b/net-misc/quagga/files/systemd/quagga.conf
deleted file mode 100644
index 296083753e0a..000000000000
--- a/net-misc/quagga/files/systemd/quagga.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/quagga 0750 quagga quagga

diff --git a/net-misc/quagga/files/systemd/ripd.service b/net-misc/quagga/files/systemd/ripd.service
deleted file mode 100644
index b2a74df47fb9..000000000000
--- a/net-misc/quagga/files/systemd/ripd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=RIP routing daemon
-Documentation=man:ripd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ripd.pid
-ExecStart=/usr/sbin/ripd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/ripngd.service b/net-misc/quagga/files/systemd/ripngd.service
deleted file mode 100644
index 75c60d8395b5..000000000000
--- a/net-misc/quagga/files/systemd/ripngd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=RIP routing daemon for IPv6
-Documentation=man:ripngd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripngd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ripngd.pid
-ExecStart=/usr/sbin/ripngd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/files/systemd/zebra.service b/net-misc/quagga/files/systemd/zebra.service
deleted file mode 100644
index d2374411b459..000000000000
--- a/net-misc/quagga/files/systemd/zebra.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=GNU Zebra routing manager
-Documentation=man:zebra(8)
-After=network.target
-ConditionPathExists=/etc/quagga/zebra.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/zebra.pid
-ExecStartPre=/bin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
deleted file mode 100644
index b4781a230f1f..000000000000
--- a/net-misc/quagga/metadata.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@g.o</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<longdescription>
-		Quagga is a modern fork of Zebra. Quagga is 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+. Quagga also supports special BGP Route Reflector and Route Server
-		behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing
-		protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol
-		MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports
-		inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The
-		Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF
-		routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood
-		service state information into the routing domain
-	</longdescription>
-	<use>
-		<flag name="bgpclassless">
-			Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
-			at http://hasso.linux.ee/doku.php/english:network:quagga
-		</flag>
-		<flag name="fpm">
-			Enable Forwarding Plane Manager support
-		</flag>
-		<flag name="multipath">
-			Enable multipath routes support for any number of routes
-		</flag>
-		<flag name="nhrpd">
-			Build Next Hop Resolution Protocol daemon
-		</flag>
-		<flag name="ospfapi">
-			Enable OSPFAPI support for client applications accessing the OSPF link state database
-		</flag>
-		<flag name="pam">
-			Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface
-			Shell (vtysh); if the readline USE flag is disabled, this flag is ignored
-		</flag>
-		<flag name="protobuf">
-			Enable support for <pkg>dev-libs/protobuf</pkg>
-		</flag>
-		<flag name="readline">
-			Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
-			Interface Shell (vtysh)
-		</flag>
-		<flag name="tcp-zebra">
-			Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
-			sockets are chosen otherwise
-		</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-misc/quagga/quagga-1.2.4-r2.ebuild b/net-misc/quagga/quagga-1.2.4-r2.ebuild
deleted file mode 100644
index a2be0d887b3d..000000000000
--- a/net-misc/quagga/quagga-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
-
-inherit autotools flag-o-matic pam readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
-HOMEPAGE="https://www.quagga.net/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
-	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86"
-
-IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	acct-group/quagga
-	acct-user/quagga
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	nhrpd? ( net-dns/c-ares:0= )
-	protobuf? ( dev-libs/protobuf-c:0= )
-	readline? (
-		sys-libs/readline:0=
-		pam? ( sys-libs/pam )
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	!elibc_glibc? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk
-	sys-devel/libtool:2
-	test? ( dev-util/dejagnu )"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
-You have to create config files in /etc/quagga before
-starting one of the daemons.
-
-You can pass additional options to the daemon by setting the EXTRA_OPTS
-variable in their respective file in /etc/conf.d"
-
-src_prepare() {
-	# Classless prefixes for BGP
-	# http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
-
-	eapply "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# -fcommon is added as a workaround for bug #707422
-	append-flags -fno-strict-aliasing -fcommon
-
-	# do not build PDF docs
-	export ac_cv_prog_PDFLATEX=no
-	export ac_cv_prog_LATEXMK=no
-
-	econf \
-		--enable-exampledir=/usr/share/doc/${PF}/samples \
-		--enable-irdp \
-		--enable-isisd \
-		--enable-isis-topology \
-		--enable-pimd \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--with-pkg-extra-version="-gentoo" \
-		--sysconfdir=/etc/quagga \
-		--localstatedir=/run/quagga \
-		--disable-static \
-		$(use_enable caps capabilities) \
-		$(usex snmp '--enable-snmp' '' '' '') \
-		$(use_enable !elibc_glibc pcreposix) \
-		$(use_enable fpm) \
-		$(use_enable tcp-zebra) \
-		$(use_enable doc) \
-		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-ospfclient' '' '' '') \
-		$(use_enable readline vtysh) \
-		$(use_with pam libpam) \
-		$(use_enable nhrpd) \
-		$(use_enable protobuf) \
-		$(use_enable ipv6 ripngd) \
-		$(use_enable ipv6 ospf6d) \
-		$(use_enable ipv6 rtadv)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	readme.gentoo_create_doc
-
-	keepdir /etc/quagga
-	fowners root:quagga /etc/quagga
-	fperms 0770 /etc/quagga
-
-	# Install systemd-related stuff, bug #553136
-	dotmpfiles "${FILESDIR}/systemd/quagga.conf"
-	systemd_dounit "${FILESDIR}/systemd/zebra.service"
-
-	# install zebra as a file, symlink the rest
-	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
-
-	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do
-		dosym zebra /etc/init.d/${service}
-		systemd_dounit "${FILESDIR}/systemd/${service}.service"
-	done
-
-	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
-
-	insinto /etc/logrotate.d
-	newins redhat/quagga.logrotate quagga
-}
-
-pkg_postinst() {
-	# Path for PIDs before first reboot should be created here, bug #558194
-	tmpfiles_process quagga.conf
-
-	readme.gentoo_print_elog
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index aac1d562be1b..c9a7f61eb738 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -362,13 +362,6 @@ dev-tex/pdfannotextractor
 # Removal in 30 days. Bug #756925
 app-text/dbacl
 
-# Sergey Popov <pinkbyte@g.o> (2021-11-22)
-# Upstream is pretty much dead
-# Has at least one security issue - bug #825358
-# Replaced by net-misc/frr
-# Removal in 30 days
-net-misc/quagga
-
 # Stephan Hartmann <sultan@g.o> (2021-11-22)
 # Dev channel releases are only for people who
 # are developers or want more experimental features