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

[Michał Górny]

commit:     4792dc21749c575aab6d1d86eab0425b98bdb0ae
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 06:47:43 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 06:50:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4792dc21

net-misc/rancid: Remove last-rited pkg

Closes: https://bugs.gentoo.org/680208
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-misc/rancid/Manifest                           |   1 -
 .../rancid/files/rancid-2.3.8-buildsystem.patch    |  64 --------
 net-misc/rancid/files/rancid-2.3.8-config.patch    |  33 ----
 .../rancid/files/rancid-2.3.8-mailprefix.patch     | 178 ---------------------
 net-misc/rancid/metadata.xml                       |   5 -
 net-misc/rancid/rancid-2.3.8.ebuild                | 112 -------------
 profiles/package.mask                              |   7 -
 7 files changed, 400 deletions(-)

diff --git a/net-misc/rancid/Manifest b/net-misc/rancid/Manifest
deleted file mode 100644
index ebb3ca9af2f..00000000000
--- a/net-misc/rancid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rancid-2.3.8.tar.gz 379908 BLAKE2B eea909cd486086d436bf9bf8d7eb287471fa0af2a2a257ba9974adbcc01fa946cbc0173e7d6e93842eaf3dac321abaad2db2ec33a0e625b50b401e9373715b23 SHA512 cd071670e160f2e8268e676ae92b0d982719a2bc306aef3ef8fdbbaae398854178613eee2a139f206e799eba6c0b49dce2094db69ea57ef938e5d0c2c294a3cc

diff --git a/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch b/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch
deleted file mode 100644
index 4a06b5c6372..00000000000
--- a/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- rancid-2.3.8/configure.in
-+++ rancid-2.3.8/configure.in
-@@ -17,7 +17,7 @@
- dnl default install location
- AC_PREFIX_DEFAULT(/usr/local/rancid)
- 
--dnl AM_MAINTAINER_MODE()
-+AM_MAINTAINER_MODE()
- 
- dnl AC_CONFIG_SUBDIRS(util)
- 
-@@ -35,7 +35,6 @@
- 
- # compiler specifics
- AC_PROG_CC
--AM_C_PROTOTYPES
- AC_PROG_CPP
- AC_C_CONST
- AC_C_INLINE
-@@ -212,7 +212,7 @@
- # is good enough -- if we can't find GNU tar, we don't really care.
- AC_CHECK_PROGS(TAR, gnutar gtar tar)
- 
--AC_CHECK_PROGS(AUTOMAKE, automake)
-+dnl AC_CHECK_PROGS(AUTOMAKE, automake)
- 
- dnl locate perl 5 and expect.
- AC_PROG_INSTALL
---- rancid-2.3.8/Makefile.am
-+++ rancid-2.3.8/Makefile.am
-@@ -24,7 +24,7 @@
- 
- @SET_MAKE@
- 
--pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
-+dist_doc_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
- EXTRA_DIST = BUGS Todo configure install-sh \
- 	mkinstalldirs Makefile.in Todo $(pkgdata_DATA)
- #DIST_COMMON = 
---- rancid-2.3.8/share/Makefile.am
-+++ rancid-2.3.8/share/Makefile.am
-@@ -50,8 +50,9 @@
- 
- pkgdata_SCRIPTS= rancid-cvspurge rtrfilter downreport
- dist_pkgdata_SCRIPTS=getipacctg
--dist_pkgdata_DATA=README.misc cisco-load.exp cisco-reload.exp \
--	index.html lgnotes.html
-+dist_pkgdata_DATA=cisco-load.exp cisco-reload.exp
-+dist_doc_DATA=README.misc
-+dist_html_DATA=index.html lgnotes.html
- 
- EXTRA_DIST = rancid-cvspurge.in rancid.spec rtrfilter.in downreport.in
- 
---- rancid-2.3.8/etc/Makefile.am
-+++ rancid-2.3.8/etc/Makefile.am
-@@ -48,7 +48,7 @@
- #AUTOMAKE_OPTIONS=foreign no-dependencies
- AUTOMAKE_OPTIONS=foreign
- 
--pkgdata_DATA= lg.conf.sample rancid.conf.sample
-+dist_doc_DATA= lg.conf.sample rancid.conf.sample
- EXTRA_DIST= $(pkgdata_DATA:%=%.in)
- 
- CLEANFILES= $(pkgdata_DATA)

