gentoo resync : 19.05.2018

2 files changed, 0 insertions, 54 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0a44b8661aa9..4ab191849edb 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,5 @@
 AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
 AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
-AUX puppet-4-webrick-ruby.patch 2062 BLAKE2B 49cecd9d0ff077dd8d9e435bfaa1f51cfd45ad6baa2fcc8198d0c2cd53e2b0e04cbc49c8488ddbe23d3187f423c03a0e14b77f242d3fda6a019770be927a78da SHA512 045fec755dea2ef258d76962fee795b4e7b01f596cb6b622434226f978d4756e059bbdf8c140c88c32d145e99f3aa627ae15349430588d00a0ed90f2371bd934
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
diff --git a/app-admin/puppet/files/puppet-4-webrick-ruby.patch b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
deleted file mode 100644
index ce4b055644f6..000000000000
--- a/app-admin/puppet/files/puppet-4-webrick-ruby.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a358d5ec01c6f87b39e5bfbab7a35582624fdbf7 Mon Sep 17 00:00:00 2001
-From: Josh Cooper <josh@puppet.com>
-Date: Fri, 12 Jan 2018 15:30:38 -0800
-Subject: [PATCH] (PUP-8297) Don't accept already connected socket
-
-Webrick's start method yields an already connected socket, so it is not
-necessary to call accept on the socket. In ruby versions prior to 2.3.6 and
-2.4.3, the accept call was a noop.
-
-In 2.3.6 and 2.4.3, it is an error, because ruby those versions use a
-non-blocking accept to handle clients that make an TCP connection, but
-are slow to negotiate the TLS handshake[1,2]. On these versions, puppet
-master would report:
-
-    SSL_accept returned=1 errno=0 state=unknown state: unexpected record
-
-Remove the call to Socket#accept.
-
-[1] https://bugs.ruby-lang.org/issues/14005
-[2] https://github.com/ruby/ruby/commit/2e728d51e70ed3756ad760c687a08b8487b0112f
----
- lib/puppet/network/http/webrick.rb     | 1 -
- spec/unit/network/http/webrick_spec.rb | 5 +++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
-index 9ebf1763be5..3ac2ff40650 100644
---- a/lib/puppet/network/http/webrick.rb
-+++ b/lib/puppet/network/http/webrick.rb
-@@ -29,7 +29,6 @@ def listen(address, port)
-         if ! IO.select([sock],nil,nil,timeout)
-           raise "Client did not send data within %.1f seconds of connecting" % timeout
-         end
--        sock.accept
-         @server.run(sock)
-       end
-     end
-diff --git a/spec/unit/network/http/webrick_spec.rb b/spec/unit/network/http/webrick_spec.rb
-index a90fc3f3378..843b0d54c8a 100644
---- a/spec/unit/network/http/webrick_spec.rb
-+++ b/spec/unit/network/http/webrick_spec.rb
-@@ -92,6 +92,11 @@
-       expect(server).to be_listening
-     end
- 
-+    it "is passed an already connected socket" do
-+      socket.expects(:accept).never
-+      server.listen(address, port)
-+    end
-+
-     describe "when the REST protocol is requested" do
-       it "should register the REST handler at /" do
-         # We don't care about the options here.