From ce38b4661c727d8e2a9b4c1e02bd0fbda4757fbcdd18585edfaae6b79415a9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20M=C3=B6llers?= <josef.moellers@suse.com>
Date: Sat, 1 Dec 2018 16:33:46 +0000
Subject: [PATCH] Accepting request 653084 from
 home:jmoellers:branches:network:utilities

OBS-URL: https://build.opensuse.org/request/show/653084
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=91
---
 wget-1.19.5.tar.gz              |   3 ---
 wget-1.19.5.tar.gz.sig          | Bin 566 -> 0 bytes
 wget-1.20.tar.gz                |   3 +++
 wget-1.20.tar.gz.sig            |  16 ++++++++++++++
 wget-ignore-void-retvalue.patch |  16 --------------
 wget-libproxy.patch             |  38 ++++++++++++++++----------------
 wget.changes                    |  21 ++++++++++++++++++
 wget.spec                       |   8 +++----
 wgetrc.patch                    |   8 +++----
 9 files changed, 66 insertions(+), 47 deletions(-)
 delete mode 100644 wget-1.19.5.tar.gz
 delete mode 100644 wget-1.19.5.tar.gz.sig
 create mode 100644 wget-1.20.tar.gz
 create mode 100644 wget-1.20.tar.gz.sig
 delete mode 100644 wget-ignore-void-retvalue.patch

