gentoo resync : 10.11.2017

3 files changed, 37 insertions, 1 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 3f5459d3bb43..fa95f9e01fd7 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -2,6 +2,7 @@ AUX conf/lighttpd.conf 8261 SHA256 98f1d23c2f3f1e7f58041a27516f8ba29312b66634371
 AUX conf/mime-types.conf 3313 SHA256 4db775fd31f89e8d2c2e64f685b3929755accbbd1b91beaba866ab6fea9eeddd SHA512 2535c9458f556a7f1a37461b543ff34869ab714438a3e53d13809bb46f0d6f4efa2da1407411678f54a64f6f9bdb32d5c3a7daf76903ef512c6d3b021719ebe7 WHIRLPOOL b442f6f75ba68a2eab23c2016373a2c4703a578291dea5732f25ebdee8db2649bf5d7121cf0311d2a8e8ae14554a0f40baa68b6185f77d1bed8e8102bdcd9844
 AUX conf/mod_cgi.conf 749 SHA256 ba6a242fd39f6d29eded80d5ea157108ac35d9bcfdb168568b35a64285fb9603 SHA512 e611b3ed232af4fb8e9b8821a29fbc32acb0a3431c701e5a64afc192abc288cf90582fbbf79085de9426be23d8d42d90da66e6993ab7cf89943ae23d59d681a1 WHIRLPOOL fb2e146db32e33d3acd077dea5295fa2a48e1d3602575d633369071e94304fa780adfcfade418e3534820736817feb436f8c6bf641c158da3de82e604581f9c9
 AUX conf/mod_fastcgi.conf 553 SHA256 61f89fd8c324d1817aaabd283024686d8b02b76eb47a344a2beada3fb3c5bf88 SHA512 e2796181ae9f7c55a48b690835f8f84aaab2c5c100846fc8ac5126b9a1351ef1a2ab30f26da2e16afa197bddf555c299a82a5cc133350212e171ac555765a08d WHIRLPOOL 64d53ffe634adf1d90e3578a86404a81eb0520780d8ece37b993c7bdc988cb27b49a82d4c6e86c3933f41d3cc714e220541b4bb4bf759f9b0b5bd0b097b0811a
+AUX lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch 1042 SHA256 792e8fad8a87f857ecd3ed753b351bcf405971e33321bff1df389c35f73460b6 SHA512 3fc99aae70d00b7cdf691cbb62361ce4db1154f173b95143d76f731fe45f4763b2ff56ed34334006a8bed3a8d029196153c62f7871b41e043c3e5523cfcdb7c3 WHIRLPOOL 34cdbe770ffff2a043cd6b4de8f908e81167e1e84ec3fa961e52b049c6d8e004f58d6f34b5a14a8ef6b24a6957e2870dff08d73e81d173877c9c9fe9ead8f02b
 AUX lighttpd.confd 240 SHA256 0be7c9c04ce508cbefb3e913951d83c5ed7f0e01fe5aebcf3a5071f30ef3dbc2 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416 WHIRLPOOL 9ffa7ee9fa1620520a282da15c5b68ee43e2bf5bfe47bd889a39d294ec48c6a254eb6d4af4fc842755f6939dc41276d25e253e088d09cd788c2495f557d15912
 AUX lighttpd.initd 1957 SHA256 aceed021f24b817347fdf216ccc61e7f34cb8fd831a377c2fbbf1230873498e2 SHA512 d5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485 WHIRLPOOL 57f49ee5139338eeccc462ef5994d4048293cb3f9151e4c5cf8607af54c1520f8a20a286e847aed92766d33081c0bcdb1929bf5dcd1c04899185ec9e50ddad6c
 AUX lighttpd.logrotate 366 SHA256 4141042540d995736de86dfb24aacc5be809defcf8320bbec181ac5c7184fc3a SHA512 d28b491423d7cf6b2f5d82191da7e816c73c36e2db469f543f4c09b6e60fce4f0931af49ffc4965e3f5906e22ea6439248dce0d3f4727022df9b6fb5e8a0b92a WHIRLPOOL 46f00ebd72931f1732c91ee1d7214dbf223a20ea962733476b6ed8ee45e1c65da3c4c7c467763d064e02f16e1949765ae9c6de0c4a5da07b5e02d29ee6a4e654
@@ -17,7 +18,7 @@ EBUILD lighttpd-1.4.42.ebuild 6071 SHA256 370b883602d941ad465f471277dfea74277050
 EBUILD lighttpd-1.4.43.ebuild 6080 SHA256 dbc189710a2a360de1a3d981cd468bad30135fd049031c63d13a00904edc6888 SHA512 b17ab4887776c304a1584d4ed79776ec14d7f9fac0bdafc9ddf32b4f427bc71ef2a9d12c5f36849c3c2de7eae4f59d46402a63f4826569ec224e0d64919ed1ec WHIRLPOOL 92ca023ff5e43aa4fbe65df006780f523cd4c958a23fed5b2d56ce3761cd93da5bdad5faa8684a2970312ddf4d564537c7a3e690b0b859ddf432242289b53d9a
 EBUILD lighttpd-1.4.44.ebuild 6080 SHA256 0920bd50fb0f7a1decb7d3fa2915e47f9ff885b982a315c72506e28228095981 SHA512 e6d29f7d6617733f9c7260ffd4549b63b3630314fbdf9c2ee2a264febabbe498c289c8693f0118c3fb4f5e2054a00d0d6209fb853e114e6ddc883c70dd4c8f02 WHIRLPOOL ac6a58369e29cb33cb80deca7f4093036fceb3b261ccc03979d8621c72dfbd57a4be74acfafaeeca9f158f4717bab488d7a9753d8e79f399ac5a107ea7f0b7a2
 EBUILD lighttpd-1.4.45.ebuild 6079 SHA256 bbcd11ac3b5f7e49e1124be04c8401125c788e02597c7eba56a43a6246aeaaea SHA512 3f22286876882bbb2eaef844e00466b8d290ce1afd7c000bf4e7387d0e96f25c274fdc53f6ac1cde4433c66dc0a9e352a7e48ea8a016de48e1d2dd2f79156208 WHIRLPOOL 41e8427540379feee038a9ceb1d0e6724f2b28759feebe85aba81cf00b9e84cc08296e04e7edda92a6566dcaa94baa2b61855cb32af7c01ef7fdd69373f2293a
