gentoo resync : 09.12.2017

10 files changed, 71 insertions, 7 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 19da60a23957..508a6cbd0b8e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index fb5f25237e8f..65f4ed9cb1c5 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -9,5 +9,5 @@ EBUILD nagios-plugin-check_raid-4.0.0_p20151215.ebuild 2125 BLAKE2B 1a0965bc5068
 EBUILD nagios-plugin-check_raid-4.0.0_p20160215.ebuild 2125 BLAKE2B 297c2311ce23b913cf953d64c4122f668355cbe69f8001410238ae1fa01d39f4d8d64ea5adb3186b78cbe1f9d0c167de192cd362a25c83a41b4f5637401f882f SHA512 1f9afc62ee8684d2151011b6c9c9a8a59224268436f2c637398e12448b3f15d11ffb443cca6456eab2800317cd201059c71992bf3b875f7940d916cb0813624e
 EBUILD nagios-plugin-check_raid-4.0.1.ebuild 2085 BLAKE2B ca2ec67f60be9a5908fe8bca3cfaf8702e9d8abace3d33e8a8d8ffc5d90d9ff0830ac0ff7af64b948676cf0d88132f795a76e4c5d16941305c38ca9d2b0c6f78 SHA512 c5f3ae89ce16bf5a49c954204eb24abe601e74f9b24813d31a1a8750ec76ba0e023f7f582dedced2df24937ecc91854d586a48bc143ab49b8f3da0a2cddfed1b
 EBUILD nagios-plugin-check_raid-4.0.2.ebuild 2085 BLAKE2B a44ba0c0ef0193d39f5d6dbbb5d9474f070adf11e4c9651eed3ad9b7bae30e4a3a14bfa9fcfc8d1eeda6e76a31e9b5c2870f495c8ea1366e6b8e76789bd943d1 SHA512 e3c52ce72719b6b1f9573154f0157e409d3d07c03d495de9a8998be3c6a4ae0124de5178537659e130c81c8f4064b92584ebee8c7176264e2b07b554bf24ca18
-EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2085 BLAKE2B 80a0056165e1f049be6c4c0a71d3684bca6059adf6cf377e27e56b2b36757da04acec3d59a23ccd683252b2a423e3c542d4e5ea723c2f409dc0568f3fe65a389 SHA512 33cfd3139ff3b0eb3061c82c5434f047c68eb8604d46423db92baf0dc31910083c96dc7ef015199f973187ce0047ada67b01662a6f8b8bf76b695525554914fd
+EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2092 BLAKE2B a01b2d95bb5cd05492f0dca92bf3b2a6d1853aff903ebc858680240d662ddc704d2fdb9bc55fdeddc601df50c749999dd85f83c5c82b13bdcab5a075005b6198 SHA512 358218ebe2a50293f9ebb6a8bf9f2b6666b4d74a715804731c0fcdc6ae5f6a20788bc7cb744d337ccfa53355b4d22b17b90c634f4822342e167aa13c0edbf002
 MISC metadata.xml 1205 BLAKE2B c0db04d446c462e232e95278a362fae4ee0ece2b71a8ee2c5ec457bf22f4c9efe851d77ddf8a3e581fb03d035a5bb1ec14d2d412c335700a072825212927f4c8 SHA512 c91761d711709ae8edd20e716e7233242feecbc3156f86c1811add83b453ae8cfb71e2de66ee3902f56f182d87019bd11eb417ca5e1e99ef540f920088dce472
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
index b54ad284019d..3c44f9c42dee 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
 
 DEPEND="dev-perl/Monitoring-Plugin
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index dbaeda633006..7a68f06442eb 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -5,8 +5,9 @@ AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec48
 AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
