wget: update patchset

net-misc/wget/patches/wget-1.15.patchset

@@ -1,4 +1,4 @@
-From d44e24178a9dd9864e7ac068249444a1d95b9af1 Mon Sep 17 00:00:00 2001
+From 242dd3e8ecdcefbd023b47092cbc19ce806fdacb Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 May 2014 15:38:37 +0000
 Subject: apply wget-1.14.patch
@@ -95,7 +95,7 @@ index 3f27ea0..3cd3ed9 100644
 1.8.3.4
 
 
-From d91114a406b6b16542a77b55ebe140314ce803c1 Mon Sep 17 00:00:00 2001
+From 6bc747571c02e44994578c13d5920a41f9a68a50 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 May 2014 15:47:24 +0000
 Subject: apply and augment wget-1.14-build-fixes.patch
@@ -146,18 +146,10 @@ index 1bb44b4..5285983 100644
          {
            xfree (url_text);
 diff --git a/src/http.c b/src/http.c
-index 5715df6..38ee4b1 100644
+index 5715df6..d6e875c 100644
 --- a/src/http.c
 +++ b/src/http.c
-@@ -29,6 +29,7 @@ Corresponding Source for a non-source form of such a combination
- shall include the source code for the parts of OpenSSL used as well
- as that of the covered work.  */
- 
-+#define __USE_GNU
- #include "wget.h"
- 
- #include <stdio.h>
-@@ -1067,6 +1068,7 @@ extract_param (const char **source, param_token *name, param_token *value,
+@@ -1067,6 +1067,7 @@ extract_param (const char **source, param_token *name, param_token *value,
                 char separator)
  {
    const char *p = *source;
@@ -165,7 +157,7 @@ index 5715df6..38ee4b1 100644
  
    while (c_isspace (*p)) ++p;
    if (!*p)
-@@ -1122,7 +1124,7 @@ extract_param (const char **source, param_token *name, param_token *value,
+@@ -1122,7 +1123,7 @@ extract_param (const char **source, param_token *name, param_token *value,
      }
    *source = p;
  
@@ -174,7 +166,7 @@ index 5715df6..38ee4b1 100644
    if (NOT_RFC2231 != param_type)
      {
        modify_param_value(value, param_type);
-@@ -1512,6 +1514,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
+@@ -1512,6 +1513,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
    int warc_payload_offset = 0;
    FILE *warc_tmp = NULL;
    int warcerr = 0;
@@ -182,7 +174,7 @@ index 5715df6..38ee4b1 100644
  
    if (opt.warc_filename != NULL)
      {
-@@ -1548,7 +1551,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
+@@ -1548,7 +1550,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
      }
  
    /* Read the response body.  */
@@ -191,7 +183,7 @@ index 5715df6..38ee4b1 100644
    if (contlen != -1)
      /* If content-length is present, read that much; otherwise, read
         until EOF.  The HTTP spec doesn't require the server to
-@@ -1653,6 +1656,7 @@ static uerr_t
+@@ -1653,6 +1655,7 @@ static uerr_t
  gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
           struct iri *iri, int count)
  {
@@ -199,7 +191,7 @@ index 5715df6..38ee4b1 100644
    struct request *req;
  
    char *type;
-@@ -2125,10 +2129,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
+@@ -2125,10 +2128,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
            if (write_error >= 0 && warc_tmp != NULL)
              {
                /* Remember end of headers / start of payload. */
@@ -212,7 +204,7 @@ index 5715df6..38ee4b1 100644
                if (warc_tmp_written != body_data_size)
                  write_error = -2;
              }
-@@ -2309,6 +2314,7 @@ read_header:
+@@ -2309,6 +2313,7 @@ read_header:
  
    if (statcode == HTTP_STATUS_UNAUTHORIZED)
      {
@@ -220,7 +212,7 @@ index 5715df6..38ee4b1 100644
        /* Authorization is required.  */
  
        /* Normally we are not interested in the response body.
-@@ -2347,7 +2353,7 @@ read_header:
+@@ -2347,7 +2352,7 @@ read_header:
          }
  
        pconn.authorized = false;

net-misc/wget/wget-1.15.recipe

@@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.15.tar.gz"
 CHECKSUM_SHA256="52126be8cf1bddd7536886e74c053ad7d0ed2aa89b4b630f76785bac21695fcd"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1996-2013 Free Software Foundation"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"