[gentoo-commits] gentoo-x86 commit in net-misc/wget/files: wget-1.16-fix-proxy-test-race.patch wget-1.16-openssl-no-ssl3.patch

[Mike Frysinger (vapier)]

vapier      14/10/29 19:57:54

  Added:                wget-1.16-fix-proxy-test-race.patch
                        wget-1.16-openssl-no-ssl3.patch
  Log:
  Add some build/test fixes from upstream.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.16-fix-proxy-test-race.patch?rev=1.1&content-type=text/plain

Index: wget-1.16-fix-proxy-test-race.patch
===================================================================
From 3eff3ad69a46364475e1f4abdf9412cfa87e3d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@×××.de>
Date: Tue, 28 Oct 2014 11:40:34 +0100
Subject: [PATCH] synchronize client and server in Test-proxied-https-auth.px

---
 tests/ChangeLog                  |  4 ++++
 tests/Test-proxied-https-auth.px | 36 +++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)

2014-10-28  Tim Ruehsen <tim.ruehsen@×××.de>

	* tests/Test-proxied-https-auth.px: synchronize client and server

diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
index cc987ff..272003f 100755
--- a/tests/Test-proxied-https-auth.px
+++ b/tests/Test-proxied-https-auth.px
@@ -49,12 +49,15 @@ sub get_request {
 }
 
 sub do_server {
+    my ($synch_callback) = @_;
     my $alrm = alarm 10;
-
     my $s = $SOCKET;
     my $conn;
     my $rqst;
     my $rspn;
+
+    $synch_callback->();
+
     for my $expect_inner_auth (0, 1) {
         $conn = $s->accept;
         $rqst = $conn->get_request;
@@ -90,7 +93,7 @@ sub do_server {
                 Connection => 'close'
                 ]);
             $rspn->protocol('HTTP/1.0');
-            print $rspn->as_string;
+            print STDERR $rspn->as_string;
             print $conn $rspn->as_string;
         } else {
             die "No proxied auth\n" unless $rqst->header('Authorization');
@@ -100,9 +103,9 @@ sub do_server {
                 'Connection' => 'close',
                 ], "foobarbaz\n");
             $rspn->protocol('HTTP/1.0');
-            print "=====\n";
-            print $rspn->as_string;
-            print "\n=====\n";
+            print STDERR "=====\n";
+            print STDERR $rspn->as_string;
+            print STDERR "\n=====\n";
             print $conn $rspn->as_string;
         }
         $conn->close;
@@ -113,18 +116,29 @@ sub do_server {
 }
 
 sub fork_server {
-    my $pid = fork;
-    die "Couldn't fork" if ($pid < 0);
-    return $pid if $pid;
+    pipe(FROM_CHILD, TO_PARENT) or die "Cannot create pipe!";
+    select((select(TO_PARENT), $| = 1)[0]);
+
+    my $pid = fork();
+    if ($pid < 0) {
+        die "Cannot fork";
+    } elsif ($pid == 0) {
+        # child
+        close FROM_CHILD;
+        do_server(sub { print TO_PARENT "SYNC\n"; close TO_PARENT });
+    } else {
+        # parent
+        close TO_PARENT;
+        chomp(my $line = <FROM_CHILD>);
+        close FROM_CHILD;
+    }
 
-    &do_server;
-    exit;
+    return $pid;
 }
 
 system ('rm -f needs-auth.txt');
 my $pid = &fork_server;
 
-sleep 1;
 my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
     . " --no-check-certificate"
-- 
2.1.2




1.1                  net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.16-openssl-no-ssl3.patch?rev=1.1&content-type=text/plain

Index: wget-1.16-openssl-no-ssl3.patch
===================================================================
From c81e3df2bc4d06835791427d888d4ae04a2384bc Mon Sep 17 00:00:00 2001
From: Peter Meiser <meiser@×××××××××××.de>
Date: Wed, 29 Oct 2014 19:26:28 +0100
Subject: [PATCH] Add guard for OpenSSL without SSLv3

---
 src/ChangeLog | 5 +++++
 src/openssl.c | 2 ++
 2 files changed, 7 insertions(+)

2014-10-29  Peter Meiser <meiser@×××××××××××.de> (tiny change)

	* openssl.c (ssl_init) [! OPENSSL_NO_SSL3]: Add guard for OpenSSL
	without SSLv3.

diff --git a/src/openssl.c b/src/openssl.c
index e24954a..6f11650 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -208,9 +208,11 @@ ssl_init (void)
       meth = SSLv2_client_method ();
       break;
 #endif
+#ifndef OPENSSL_NO_SSL3
     case secure_protocol_sslv3:
       meth = SSLv3_client_method ();
       break;
+#endif
     case secure_protocol_auto:
     case secure_protocol_pfs:
     case secure_protocol_tlsv1:
-- 
2.1.2