+AUX pointer-cmp.patch 525 BLAKE2B 67e9038c49caeb8ca61cd48850f8d78c6c52a13b9768c390091e88563999ba28966b995dc10cdaff6ee5727d284dd90b9f125dc616a3bc41ad9e5872e7ce1c5a SHA512 17b3b230a94b4693aee6cb25219b6cc102d49d3029796646630e83a37db9a7417686defe810c524422e0dfc9367f2a776ca1d67dc84ed32182ff263e2e737c5b
 DIST ntopng-2.4.tar.gz 134074662 SHA256 f44e2faf3cb712d75106fc9c594139fbfd437edf4a7e6e9ed65134e1f47ad355 SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a WHIRLPOOL ba5d9fce207d1a89e5c8b35705b0aaeb66235153b91eaf7a84b1c50bcb4b897f992c81aa7fd316ad2d87458cdfdcd4d63de37d0a00375706a036f491ba448c7b
 DIST ntopng-3.0.tar.gz 23017655 SHA256 3780f1e71bc7aa404f40ea9b805d195943cdb5095d712f41669eae138d388ad5 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 WHIRLPOOL 21351cd8e658826ac3bfe91e6817d4daef609f86655a2c645afcdc1eb3ec24ef3c92c99574363b2d15706abf9a7277489453fc8a2a4ff3ec625284a458ff643a
 EBUILD ntopng-2.4.ebuild 1721 BLAKE2B 8dd44c4a4889a5d1b448cc708ff3289f1829ce4c9aeb93b094935142e7d56a12beb8db97b66f3dc57704e6826a3e77dc4d71d9086fd56d5eb0c6e8a06abd3ad0 SHA512 3364607a3207a0997876898cfd17608c001d5576255877b4748de2eb8bb68dcdd995a1213684d5ec25389b68da9c8607b9674484178cfb3099f6e7e482df5f86
-EBUILD ntopng-3.0-r1.ebuild 1537 BLAKE2B ad3f8e80999746563c83771f353f9f976a08090214268f08bd222529069650642d2347aec1ac776f1aaa6070a44c62ef15e48a28309af48517769c836070ec77 SHA512 47805afc7765af88a4cbee85e6eb98a88f840fa74d6118c8ff0f16b04994816b9c73c6019c8f0c3bbc21868a4f087422d8d04492227903584baa15581eb690d2
+EBUILD ntopng-3.0-r1.ebuild 1575 BLAKE2B a509af2e9fc3b46deff00f1fddd605253816ea8d5cf8b42a6ae7be89720c110fb99452925bf612288779167a1c9b3585f3bd9c787fa82f038d3c17fa173ce433 SHA512 6dce8ebb056ea90c856381f8f239e48bf5387b0308c97c49cedcb5bb85d51af48d3a8663a36098f2c800f29a8cc31d8922806da3b1084c8b15e62e992bab5090
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/files/pointer-cmp.patch b/net-analyzer/ntopng/files/pointer-cmp.patch
new file mode 100644
index 000000000000..11fb47ca3853
--- /dev/null
+++ b/net-analyzer/ntopng/files/pointer-cmp.patch
@@ -0,0 +1,12 @@
+diff -Naur ntopng-3.0-orig/src/AddressResolution.cpp ntopng-3.0/src/AddressResolution.cpp
+--- ntopng-3.0-orig/src/AddressResolution.cpp	2017-06-01 00:18:57.000000000 -0700
++++ ntopng-3.0/src/AddressResolution.cpp	2017-11-27 23:13:50.158163187 -0800
+@@ -52,7 +52,7 @@
+   u_int numeric_ip_len;
+ 
+   snprintf(query, sizeof(query), "%s", _numeric_ip);
+-  if((at = strchr(query, '@')) != '\0') at[0] = '\0';
++  if((at = strchr(query, '@')) != NULL) at[0] = '\0';
+   numeric_ip = query;
+   numeric_ip_len = strlen(numeric_ip)-1;
+ 
diff --git a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
index 3fe29fa78180..3470ef4dea27 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.0-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-mysqltool.patch
+	"${FILESDIR}"/${P}-pointer-cmp.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index d14a02565e5f..8ddcb12cc68a 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a09283a6befdf35614e6a3cf4cb1e20ab1d57a53c3715555fb0af73e62f76a4b99e58b83d77d44382f72edb3 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a
 AUX prometheus-node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