diff --git a/net-misc/rancid/files/rancid-2.3.8-config.patch b/net-misc/rancid/files/rancid-2.3.8-config.patch
deleted file mode 100644
index f39f28382da..00000000000
--- a/net-misc/rancid/files/rancid-2.3.8-config.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- etc/rancid.conf.sample.in
-+++ etc/rancid.conf.sample.in
-@@ -42,7 +42,10 @@
- RCSSYS=@RCSSYS@; export RCSSYS
- #
- # if ACLSORT is NO, access-lists will NOT be sorted.
--#ACLSORT=YES; export ACLSORT
-+#
-+#Gentoo - changing default to NO because access-list order matters in most instances
-+#and many people expect to use rancid as a backup system
-+ACLSORT=NO; export ACLSORT
- #
- # if NOPIPE is set, temp files will be used instead of a cmd pipe during
- # collection from the router(s).
-@@ -50,10 +53,16 @@
- #
- # FILTER_PWDS determines which passwords are filtered from configs by the
- # value set (NO | YES | ALL).  see rancid.conf(5).
--#FILTER_PWDS=YES; export FILTER_PWDS
-+#
-+#Gentoo - changing default to ALL; diffs are emailed and even the most secure
-+#password hashes on most routers are easily brute-forceable with modern systems
-+FILTER_PWDS=ALL; export FILTER_PWDS
- #
- # if NOCOMMSTR is set, snmp community strings will be stripped from the configs
--#NOCOMMSTR=YES; export NOCOMMSTR
-+#
-+#Gentoo - changing default to YES; diffs are emailed and SNMP communities
-+#can be just as dangerous as passwords
-+NOCOMMSTR=YES; export NOCOMMSTR
- #
- # How many times failed collections are retried (for each run) before
- # giving up.  Minimum: 1

