gentoo resync : 29.03.2018

8 files changed, 23 insertions, 120 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a24a2a0b8ad4..fa9beca78ffc 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ganglia-web/Manifest b/sys-cluster/ganglia-web/Manifest
index 52072ede4ed9..7a03671b8081 100644
--- a/sys-cluster/ganglia-web/Manifest
+++ b/sys-cluster/ganglia-web/Manifest
@@ -1,6 +1,4 @@
 AUX CVE-2013-6395-fix-xss.patch 922 BLAKE2B 39012fee1f41af98283e3e97340bea168409392835484102eeb296828fbbe2e0dabc253b35d397a2d40e4221d4c2b0c37593f766e58313cd8f4addcafbd32a1c SHA512 6ea9694203f5402eb84bf412db6f8c687872a6ab0bea1a0645d92e7852b4a8542f48420442e451042c032d43056ba07d23fd09344d45533017ebdebf111ec556
-DIST ganglia-web-3.5.10.tar.gz 1431977 BLAKE2B 75ca16b8a015e411a5a6d773b9b2e692440c1751515de793b57062fc8128ef24fa3c3e19748eb13cd977635ba92d84365e0a33eb96baa32388b7ff511cbd073e SHA512 9f035c27e7afe944d854a701fc70869940c9cacef5b58b92493241a817f4f5b80103191ab6e9c062ade4c92288fdd25097c95f6d57f409d4840cab2c5ee66efd
-DIST ganglia-web-3.5.8.tar.gz 1431184 BLAKE2B 9b05e9f52ff2bee01a60c694bbe43a07524ed20de96bd50f3f452eeb6e3d7fe2ad2c32cf48f88995d638303aa2b5b371c0b04b4943619d2ff10f240845b167d1 SHA512 1ba5df64801b28a3e412acd6c63301c7911b24d21dc261c9d970bdabeb3c47102ab47e5de89fd5fdcaa6b79a2e9c3421e7abaf0641e25d1f5821c54a232b0933
-EBUILD ganglia-web-3.5.10-r1.ebuild 1186 BLAKE2B 20b0cf66629ee82b62ce4c0145f32abff1502389a4fd23dedb0f7c31173a3a8380f837f29a2501bbc8d37d58d15ab5db5c9b505f6c0014bdb99eeead83a5aec0 SHA512 012694bf0d7d72be85b3af4f9fffc2571b99f2f2e6613629a0769f5873bf194045a2e1d18511d7dd8aff0fc152407057de2f88b58f75557d9701c8a73ad33934
-EBUILD ganglia-web-3.5.8-r1.ebuild 1183 BLAKE2B 042f9b29ba15b307c36c3d6a808a0f2c016f0734f385ed53430f9402da43af3327a43d61e3b8445f740bb26c2edddaf46ed646d4ade0422bbc1e31f15fe85d86 SHA512 2481fc91882073b4cfe9d8b0bd9fb3b7716c3b629aa9cb08afaac34ac6e553f7d2d23a449a128afbad9f24bb94c0a4dc6aea4f515c83fe273be536451c42abe5
-MISC metadata.xml 334 BLAKE2B 59027b7d3fbc47f52e3b17ca0e04d3ace7283f7fcdf5ab6328c652fd1a52a32b10a19017794e31e6fdafec51901758e312a0761025edf6aa610629d5099fbf36 SHA512 9b58ae22b5ef2ebe1d7b247b179273a68033ccbc01c78969a2ec10a2a3932432ea4328b91e192b30dcef84381313fff1d26fc0e4d7e4cf70f0a36aa9c3cd8a63
+DIST ganglia-web-3.7.3.tar.gz 709356 BLAKE2B 8d5ac9eb8bd37ea040b08caa763797929acac3bd520c88af0e8fd3a9cfbc28d2a55e42d772ca1b6d5e87fe7dce6f4a6e7e15b836d06052c7e642885c727070cc SHA512 884b1ba168b8fe01aa865ae77df6995bb5a09a8b2d441189264283fc1c95b8a6fd0800488ad75e9c1cdd3694b9d6c1c33218ddad804ade2d6be948791b797a95
+EBUILD ganglia-web-3.7.3.ebuild 1081 BLAKE2B 03d9c106f9150dfe7d14f0ac0b255fd56c10fe83dc2c776d386064f5e6873a410bb2cb5c8904582f5c20e8dda1df0d92d2b4b33ce70fca3854eb5f7878e5a368 SHA512 56365d52b89856d3169730e2b64f5a45ebe31b064be4f77f0bbfeb29ff4dddf8635405a2dfce986cd1e7edfd72f26a73bffd94e97e054c20a8624fdf5b65be17
+MISC metadata.xml 633 BLAKE2B 29ba6ca6f778c6ce5067e0063afed1eb2c4c918c1627f7e8767750bfad4d6576e710d869912eae816a0db523d110385ae77b1f60205f3968a900b624bcbc604a SHA512 0968fdd09ec185b3a88a6656d816da77c1e08950b3395b3377969da698c4288c2e127fe4a3e97ea20d936d1a6aab280d5b9bf1df52b3da4bcefdc289a05dcd89
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild
deleted file mode 100644
index a50a91e815d1..000000000000
--- a/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-WEBAPP_MANUAL_SLOT="yes"
-inherit webapp eutils
-
-DESCRIPTION="Web frontend for sys-cluster/ganglia"
-HOMEPAGE="http://ganglia.sourceforge.net"
-SRC_URI="mirror://sourceforge/ganglia/${PN}/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="vhosts"
-
-DEPEND="net-misc/rsync"
-RDEPEND="
-	${DEPEND}
-	${WEBAPP_DEPEND}
-	>=sys-cluster/ganglia-3.3.7[-minimal]
-	dev-lang/php[gd,xml,ctype,cgi]
-	media-fonts/dejavu"
-
-src_configure() {
-	return 0
-}
-
-src_compile() {
-	return 0
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/CVE-2013-6395-fix-xss.patch
-}
-
-src_install() {
-	webapp_src_preinst
-	cd "${S}"
-	emake \
-		GDESTDIR="${MY_HTDOCSDIR}" \
-		DESTDIR="${D}" \
-		APACHE_USER=nobody \
-		install || die
-	webapp_configfile "${MY_HTDOCSDIR}"/conf_default.php
-	webapp_src_install
-
-	fowners -R nobody:nobody /var/lib/ganglia-web/dwoo
-	fperms -R 777 /var/lib/ganglia-web/dwoo
-
-	dodoc AUTHORS README TODO || die
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	# upgrade from < 3.5.6
-	if [ -d "${ROOT}"/var/lib/ganglia/dwoo ]; then
-		rm -rf "${ROOT}"/var/lib/ganglia/dwoo || die
-	fi
-}
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
index 4ee2bb7ef1a0..13516e683da2 100644
--- a/sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild
+++ b/sys-cluster/ganglia-web/ganglia-web-3.7.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 WEBAPP_MANUAL_SLOT="yes"
-inherit webapp eutils
+inherit webapp
 
 DESCRIPTION="Web frontend for sys-cluster/ganglia"
 HOMEPAGE="http://ganglia.sourceforge.net"