diff --git a/wget-1.19.5.tar.gz b/wget-1.19.5.tar.gz
deleted file mode 100644
index 2b70bef..0000000
--- a/wget-1.19.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b39212abe1a73f2b28f4c6cb223c738559caac91d6e416a6d91d4b9d55c9faee
-size 4455797
diff --git a/wget-1.19.5.tar.gz.sig b/wget-1.19.5.tar.gz.sig
deleted file mode 100644
index 00bea4bbf8299fc136ff4069d212e1dba7bc9edb7d4771dac7007668fef8dc0b..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SW*e79j*2vVFXmVM{GoL1b+RFfF#CX9Oq(0$T4f<^T!_5C||W
zwxVYQDDkQg0G7T@jxS#^av+Umn#VJ5Do`^jWsR!GvwqD<S|#i?!P}rsL%Lfx@$M|k
z8KoXh8m$9?Y%{bd>``T9s4ycb>w!@PyX9B~BX|5bjm5%eaOG-MZk2`AkvyE7v`~eT
zGD3C|{IhCq`WTNPdoAc`AWe1ER@02U*Q?oz9_L!irEQefR#kO18<p>OvB}r+Wdbe%
z2D4nU6ZCymowqT0Ecc;C{<zwY?!_uYVS89VPmut1ACF`v0S8E6$}zqrYSf%8){4s@
zR@nQmXK)vcW9nayYpLrv7@!{##eY`|>`c!gG<)LPOviW*l(vbbdo`@{pD3EmT96Ql
z&xdga4LC|lXNEAr2TPt_8K?oiU@BNlx2(<a6MOo=0l!yay1eKUSiTTz^9b}mT~aO>
znraH&kKr*1HmhW<iS@cQ7Tf2x{#{9pcdPF+{HZ3OFS<KHSF>!;p#_GGWYBs-fCMs=
zUz#ofQqz7hS}9!WgG!QT;2HNJ>`$hEFGquTHF?|r?ZQZcBnro_ByD^Djg|sacak9Y
z6JF#?F!{wj<t8|k^WJ%aF$~awmc!unO4bVPut8XR){pteu5T`0&}2-2`vGysHp3~~
zw&d?PLD^XMNrUh^q_V@$-nhzxx$IGC!p_?@6uW^g`UL~-P_%cbe!an(qfs3XsfKMP
Eh$guS(EtDd

diff --git a/wget-1.20.tar.gz b/wget-1.20.tar.gz
new file mode 100644
index 0000000..a127950
--- /dev/null
+++ b/wget-1.20.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a057925c74c059d9e37de63a63b450da66c5c1c8cef869a6df420b3bb45a0cf
+size 4474641
diff --git a/wget-1.20.tar.gz.sig b/wget-1.20.tar.gz.sig
new file mode 100644
index 0000000..825db30
--- /dev/null
+++ b/wget-1.20.tar.gz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEa5j2N9h5xSNuJ3xcZP+QqujHCvkFAlwAcjEACgkQZP+QqujH
+Cvl1xxAAi/0j2UjNjOftXX1LFCKn+6Q5//T9iurjUZzpcLc7K7eiTSfI9TIpXzU9
+mWbvs6OiXbM8x/l4wj0gkV6OugpKBbAMagA9VT0vbFAetadWJE435U+ghruhz97e
+aKOVyTcOQNYHpHpw50bnmv2vyLCeFctE9eA6f7d88X7l27Et2QmnVyqGfhULGROX
+TFRY6LEqS5tNioL5r70j/rogf/Nb/ZEcXSWMbB/Y0Hold+IbaZn7qYtgP/lBFEGk
+UlX2mpPJuwktYGV+wJNlz0JwCbLCXsM9oTij29Kn1SujJ0QLfz43VqUbZK2vX8wu
+hRXqtqyq/GeWECQ4o/um08PEYNDW/BnucHX8/abP+I2NxVxJOSD9+LNsv1Yu2wnH
+aN9WPJ8Kts25nM0XqqUPgfPPJcuj/YNw9KBmA32VXGdP0RdsLZG2TtyNtFsUH7PQ
+OSXbUNEVuXECaRgMcZ6Jd251rOjROScBD+rSfsepfK6XsgnlweXD5LnDX6FBnigL
+P8P15VdM68jPLzwrwByDi+kjd59ojzu1Wc28WbX10K9jFx3OOy6RKJ0ULqNulNk9
+b4UXdbAmiXlDIN3FDN3fOCZzPGqcbcg21GoU2AvKfs9EKKVlIUgbxVfAcDtogn3h
+b1CetPZWgl0tPS0TaGQvnvDI1ftdUt3WoCqmXuoWeKdHnwmeqbY=
+=y9uB
+-----END PGP SIGNATURE-----
diff --git a/wget-ignore-void-retvalue.patch b/wget-ignore-void-retvalue.patch
deleted file mode 100644
index 445114d..0000000
--- a/wget-ignore-void-retvalue.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: wget-1.19.5/src/host.c
-===================================================================
---- wget-1.19.5.orig/src/host.c
-+++ wget-1.19.5/src/host.c
-@@ -732,7 +732,10 @@ wait_ares (ares_channel channel)
-         ares_process (channel, &read_fds, &write_fds);
-     }
-   if (timer)
--    timer = ptimer_destroy (timer);
-+  {
-+    ptimer_destroy (timer);
-+    timer = NULL;
-+  }
- }
- 
- static void
diff --git a/wget-libproxy.patch b/wget-libproxy.patch
index aebf6fd..aa56bb3 100644
--- a/wget-libproxy.patch
+++ b/wget-libproxy.patch
@@ -1,10 +1,10 @@
-Index: wget-1.19.1/configure.ac
+Index: wget-1.20/configure.ac
 ===================================================================
---- wget-1.19.1.orig/configure.ac
-+++ wget-1.19.1/configure.ac
-@@ -506,6 +506,22 @@ AS_IF([test x"$with_metalink" != xno], [
-   ])
- ])
+--- wget-1.20.orig/configure.ac
++++ wget-1.20/configure.ac
+@@ -493,6 +493,22 @@ else
+   fi
+ fi
  
 +dnl
 +dnl libproxy support
@@ -25,11 +25,11 @@ Index: wget-1.19.1/configure.ac
  dnl **********************************************************************
  dnl Checks for IPv6
  dnl **********************************************************************
-Index: wget-1.19.1/src/Makefile.am
+Index: wget-1.20/src/Makefile.am
 ===================================================================
---- wget-1.19.1.orig/src/Makefile.am
-+++ wget-1.19.1/src/Makefile.am
-@@ -64,7 +64,7 @@ wget_SOURCES = connect.c convert.c cooki
+--- wget-1.20.orig/src/Makefile.am
++++ wget-1.20/src/Makefile.am
+@@ -62,7 +62,7 @@ wget_SOURCES = connect.c convert.c cooki
  nodist_wget_SOURCES = version.c
  EXTRA_wget_SOURCES = iri.c
  LDADD = $(LIBOBJS) ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB)\
@@ -38,11 +38,11 @@ Index: wget-1.19.1/src/Makefile.am
   $(LIB_NANOSLEEP) $(LIB_POSIX_SPAWN) $(LIB_SELECT) $(LIBICONV) $(LIBINTL)\
   $(LIBTHREAD) $(LIBUNISTRING) $(SERVENT_LIB)
  AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
-Index: wget-1.19.1/src/retr.c
+Index: wget-1.20/src/retr.c
 ===================================================================
---- wget-1.19.1.orig/src/retr.c
-+++ wget-1.19.1/src/retr.c
-@@ -58,6 +58,10 @@ as that of the covered work.  */
+--- wget-1.20.orig/src/retr.c
++++ wget-1.20/src/retr.c
+@@ -61,6 +61,10 @@ as that of the covered work.  */
  #include "iri.h"
  #include "hsts.h"
  
@@ -53,7 +53,7 @@ Index: wget-1.19.1/src/retr.c
  /* Total size of downloaded files.  Used to enforce quota.  */
  SUM_SIZE_INT total_downloaded_bytes;
  
-@@ -1319,7 +1323,40 @@ getproxy (struct url *u)
+@@ -1480,7 +1484,40 @@ getproxy (struct url *u)
        break;
      }
    if (!proxy || !*proxy)
@@ -94,11 +94,11 @@ Index: wget-1.19.1/src/retr.c
  
    /* Handle shorthands.  `rewritten_storage' is a kludge to allow
       getproxy() to return static storage. */
-Index: wget-1.19.1/tests/Makefile.am
+Index: wget-1.20/tests/Makefile.am
 ===================================================================
---- wget-1.19.1.orig/tests/Makefile.am
-+++ wget-1.19.1/tests/Makefile.am
-@@ -32,6 +32,7 @@
+--- wget-1.20.orig/tests/Makefile.am
++++ wget-1.20/tests/Makefile.am
+@@ -30,6 +30,7 @@
  #
  # Version: @VERSION@
  #
diff --git a/wget.changes b/wget.changes
index 21637c4..93bcb1a 100644
--- a/wget.changes
+++ b/wget.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Nov 30 14:02:43 UTC 2018 - josef.moellers@suse.com
+
+- Version update to 1.20:
+  * Add new option `--retry-on-host-error` to treat local errors as
+    transient and hence Wget will retry to download the file after
+    a brief waiting period.
+  * multiple potential resource leaks as found by static analysis.
+  * Wget will now not create an empty wget-log file when running
+    with -q and -b. switches together
+  * When compiled using the GnuTLS = 3.6.3, Wget now has support
+    for TLSv1.3.
+  * Now there is support for using libpcre2 for regex pattern
+    matching.
+  * When downloading over FTP recursively, one can now use the
+    --accept,reject -regex switches to fine-tune the downloaded
+    files.
+  * Building Wget from the git sources now requires autoconf 2.63
+    or above. Building from the Tarballs works as it used to.
+  [wget-ignore-void-retvalue.patch]
+
 -------------------------------------------------------------------
 Mon May  7 07:04:05 UTC 2018 - josef.moellers@suse.com
 
diff --git a/wget.spec b/wget.spec
index 2c5852a..c332135 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package wget
 #
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %bcond_with	regression_tests
 Name:           wget
-Version:        1.19.5
+Version:        1.20
 Release:        0
 Summary:        A Tool for Mirroring FTP and HTTP Servers
 License:        GPL-3.0+
@@ -33,7 +33,6 @@ Patch6:         wget-1.14-no-ssl-comp.patch
 # PATCH-FIX-OPENSUSE fix pod syntax for perl 5.18 coolo@suse.de
 Patch7:         wget-fix-pod-syntax.diff
 Patch8:         wget-errno-clobber.patch
-Patch9:         wget-ignore-void-retvalue.patch
 BuildRequires:  automake
 BuildRequires:  gpgme-devel >= 0.4.2
 BuildRequires:  libcares-devel
@@ -71,14 +70,13 @@ This can be done in script files or via the command line.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 %if 0%{?suse_version} > 1110
 %patch1 -p1
 %endif
 %patch6
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %build
 %if 0%{?suse_version} > 1110
diff --git a/wgetrc.patch b/wgetrc.patch
index 6d542d8..f0ec1ee 100644
--- a/wgetrc.patch
+++ b/wgetrc.patch
@@ -1,8 +1,8 @@
-Index: doc/sample.wgetrc
+Index: wget-1.20/doc/sample.wgetrc
 ===================================================================
---- doc/sample.wgetrc.orig
-+++ doc/sample.wgetrc
-@@ -114,6 +114,9 @@
+--- wget-1.20.orig/doc/sample.wgetrc
++++ wget-1.20/doc/sample.wgetrc
+@@ -120,6 +120,9 @@
  
  # To try ipv6 addresses first:
  #prefer-family = IPv6