diff --git a/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch b/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch
deleted file mode 100644
index 171a380679d..00000000000
--- a/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- rancid-2.3.8/bin/Makefile.am
-+++ rancid-2.3.8/bin/Makefile.am
-@@ -96,8 +96,6 @@
- 	-e 's,@PERLV\@,$(PERLV),g' \
- 	-e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \
- 	-e 's,@LG_PING_CMD\@,$(LG_PING_CMD),g' \
--	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
--	-e 's,@MAILPLUS\@,$(MAILPLUS),g' \
- 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
- 	-e 's,@SVN_FSTYPE\@,$(SVN_FSTYPE),g' \
- 	-e 's,@VERSION\@,$(VERSION),g' \
---- rancid-2.3.8/bin/control_rancid.in
-+++ rancid-2.3.8/bin/control_rancid.in
-@@ -118,8 +118,8 @@
- fi
- 
- # the receipient(s) of diffs & mail options
--mailrcpt=${mailrcpt:-"@MAILPLUS@${GROUP}${MAILDOMAIN}"}; export mailrcpt
--adminmailrcpt=${adminmailrcpt:-"@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"};
-+mailrcpt=${mailrcpt:-"${MAILPREFIX}${GROUP}${MAILDOMAIN}"}; export mailrcpt
-+adminmailrcpt=${adminmailrcpt:-"${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"};
- export adminmailrcpt
- set | grep MAILHEADERS= > /dev/null 2>&1
- if [ $? -ne 0 ] ; then
---- rancid-2.3.8/bin/rancid-run.in
-+++ rancid-2.3.8/bin/rancid-run.in
-@@ -147,7 +147,7 @@
- 	    if [ -s $TMPDIR/.$GROUP.old ]
- 	    then
- 		(
--		  echo "To: @ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"
-+		  echo "To: ${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"
- 		  echo "Subject: rancid hung - $GROUP"
- 		  echo "Precedence: bulk"
- 		  echo ""
---- rancid-2.3.8/configure.in
-+++ rancid-2.3.8/configure.in
-@@ -163,46 +163,6 @@
- AC_SUBST(SVN_FSTYPE)
- rd_cv_RCSSYS=$RCSSYS
- 
--# Check for a preference for using mail addresses like rancid+group
--# instead of the standard rancid-group
--AC_MSG_CHECKING([whether mail addresses should be in the rancid+ form])
--AC_ARG_ENABLE(mail-plus,
--	AS_HELP_STRING([--enable-mail-plus], [enable mail to rancid+ addresses, instead of rancid-]),
--[if test "$enable_mail_plus" = yes; then
--    AC_MSG_RESULT(yes)
--    MAILPLUS="rancid+"
--    AC_SUBST(MAILPLUS)
--else
--    AC_MSG_RESULT(no)
--    MAILPLUS="rancid-"
--    AC_SUBST(MAILPLUS)
--fi],
--[AC_MSG_RESULT(no)
--    MAILPLUS="rancid-"
--    AC_SUBST(MAILPLUS)
--])
--rd_cv_MAILPLUS=$MAILPLUS
--
--# Check for a preference for using mail addresses like rancid+admin-group
--# instead of the standard rancid-admin-group
--AC_MSG_CHECKING([whether admin mail addresses should be in the rancid-admin+ form])
--AC_ARG_ENABLE(adminmail-plus,
--	AS_HELP_STRING([--enable-adminmail-plus], [enable mail to rancid-admin+ addresses, instead of rancid-admin-]),
--[if test "$enable_adminmail_plus" = yes; then
--    AC_MSG_RESULT([rancid-admin+])
--    ADMINMAILPLUS="rancid-admin+"
--    AC_SUBST(ADMINMAILPLUS)
--else
--    AC_MSG_RESULT([${MAILPLUS}admin-])
--    ADMINMAILPLUS="${MAILPLUS}admin-"
--    AC_SUBST(ADMINMAILPLUS)
--fi],
--[AC_MSG_RESULT([${MAILPLUS}admin-])
--    ADMINMAILPLUS="${MAILPLUS}admin-"
--    AC_SUBST(ADMINMAILPLUS)
--])
--rd_cv_ADMINMAILPLUS=$ADMINMAILPLUS
--
- AC_PATH_PROG(DIRNAME,dirname,no)
- 
- # locate GNU diff (one supporting the -u option)
---- rancid-2.3.8/etc/rancid.conf.sample.in
-+++ rancid-2.3.8/etc/rancid.conf.sample.in
-@@ -71,6 +71,21 @@
- # The number of devices to collect simultaneously.
- #PAR_COUNT=5; export PAR_COUNT
- #
-+# Define the prefixes for regular and administrative email groups
-+# configuration diffs will be emailed to {MAILPREFIX}{GROUPNAME}
-+# eg. rancid-routers
-+# problems/errors will be emailed to {ADMINMAILPREFIX}{GROUPNAME}
-+# eg. rancid-admin-routers
-+# 
-+MAILPREFIX="rancid-"; export MAILPREFIX
-+ADMINMAILPREFIX="rancid-admin-"; export ADMINMAILPREFIX
-+#
-+# To use a delimiter-based system instead of email aliases,
-+# comment the above 2 lines and uncomment the following two lines:
-+#MAILPREFIX="rancid+"; export MAILPREFIX
-+#ADMINMAILPREFIX="rancid-admin+"; export ADMINMAILPREFIX
-+#
-+#
- # list of rancid groups
- #LIST_OF_GROUPS="sl joebobisp"
- # more groups...
---- rancid-2.3.8/man/Makefile.am
-+++ rancid-2.3.8/man/Makefile.am
-@@ -79,9 +79,7 @@
- 	-e 's,@bindir\@,$(bindir),g' \
- 	-e 's,@localstatedir\@,$(localstatedir),g' \
- 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
--	-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
--	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
--	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
-+	-e 's,@pkgdatadir\@,$(pkgdatadir),g'
- 
- lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
- 	rm -f lg.conf.5 lg.conf.5.tmp; \
---- rancid-2.3.8/man/rancid.conf.5.in
-+++ rancid-2.3.8/man/rancid.conf.5.in
-@@ -81,6 +81,19 @@
- are always filtered (e.g.: Alteon passwords).
- .\"
- .TP
-+.B MAILPREFIX
-+Sets the mail prefix that is used to generate group emails. Configuration 
-+diffs are emailed to an address of the form {MAILPREFIX}{GROUPNAME}
-+eg. rancid-routers
-+.sp
-+Default: rancid-
-+.B ADMINMAILPREFIX
-+Sets the mail prefix that is used to generate admin group emails.
-+problems/errors are emailed to an address of the form 
-+{ADMINMAILPREFIX}{GROUPNAME}
-+eg. rancid-admin-routers
-+.sp
-+Default: rancid-admin-
- .B LIST_OF_GROUPS
- Defines a list of group names of routers separated by white-space.  These
- names become the directory names in $BASEDIR which contain the data
-@@ -104,10 +117,10 @@
- .sp
- .in +1i
- .nf
--@MAILPLUS@uofo:            frank
--@ADMINMAILPLUS@uofo:      joe,bob
--@MAILPLUS@usfs:            frank
--@ADMINMAILPLUS@usfs:      joe,bob
-+rancid-uofo:            frank
-+rancid-admin-uofo:      joe,bob
-+randid-usfs:            frank
-+rancid-admin-usfs:      joe,bob
- .fi
- .sp
- .in -1i
-@@ -129,7 +142,7 @@
- .B MAILDOMAIN
- Define the domain part of addresses for administrative and diff e-mail.
- The value of this variable is simply appended to the normal mail addresses.
--For example @MAILPLUS@usfs@×××××××.com, if
-+For example rancid-usfs@×××××××.com, if
- .B MAILDOMAIN
- had been set to "@example.com".
- .\"
---- rancid-2.3.8/share/downreport.in
-+++ rancid-2.3.8/share/downreport.in
-@@ -73,7 +73,7 @@
- 
- for GROUP in $LIST_OF_GROUPS; do
-   (
--    echo "To: @MAILPLUS@admin-$GROUP"
-+    echo "To: ${ADMINMAILPREFIX}$GROUP"
-     echo "Subject: Down router report - $GROUP"
-     echo "$MAILHEADERS" | awk '{gsub(/\\n/,"\n");print;}'
-     echo ""

diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/net-misc/rancid/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/net-misc/rancid/rancid-2.3.8.ebuild b/net-misc/rancid/rancid-2.3.8.ebuild
deleted file mode 100644
index 300c3ef0e19..00000000000
--- a/net-misc/rancid/rancid-2.3.8.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils readme.gentoo user
-
-DESCRIPTION="Really Awesome New Cisco confIg Differ"
-HOMEPAGE="http://www.shrubbery.net/rancid/"
-SRC_URI="http://http.debian.net/debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-4"
-
-SLOT="0"
-RESTRICT="mirror"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cvs subversion"
-
-REQUIRED_USE="^^ ( cvs subversion )"
-
-# app-arch/par is blocker, due to bug #455838
-DEPEND="
-	!app-arch/par
-	dev-lang/perl
-	dev-lang/tcl:0=
-	dev-tcltk/expect
-	sys-apps/diffutils
-	cvs? ( dev-vcs/cvs )
-	subversion? ( dev-vcs/subversion )
-	|| (
-		net-misc/netkit-telnetd
-		net-misc/telnet-bsd
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mailprefix.patch
-	epatch "${FILESDIR}"/${P}-config.patch
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
-
-	# respect CFLAGS, bug #455840
-	sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed'
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var/${PN} \
-		--enable-conf-install \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		$(use subversion && echo "--with-svn=fsfs")
-}
-
-src_install() {
-	default
-
-	if use subversion ; then
-		sed -e 's/^RCSSYS=cvs/RCSSYS=svn/' \
-			-i "${D}"/etc/rancid.conf || die
-	fi
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/var/rancid/.cloginrc\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_src_install
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash "${EPREFIX}"/var/rancid ${PN}
-
-	keepdir /var/${PN}{,/logs}
-	touch 	"${ED}"/var/${PN}/.cloginrc
-
-	fperms ug=rwX,o= /var/${PN}/{,logs,.cloginrc}
-	fowners ${PN}:${PN} /var/${PN}/{,logs,.cloginrc}
-}
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Micro-HOWTO on how to get running:
-
-1) Modify MAILPREFIX, ADMINMAILPREFIX, and LIST_OF_GROUPS
-in /etc/rancid.conf:
-MAILPREFIX=\"rancid-\"
-ADMINMAILPREFIX=\"rancid-admin-\"
-LIST_OF_GROUPS=\"routers switches\"
-
-2) Setup email aliases for rancid:
-you will need to define mail aliases for {MAILPREFIX}{GROUP}
-and {ADMINMAILPREFIX}{GROUP} for each group you defined above
-How to do this depends on your mailserver
-
-3) Run rancid-cvs as the rancid user to initialise directories and
-repositories; eg. su -c /usr/bin/rancid-cvs - rancid
-Note the command is the same even if you are using subversion
-
-4) Populate /var/rancid/{GROUPNAME}/router.db with nodes
-see man 5 router.db for detailed formatting information
-
-5) Populate /var/rancid/.cloginrc with credentials
-see /usr/share/rancid/cloginrc.sample for an example
-
-6) Test clogin access with: clogin -f /var/rancid/.clogin hostname
-
-7) Add a cronjob for the rancid user to regularly call rancid-run
-eg: run crontab -u rancid -e and add the lines below
-# run rancid once an hour
-0 * * * *	/usr/bin/rancid-run
-# cleanup old logfiles generated by rancid once a day
-50 23 * * *	/usr/bin/find /var/rancid/logs -type f -mtime +2 -exec rm {} \;
-"

diff --git a/profiles/package.mask b/profiles/package.mask
index 040fb6f64ed..df9f58538b6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -768,13 +768,6 @@ net-libs/adns
 # Removal in 30 days.  Bug #680212.
 dev-libs/liboop
 
-# Michał Górny <mgorny@g.o> (13 Mar 2019)
-# Both packages duplicate each other (#511032) and share the same bugs.
-# They are both unmaintained, apparently fail to build (#541894)
-# and have a bump pending for over 3 years (#557284).
-# Removal in 30 days.  Bug #680208.
-net-misc/rancid
-
 # Eray Aslan <eras@g.o> (01 Mar 2019)
 # Mask experimental software
 =mail-mta/postfix-3.5*