Mailinglist Archive: opensuse-commit (1029 mails)

< Previous Next >
commit libzypp for openSUSE:Factory

Hello community,

here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Fri Jul 8 09:25:35 CEST 2011.



--------
--- libzypp/libzypp.changes 2011-07-04 16:09:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2011-07-07
16:16:36.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Jul 7 15:53:17 CEST 2011 - ma@xxxxxxx
+
+- Fix tests for available libcurl version.
+- version 9.8.4 (8)
+
+-------------------------------------------------------------------
+Thu Jul 7 01:13:47 CEST 2011 - ma@xxxxxxx
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
libzypp-9.8.3.tar.bz2

New:
----
libzypp-9.8.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.xQWmkH/_old 2011-07-08 09:20:15.000000000 +0200
+++ /var/tmp/diff_new_pack.xQWmkH/_new 2011-07-08 09:20:15.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
-Version: 9.8.3
+Version: 9.8.4
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc

++++++ libzypp-9.8.3.tar.bz2 -> libzypp-9.8.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.3/VERSION.cmake
new/libzypp-9.8.4/VERSION.cmake
--- old/libzypp-9.8.3/VERSION.cmake 2011-07-04 16:04:10.000000000 +0200
+++ new/libzypp-9.8.4/VERSION.cmake 2011-07-07 16:12:55.000000000 +0200
@@ -61,8 +61,8 @@
SET(LIBZYPP_MAJOR "9")
SET(LIBZYPP_COMPATMINOR "8")
SET(LIBZYPP_MINOR "8")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
#
-# LAST RELEASED: 9.8.3 (8)
+# LAST RELEASED: 9.8.4 (8)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.3/package/libzypp.changes
new/libzypp-9.8.4/package/libzypp.changes
--- old/libzypp-9.8.3/package/libzypp.changes 2011-07-04 16:04:10.000000000
+0200
+++ new/libzypp-9.8.4/package/libzypp.changes 2011-07-07 16:12:55.000000000
+0200
@@ -1,8 +1,19 @@
-------------------------------------------------------------------
+Thu Jul 7 15:53:17 CEST 2011 - ma@xxxxxxx
+
+- Fix tests for available libcurl version.
+- version 9.8.4 (8)
+
+-------------------------------------------------------------------
+Thu Jul 7 01:13:47 CEST 2011 - ma@xxxxxxx
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Mon Jul 4 10:41:42 CEST 2011 - ma@xxxxxxx

-- Make fix for bnc#702576 more robust.
-- Enhance fix for bnc#699435. Return an error if download in advance
+- Make fix for bnc#702576 more robust.
+- Enhance fix for bnc#699435. Return an error if download in advance
failed to provide all packages, so zypper does not silently quit.
- version 9.8.3 (8)

@@ -25,7 +36,7 @@
-------------------------------------------------------------------
Tue Jun 21 10:44:47 CEST 2011 - dmacvicar@xxxxxxx

-- Add configuration template for automatic kernel
+- Add configuration template for automatic kernel
purge (feature#312018) to zypp.conf

-------------------------------------------------------------------
Files old/libzypp-9.8.3/po/zypp-po.tar.bz2 and
new/libzypp-9.8.4/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.3/zypp/media/MediaCurl.cc
new/libzypp-9.8.4/zypp/media/MediaCurl.cc
--- old/libzypp-9.8.3/zypp/media/MediaCurl.cc 2011-07-04 16:04:11.000000000
+0200
+++ new/libzypp-9.8.4/zypp/media/MediaCurl.cc 2011-07-07 16:12:55.000000000
+0200
@@ -44,6 +44,8 @@
#define TRANSFER_TIMEOUT 60 * 3
#define TRANSFER_TIMEOUT_MAX 60 * 60

+#undef CURLVERSION_AT_LEAST
+#define CURLVERSION_AT_LEAST(M,N,O) LIBCURL_VERSION_NUM >=
((((M)<<8)+(N))<<8)+(O)

using namespace std;
using namespace zypp::base;
@@ -574,7 +576,7 @@

if ( _url.getScheme() == "https" )
{
-#if LIBCURL_VERSION_NUMBER >= 0x071904
+#if CURLVERSION_AT_LEAST(7,19,4)
// restrict following of redirections from https to https only
SET_OPTION( CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS );
#endif
@@ -647,7 +649,7 @@
}
else
{
-#if LIBCURL_VERSION_NUMBER >= 0x071904
+#if CURLVERSION_AT_LEAST(7,19,4)
SET_OPTION(CURLOPT_NOPROXY, "*");
#endif
}
@@ -660,7 +662,7 @@
SET_OPTION(CURLOPT_LOW_SPEED_TIME, 10L);
}

-#if LIBCURL_VERSION_NUMBER >= 0x071505
+#if CURLVERSION_AT_LEAST(7,15,5)
if ( _settings.maxDownloadSpeed() != 0 )
SET_OPTION_OFFT(CURLOPT_MAX_RECV_SPEED_LARGE,
_settings.maxDownloadSpeed());
#endif
@@ -677,7 +679,7 @@
SET_OPTION(CURLOPT_PROGRESSFUNCTION, &progressCallback );
SET_OPTION(CURLOPT_NOPROGRESS, 0L);

-#if LIBCURL_VERSION_NUMBER >= 0x071800
+#if CURLVERSION_AT_LEAST(7,18,0)
// bnc #306272
SET_OPTION(CURLOPT_PROXY_TRANSFER_MODE, 1L );
#endif
@@ -954,7 +956,7 @@
}
break;
case CURLE_FTP_COULDNT_RETR_FILE:
-#if LIBCURL_VERSION_NUMBER >= 0x071600
+#if CURLVERSION_AT_LEAST(7,16,0)
case CURLE_REMOTE_FILE_NOT_FOUND:
#endif
case CURLE_FTP_ACCESS_DENIED:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.3/zypp/media/MediaMultiCurl.cc
new/libzypp-9.8.4/zypp/media/MediaMultiCurl.cc
--- old/libzypp-9.8.3/zypp/media/MediaMultiCurl.cc 2011-07-04
16:04:11.000000000 +0200
+++ new/libzypp-9.8.4/zypp/media/MediaMultiCurl.cc 2011-07-07
16:12:55.000000000 +0200
@@ -30,6 +30,9 @@
using namespace std;
using namespace zypp::base;

+#undef CURLVERSION_AT_LEAST
+#define CURLVERSION_AT_LEAST(M,N,O) LIBCURL_VERSION_NUM >=
((((M)<<8)+(N))<<8)+(O)
+
namespace zypp {
namespace media {

@@ -379,7 +382,7 @@
curl_multi_remove_handle(_request->_multi, _curl);
if (_state == WORKER_DONE || _state == WORKER_SLEEP)
{
-#if LIBCURL_VERSION_NUMBER >= 0x071505
+#if CURLVERSION_AT_LEAST(7,15,5)
curl_easy_setopt(_curl, CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t)0);
#endif
curl_easy_setopt(_curl, CURLOPT_PRIVATE, (void *)0);
@@ -1099,7 +1102,7 @@
if (avg < 1024)
avg = 1024;
worker->_maxspeed = avg;
-#if LIBCURL_VERSION_NUMBER >= 0x071505
+#if CURLVERSION_AT_LEAST(7,15,5)
curl_easy_setopt(worker->_curl, CURLOPT_MAX_RECV_SPEED_LARGE,
(curl_off_t)(avg));
#endif
}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >