gentoo resync : 10.01.2018

17 files changed, 138 insertions, 30 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 45b0cbd7eb7e..5673f1cd3c91 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index e5c09520e27e..1da9006c154c 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -5,7 +5,7 @@ AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
-EBUILD arpwatch-2.1.15-r10.ebuild 1608 BLAKE2B 0a3fd0c47798036e1d19736db6f6b82bae238010aa8dd25dea5bb06f900cbed13288d5578b259b9e30dff08b9f934ab473d5d50de8a274ee9426df2709a74179 SHA512 1c7bebf0f62c0b421b87dc18f5b509495b30a75b997c748b00420333bc3815b6236a64fc3be60173fa353b813c1de0b33207173dea3c2750314bb0439e38a271
+EBUILD arpwatch-2.1.15-r11.ebuild 2230 BLAKE2B 3c3e5f3d4dc4b943035baae4deb78b1a9f4f6918fb3364c3f129fa4a34e625c0d4898391e3a499544f337f67903eebca4b5068da115aba9e4604f62aabc60500 SHA512 53e650db791689b1eb720e5c746aabaf16d1b21174c779c98b391b264c92dd005d3ff1f59e646885cd88274189c07eb6b8a3aad64f802049a84e1ae48f5652fe
 EBUILD arpwatch-2.1.15-r8.ebuild 1388 BLAKE2B 6adf8401c70c0ebe2e9d98e7c2a9096174d4eaef5474c0c941df4360b9e0f5f6367aa40c564d0b742f1c625bd5e1b7c4419fc718989b50574622dc6cf66505ed SHA512 73e3289f751cce19f522353c68b65d7222561adc70e79f58b848344487258c744541b03179bf712a38ed81f3565bb41c1262aa78eaa2ede1314a9751353fb0fe
 EBUILD arpwatch-2.1.15-r9.ebuild 1370 BLAKE2B 42ea454eff9469fe5ca2fe4aa264fc6b73a779dd520f632d34c6f420c426e889c62c18ce9346e597f6c2efcfe4280df84337cd6d02d87abcea9249c3d2a8687d SHA512 dbd27d01b2be37e056bad0d23544c43f75ddf6f0f4fba8e9a2a21d5d10c5ceccde02a0882548c8350b9510d90ebce87e60485dad1521363e882deec3396741bb
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
index 986da0386f7d..758ebf7b0548 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,9 +61,26 @@ src_install () {
 	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
 
 	diropts --group=arpwatch --mode=770
-	dodir /var/lib/arpwatch
+	keepdir /var/lib/arpwatch
 	dodoc README CHANGES
 
 	newinitd "${FILESDIR}"/arpwatch.initd-r1 arpwatch
 	newconfd "${FILESDIR}"/arpwatch.confd-r1 arpwatch
 }
