Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Mon Aug 9 02:10:52 CEST 2010.
--------
--- libzypp/libzypp.changes 2010-07-27 16:51:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2010-08-05 21:01:54.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Aug 5 01:13:53 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Aug 3 16:17:04 CEST 2010 - ma@suse.de
+
+- Fix memory leaks.
+
+-------------------------------------------------------------------
+Mon Aug 2 11:58:57 CEST 2010 - ma@suse.de
+
+- Enhance PoolItem interface to assist patch classification. (bnc#627316)
+- version 8.1.0 (0)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-8.0.1.tar.bz2
New:
----
libzypp-8.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.TC2nRO/_old 2010-08-09 02:10:42.000000000 +0200
+++ /var/tmp/diff_new_pack.TC2nRO/_new 2010-08-09 02:10:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 8.0.1)
+# spec file for package libzypp (Version 8.1.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
-Version: 8.0.1
+Version: 8.1.0
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
@@ -85,7 +85,6 @@
Requires: gnupg2
%endif
-%define min_aria_version 1.1.2
# ---------------------------------------------------------------
%if 0%{?suse_version} == 1110
# (almost) common codebase, but on SLES11-SP1 (according to Rudi
@@ -94,19 +93,17 @@
# from po/sle-zypp-po.tar.bz2.
%define min_curl_version 7.19.0-11.22
%define use_translation_set sle-zypp
-# No requirement, but as we'd use it in case it is present,
-# check for a sufficient version:
-Conflicts: aria2 < %{min_aria_version}
# ---------------------------------------------------------------
%else
# ---------------------------------------------------------------
-# This is 11.2 (better not sles11-sp1)
+# This is >=11.2 (better not sles11-sp1)
# need CURLOPT_REDIR_PROTOCOLS:
%define min_curl_version 7.19.4
-# want aria2:
-Conflicts: aria2 < %{min_aria_version}
-BuildRequires: aria2 >= %{min_aria_version}
%endif
+# No requirement, but as we'd use it in case it is present,
+# check for a sufficient version:
+%define min_aria_version 1.1.2
+Conflicts: aria2 < %{min_aria_version}
# ---------------------------------------------------------------
%if 0%{?suse_version}
++++++ libzypp-8.0.1.tar.bz2 -> libzypp-8.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/VERSION.cmake new/libzypp-8.1.0/VERSION.cmake
--- old/libzypp-8.0.1/VERSION.cmake 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/VERSION.cmake 2010-08-05 18:32:16.000000000 +0200
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "8")
SET(LIBZYPP_COMPATMINOR "0")
-SET(LIBZYPP_MINOR "0")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_MINOR "1")
+SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 8.0.1 (0)
+# LAST RELEASED: 8.1.0 (0)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/libzypp.spec.cmake new/libzypp-8.1.0/libzypp.spec.cmake
--- old/libzypp-8.0.1/libzypp.spec.cmake 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/libzypp.spec.cmake 2010-08-05 18:32:16.000000000 +0200
@@ -77,7 +77,6 @@
Requires: gnupg2
%endif
-%define min_aria_version 1.1.2
# ---------------------------------------------------------------
%if 0%{?suse_version} == 1110
# (almost) common codebase, but on SLES11-SP1 (according to Rudi
@@ -86,19 +85,17 @@
# from po/sle-zypp-po.tar.bz2.
%define min_curl_version 7.19.0-11.22
%define use_translation_set sle-zypp
-# No requirement, but as we'd use it in case it is present,
-# check for a sufficient version:
-Conflicts: aria2 < %{min_aria_version}
# ---------------------------------------------------------------
%else
# ---------------------------------------------------------------
-# This is 11.2 (better not sles11-sp1)
+# This is >=11.2 (better not sles11-sp1)
# need CURLOPT_REDIR_PROTOCOLS:
%define min_curl_version 7.19.4
-# want aria2:
-Conflicts: aria2 < %{min_aria_version}
-BuildRequires: aria2 >= %{min_aria_version}
%endif
+# No requirement, but as we'd use it in case it is present,
+# check for a sufficient version:
+%define min_aria_version 1.1.2
+Conflicts: aria2 < %{min_aria_version}
# ---------------------------------------------------------------
%if 0%{?suse_version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/package/libzypp.changes new/libzypp-8.1.0/package/libzypp.changes
--- old/libzypp-8.0.1/package/libzypp.changes 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/package/libzypp.changes 2010-08-05 18:32:16.000000000 +0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Thu Aug 5 01:13:53 CEST 2010 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Aug 3 16:17:04 CEST 2010 - ma@suse.de
+
+- Fix memory leaks.
+
+-------------------------------------------------------------------
+Mon Aug 2 11:58:57 CEST 2010 - ma@suse.de
+
+- Enhance PoolItem interface to assist patch classification. (bnc#627316)
+- version 8.1.0 (0)
+
+-------------------------------------------------------------------
Tue Jul 27 15:38:00 CEST 2010 - ma@suse.de
- Fix bug in PoolQuery::addDependency
Files old/libzypp-8.0.1/po/zypp-po.tar.bz2 and new/libzypp-8.1.0/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/zypp/PoolItem.cc new/libzypp-8.1.0/zypp/PoolItem.cc
--- old/libzypp-8.0.1/zypp/PoolItem.cc 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/zypp/PoolItem.cc 2010-08-05 18:32:16.000000000 +0200
@@ -90,6 +90,16 @@
return status().isBroken();
}
+ bool isNeeded() const
+ {
+ return status().isToBeInstalled() || ( isBroken() && ! status().isLocked() );
+ }
+
+ bool isUnwanted() const
+ {
+ return isBroken() && status().isLocked();
+ }
+
private:
mutable ResStatus _status;
ResObject::constPtr _resolvable;
@@ -252,6 +262,12 @@
bool PoolItem::isBroken() const
{ return _pimpl->isBroken(); }
+ bool PoolItem::isNeeded() const
+ { return _pimpl->isNeeded(); }
+
+ bool PoolItem::isUnwanted() const
+ { return _pimpl->isUnwanted(); }
+
void PoolItem::saveState() const
{ _pimpl->saveState(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/zypp/PoolItem.h new/libzypp-8.1.0/zypp/PoolItem.h
--- old/libzypp-8.0.1/zypp/PoolItem.h 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/zypp/PoolItem.h 2010-08-05 18:32:16.000000000 +0200
@@ -95,6 +95,14 @@
/** Whether a relevant items requirements are broken. */
bool isBroken() const;
+
+ /** This includes \c unlocked broken patches, as well as those already
+ * selected to be installed (otherwise classified as \c satisfied).
+ */
+ bool isNeeded() const;
+
+ /** Broken (needed) but locked patches. */
+ bool isUnwanted() const;
//@}
//@}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/zypp/media/MediaBlockList.cc new/libzypp-8.1.0/zypp/media/MediaBlockList.cc
--- old/libzypp-8.0.1/zypp/media/MediaBlockList.cc 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/zypp/media/MediaBlockList.cc 2010-08-05 18:32:16.000000000 +0200
@@ -300,7 +300,7 @@
memset(ht, 0, (hm + 1) * sizeof(unsigned int));
for (unsigned int i = 0; i < rsums.size(); i++)
{
- if (blocks[i].size != blksize && (i != nblks - 1 || rsumpad == blksize))
+ if (blocks[i].size != blksize && (i != nblks - 1 || rsumpad != blksize))
continue;
unsigned int r = rsums[i];
unsigned int h = r & hm;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.0.1/zypp/media/MediaMultiCurl.cc new/libzypp-8.1.0/zypp/media/MediaMultiCurl.cc
--- old/libzypp-8.0.1/zypp/media/MediaMultiCurl.cc 2010-07-27 16:46:33.000000000 +0200
+++ new/libzypp-8.1.0/zypp/media/MediaMultiCurl.cc 2010-08-05 18:32:16.000000000 +0200
@@ -392,6 +392,9 @@
close(_dnspipe);
_dnspipe = -1;
}
+ // the destructor in MediaCurl doesn't call disconnect() if
+ // the media is not attached, so we do it here manually
+ disconnectFrom();
}
static inline bool env_isset(string name)
@@ -1146,6 +1149,16 @@
curl_multi_cleanup(_multi);
_multi = 0;
}
+ std::map