gentoo resync : 18.11.2018

4 files changed, 74 insertions, 2 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 18c622f48315..ef9fa5b2a221 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index f689f67ca705..bce5d7e929e0 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -5,6 +5,7 @@ AUX http-replicator-3.0-repcacheman-0.44-r2 5337 BLAKE2B 3b6c8b16b34cb3ef9b98408
 AUX http-replicator-3.0-sighup.patch 993 BLAKE2B 82709484ea1f5e63ae5eb883339f4561f7ed05625453c18c8d74207c8ea33b5a6bcc6aab69b9e1e8fd86e2d49e4b4d94fe0a438f1939cc34e6ec60543894e43c SHA512 25da23acd8c235f2b0dbe2f424a92a161d3f4e96e5bea67973004c7bb0642640b73d528b1675174a611bef35f34cc18de08d78c3464cb6080f4f44f833173aee
 AUX http-replicator-3.0.conf 1704 BLAKE2B d496ff21d492ca89fdfb64467de902481fe2c7bbec96227cac6ade3dd05850c74875062058dba491778fb06409b396cad7e4876106cc521bc642268976129479 SHA512 c56031c303f79a44a006781b3796abaae24f1b8ea368eb0436a7ada8defe0f92382649098aef7c41372bfbf1889a17468af201669756912e0c55985c5981fb4c
 AUX http-replicator-3.0.init 620 BLAKE2B 48e44e912233e58e598d9c041e6f1ad4bea48fb67cceb41ae13c008067e28bef2b4a6c35205b0f274c5124a54d48fb32f3334e12716b33c0bf2a29c1c5bc84f8 SHA512 e69143963155cdc03874b51dc0eef8a46bee3d7828bf20bdb50b4ea9ea6bb2e4fd705e1d9ee4864e53488e4035aa91ebd47f02a597bfa1ee6d5b7121ac5fd68d
+AUX http-replicator-4.0_alpha2-ipv6.patch 2266 BLAKE2B c5f7f87346adc5c237eb34a7cb1497eac2de58388c296eaf00d80a02f0d0bd34619e0044fb4674065e43489461d506c76dc52b04b80c1be2ea92a52b21eed4eb SHA512 70793ee864630156cd25453c2bae4c1bde40b7378d938f45e39b94e8ac8fa1e7a779d6535fbe3a5a5f1b44a4297c6910ac51ce4cb80321f96d26a08559b1f22e
 AUX http-replicator-4.0_alpha2-r2.conf 1440 BLAKE2B 1ab4c03ff638ec90c6c29884713522c4b7f2092618752309e66ae93d4e7955e09bb9f9941e87d6b14223f7b27edb0cb8c29510ce259437719099d3ad11cb1e29 SHA512 e6237c8b7eeb319615d45abdef4feaca6bbeb741bc75e80173e42328e4eb5f4192edfbf42c7e6e307c14d258e7ec67a0ae6451ff7daef631b2d1e39fe17a48fb
 AUX http-replicator-4.0_alpha2-r3-pid.patch 2681 BLAKE2B 4ae5e263c5476f402dde1bcb2f1b668e648611c46a785bbdeb58dfc75abab4ddabf95783848eb20c3d447448b1c9c5aa210601669de2a4926aba9ff08ee04103 SHA512 9ceb6ede3ec31fd7f702ac77a51897301fd7b16baee869a82180f388949ff7388f0917d667786b45643603c0e9d655cd8686948d5e34896c1fe5932fd76e42b5
 AUX http-replicator-4.0_alpha2-r3.init 644 BLAKE2B cf017fcd078532960e16e4c9735ab4df62d65794ac961798ffd39760fb860199d87322e0792ec759f48d2e9ddaa3134bbc52d9ed39c6d4f564b981d6873cdb72 SHA512 b1a8bd956d35cc536b835aac6cb82202f0b6b775d7eae81ac30f501d1c72877d093711e0f00a28eb7645a383e211d3196379b37da1e0421773c1b91ed6d3837b
@@ -13,5 +14,5 @@ AUX http-replicator.service.conf 164 BLAKE2B 28006ec4c4b27eb1f75276432e30c0f9b33
 DIST http-replicator_3.0.tar.gz 39291 BLAKE2B a97d8b6b32f5d4ca4feefa9abaa7da7cb6570f76566c79d7371134c0edd74b2333a02480deff02fa1bf5b6cd6f2bfbfe4aaa649633d70bd2efbdd22701422651 SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57
 DIST http-replicator_4.0alpha2.tgz 27575 BLAKE2B 48138bc8fa9695ddb31ce89c4638adda4a1d1b58c904cd98d0ee1dbab006f79ef7d19495db8eb4de0113f8e45da425950524c48ec9e3e864d8595ccdef9f7cfa SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c
 EBUILD http-replicator-3.0-r7.ebuild 3443 BLAKE2B 6b68836ebc6bb27f6ad76c9619b6b00069b9ea676ec9abf0b6b81a75d40e00062d650c3fdff1e8022b33ba5a517f590a440c7e159e498fa63379c6cdbb664996 SHA512 f2fca6973f801d66755cc5f79d19e44cab08d70211739d5cf0e8f4d25c66893afe79ca9126a8091477dbca75cfa797b334b6e11d236396c4505060ddbcf8a538
