gentoo resync : 29.10.2017

6 files changed, 63 insertions, 6 deletions

diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 8f16001d0e08..299c1a1e8b38 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,6 +1,8 @@
 AUX 47_mod_gnutls.conf 1125 SHA256 bbe6b19c62f4a47d7083ea07d78b7d9a368ab1fb95afc059b87993c19567550b SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7 WHIRLPOOL 1bc96d9db8c71c95261f0bc19f127c65a61c3f1218e27772cdfb7302d8f19f6a9aa579fe8dac890efd6789c8dfabe7f86e81d649d0bb2285d9a45b08196e0c72
 DIST mod_gnutls-0.8.2.tar.bz2 415903 SHA256 05eeb78e41f1fd6780607a17d705b1965ce5c3ce6223a9a8a86ba9288d22e683 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d WHIRLPOOL f3b57579bbdfea5ed845df8bd551f7b03b3f49f1b22ede1ff5c1b1b7c7fd1eeea0a55f0fb7ffe4a91cb9d5bce60f7e2e47d586f2f58057b18cf950eee24b1fbb
+DIST mod_gnutls-0.8.3.tar.bz2 420257 SHA256 3517dddef04e0cb64c4805799d1b749bb6273f99c3ac33634677210fbe60292b SHA512 a0c5babeef5b76e9a10642b3825832290dce3b094d236dd06f76228ba7523ba14c2ada4d97d9c47bf9da0cb0808a9c8fb1080122d27399f6a9267ee0f3ce4656 WHIRLPOOL 30cc7faa9b69f81accdb260fc37e2aed98807e33a5ceec0e13c79da7c6e5699c4e0594130276d39ac7a6449f75a80778e17ef8bdd8e331fe47a704184d7624b7
 EBUILD mod_gnutls-0.8.2-r1.ebuild 1002 SHA256 d2a08099cfffffcefeb1f368c713c3b5fe0f1237c2e05af1cdad8430605074c1 SHA512 90377f614bea6c8689be1f6e26d94e9ac3effa43a143366f4c6c2bbd363d214252ef4e35fc272eef74cd1776cd08dc889dd5013ec6b7641d53085b211138275e WHIRLPOOL 3e2a27077d230d275fd488bdc33183318eda7c57d97d2b835229a1fdae85ead3d4599b6dadb9449973adda3455a805d31107ae8769b013626df30418b1c31271
+EBUILD mod_gnutls-0.8.3.ebuild 1038 SHA256 1fee5fb758ba56db59ca13c41f3dad0b581e89e836eca8ff3cae04e413413856 SHA512 3f668bea52e392c63ee51818e0ba05309cd5e6ceb746dbd98bf8a6b809f92a1d16f7ff620363916a3e2026014aa83144f20f10d77a5acab27a7b1e0b41c6f00d WHIRLPOOL 29bc1ce7137660194af638277092fb424193de57cb7f5eb0d70c37120ba54f5cd807ef942752e633108a43d7fd54b0e53e3974fdd4b4333bf7fd23b334948a6f
 MISC ChangeLog 4594 SHA256 510f0d34a08a98ae21267cdb4b16378564e3258ba83ce2d940fd259478e35ef1 SHA512 de5fa5f7434e0f7f45f2afca6e31a0121ffefe42cb4824ab0aa85401eb95d77b5218aa0d0037aa6048bda0bb87080507e57b33d82f8ec0b2c49981cb8a293494 WHIRLPOOL 1f0928a4d82eee45863038a378d7fb21c9ff70cb4078e3bb6dd67b9ed45cf523dd2bd451dfd0b953355872e3c028ad210e4ed9746cb2383416927fa193b65ab1
 MISC ChangeLog-2015 6058 SHA256 c0754abe9061116f204f7ba33b4cad4e88df06cf9a77cbe4de57524197dccdbf SHA512 4542fbcfb1be292ada71bfeecdb1abbd46941c41b2efb2fa52f4532af7efeb45195e1ca5a3733e47c0d38e954ae7512742a7b2ffc4303416fdd9887ef4fe99b8 WHIRLPOOL 216f97c914ee52ebfe98e1eb5722d5906fde5ff45aea3411b0c35ad7e94f2f33ad651908c9b1ba602829ca9a33695d9b82cf5b0d20ee0e3cb2fdb74d03333e6f
 MISC metadata.xml 255 SHA256 42291ecdbc745487c205fe39446325b98c3da38b68645b9e028c92f3e0b65bdf SHA512 a162282826a4c1ec206bc30afd84b64f7b3efa011122bf2f0f228fd5f89de5f2a8c218d0c72671e744a8207b143966afe62d3687974c2ac3aaef9450d442e0ba WHIRLPOOL 11caeb9245f4312d4bfee3fc9b3c1f45d1fb1d95c8bc3db7462a85311d569f2b585d55857acd35fc15190f06960713118ef66d94c67e8f2e8da23388cc5318a3
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
new file mode 100644
index 000000000000..f559ac1fb5ee
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools apache-module
+
+DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
+HOMEPAGE="https://mod.gnutls.org/"
+SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND=">=net-libs/gnutls-3.3.0:="
+DEPEND="${CDEPEND}
+	test? ( app-crypt/monkeysphere )"
+RDEPEND="${CDEPEND}"
+
+# Fails because gpg-agent cannot be accessed
+RESTRICT="test"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="CHANGELOG NOTICE README"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apxs="${APXS}"
+		--disable-strict
+		--disable-doxygen-dot
+		--disable-doxygen-doc
+		--disable-doxygen-html
+		--disable-doxygen-pdf
+		ac_cv_path_UNSHARE=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
index 436ed7ab593a..6076b6305dbd 100644
--- a/www-apache/mod_nss/Manifest
+++ b/www-apache/mod_nss/Manifest
@@ -1,6 +1,6 @@
 AUX 47_mod_nss.conf 8849 SHA256 78f48475b21bd8a5b1304c8bd14437a0e92e9a8b6ffbe7ecd243f83d37da8342 SHA512 d3ff614e17afea1cb0c5e451ba53cf5bb1c0d5c0ee6017fdecba0e976262376e36b5556b2d08cb131ebfdd795cfe4a6736dabda99059fc40aeff63a1c4d37a23 WHIRLPOOL 6e9e4fbc61620aa98d8817e1b3b3c5d2b972f19d6e9ad9ecdf34e4ffe503839f532094d120c872a1eff49e2daa3d5f1e7f4756daa26c7561d7ca694b676d93e4
 DIST mod_nss-1.0.12.tar.gz 171657 SHA256 6a206d85c8c772eb9f424aaf5774b69c235af869d54cc8f45018ec82e1b89404 SHA512 f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a WHIRLPOOL df692da1478c86feab7005498b3f0cf24136b210bef3ea25790e4fc6613690e61f9a9485ce11f5f2ec0f931702a9db08a4fafa286bf37fa0f0df6c1df224270b