-SRC_URI="mirror://sourceforge/ganglia/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/ganglia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -18,36 +18,25 @@ RDEPEND="
 	${DEPEND}
 	${WEBAPP_DEPEND}
 	>=sys-cluster/ganglia-3.3.7[-minimal]
-	dev-lang/php[gd,xml,ctype,cgi]
+	dev-lang/php[gd,xml,ctype]
+	virtual/httpd-php
 	media-fonts/dejavu"
 
-src_configure() {
-	return 0
-}
-
-src_compile() {
-	return 0
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/CVE-2013-6395-fix-xss.patch
-}
-
 src_install() {
 	webapp_src_preinst
-	cd "${S}"
+	cd "${S}" || die
 	emake \
 		GDESTDIR="${MY_HTDOCSDIR}" \
 		DESTDIR="${D}" \
 		APACHE_USER=nobody \
-		install || die
+		install
 	webapp_configfile "${MY_HTDOCSDIR}"/conf_default.php
 	webapp_src_install
 
 	fowners -R nobody:nobody /var/lib/ganglia-web/dwoo
 	fperms -R 777 /var/lib/ganglia-web/dwoo
 
-	dodoc AUTHORS README TODO || die
+	einstalldocs AUTHORS README TODO
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/ganglia-web/metadata.xml b/sys-cluster/ganglia-web/metadata.xml
index 89825dedcad9..9c08c34000c6 100644
--- a/sys-cluster/ganglia-web/metadata.xml
+++ b/sys-cluster/ganglia-web/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danweeks.net</email>
+		<name>Daniel M. Weeks</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">ganglia/ganglia-web</remote-id>
 		<remote-id type="sourceforge">ganglia</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 7b324304808a..0029b868cdd6 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,10 +1,9 @@
-AUX keepalived-1.4.0-fix-no-sorry-segfault.patch 1223 BLAKE2B 409ca766c9300301724134b316cf2f0d9fae0c9c95ab9eda518c0b2c14ae5cd13d3c123bcf0fd353186bccd99f499d0c61c34f0a9e92e42ce1da2ceb96c2981a SHA512 7f7a69ec8f77a8614c6d060b87b36c7cae173721df33febbb740b19a6dc56568b95f8ff41c5018755bd18dd40d6e70b9ade067e22ed91c3219851e262fb0fe82
 AUX keepalived.confd 171 BLAKE2B ad9baf96333182a2acdb10a4be7220de1dc0827c4932af07ae8aae17d72233c3cb9bac637acc4c918503da664c8612a8815f4e2eec0aa18d10715fb2e8e3a71f SHA512 468d176d22f1ce308871829f24624b33e6ba3b234a413395599a67a865f3cf815cc24a10c244dffd1421a0acf5352fe51027a2d3b282cd3822dfeadc8a1d4df0
 AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7815c4db0062691dc2ea905c704d7d123588355a8cfbde124e2a5732d621eb5c664169a83ec81f6ed SHA512 240201b81bcca7b213bd3ec45fc286f0305d72a6952a3baf485d717df413df3a2da0f4b018eaa050b0b12cda78767f5c4ae60ec75e5802cfe57cb29951e86ba0
 DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
 DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
-DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
+DIST keepalived-1.4.2.tar.gz 738096 BLAKE2B edfd2c20b4de80a2e15d9598558b0ccfb4d6a7a7eace278ab97358691ed38485017ecca2f2934405930818b54e60f644c575dc4a320a9900bf81b97916268c91 SHA512 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
 EBUILD keepalived-1.3.5.ebuild 1532 BLAKE2B 273a9f41e4a1d190a6ffd882b230f95fdc536cfc7d92a1b1b8f0e465165d80de282a6f4bc1d2450b6cecf6ea6086384602e6f8d8a639ff0fba9ba1f4b6cb1b57 SHA512 79052c15fd3329bb2493fb5833d951f70620d04cbe4077964416a029fe9ec953732061f751913b35c7c64a1f73c230a6d0691454d18ba9610270578397fc52f8
-EBUILD keepalived-1.4.0-r1.ebuild 1656 BLAKE2B a50e03ce06a857e7fadd2b94be9ddf00d3a0e7fa0dcaa246be10545ca2bfbee430befae961415a12096ba26f4769851492215c4af8351f134ecacb56459e9087 SHA512 cf1237fced58729c7a1c325437f6de65ddb2bc69d78425dd8e765aca373273b5fae39c9e73b1503d4db354e65e41e181e4048fd653bc638a0a47742747583475
+EBUILD keepalived-1.4.2.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch b/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
deleted file mode 100644
index cbababb39802..000000000000
--- a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 49559856e19a1a9fad590cc640da7df57c6b9a66 Mon Sep 17 00:00:00 2001
-From: Quentin Armitage <quentin@armitage.org.uk>
-Date: Wed, 17 Jan 2018 12:08:07 +0000
-Subject: [PATCH] Fix segfault if no sorry server configured for a virtual
- server
-
-Issue #751 identified a segfault in vs_end_handler(), and it
-transpires that the forwarding method of the sorry server was being
-checked without first testing that a sorry server had been configured.
-
-Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
----
- keepalived/check/check_parser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/keepalived/check/check_parser.c b/keepalived/check/check_parser.c
-index b2518da7..170e47d4 100644
---- a/keepalived/check/check_parser.c
-+++ b/keepalived/check/check_parser.c
-@@ -120,7 +120,7 @@ vs_end_handler(void)
- 
- 	/* If the real (sorry) server uses tunnel forwarding, the address family
- 	 * does not have to match the address family of the virtaul server */
--	if (vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) {
-+	if (vs->s_svr && vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) {
- 		if (vs->af == AF_UNSPEC)
- 			vs->af = vs->s_svr->addr.ss_family;
- 		else if (vs->af != vs->s_svr->addr.ss_family) {
diff --git a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
index 1be5d090b408..9ec3a8f5d741 100644
--- a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
@@ -30,10 +30,6 @@ DOCS=(
 	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
 )
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-no-sorry-segfault.patch"
-)
-
 src_prepare() {
 	default