From 5e0ebbfc4b4ac47c9bc0d69c6f20f63c001462722432b35a7f503f8f27b16178 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 3 Mar 2015 07:43:06 +0000 Subject: [PATCH] Accepting request 288607 from home:AndreasStieger:branches:network:utilities GNU wget 1.16.2 OBS-URL: https://build.opensuse.org/request/show/288607 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=51 --- wget-1.14-openssl-no-intern.patch | 25 ------------------------- wget-1.16.1.tar.xz | 3 --- wget-1.16.1.tar.xz.sig | Bin 543 -> 0 bytes wget-1.16.2.tar.xz | 3 +++ wget-1.16.2.tar.xz.sig | Bin 0 -> 543 bytes wget.changes | 10 ++++++++++ wget.spec | 6 ++---- 7 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 wget-1.14-openssl-no-intern.patch delete mode 100644 wget-1.16.1.tar.xz delete mode 100644 wget-1.16.1.tar.xz.sig create mode 100644 wget-1.16.2.tar.xz create mode 100644 wget-1.16.2.tar.xz.sig diff --git a/wget-1.14-openssl-no-intern.patch b/wget-1.14-openssl-no-intern.patch deleted file mode 100644 index 8801376..0000000 --- a/wget-1.14-openssl-no-intern.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- - src/openssl.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: wget-1.15/src/openssl.c -=================================================================== ---- wget-1.15.orig/src/openssl.c 2014-01-19 21:35:59.000000000 +0000 -+++ wget-1.15/src/openssl.c 2014-01-19 21:37:27.000000000 +0000 -@@ -29,6 +29,7 @@ Corresponding Source for a non-source fo - shall include the source code for the parts of OpenSSL used as well - as that of the covered work. */ - -+#define OPENSSL_NO_SSL_INTERN - #include "wget.h" - - #include -@@ -479,7 +480,7 @@ ssl_connect_wget (int fd, const char *ho - DEBUGP (("SSL handshake timed out.\n")); - goto timeout; - } -- if (scwt_ctx.result <= 0 || conn->state != SSL_ST_OK) -+ if (scwt_ctx.result <= 0 || SSL_get_state(conn) != SSL_ST_OK) - goto error; - - ctx = xnew0 (struct openssl_transport_context); diff --git a/wget-1.16.1.tar.xz b/wget-1.16.1.tar.xz deleted file mode 100644 index 41e073d..0000000 --- a/wget-1.16.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b96c707ee15fe847f5bc2f872a7a530dca803b927a750419b44f50803e14d33 -size 1760120 diff --git a/wget-1.16.1.tar.xz.sig b/wget-1.16.1.tar.xz.sig deleted file mode 100644 index ef995226ccd99e8e9d973120a342c0d376637c01a7960d32979af12f8a8ea37b..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-usf1>~j2@obdZSvt`;p+Un5B@4hq&s;PL@^#`Qt^o( zJB3cjQOAmljYXdbI~-TBo-XQe1p>fvCQ-tN?&1} z7^|5M$_b}GE4Jn&@w3>+KwmP2Jv_;Q+b2c!6#cVOPOcE+X3|m9s&EL@@;rCN4)OL? z_<3(}#a|q>lC!UG9DFVE0{b^aWl%fDC!$a~;Z`Y%j8R4V7H}G-5)Jb=uGf`h3YdvL z-8TvNSiLZIn*vhak;j5t0XL#s_EP|K3%J#M?0 z|62UC2#UCHM+#!c=iq-TD)NrauNeTIHd}5}0qH)pu_ou0{N*Um3m#h0@w?l@#u+yv zvkURK43MPJtoM&CCy@_I1zf3>5<#?EkvG-Ker{mfg+Ou`%`VV5M{>5-DT?9g;Z=Q4 z{(Q&jRqP_4igk@@Y^u+G2OOTrW_P?QkxZ6E#fS^i64O=Rb8^C(C;d`1cR<|@G&SLQ zyp-S!@OS4)K~M-i%7S{~Dye$g45cj~Z;QNc{ZiH7ZX$T^4lFPEnpT#=mnc>I7;hTC h4(R&))CRn9RHA~;dHe`eh{Np=EMIZNpncbGIWS((2WJ2P diff --git a/wget-1.16.2.tar.xz b/wget-1.16.2.tar.xz new file mode 100644 index 0000000..6ad5bea --- /dev/null +++ b/wget-1.16.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7dfde1bcb0eb135addf587a649fd0e47c1a876edef359b9197cdffd1fdcd7d5 +size 1805080 diff --git a/wget-1.16.2.tar.xz.sig b/wget-1.16.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..af4891d836840d403f1e7ad3aa8bd1c0ec571ce84def0fb3d61cd8adf62ee18e GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-v@*m?j82@obdZSvt`;p$vt5CFUeOo1u7dEY~UwaXt= z$@{D#&kRwzd(yG0qG##_4N}WIIZ1raNr~%49~8pbQWPz4OD^j5?8yiLTP_5Z5yc*M) z$M+(B_z^H;_N&PB@*b4D1@VrE3J*DZ8A8Vh-}%Vg(Bdm8t+}0fU=!X0r&|xZbYs<# zywzWYaPO>PDa251Wn4QLWpzM-^@d#Hi1-EPY39AQ--N;NaQLfI3EsX68DzjWc5whM zW?u@2pMd@rf<*lMq)#t7e0}XxpS(2}(Y40-=d9i#RI)trgAD65pY3!yhlpp7LBYNv zQs7_iQOqsSkU)egDn*URB}i`0o!m}7ln}=@NrWCs0Sfo4eal=V)j`PX!#-hv^E@$p z7Bn7v4?UB0md}tjPzRu?TE^stQmZo6vk?wwaWe!=;v{P^M;WTJGk06Prtru%3lRT~ zs!j(^h?vp28BN}rq`Rq13&-( literal 0 HcmV?d00001 diff --git a/wget.changes b/wget.changes index 856d898..4431d10 100644 --- a/wget.changes +++ b/wget.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 3 07:42:21 UTC 2015 - astieger@suse.com + +- GNU wget 1.16.2: + * Allow progress bar on stderr when -o is used. + * Accept 5-digit port numbers in FTP EPSV responses. + * Support older versions of flex. + * Updated translations. +- drop wget-1.14-openssl-no-intern.patch, now upstream + ------------------------------------------------------------------- Wed Dec 24 13:33:29 UTC 2014 - andreas.stieger@gmx.de diff --git a/wget.spec b/wget.spec index 8949801..5ead079 100644 --- a/wget.spec +++ b/wget.spec @@ -1,7 +1,7 @@ # # spec file for package wget # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -19,7 +19,7 @@ %bcond_with regression_tests Name: wget -Version: 1.16.1 +Version: 1.16.2 Release: 0 Summary: A Tool for Mirroring FTP and HTTP Servers License: GPL-3.0+ @@ -30,7 +30,6 @@ Source1: https://ftp.gnu.org/gnu/wget/%name-%version.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=wget&download=1#/wget.keyring Patch0: wgetrc.patch Patch1: wget-libproxy.patch -Patch5: wget-1.14-openssl-no-intern.patch 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 @@ -62,7 +61,6 @@ This can be done in script files or via the command line. %if 0%{suse_version} > 1110 %patch1 -p1 %endif -%patch5 -p1 %patch6 %patch7 -p1