From dc5b408f07d67d6b88fe33e42c43ad8b62917c43 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Wed, 22 Feb 2017 11:41:30 +0300 Subject: net-misc/quagga: security cleanup Gentoo-Bug: 607212 Package-Manager: portage-2.3.3 --- net-misc/quagga/Manifest | 1 - .../quagga-1.1.0-supress-dev-build-logs.patch | 25 ---- net-misc/quagga/quagga-1.1.0-r2.ebuild | 135 --------------------- 3 files changed, 161 deletions(-) delete mode 100644 net-misc/quagga/files/quagga-1.1.0-supress-dev-build-logs.patch delete mode 100644 net-misc/quagga/quagga-1.1.0-r2.ebuild diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest index d04304399871..66cdb2380eda 100644 --- a/net-misc/quagga/Manifest +++ b/net-misc/quagga/Manifest @@ -1,3 +1,2 @@ DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e -DIST quagga-1.1.0.tar.gz 2870278 SHA256 f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63 SHA512 3b29a90c4f05593714bda3c702fd2c8886ce48fba2fbfb98f55cc04d1025edd5427944e9a9fb7cd630e5e8ccea388b72a8e611ab65c370e760f3f319d03f090f WHIRLPOOL ee4a78b1d20aa9e7e7aea1f0be2adee83efa0fd47a807a4ec1affb1e059fee156861b612f73716cbf80e96cc6676baed062b9440ea7664198078cd6760380573 DIST quagga-1.1.1.tar.gz 2871705 SHA256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58 WHIRLPOOL 795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be diff --git a/net-misc/quagga/files/quagga-1.1.0-supress-dev-build-logs.patch b/net-misc/quagga/files/quagga-1.1.0-supress-dev-build-logs.patch deleted file mode 100644 index e0d27d0fd190..000000000000 --- a/net-misc/quagga/files/quagga-1.1.0-supress-dev-build-logs.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 92193665 warns about duplicate node installs. This should only be -enabled for dev builds beacuse it causes unwanted noise on production -builds. I've enclosed the relevant commands in #ifdef DEV_BUILD, which may -or may not be appropriate. If there's a more appropriate compile-time -option available, that could be used instead. - ---- - lib/command.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/command.c b/lib/command.c -index ab46fc4..bff86e5 100644 ---- a/lib/command.c -+++ b/lib/command.c -@@ -638,9 +638,11 @@ install_element (enum node_type ntype, struct cmd_element *cmd) - - if (hash_lookup (cnode->cmd_hash, cmd) != NULL) - { -+#ifdef DEV_BUILD - fprintf (stderr, - "Multiple command installs to node %d of command:\n%s\n", - ntype, cmd->string); -+#endif - return; - } diff --git a/net-misc/quagga/quagga-1.1.0-r2.ebuild b/net-misc/quagga/quagga-1.1.0-r2.ebuild deleted file mode 100644 index a152fb2fa02c..000000000000 --- a/net-misc/quagga/quagga-1.1.0-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch - -inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user - -DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP" -HOMEPAGE="http://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 doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra" - -COMMON_DEPEND=" - caps? ( sys-libs/libcap ) - 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" -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2" - -PATCHES=( - "${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch" - "${FILESDIR}/${P}-supress-dev-build-logs.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" - -pkg_setup() { - enewgroup quagga - enewuser quagga -1 -1 /var/empty quagga -} - -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() { - append-flags -fno-strict-aliasing - - # 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 tcp-zebra) \ - $(use_enable doc) \ - $(usex multipath $(use_enable multipath) '' '=0' '') \ - $(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \ - $(use_enable readline vtysh) \ - $(use_with pam libpam) \ - $(use_enable protobuf) \ - $(use_enable ipv6 ripngd) \ - $(use_enable ipv6 ospf6d) \ - $(use_enable ipv6 rtadv) -} - -src_install() { - default - prune_libtool_files - readme.gentoo_create_doc - - keepdir /etc/quagga - fowners root:quagga /etc/quagga - fperms 0770 /etc/quagga - - # Path for PIDs before first reboot should be created here, bug #558194 - dodir /run/quagga - fowners quagga:quagga /run/quagga - fperms 0770 /run/quagga - - # Install systemd-related stuff, bug #553136 - systemd_dotmpfilesd "${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); 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() { - readme.gentoo_print_elog -} -- cgit v1.2.3-65-gdbad