-EBUILD mod_nss-1.0.12-r1.ebuild 1265 SHA256 a25d61743068c8f054e1a0e60ab2f0b1b5caaf67c036992134f53f3b746f310d SHA512 a6bb433412f9e2149899516143af205b302c4e6f66c9273122275926f728d9b9bb0b77fa3e1f8d9796a221e568766514c05c15262477e54c45e992a17b15f341 WHIRLPOOL 3e8d0ff6baa3c161a7c2b984f1ff4414f6a4cd1fd7410f0cdf0b6d3376315b4708dc36ec85b5081f1257f325ca3fd66d0ee1f6fc288ff8b3b815ae3a638c015c
+EBUILD mod_nss-1.0.12-r1.ebuild 1249 SHA256 b66aecb0fc06bb99f85bd66f11814a22cff19a565180b35dea04f337b0320da6 SHA512 ab11d87f2fec1ee9ba320dbf9809225d15ec435f9fa7b43c8f3289bc87cb937013ffc3e6a5feac6cb46258e9bc290801ddb02da514b9f68199aaad675446bbf9 WHIRLPOOL 541b397b10cdc6722af403c7808528974090645fd05d73824c79b42e47eda41c3cdd6615c9a6131946d2b6032e61992bf0d56ad6b0bb3732cc6e204633168a71
 MISC ChangeLog 3118 SHA256 338ec89b09af79b3f1424cf61c5262ab2aa4eaaa74d1e4214fdd20576f7efd8e SHA512 860a1d9ece12d7ec949674e410448b353d4374894d09424fc390018603062afa87ee7f7c5598e4ee391a4dcb261ee7a8543379b14ceb48e60905777f17d58a88 WHIRLPOOL c015d3d59086a7c1ff5206cc6aa3a174410455808734b9d559af2d6c1041b49e459cd41fbc6c80dfaaba940f91f0e44ffec980d4caf68990aefd13c952c5495e
 MISC ChangeLog-2015 1398 SHA256 9cac80aa71d93ddf40030c5ff992553fbb48eeaad5c6730f84ede2db36cf2561 SHA512 1d7744a8e013d42b62561fda6b3815d831e45621bef0c4f347f029550d2ac2a3821a317585a58ae65c3c67d0efeeab2795b7e72afc706f4f3a5cabdf6e790c1e WHIRLPOOL d4a624e2fcc3d3d5679e662429cfb57a5a6cc213b0043ec5351899d9ef23680f02841a1dc4751b5cfddb37aea452e0b50b0e38ef6840004e8c5bbcc8f4b4159c
 MISC metadata.xml 240 SHA256 f996bc17094f612e659dcbe2d91be2d7fe5c7cfbf3b5ee7060d6adf3aff22cdd SHA512 12bc0c58114b3c377663bdbfadf973193f074b46bfa51fad44b6ace89c757e07a7bfa1e41cbc1904151e7fd35c7ffe63b7a2083e11f313de136ba58017d21b86 WHIRLPOOL afe38be63cfac552eb3662d4a555dd43bf0ed3fb421a7b5bd53abf0228b7c18ec1d347f4e12d2d085dfbbf5d19e7a0ace0373980c420b2ba3a7f9bc3ce93b934