-EBUILD lighttpd-1.4.47.ebuild 6087 SHA256 db7c9e3d6fb1964c284c3cbd8fa3b5c9482c61c4c70719d016f4a6b58c1ef121 SHA512 6e333e8a5ed9d580b88a9005ba65290ce0817230f9e8006ec2d5c08b9a400b1f3b0ab845537e6b14cf3bc1b1e73bc29326018c88a79813b2047de281473af389 WHIRLPOOL 080089b3d44ace54f59c13ed2055e9a4c798e4cf359de5bcbd828e944800e82c74f8c82025851834796030d087fc5f5973e550764c00c6bd06452f52857281f6
+EBUILD lighttpd-1.4.47.ebuild 6153 SHA256 427eb2de1fa27e6a4a540a0f8dfcd968bdf9fae5250a8bb0bb9914ca7d139d95 SHA512 68567e4d5f6a177b6c36d9a2d2893379ff21bbafc610584034b2db35d90bf717cc1336e44e4d9ef7d3f37dd1b4b49bb0c1aa7c2277e98af2acbfa8f60e68ea83 WHIRLPOOL 48bbb843447276e922b59c2f9c00dc67f55c552887a5f1f02f6ddc099c20c1c1fa607bc4c58775025b72f082c70000572766debf31e0ed69e49f792ddf57a43c
 EBUILD lighttpd-9999.ebuild 6097 SHA256 6cd03e52014e85149a459a421abe57877fb7990baf7de117a49fdba12a565100 SHA512 f1898fb6b9b9331d206119bd3ca0cec00d8cce4836dda65829d7d82c79ba4a38b8a55cd5e08dedd1780a29f78e0deb7ecbb546826a182202fa1c009a3a794bc9 WHIRLPOOL 8141eb819762dd7a9b5ed683d5241d76c3c5095a99d1724c1d2e1b33e53f3ba1764590e3d7837276cbc0fd596eee41f2943a40022acdbf443eb943532af9b709
 MISC ChangeLog 6969 SHA256 98caae3758751b6ac130263038f7713d728701422c2f5b50347049f66dc53f7d SHA512 dfebc0e6ffa9d2ca30c21167b3a1f7458f6c7ffc189e41bfe714e09bdfc648d6830955f3b5bf19fafd4030a7924048d6d356e261b8a8351b09c59d43af4286db WHIRLPOOL 3f5d71548c717b1b419fba2b4138ed87ae76818eb97cf7a4b1f2f71d4254c8d85869fde46d6b305fe7e98ff671776e6e40583cb653634936334989fc6b1197e0
 MISC ChangeLog-2015 68066 SHA256 e7fefb5620b11f07ecfb5d88b3419a982bf4032fab68f6dab74898c6c33167aa SHA512 4f13902c1d561e94d30511b7aa305bebf2bca96b8f841667d77a69bdcfb08511c7a837a08c694ee8287e747456182c9c201dce63c46be14a3eecde1598fe7c96 WHIRLPOOL 62440fda0dce63a1ba2fcfa512099110cbde210b2f5f5a3f3b23faf28c2d339f59becba15e4ef5797688b992273ff58e08173eab65bc7d53bf70b65bbe718c1c
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch b/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
new file mode 100644
index 000000000000..7916ac0b53f3
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
@@ -0,0 +1,31 @@
+Backport upstream fixes for Gentoo bug #636650
+
+Original upstream commit message:
+
+Author: nicorac <claudio.nicora@gmail.com>
+Date:   Wed Oct 25 16:48:24 2017 +0200
+
+    [core] fix build --disable-ipv6 (fixes #2832)
+    
+    x-ref:
+      "Build error on systems without IPV6 support (regression from 1.4.46)"
+      https://redmine.lighttpd.net/issues/2832
+    
+    github: closes #87
+
+--- a/src/network.c
++++ b/src/network.c
+@@ -77,9 +77,13 @@ static void network_host_normalize_addr_str(buffer *host, sock_addr *addr) {
+     if (addr->plain.sa_family == AF_INET6)
+         buffer_append_string_len(host, CONST_STR_LEN("]"));
+     if (addr->plain.sa_family != AF_UNIX) {
++      #ifdef HAVE_IPV6
+         unsigned short port = (addr->plain.sa_family == AF_INET)
+           ? ntohs(addr->ipv4.sin_port)
+           : ntohs(addr->ipv6.sin6_port);
++      #else
++        unsigned short port = ntohs(addr->ipv4.sin_port);
++      #endif
+         buffer_append_string_len(host, CONST_STR_LEN(":"));
+         buffer_append_int(host, (int)port);
+     }
diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
index 69a3db322f69..7267b9187d2d 100644
--- a/www-servers/lighttpd/lighttpd-1.4.47.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
@@ -51,6 +51,10 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-apache )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-3d257ec3-respect-HAVE_IPV6.patch"
+)
+
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
 	local config="${D}/etc/lighttpd/lighttpd.conf"