-DIST prometheus-node_exporter-0.15.1.tar.gz 1327099 SHA256 63503acd6f4c83f20465b0ad3abe49232ada3a933f0f6717aec99bfe13d20934 SHA512 884f4b3a5e78ecf110e26fbceb6e431cf69f9d0e87ceae33ac767addac197230c2a0d34725fe1f5fe99cbb280e89e4dfea3a6d559027633a7fb071cfdc0f8539 WHIRLPOOL aedcaaf8145952feedac81a5789c9e193624f0ad7da63b2aeef1e96775ae0df69e33dd8e21c64f73a75d698d76d64c7c9b9dec203a9c18374b6083162932a8cf
+DIST prometheus-node_exporter-0.15.1.tar.gz 1327099 BLAKE2B 56d877ee0aea8c18150cca38a62ba6dc439e847188d887def3090b9e3272cb1a077aa451ac63784f8e94d1324630a1320ef5a83127914a4a3820fbf637361b83 SHA512 884f4b3a5e78ecf110e26fbceb6e431cf69f9d0e87ceae33ac767addac197230c2a0d34725fe1f5fe99cbb280e89e4dfea3a6d559027633a7fb071cfdc0f8539
+DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
 EBUILD prometheus-node_exporter-0.15.1.ebuild 1226 BLAKE2B f6542569cd28ce6c692b10874c57cba249876e7b90e18f1b64ce92dda0a3d7a2c38bf34f27d16c909cb8b3b4fc2ba533d80b3a045dcfb4a4119d46ee80447a9e SHA512 b98a1095a3493a9172722bff45eedcbca1b3878f87209e122ba4689448be31013b409347345fca78a50c370d7ea41132f2c3b4fdbae897912cd1feaa226673b9
+EBUILD prometheus-node_exporter-0.15.2.ebuild 1226 BLAKE2B d01056a5f223bb1a55cd13632a022d973a81c267a36da1329c3d79e6c8bd35b062db653e7140915d1d154fa2858a3b048eedbd301d3b804a3a6eaad377afd01f SHA512 4d2c05f64754001828474ed77d58078a8b9cacdf159ce7e93b36f61900d33c396d36e11f67fd4de9faa79a3dee2a82f24c8a31b3627bb48affb55a25db675695
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild
new file mode 100644
index 000000000000..120e1bcf1334
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/node_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT="98bc649"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix node_exporter || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin node_exporter/node_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	popd || die
+	keepdir /var/lib/node_exporter /var/log/node_exporter
+	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 0eebd2c466d3..9e57186e97d5 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,4 @@
-DIST tcpdump-4.9.2.tar.gz 2298386 SHA256 798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b WHIRLPOOL 6652a5bb83a082bc8df050610ed640f0119fb846f2938a5148be3008506548e73c3c6437a62752eafdd00910c35b2b5decfd21c207719d156fb7dc8ca9e3443a
-EBUILD tcpdump-4.9.2.ebuild 2083 BLAKE2B 8963dc978030f63f67a9d6eac9c52d7f37657aa8e028da89c6b2fcdc7c8371607d8cdbab3f03e4647eedca1ac0c0d14d1fc1dbc2f37175cd7d6cf8215814b254 SHA512 1d6df16693ed2fb2f4aa50e26d789f679eeee5521da6e23c82520eec9165d86dd40bb3c2c089a4048baf0b34270d207c65487cfb325c6d1b5808728516373dbf
+DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
+EBUILD tcpdump-4.9.2.ebuild 2082 BLAKE2B d801c3bd9530bb20b8446991a1279d936e798947be87495cfda10770c58f83c9444a0e9a69529dae3499124d39561098e33599f95fed623a64cf4e6a5a623406 SHA512 bc7d4065cfa34d0d3d1f6991823e531f414ee368a0bc24a2e8f339981dee4a3b17003aaee257bf7e8982584f9507b8931d49110d98e2c4ffbc475824d05d53ee
 EBUILD tcpdump-9999.ebuild 2210 BLAKE2B da1f08451d672650c53c4e6e6d968bf3f482c071c94ed36b50b9386d99e8af23c4ac2ad82c231c716f3f65583e80c812416c58ef85afe9367e489ef08866af62 SHA512 1c6e0b3ff504bcca0ebbb160f5a0eb88d5c57a4afc09400bbbccfaf62396018f4a03e284626b7a7d55829ffc8bf2648f5d84ae63defa9c1d7cde3678bf2635e6
 MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
index 5ce4d4fd76cb..1a08871479af 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 
 RDEPEND="