Imported Upstream version 14.38.2

Change-Id: I75f97df16c3c6ea4467020f159ac7bba7abb68bd
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 87b442f..c392fef 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "30")
 SET(LIBZYPP_MINOR "38")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 14.38.1 (30)
+# LAST RELEASED: 14.38.2 (30)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 6a739a0..73f57e4 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,10 +1,8 @@
 -------------------------------------------------------------------
-Thu Apr  2 16:01:43 CEST 2015 - ma@suse.de
+Thu Apr  2 19:21:07 CEST 2015 - ma@suse.de
 
-- Fixes to build with gcc5
-- RepoProvideFile: Suppress MediaChangeReport while testing
-  multiple baseurls (bnc#899510)
-- version 14.38.1 (30)
+- POODLE: libzypp should only talk TLS (bnc#903405)
+- version 14.38.2 (30)
 
 -------------------------------------------------------------------
 Thu Mar 19 16:44:39 CET 2015 - ma@suse.de

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index d77be2c..871395c 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -643,6 +643,8 @@ void MediaCurl::setupEasy()
 #endif
     SET_OPTION(CURLOPT_SSL_VERIFYPEER, _settings.verifyPeerEnabled() ? 1L : 0L);
     SET_OPTION(CURLOPT_SSL_VERIFYHOST, _settings.verifyHostEnabled() ? 2L : 0L);
+    // bnc#903405 - POODLE: libzypp should only talk TLS
+    SET_OPTION(CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
   }
 
   SET_OPTION(CURLOPT_USERAGENT, _settings.userAgentString().c_str() );

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index edd1055..89506ed 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -1059,7 +1059,7 @@ namespace zypp
 
         cmd << "  > '" << tmpsolv.path() << "'";
 
-        MIL << "Executing: " << cmd.str() << endl;
+        MIL << "Executing: " << cmd << endl;
         ExternalProgram prog( cmd.str(), ExternalProgram::Stderr_To_Stdout );
 
         cmd << endl;