Hello community, here is the log from the commit of package wget for openSUSE:Factory checked in at Mon Apr 11 09:43:29 CEST 2011.
-------- --- wget/wget.changes 2010-08-15 18:16:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/wget/wget.changes 2011-04-09 22:04:40.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 9 20:03:18 UTC 2011 - [email protected] + +- SSLv2 is being disabled in openSSL, allow painless obsoletion. +- Support IDN. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- wget-1.12-nosslv2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wget.spec ++++++ --- /var/tmp/diff_new_pack.jlvmdL/_old 2011-04-11 09:15:54.000000000 +0200 +++ /var/tmp/diff_new_pack.jlvmdL/_new 2011-04-11 09:15:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package wget (Version 1.12) +# spec file for package wget # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products 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 @@ Name: wget Version: 1.12 -Release: 1 +Release: 5 License: GPLv3+ Summary: A Tool for Mirroring FTP and HTTP Servers Url: http://www.gnu.org/software/wget/ @@ -29,10 +29,12 @@ Patch0: wgetrc.patch # PATCH-FEATURE-UPSTREAM wget-libproxy.patch [email protected] -- Add libproxy support to wget Patch1: wget-libproxy.patch +Patch2: wget-1.12-nosslv2.patch BuildRequires: libpng-devel BuildRequires: libproxy-devel BuildRequires: openssl-devel BuildRequires: pkg-config +BuildRequires: libidn-devel PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +46,7 @@ %setup -q %patch0 %patch1 -p1 +%patch2 %build ./autogen.sh ++++++ wget-1.12-nosslv2.patch ++++++ --- src/init.c.orig +++ src/init.c @@ -1331,7 +1331,9 @@ cmd_spec_secure_protocol (const char *co { static const struct decode_item choices[] = { { "auto", secure_protocol_auto }, +#ifndef OPENSSL_NO_SSL2 { "sslv2", secure_protocol_sslv2 }, +#endif { "sslv3", secure_protocol_sslv3 }, { "tlsv1", secure_protocol_tlsv1 }, }; --- src/openssl.c.orig +++ src/openssl.c @@ -42,6 +42,7 @@ as that of the covered work. */ #include <openssl/x509.h> #include <openssl/err.h> #include <openssl/rand.h> +#include <openssl/engine.h> #include "utils.h" #include "connect.h" @@ -178,15 +179,21 @@ ssl_init () SSL_load_error_strings (); SSLeay_add_all_algorithms (); SSLeay_add_ssl_algorithms (); +/* Load all bundled ENGINEs into memory and make them visible */ + ENGINE_load_builtin_engines(); +/* Register all of them for every algorithm they collectively implement */ + ENGINE_register_all_complete(); switch (opt.secure_protocol) { case secure_protocol_auto: meth = SSLv23_client_method (); break; +#ifndef OPENSSL_NO_SSL2 case secure_protocol_sslv2: meth = SSLv2_client_method (); break; +#endif case secure_protocol_sslv3: meth = SSLv3_client_method (); break; --- src/options.h.orig +++ src/options.h @@ -171,7 +171,9 @@ struct options #ifdef HAVE_SSL enum { secure_protocol_auto, +#ifndef OPENSSL_NO_SSL2 secure_protocol_sslv2, +#endif secure_protocol_sslv3, secure_protocol_tlsv1 } secure_protocol; /* type of secure protocol to use. */ --- src/iri.c.orig +++ src/iri.c @@ -114,7 +114,7 @@ check_encoding_name (char *encoding) static bool open_locale_to_utf8 (void) { - + return true; } /* Try converting string str from locale to UTF-8. Return a new string ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
