From 529cc08369a11944bdc8448cbfcad403f5ed540d Mon Sep 17 00:00:00 2001 From: Andreas Billmeier Date: Fri, 27 May 2022 15:32:55 +0200 Subject: [PATCH] update rancid-3.13-r1 --- net-misc/rancid/Manifest | 14 +- .../files/rancid-2.3.8-buildsystem.patch | 64 ------- .../rancid/files/rancid-2.3.8-config.patch | 33 ---- .../files/rancid-2.3.8-mailprefix.patch | 178 ------------------ .../rancid-3.13-no_network_in_sandbox.patch | 63 +++++++ .../files/rancid-3.6.2-buildsystem.patch | 47 ----- .../rancid/files/rancid-3.6.2-config.patch | 34 ---- .../rancid/files/rancid-3.7-buildsystem.patch | 47 ----- net-misc/rancid/files/rancid-3.7-config.patch | 34 ---- .../rancid/files/rancid-3.8-buildsystem.patch | 47 ----- net-misc/rancid/files/rancid-3.8-config.patch | 34 ---- .../rancid/files/rancid-3.9-buildsystem.patch | 47 ----- net-misc/rancid/files/rancid-3.9-config.patch | 34 ---- ...ncid-3.13.ebuild => rancid-3.13-r1.ebuild} | 7 +- 14 files changed, 68 insertions(+), 615 deletions(-) delete mode 100644 net-misc/rancid/files/rancid-2.3.8-buildsystem.patch delete mode 100644 net-misc/rancid/files/rancid-2.3.8-config.patch delete mode 100644 net-misc/rancid/files/rancid-2.3.8-mailprefix.patch create mode 100644 net-misc/rancid/files/rancid-3.13-no_network_in_sandbox.patch delete mode 100644 net-misc/rancid/files/rancid-3.6.2-buildsystem.patch delete mode 100644 net-misc/rancid/files/rancid-3.6.2-config.patch delete mode 100644 net-misc/rancid/files/rancid-3.7-buildsystem.patch delete mode 100644 net-misc/rancid/files/rancid-3.7-config.patch delete mode 100644 net-misc/rancid/files/rancid-3.8-buildsystem.patch delete mode 100644 net-misc/rancid/files/rancid-3.8-config.patch delete mode 100644 net-misc/rancid/files/rancid-3.9-buildsystem.patch delete mode 100644 net-misc/rancid/files/rancid-3.9-config.patch rename net-misc/rancid/{rancid-3.13.ebuild => rancid-3.13-r1.ebuild} (95%) diff --git a/net-misc/rancid/Manifest b/net-misc/rancid/Manifest index 94bc932..3cfe8e5 100644 --- a/net-misc/rancid/Manifest +++ b/net-misc/rancid/Manifest @@ -1,15 +1,5 @@ -AUX rancid-2.3.8-buildsystem.patch 1741 BLAKE2B 03056e70631b0bae0b8501df70b38ebcbc148ba98a2811b74c79f90d909f8996c1c75649d8c511f117861a8a1da34c12dc952b8e673599286b62c9fb99837e3a SHA512 2ce1befcd4898654958e8a961156a6eda95da319d98ca66c9cb216ab46b80166571146b631a699be5702d5bb7baa8301b570fe82fb89ba8096a941807005f9ab -AUX rancid-2.3.8-config.patch 1241 BLAKE2B 8d03211285ecd05d277cb5d1e60f3ba3f91eaec3e2bf35cbad4976907aa952438714447da66994784d39c1ea15448883c3b2f3ed4264d30939a39bfbecf09592 SHA512 abad6758dbe89eacf566b5cc931749ed9667ec7f7e824a8091f5a02edfeacb4497b1dfc5444ae41f5652a479791c585e4625b8877e710f460698a8bb2cccce9c -AUX rancid-2.3.8-mailprefix.patch 5878 BLAKE2B 87d5ef27a2194eb746006e0330b562a22d7801ec9954e248b41417defddc2ccdaa92a7c9b220edb6f1aba312e43e8e5cfe16b4ff47893538e781e3aa9a896abe SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd -AUX rancid-3.6.2-buildsystem.patch 1419 BLAKE2B 679e2fb7b2499b5bf7ef0534667673cbbad75c6f2cd2b45e181117c9cb74ec08ed5f5d78479f1dfd242bfa74a0bc28ad28a003135e586f8ba27c09e0439e29e5 SHA512 17b030437fbc39859a45cf46554b3d27c54bbfa5d6d7466d26a861fc0694d8139427e48c5d0daaa420bfce627418656479734126faa912d1beec6a37b86655d5 -AUX rancid-3.6.2-config.patch 1390 BLAKE2B 5c6f0e2ce8dbfe4467843038b5fe0a77aafab2f2361fb506ad21b4330e2c6123246bf99c50a2bc1830a6f79643100954f0a913f1c572ac5b9d6a653b48b15e27 SHA512 ff82143297cf874586a9d0e7c18702d9c4dd74fdede0fb95c222161188703342a8486addf15cdc939eef5382729d8c3727d4764778adc5b935a827b5b860b593 -AUX rancid-3.7-buildsystem.patch 1419 BLAKE2B 679e2fb7b2499b5bf7ef0534667673cbbad75c6f2cd2b45e181117c9cb74ec08ed5f5d78479f1dfd242bfa74a0bc28ad28a003135e586f8ba27c09e0439e29e5 SHA512 17b030437fbc39859a45cf46554b3d27c54bbfa5d6d7466d26a861fc0694d8139427e48c5d0daaa420bfce627418656479734126faa912d1beec6a37b86655d5 -AUX rancid-3.7-config.patch 1390 BLAKE2B 5c6f0e2ce8dbfe4467843038b5fe0a77aafab2f2361fb506ad21b4330e2c6123246bf99c50a2bc1830a6f79643100954f0a913f1c572ac5b9d6a653b48b15e27 SHA512 ff82143297cf874586a9d0e7c18702d9c4dd74fdede0fb95c222161188703342a8486addf15cdc939eef5382729d8c3727d4764778adc5b935a827b5b860b593 -AUX rancid-3.8-buildsystem.patch 1419 BLAKE2B 679e2fb7b2499b5bf7ef0534667673cbbad75c6f2cd2b45e181117c9cb74ec08ed5f5d78479f1dfd242bfa74a0bc28ad28a003135e586f8ba27c09e0439e29e5 SHA512 17b030437fbc39859a45cf46554b3d27c54bbfa5d6d7466d26a861fc0694d8139427e48c5d0daaa420bfce627418656479734126faa912d1beec6a37b86655d5 -AUX rancid-3.8-config.patch 1390 BLAKE2B 5c6f0e2ce8dbfe4467843038b5fe0a77aafab2f2361fb506ad21b4330e2c6123246bf99c50a2bc1830a6f79643100954f0a913f1c572ac5b9d6a653b48b15e27 SHA512 ff82143297cf874586a9d0e7c18702d9c4dd74fdede0fb95c222161188703342a8486addf15cdc939eef5382729d8c3727d4764778adc5b935a827b5b860b593 -AUX rancid-3.9-buildsystem.patch 1419 BLAKE2B 679e2fb7b2499b5bf7ef0534667673cbbad75c6f2cd2b45e181117c9cb74ec08ed5f5d78479f1dfd242bfa74a0bc28ad28a003135e586f8ba27c09e0439e29e5 SHA512 17b030437fbc39859a45cf46554b3d27c54bbfa5d6d7466d26a861fc0694d8139427e48c5d0daaa420bfce627418656479734126faa912d1beec6a37b86655d5 -AUX rancid-3.9-config.patch 1390 BLAKE2B 5c6f0e2ce8dbfe4467843038b5fe0a77aafab2f2361fb506ad21b4330e2c6123246bf99c50a2bc1830a6f79643100954f0a913f1c572ac5b9d6a653b48b15e27 SHA512 ff82143297cf874586a9d0e7c18702d9c4dd74fdede0fb95c222161188703342a8486addf15cdc939eef5382729d8c3727d4764778adc5b935a827b5b860b593 +AUX rancid-3.13-no_network_in_sandbox.patch 1638 BLAKE2B 1f8b827a69f08d524031627b710e5132e7e0293fb11719b2e25c37ddceccf163b517fed1059566fcfc97a123232d64036249df87ac049f1417f30c4dc95773f9 SHA512 9cabb25f1136fb8f61a9caa3d3466651a5ba34bcae7e4419953ee35c7885f8853681ec37e8b15033ce82b83b7c9878d3a271640412e7a0ef5cecba8f5e104cd2 DIST rancid-3.13.tar.gz 506297 BLAKE2B cb28c03a09ecbc79b55c4962880c54088908598ceaacdc62751fdd2adf08fdb3e38917365c47e95eb7b49671731d8146bb6d6cb2f775cc9ff57c83eed92deb5e SHA512 2dbd8a743a03cd94b474c08b0bb1868a991353690b9f3ff2828d16a3a102ca68e4092cb07f24ec4e57c4436e6657f3f2638f890069fbbd35d6c7a34d5bd55df5 DIST rancid-3.9.tar.gz 515946 BLAKE2B 85f49e61c0e885d3bfacf917a3809c5bde01ac9e384ddc6bfcaa01588c8cb5f5632b572a5d732cad044e321aef815c93bbd382531bcf3c86a28f98cd7a624de0 SHA512 d3c88e2092aa907481dbdaa41baea413a5ab5ba194a80c644ae59faea4538b7377e20e15a81270d2e453ca78cc96bdbe3516ed75c9e9e61a7c3bcc7121fbc77c -EBUILD rancid-3.13.ebuild 2930 BLAKE2B c76ce2eb8c506e90be6a9f6ff63507216da3bac546b39416dc14d6f092a217177091196c9423fac31e17db59d0c0ac4a4cc1c533c5e7e59f0b4d8cbb9ec344d3 SHA512 0b5f5b728aa73f2f7a614ae201ab06b26c82fd7befa11f9889cc71934854d325606aef07ad02c7e7621abcc501b0fbbfc183b21e9c06e86821e4bd4e81d3f7f2 +EBUILD rancid-3.13-r1.ebuild 2904 BLAKE2B fb24c4201c99a692552416f9782fcc0af06037abdbfa3fa3f5904e4124d7cde40094552427ef81bf18cd57930c6823f791082a8b075d429d09efac9598a790b3 SHA512 7bc3475acb4a4bdf21ee5a7c13aaae6b7dfa9b458e18a31ff7e4542ba789666d7d1666de1a3aec4ea257dccf0fe19a5062fe9d9fd48447d88aa0ae235a4bac20 EBUILD rancid-3.9.ebuild 2998 BLAKE2B 37605679da9c57e083ab8b28c9975c4e7f54c6c1f8ac7b3b69161e01f8edae9feb2031a4f71f9616ca7e389aaa3203eb9cbf6779d314f93a502731ba87b8a977 SHA512 7c3b326e2d94a8f5be283a05e02b3c96048f8e00cec8d465f9506315f928ba6cc71924209666d924d8f6af092ad122b295e2189df518a689ae7ce8e3cf301c45 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 4a06b5c..0000000 --- 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 f39f283..0000000 --- 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 171a380..0000000 --- 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@example.com, if -+For example rancid-usfs@example.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/files/rancid-3.13-no_network_in_sandbox.patch b/net-misc/rancid/files/rancid-3.13-no_network_in_sandbox.patch new file mode 100644 index 0000000..ab71fcb --- /dev/null +++ b/net-misc/rancid/files/rancid-3.13-no_network_in_sandbox.patch @@ -0,0 +1,63 @@ +diff --git a/configure b/configure +index 9d32907..a5118bf 100755 +--- a/configure ++++ b/configure +@@ -5500,24 +5500,7 @@ fi + # ping seems to take one of two formats for count (N) + # BSD: ping -c N host + # SVR: ping host N +-$PING_PATH -c 1 -v 127.0.0.1 > /dev/null 2>&1 +-if test $? -eq 0 ; then +- LG_PING_CMD="$PING_PATH -c 1" +-else +- $PING_PATH 127.0.0.1 56 1 > /dev/null 2>&1 +- if test $? -eq 0 ; then +- LG_PING_CMD="$PING_PATH" +- else +- # cygwin using windows ping? +- $PING_PATH -n 1 127.0.0.1 > /dev/null 2>&1 +- if test $? -eq 0 ; then +- LG_PING_CMD="$PING_PATH -n 1" +- else +- as_fn_error $? "can't figure out how to pass count == 1 to $PING_PATH." "$LINENO" 5 +- exit 1 +- fi +- fi +-fi ++LG_PING_CMD="$PING_PATH -c 1" + + rd_cv_lg_ping_cmd=$LG_PING_CMD + +diff --git a/configure.ac b/configure.ac +index ad0dd08..1147b36 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -351,26 +351,8 @@ if test $PING_PATH = no; then + exit 1 + fi + # ping seems to take one of two formats for count (N) +-# BSD: ping -c N host +-# SVR: ping host N +-$PING_PATH -c 1 -v 127.0.0.1 > /dev/null 2>&1 +-if test $? -eq 0 ; then +- LG_PING_CMD="$PING_PATH -c 1" +-else +- $PING_PATH 127.0.0.1 56 1 > /dev/null 2>&1 +- if test $? -eq 0 ; then +- LG_PING_CMD="$PING_PATH" +- else +- # cygwin using windows ping? +- $PING_PATH -n 1 127.0.0.1 > /dev/null 2>&1 +- if test $? -eq 0 ; then +- LG_PING_CMD="$PING_PATH -n 1" +- else +- AC_MSG_ERROR([can't figure out how to pass count == 1 to $PING_PATH.]) +- exit 1 +- fi +- fi +-fi ++LG_PING_CMD="$PING_PATH -c 1" ++ + AC_SUBST(LG_PING_CMD) + rd_cv_lg_ping_cmd=$LG_PING_CMD + diff --git a/net-misc/rancid/files/rancid-3.6.2-buildsystem.patch b/net-misc/rancid/files/rancid-3.6.2-buildsystem.patch deleted file mode 100644 index 2413d44..0000000 --- a/net-misc/rancid/files/rancid-3.6.2-buildsystem.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -259,7 +259,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 ---- Makefile.am -+++ Makefile.am -@@ -13,7 +13,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 configure.vers install-sh \ - mkinstalldirs Makefile.in Todo $(pkgdata_DATA) - #DIST_COMMON = ---- share/Makefile.am -+++ share/Makefile.am -@@ -13,8 +13,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 - ---- etc/Makefile.am -+++ etc/Makefile.am -@@ -10,7 +10,7 @@ - sysconf_DATA= rancid.types.base - pkgdata_nogen = rancid.types.conf - pkgdata_gen = lg.conf.sample rancid.conf.sample --pkgdata_DATA = $(pkgdata_nogen) $(pkgdata_gen) -+dist_doc_DATA= $(pkgdata_nogen) $(pkgdata_gen) - - EXTRA_DIST= $(pkgdata_gen:%=%.in) $(pkgdata_nogen) $(sysconf_DATA) - diff --git a/net-misc/rancid/files/rancid-3.6.2-config.patch b/net-misc/rancid/files/rancid-3.6.2-config.patch deleted file mode 100644 index 5bf214e..0000000 --- a/net-misc/rancid/files/rancid-3.6.2-config.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- etc/rancid.conf.sample.in 2017-01-11 07:59:52.000000000 +1100 -+++ etc/rancid.conf.sample.in 2017-02-03 09:44:00.685664867 +1100 -@@ -67,7 +67,10 @@ - #ACLFILTERSEQ=YES; export FILTERSEQ - # - # 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). -@@ -75,11 +78,17 @@ - # - # 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 to YES, 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 - # - # FILTER_OSC determines if oscillating data such as keys, passwords, etc are - # filtered from configs by the value set (NO | YES). FILTER_PWDS may override diff --git a/net-misc/rancid/files/rancid-3.7-buildsystem.patch b/net-misc/rancid/files/rancid-3.7-buildsystem.patch deleted file mode 100644 index 2413d44..0000000 --- a/net-misc/rancid/files/rancid-3.7-buildsystem.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -259,7 +259,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 ---- Makefile.am -+++ Makefile.am -@@ -13,7 +13,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 configure.vers install-sh \ - mkinstalldirs Makefile.in Todo $(pkgdata_DATA) - #DIST_COMMON = ---- share/Makefile.am -+++ share/Makefile.am -@@ -13,8 +13,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 - ---- etc/Makefile.am -+++ etc/Makefile.am -@@ -10,7 +10,7 @@ - sysconf_DATA= rancid.types.base - pkgdata_nogen = rancid.types.conf - pkgdata_gen = lg.conf.sample rancid.conf.sample --pkgdata_DATA = $(pkgdata_nogen) $(pkgdata_gen) -+dist_doc_DATA= $(pkgdata_nogen) $(pkgdata_gen) - - EXTRA_DIST= $(pkgdata_gen:%=%.in) $(pkgdata_nogen) $(sysconf_DATA) - diff --git a/net-misc/rancid/files/rancid-3.7-config.patch b/net-misc/rancid/files/rancid-3.7-config.patch deleted file mode 100644 index 5bf214e..0000000 --- a/net-misc/rancid/files/rancid-3.7-config.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- etc/rancid.conf.sample.in 2017-01-11 07:59:52.000000000 +1100 -+++ etc/rancid.conf.sample.in 2017-02-03 09:44:00.685664867 +1100 -@@ -67,7 +67,10 @@ - #ACLFILTERSEQ=YES; export FILTERSEQ - # - # 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). -@@ -75,11 +78,17 @@ - # - # 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 to YES, 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 - # - # FILTER_OSC determines if oscillating data such as keys, passwords, etc are - # filtered from configs by the value set (NO | YES). FILTER_PWDS may override diff --git a/net-misc/rancid/files/rancid-3.8-buildsystem.patch b/net-misc/rancid/files/rancid-3.8-buildsystem.patch deleted file mode 100644 index 2413d44..0000000 --- a/net-misc/rancid/files/rancid-3.8-buildsystem.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -259,7 +259,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 ---- Makefile.am -+++ Makefile.am -@@ -13,7 +13,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 configure.vers install-sh \ - mkinstalldirs Makefile.in Todo $(pkgdata_DATA) - #DIST_COMMON = ---- share/Makefile.am -+++ share/Makefile.am -@@ -13,8 +13,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 - ---- etc/Makefile.am -+++ etc/Makefile.am -@@ -10,7 +10,7 @@ - sysconf_DATA= rancid.types.base - pkgdata_nogen = rancid.types.conf - pkgdata_gen = lg.conf.sample rancid.conf.sample --pkgdata_DATA = $(pkgdata_nogen) $(pkgdata_gen) -+dist_doc_DATA= $(pkgdata_nogen) $(pkgdata_gen) - - EXTRA_DIST= $(pkgdata_gen:%=%.in) $(pkgdata_nogen) $(sysconf_DATA) - diff --git a/net-misc/rancid/files/rancid-3.8-config.patch b/net-misc/rancid/files/rancid-3.8-config.patch deleted file mode 100644 index 5bf214e..0000000 --- a/net-misc/rancid/files/rancid-3.8-config.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- etc/rancid.conf.sample.in 2017-01-11 07:59:52.000000000 +1100 -+++ etc/rancid.conf.sample.in 2017-02-03 09:44:00.685664867 +1100 -@@ -67,7 +67,10 @@ - #ACLFILTERSEQ=YES; export FILTERSEQ - # - # 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). -@@ -75,11 +78,17 @@ - # - # 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 to YES, 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 - # - # FILTER_OSC determines if oscillating data such as keys, passwords, etc are - # filtered from configs by the value set (NO | YES). FILTER_PWDS may override diff --git a/net-misc/rancid/files/rancid-3.9-buildsystem.patch b/net-misc/rancid/files/rancid-3.9-buildsystem.patch deleted file mode 100644 index 2413d44..0000000 --- a/net-misc/rancid/files/rancid-3.9-buildsystem.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -259,7 +259,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 ---- Makefile.am -+++ Makefile.am -@@ -13,7 +13,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 configure.vers install-sh \ - mkinstalldirs Makefile.in Todo $(pkgdata_DATA) - #DIST_COMMON = ---- share/Makefile.am -+++ share/Makefile.am -@@ -13,8 +13,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 - ---- etc/Makefile.am -+++ etc/Makefile.am -@@ -10,7 +10,7 @@ - sysconf_DATA= rancid.types.base - pkgdata_nogen = rancid.types.conf - pkgdata_gen = lg.conf.sample rancid.conf.sample --pkgdata_DATA = $(pkgdata_nogen) $(pkgdata_gen) -+dist_doc_DATA= $(pkgdata_nogen) $(pkgdata_gen) - - EXTRA_DIST= $(pkgdata_gen:%=%.in) $(pkgdata_nogen) $(sysconf_DATA) - diff --git a/net-misc/rancid/files/rancid-3.9-config.patch b/net-misc/rancid/files/rancid-3.9-config.patch deleted file mode 100644 index 5bf214e..0000000 --- a/net-misc/rancid/files/rancid-3.9-config.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- etc/rancid.conf.sample.in 2017-01-11 07:59:52.000000000 +1100 -+++ etc/rancid.conf.sample.in 2017-02-03 09:44:00.685664867 +1100 -@@ -67,7 +67,10 @@ - #ACLFILTERSEQ=YES; export FILTERSEQ - # - # 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). -@@ -75,11 +78,17 @@ - # - # 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 to YES, 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 - # - # FILTER_OSC determines if oscillating data such as keys, passwords, etc are - # filtered from configs by the value set (NO | YES). FILTER_PWDS may override diff --git a/net-misc/rancid/rancid-3.13.ebuild b/net-misc/rancid/rancid-3.13-r1.ebuild similarity index 95% rename from net-misc/rancid/rancid-3.13.ebuild rename to net-misc/rancid/rancid-3.13-r1.ebuild index 78cff56..aa13d2d 100644 --- a/net-misc/rancid/rancid-3.13.ebuild +++ b/net-misc/rancid/rancid-3.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -31,11 +31,10 @@ DEPEND=" )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-no_network_in_sandbox.patch" ) + src_prepare() { default - 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' }