+
+pkg_postinst() {
+	# Previous revisions installed /var/lib/arpwatch with the wrong
+	# ownership. Instead of the intended arpwatch:root, it was left as
+	# root:root. If we find any such mis-owned directories, we fix them,
+	# and then set the permission bits how we want them in *this*
+	# revision.
+	#
+	# The "--from" flag ensures that we only fix directories that need
+	# fixing, and the "&& chmod" ensures that we only adjust the
+	# permissions if the owner also needed fixing.
+	chown --from=root:root \
+		  --no-dereference \
+		  :arpwatch \
+		  "${ROOT}"/var/lib/arpwatch && \
+		chmod 770 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 8a4180ed843f..45f3af655223 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -3,7 +3,7 @@ AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb
 DIST cacti-spine-1.1.20.tar.gz 801877 BLAKE2B 35da513691967e507b9d10c373de571e2ef84aa20021d1bcfb2bc446a99fbbd2c68ebcd99dc47bece4387faa6596a7b109d8a61f02a3b2413cb89bfbcaa22e89 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f
 DIST cacti-spine-1.1.21.tar.gz 801907 BLAKE2B cdcda765d349db12df1c672c4469770297d09a3946f19f1e686c251ef30d5be1e3f772efeeb3f344b21ecdba29275dde1b683025ae7c16b10561486397a484f3 SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0
 DIST cacti-spine-1.1.28.tar.gz 802006 BLAKE2B 79e833b6afb619a1d2361bad38c3a52dc1e29b296864670f830a3bc998e7e456638523da15032751d56c65aefe0480477e70b741b23882a2a38adb2262aef601 SHA512 2255823d29342b49babebbae175c29fc7054b05ec5ae5897609960d808409f46e6d0cfcba2038dfad9598bc23532794f6cf26032a0566d2d2d2c57d622d37ab1
-EBUILD cacti-spine-1.1.20.ebuild 860 BLAKE2B b82110544f92f70c2ab512b6f30b709df621a7dd90557edc6c4d6d27fef9b5121004159c981e2a57eb857e6101b1d6b42c5c0b9451881cd7cae6f7bea416d94e SHA512 dc1c9f975baea6553163fd29c13fff1bb3a99e268b2bab5fca31619e9880f579545ccf75a508525889ccd9d96923f29703f1860e5b35acbcbee69a12b064fb1a
+EBUILD cacti-spine-1.1.20.ebuild 859 BLAKE2B 4ce5b34307c2c365b9e70f523f888c0deb41b4bc0d853590c8394af59cf81045e78b5c653ece72a72f053eef6112d9095eb31e0a5563f1f968d179c891b4b4d0 SHA512 60668a2b2c306e9d12707e2e5cce908522019d58e0742b39ef0a1b5a63bc91d3ca35829842e22aeda0adbabaa200f954cffc6cd8427d1fab801078ceca6b90c2
 EBUILD cacti-spine-1.1.21.ebuild 862 BLAKE2B 7165f0d06307e442cdcbc3160f0fc1548188fd0ad7f3f6dd9a16dc0322e616c1c38dc85a7382c59b4a7809e9cd46ee83684cbbbc2a9dc398f493a3d83123bcb8 SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2
 EBUILD cacti-spine-1.1.28.ebuild 863 BLAKE2B 0a28fb4df62540d9c43068c169b3e56d8de7cbd550cd845b1dcfd87ac6b1188513e48a02209d308e27b315d3b44dedc8529a57c477ad868e8f8bfeb8a8b25da6 SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
index 0ca89463112f..837f87b754fa 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 
 CDEPEND="
 	dev-libs/openssl:*
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 555494e1fab8..b99fb08f280e 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,7 +2,7 @@ AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005
 DIST cacti-1.1.20.tar.gz 8903728 BLAKE2B 0efc22726540c57d9d6af71f80e9843bfee3d846ecfffbb8552511d06080c377ccfad8c8d19e21186b666c393d32a8f39196cb9caa0f005bb92f7c87c0fc316d SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b
 DIST cacti-1.1.21.tar.gz 8905650 BLAKE2B a6e579b7d846388a9b732465eecdb5694c226b5edc98c1a005bbb8c17a307fa4d6ec56342e77e68bc62302c29451527e634fbbe6a9788073f0c5608dac57b76b SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2
 DIST cacti-1.1.28.tar.gz 8953179 BLAKE2B a1a7c3e39cfdb0f47eee86131d2210fb209b351cf91b56b8584d90ef53d216ab85936d66942506415d7e2610bdf2aa5235430cc664edd05ab612815d60d42b18 SHA512 2816a78604d169951519404e4bfbf17377912efd7a8bf1ef2a262fde7414783e65ee4a6bcac7dd3175fd9942aebf475b7dbd1fe6d350f75cf88246d3561ef9e8
-EBUILD cacti-1.1.20.ebuild 1257 BLAKE2B 2c9e6968cb71a34a67fd9c9923375ae7c354542c3b6b33f0a60e1452f6a2811de0fbb7603f0a1e55710c6f0ee49ce0e77facac9cfaaf7033e012bd764d41ca60 SHA512 830f0dff90239b799454a572bf3b3412b59c57b323db30d61337ef7a73023e44cac4267f672f9cb48002afda86ad0091b047ef89a47b09bfc8aa733d0c2a450e
+EBUILD cacti-1.1.20.ebuild 1256 BLAKE2B acd5fc47cdc38cee840bec35a3e090c1f60c33892995ad05b933d3f3dc921db20963e384784ca295c1053ce76c5f840a09171c4121cbba22f8ef24638fabff45 SHA512 efcba1fe5319225ddf5a95dd231b45811c5ed868716c4a003bc62696fd202f640a36eac2a1e406241fce3ef14a0147c0d5fbedffc8a2c76986d01903ad14029e
 EBUILD cacti-1.1.21.ebuild 1259 BLAKE2B 667ef36b00fef1cbd608bbae4caaa21bc32faa5e49a9bca21eff1220a5b086feea6fe4e57998ced79fd22888b357d77f0a4c9efc9998c0bd5b21c52c8823af3e SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884
 EBUILD cacti-1.1.28.ebuild 1050 BLAKE2B 55199db5379ee4c66f51c6b6ec2769292926ac2fdef295486d170362636e1320dc07c844d0ee17121c42b0baa3527611fc06a67c8fb0b23d6bfea312cdd0d707 SHA512 94bd12777ea28c602f9b5e3a2fe317afefc10833e3f4b3e4c7cc2218b8759e3347d53f2b78a94de5dcbf33f1610fd5e403c7bcef4a839c12f7255f46cca08d01
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.1.20.ebuild b/net-analyzer/cacti/cacti-1.1.20.ebuild
index ea74ba637169..d3b41fd3fc3c 100644
--- a/net-analyzer/cacti/cacti-1.1.20.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 040fca778d89..f4edacceaf63 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,6 +1,7 @@
 AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac9815c6e20fcd0c32cbd3ee149746dccff2a89f9113243cfe56d5fee66417f07289450c43e089502c270572e5bd SHA512 d93456173c25a5858e71ededd30a6322d5a8cb2908053e1a47529774fad1e4ff0c7a9935501391f8b3dee95cda4620d1b2bd98ea67aa9a2618b22c45ce4c7026
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
-AUX mrtg.rc 1285 BLAKE2B 8a50a40829f4eef780bd0d000ce73e41c742defd0d9fc8fff3e6bc5b1dd8620a94738c83e437413e35546828ea994f90df5023e5bf58fcb896d8e4e04cdabeb6 SHA512 4885de66f6b9b65e262b1d49ac7cb3c96a29041d3055316f4db7fce4c5a5155fc4640af818f2881bf2fcd23312ff344ad0b2765e9820667fb08fbb21ee520679
+AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
 DIST mrtg-2.17.4.tar.gz 1096879 BLAKE2B 12d485e8bdb28ff3706341d5b53e78dc37291e6f157e7792f1d2f3b43ee09c7b7eed57acfd8c7e9c9621187f75ee117e0ea85ce1ec34636f26aaf7e06ca58e14 SHA512 b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110
-EBUILD mrtg-2.17.4-r1.ebuild 839 BLAKE2B bb6c11a2856434248e87407fa4a1f5262a2f11f368d67b31838ca18491bf88eb9e2189218664b7c674bc319ad14a3aacacde52d7cf6ce7af5d242be0c7e3521a SHA512 d4fdf13f873e204d5cb03539e7e37003c904edfb1653a064a7b20cc92875fe07495f202a08cf2b5b1ab88420dca7881ae776fcdb79cd9d95bf9595624b8f9fd9
+EBUILD mrtg-2.17.4-r1.ebuild 824 BLAKE2B 34727aafba25ed97e7eb8e5f37806f533eac1d4300bf225c6142dc884cc2d7dcbf33cd0a4367a06427d789c076f78d0d4c6bd75a36c6adf16fd44f1f76d549f5 SHA512 a81daab88b80342d21a46eb8be24135b301e0c1169abd6871c4fa7081a765ed7adb8a39a4de35774f5da151788c7a805e9c7b082a5127074575146f03a9ed9c4
+EBUILD mrtg-2.17.4-r2.ebuild 1000 BLAKE2B 335c76bb71ba16bc1908762dc5002b8ab26e464ce294d6ecab2763bda86fde929bcd826fbafcb9d3b69bc1a64f58ffed09de597914bc4d5b9eb7badeb3481196 SHA512 3c71dfe63faa649b90aba120b148348a2b1bdf5ff6250887006183939f8e94f0d87fc855e94782f3f9aa6c1f355a2ec27dfca5af820906319b681e80a5dddba4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index d1ee6861cd45..0ff5d0783f38 100644
--- a/net-analyzer/mrtg/files/mrtg.rc
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -10,7 +10,7 @@ depend() {
 }
  
 checkconfig() {
-    if [[ ! -f ${MRTG_CONF} ]] ; then
+    if [ ! -f ${MRTG_CONF} ] ; then
 		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
 		return 1
 	fi
@@ -22,21 +22,21 @@ checkconfig() {
 start() {
 	# mrtg will not run if LANG=*utf8
 	# use grep instead of bash regexp for bug #159786
-	[[ "$(echo $LANG|grep -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ]] \
+	[ "$(echo $LANG|grep -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ] \
 	&& LANG='C'
 
 	checkconfig || return $?
 
 	# enable logging?
-	[[ -n "${MRTG_LOG}" ]] && \
+	[ -n "${MRTG_LOG}" ] && \
 		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
 	
 	# run as a different user?
-	[[ -n "${MRTG_USER}" ]] && \
+	[ -n "${MRTG_USER}" ] && \
 		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
 
 	# run as a different group?
-	[[ -n "${MRTG_GROUP}" ]] && \
+	[ -n "${MRTG_GROUP}" ] && \
 		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
 
 	ebegin "Starting mrtg"
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index aa3e52b338d4..d6459ad61290 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="http://oss.oetiker.ch/mrtg/"
-SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
+HOMEPAGE="https://oss.oetiker.ch/mrtg/"
+SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r2.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r2.ebuild
new file mode 100644
index 000000000000..a278e5a925f4
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="https://oss.oetiker.ch/mrtg/"
+SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="
+	>=dev-perl/SNMP_Session-1.13-r2
+	>=dev-perl/Socket6-0.23
+	dev-lang/perl
+	media-libs/gd[png]
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-mrtg )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-socket6.patch
+)
+
+src_prepare() {
+	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+
+	sed -i \
+		-e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
+		$(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
+
+	default
+}
+
+src_install () {
+	keepdir /var/lib/mrtg
+
+	default
+
+	mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
+
+	newinitd "${FILESDIR}/mrtg.rc" ${PN}
+	newconfd "${FILESDIR}/mrtg.confd" ${PN}
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index c18f13ac9750..3f1f094e30f5 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -4,7 +4,7 @@ DIST sslscan-1.11.10-rbsec.tar.gz 52108 BLAKE2B db78ae281149da451cc2f6f60d8379d5
 DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
 DIST sslscan-1.11.9-rbsec.tar.gz 52215 BLAKE2B 8f2a28beb0a0c08f469ba473821e73420e593bb7d627064df520bb3e49311b426ebf3d94d255b3902cdf4eca167c1f54092d923f637bfd8c00eac8a84108ae61 SHA512 ed2ca15c185a36c166bec640f1771114ce845c0a84a6490aeca8170b8623ad3c370515c25079bb1f29fce79e3b24186fd298d72cc101d9076e4d7984a1202938
-EBUILD sslscan-1.11.10.ebuild 1305 BLAKE2B e12871889c0eccd9e2c99b5f3c2ba0502e2aee251de3fc5d9d98c03eded7d2daeb85cd3373f67d5bc696f1db0b284857ae8a38d421ef9785b2b64253cd87bdb4 SHA512 92fdddcce54763eddd8beb0f2ea474a60f2000d9c896d5b7b073ec3cb2a1dacae12f5f118fd94f5a4e382c7ded6808ca91cbba04929279d1da418e82237be404
+EBUILD sslscan-1.11.10.ebuild 1303 BLAKE2B 2c39f37ed0ad85e4e2a3f76e5b47a29906e2d50150f96686b2466fd5ebb7a364bf9355cf155434720967e1430c6363eaf1b468bbb884039914504038f2bf6085 SHA512 f11f67b88a4577a70c684584e70b6bf75e8498a3b48fc9ed7f07601ce97415375ab3136577e3b4feabc3ebe02d711de3b76b4b14715b2831a4312d517f0d43a4
 EBUILD sslscan-1.11.11.ebuild 1163 BLAKE2B 7bccef3a83ed1a8c7d914dd0959beb92d4402f1c141df390bd209ad7c77eaf7e2346c6547305a7dbf471e0d091199b70e4fbc1583b1076a13ff6c4bb21225400 SHA512 d86e6c4ea2e1437b63956e37d26c3240e71386c2e0dce98edd8077bd8aafb1c7b1ca4d2b8c3cb87250d51af6fa24a86e13992679ebbdd07d3667fa7171cbe920
 EBUILD sslscan-1.11.9.ebuild 1110 BLAKE2B e1036f2fdfbb28cc53826e7b48e931ae6b35f4cd8c709ccaaf51e87b13432a24e3493a09bea49ca8d778952498a74858532aea43b5d52ddf630af2bd9d902b3e SHA512 bcc11d8cf25284ee634e36bd4d9bc5fee8a98154064b0a9cbc01f969a1a9933a4e864a64a7b744a26a2c1d661e9b3709ab6519cd72ba9fc4bfc9be14e7273ca5
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.10.ebuild b/net-analyzer/sslscan/sslscan-1.11.10.ebuild
index f71143d59a97..bbc02f4e1bd5 100644
--- a/net-analyzer/sslscan/sslscan-1.11.10.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +static"
 
 # Depend on -bindist since sslscan unconditionally requires elliptic
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index db712b939428..612f7d5fb351 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,4 +1,6 @@
 DIST wapiti-2.3.0.tar.gz 305739 BLAKE2B a425694bf334e373acd4e7a60734b1162a709a996eb322fd8d8c6a92c9db34e7ae3c8bab4f1b0a514e7f88cda8f9f7ba5f5d24e20425993c36d8283a12470d1f SHA512 a72e87f4c2aec3884d5de7018c7fe1ab32721fc86420167c0b7636f31d9718661c787ff3d4ee66cc27e3932497543d0324b0bd238c33ce16f41f39213c119af2
+DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e
 EBUILD wapiti-2.3.0.ebuild 508 BLAKE2B 72b4b8d4cc830ee3b1151f6aed2828e40be1a43f0097aea47d59ecba3044f219519b47e6cd51fc957bec475d43fdd2a965139ef8391aada1fabd43506bb73c48 SHA512 dea28c6d333d56e36a35f4d6aee96b36896a205e95cd799146f6cecb660dc12bb9ea6359af83b03a50f5772b71e69a4fad9545e20b48d2aa73d02e117f445eec
-EBUILD wapiti-9999.ebuild 524 BLAKE2B ae2604aa472dfabe437e3597f56218575f469a1570b1b34a9ddbc14a1cd488c648d9918c5d05f6888999eeda89b7817fc39906dbc349fced09efa160b84939d3 SHA512 e95bc1deb156017ccfc295774ca6d01c2c4ed25046b1bafc9f3110ef8128f4d4f2f95f6074fdcd18a2d6a500f991278082d475725aec562bfa125bf2d9e936cd
-MISC metadata.xml 731 BLAKE2B e212d07a84034b06706f400ce9e15a4e278f62cf1ec6ac5f3424701b09fcb0d94e2753301e0d9df40abdd1beb2dc9210ca48b5eaac84fe1325ab50960d8ef08b SHA512 f71323601d1b5be55efccda40ad08f6dddcd26c9400557765d9ccc32da18e6992b0780f50b070306a12e36c15da02b522e1eb2463494de5e88c838b68ad78abf
+EBUILD wapiti-3.0.0.ebuild 778 BLAKE2B a7385fb08636ec161fd3a9c11061bf1af9806eed34e472cfe6d3fb2578d6483f13ad0cc7628f75c1f293523b04eef08fe9cc7e61a61d88c5631a78966345c31f SHA512 753e4d61b6be4ed012fc4251a7561dd8546632865f7485d5c68604718a8d2c1d73d1b518b2a99377be785091eef6e8fa0160aef6c46e1639fb257bb47ad325a7
+EBUILD wapiti-9999.ebuild 800 BLAKE2B e9b0f9d54f3c94904cbd217b7218141a6179528b6efd1c89f2356817df98ba902e8be297b72ad965ad5a70ee8a3d22f7b7def35ff3bee0a258dd08c053ac681d SHA512 10fb2896b49e009a38b8ca555197c0bb09d815e299c5dbc165217228e0817c6a983a2d47ac7c57625bb951777510dfcc04ece6e7a20808eb255be3b75064e9fc
+MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml
index 043a4b4f70a2..59ef9906d471 100644
--- a/net-analyzer/wapiti/metadata.xml
+++ b/net-analyzer/wapiti/metadata.xml
@@ -13,4 +13,8 @@ Once it gets this list, Wapiti acts like a fuzzer, injecting payloads to see if
 	<upstream>
 		<remote-id type="sourceforge">wapiti</remote-id>
 	</upstream>
+	<use>
+		<flag name="kerberos">Support Kerberos authentication</flag>
+		<flag name="ntlm">Support NTLM authentication</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/wapiti/wapiti-3.0.0.ebuild b/net-analyzer/wapiti/wapiti-3.0.0.ebuild
new file mode 100644
index 000000000000..a3f9f3451f63
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos ntlm"
+
+DEPEND=""
+
+RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/tld[${PYTHON_USEDEP}]
+	dev-python/yaswfp[${PYTHON_USEDEP}]
+	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
+	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 7d202ad1e489..525c4a02ceb0 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE='xml'
 
 ESVN_REPO_URI="https://svn.code.sf.net/p/wapiti/code/trunk/"
@@ -16,8 +16,14 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="kerberos ntlm"
 
 DEPEND=""
 RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]"
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/tld[${PYTHON_USEDEP}]
+	dev-python/yaswfp[${PYTHON_USEDEP}]
+	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
+	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"