diff --git a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
index 551b08179f36..bc7333c7cf65 100644
--- a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
+++ b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools apache-module eutils
 
 DESCRIPTION="SSL/TLS module for the Apache HTTP server"
-HOMEPAGE="https://fedorahosted.org/mod_nss/"
-SRC_URI="https://fedorahosted.org/released/mod_nss/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/mod_nss"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index e4d1b2317a8c..d15ee4857118 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -6,7 +6,7 @@ DIST passenger-5.1.11.tar.gz 4243340 SHA256 26fc56b2f6d27ed58b948d9601a17a4f61e9
 DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
 DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
 DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
-EBUILD passenger-5.1.11.ebuild 3981 SHA256 1abf5503c689a4547ce4c0a63252940e3f9d7930d188f4680a341bb00f82ec95 SHA512 bd345120db4a296673d10b9778de4c01b47c7204e0506899cffe5a348caa8eb1ac4d2ae1929c8f442ad0793f234de25915a158b2d72253c0b4ca1ef44aa0440f WHIRLPOOL 7a468471c59da013e39efb6f29a8009c55daf1e4e4634bc275a2f00249ab6a07c020ea536377607da8b73c0a7b2996b2a4666d8373cacb161a0791543b9a9780
+EBUILD passenger-5.1.11.ebuild 3980 SHA256 9677c2c41cd6f6ec32e187a5fbef602f40909a35ff86b356270cf037d48e6d5f SHA512 3ee83e353f2a8e645b4e499b945deb2ad518ab620715ed7d6ed0fb69ac8571c1c63383ebf4e44514e9a420a8ac6739c1120b3af688c397260ee3aae94eb542f4 WHIRLPOOL 265d93f494a099c767313cc68d7e674dd943e567d20e34a98c86bbecfceffdfd84ef8400c033a9056b229ed83feea23241c54f426e86c67a655142001646b6bc
 EBUILD passenger-5.1.2.ebuild 3802 SHA256 4e68673b6e194126a37eb8acbb207a91e60219c4a2edfd635dd4508e652c9e9e SHA512 8f8ccf842182cff920f7956e3934e35154bd6235991e50e90bd1629b4f33caa4d480072eddbbc2ad335706bed0f5258ad4de0755beb0c2c89fbf11afcecebc47 WHIRLPOOL 5014b02757779a5cfdc5061ba8d8d5b588ed1e7048ea4b604c3c1a94bd572ab3b8f7c5c775c20dafd87400c305998a7c412bd8c6190e01ea003491058b9eaeb8
 EBUILD passenger-5.1.6.ebuild 3833 SHA256 228c9dbb2b64272213095f96ae7e20b33d643b0a0cde8b6996915f1faf3da95f SHA512 8f384e47cc1efa7c4dabe6dcc42fddd66a2498df22933d4e65fbed124540edb2210f8c0113ae4c2acd3f4d1066fb5eb8bb710f4a23065ef1db6003b48a80ecb6 WHIRLPOOL 1a45c0119c33f5d42c65083adb771d8bfae44daf300269d0734fcfc073e0dd1e665d69708e7f8757e3edb5ad9d500ee6b0d41d6ecdea8114ada29ff7ab1744e4
 EBUILD passenger-5.1.8.ebuild 3827 SHA256 d178ed339b1f895be1457753801d0dd838345ea485f8ab2e1b2227d59b34f542 SHA512 9a6153f12d67e13280b6539dc7f9bc6614a8c793f9484e2df3ed3c4793c37fe6dc7e48f7aca5cad85e2e9abd74455cc2d58010e22ff8a44e3c277e7872d58206 WHIRLPOOL 3cef97673ba0a6d95375368aecc7d7a577d26e2dcadaf781bb421d617fabd8ac5c99a9facc1656afe919f9804401d43db0d253101486c9bfd5d9b15805c1db9d
diff --git a/www-apache/passenger/passenger-5.1.11.ebuild b/www-apache/passenger/passenger-5.1.11.ebuild
index 9a80d0c6a2a0..6de168a4b44c 100644
--- a/www-apache/passenger/passenger-5.1.11.ebuild
+++ b/www-apache/passenger/passenger-5.1.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"