-EBUILD http-replicator-4.0_alpha2-r6.ebuild 1995 BLAKE2B d8986ffdba23c817e7e4d84dd6f3d62889413db418944dd4fa1983b7b1d82eb94c63fa21e9cfc13d91ff26d684f12a52f09f579ac7981e4be387015f419abeaf SHA512 0a2ee980380061b5c3bdd82efe8003391ea78b3526c2a98608cb87b67571319d49d3217da927c1cf87a9a06e7fcd00a4a92fe7ae80a634b6533950b54b81957e
+EBUILD http-replicator-4.0_alpha2-r7.ebuild 2047 BLAKE2B 37791be4784f6399e0d44b45d635c0c877e23232a36a87d9e806a5595e874a1e150634dd477d079ca98eb1471ab4fcd562ebfff858cb89a8c183bfc7ce401672 SHA512 0c7e2976d2e43fb2050ae8829618db99de31831b79c1de670c49b1d8f8735c74f37a0dfa06c4f86fde07ef52bcc6f8190e7398c8b8ffed7fdc886dbbc9db4047
 MISC metadata.xml 252 BLAKE2B 5386635b038f2498cadf1730fa7ae823427900b961296f4acca678ea12eb7c66ed7ad6cbca15afd26042c7af8d687958c702a9c48fc00856b460e2b49e55b2ac SHA512 ffd7c4cd77545f753618c9e9cfeba05b557044879ce332c01deaad820e184329cf383c8488ba777e9653029d3f75e5c99936ca225ebc4a5fb9b4d4e257ba8e7d
diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-ipv6.patch b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-ipv6.patch
new file mode 100644
index 000000000000..906844fd9586
--- /dev/null
+++ b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-ipv6.patch
@@ -0,0 +1,68 @@
+diff -ur a/fiber.py b/fiber.py
+--- a/fiber.py	2018-10-27 12:52:10.536264605 -0400
++++ b/fiber.py	2018-10-27 12:57:26.688730570 -0400
+@@ -180,10 +180,10 @@
+   os.dup2( nul.fileno(), sys.stdin.fileno()  )
+ 
+ 
+-def spawn( generator, port, debug, log, pidfile ):
++def spawn( generator, port, debug, log, pidfile, listenfamily ):
+ 
+   try:
+-    listener = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
++    listener = socket.socket( listenfamily, socket.SOCK_STREAM )
+     listener.setblocking( 0 )
+     listener.setsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR, listener.getsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR ) | 1 )
+     listener.bind( ( '', port ) )
+diff -ur a/http-replicator b/http-replicator
+--- a/http-replicator	2018-10-27 12:52:10.542931816 -0400
++++ b/http-replicator	2018-10-27 12:59:36.345978943 -0400
+@@ -9,7 +9,7 @@
+ 
+ def Replicator( client, address ):
+ 
+-  print 'Accepted request from %s:%i' % address
++  print 'Accepted request from [%s]:%i' % address[0:2]
+ 
+   request = Request.HttpRequest()
+   while not request.Protocol:
+@@ -60,4 +60,4 @@
+   print 'Transaction successfully completed'
+ 
+ 
+-fiber.spawn( Replicator, Params.PORT, Params.DEBUG, Params.LOG, Params.PIDFILE )
++fiber.spawn( Replicator, Params.PORT, Params.DEBUG, Params.LOG, Params.PIDFILE, Params.LISTENFAMILY )
+diff -ur a/Params.py b/Params.py
+--- a/Params.py	2018-10-27 12:52:10.549599026 -0400
++++ b/Params.py	2018-10-27 12:55:31.772685822 -0400
+@@ -9,6 +9,7 @@
+ TIMEOUT = 15
+ PIDFILE = False
+ FAMILY = socket.AF_INET
++LISTENFAMILY = socket.AF_INET
+ FLAT = False
+ STATIC = False
+ ONLINE = True
+@@ -63,6 +64,7 @@
+       sys.exit( 'Error: %s requires a positive numerical argument' % _arg )
+   elif _arg in ( '-6', '--ipv6' ):
+     FAMILY = socket.AF_UNSPEC
++    LISTENFAMILY = socket.AF_INET6
+   elif _arg == '--flat':
+     FLAT = True
+   elif _arg == '--static':
+diff --git a/Protocol.py b/Protocol.py
+--- a/Protocol.py
++++ b/Protocol.py
+@@ -13,7 +13,7 @@ def connect( addr ):
+ 
+   family, socktype, proto, canonname, sockaddr = DNSCache[ addr ][ 0 ]
+ 
+-  print 'Connecting to %s:%i' % sockaddr
++  print 'Connecting to [%s]:%i' % sockaddr[0:2]
+   sock = socket.socket( family, socktype, proto )
+   sock.setblocking( 0 )
+   sock.connect_ex( sockaddr )
+-- 
+2.18.1
+
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r6.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild
index 67f093d09fef..d1b5659c5542 100644
--- a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r6.ebuild
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild
@@ -45,7 +45,10 @@ https://forums.gentoo.org/viewtopic-t-173226.html
 Starting with 4.x releases, the conf.d parameters have changed.
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.0_alpha2-r3-pid.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0_alpha2-r3-pid.patch
+	"${FILESDIR}"/${PN}-4.0_alpha2-ipv6.patch #669078
+)
 
 src_test() {
 	./unit-test && die