Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Tue Jul 26 11:58:04 CEST 2011.
--------
--- libzypp/libzypp.changes 2011-07-18 12:42:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2011-07-25
16:34:51.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jul 25 16:20:37 CEST 2011 - m...@suse.de
+
+- Always read /proc/mounts when looking for mounted media (bnc#705893)
+- version 9.9.1 (8)
+
+-------------------------------------------------------------------
+Fri Jul 22 13:12:34 CEST 2011 - m...@suse.de
+
+- MediaUserAuth: Do not expose libcurl header files.
+- version 9.9.0 (8)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-9.8.7.tar.bz2
New:
----
libzypp-9.9.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.TdrWOg/_old 2011-07-26 11:56:50.000000000 +0200
+++ /var/tmp/diff_new_pack.TdrWOg/_new 2011-07-26 11:56:50.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
-Version: 9.8.7
+Version: 9.9.1
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ libzypp-9.8.7.tar.bz2 -> libzypp-9.9.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/VERSION.cmake
new/libzypp-9.9.1/VERSION.cmake
--- old/libzypp-9.8.7/VERSION.cmake 2011-07-18 12:39:35.000000000 +0200
+++ new/libzypp-9.9.1/VERSION.cmake 2011-07-25 16:31:20.000000000 +0200
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "9")
SET(LIBZYPP_COMPATMINOR "8")
-SET(LIBZYPP_MINOR "8")
-SET(LIBZYPP_PATCH "7")
+SET(LIBZYPP_MINOR "9")
+SET(LIBZYPP_PATCH "1")
#
-# LAST RELEASED: 9.8.7 (8)
+# LAST RELEASED: 9.9.1 (8)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/package/libzypp.changes
new/libzypp-9.9.1/package/libzypp.changes
--- old/libzypp-9.8.7/package/libzypp.changes 2011-07-18 12:39:35.000000000
+0200
+++ new/libzypp-9.9.1/package/libzypp.changes 2011-07-25 16:31:20.000000000
+0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Mon Jul 25 16:20:37 CEST 2011 - m...@suse.de
+
+- Always read /proc/mounts when looking for mounted media (bnc#705893)
+- version 9.9.1 (8)
+
+-------------------------------------------------------------------
+Fri Jul 22 13:12:34 CEST 2011 - m...@suse.de
+
+- MediaUserAuth: Do not expose libcurl header files.
+- version 9.9.0 (8)
+
+-------------------------------------------------------------------
Mon Jul 18 11:33:25 CEST 2011 - m...@suse.de
- More initialize parser structure fixes. (bnc#705181)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/zypp/media/MediaManager.cc
new/libzypp-9.9.1/zypp/media/MediaManager.cc
--- old/libzypp-9.8.7/zypp/media/MediaManager.cc 2011-07-18
12:39:36.000000000 +0200
+++ new/libzypp-9.9.1/zypp/media/MediaManager.cc 2011-07-25
16:31:21.000000000 +0200
@@ -231,9 +231,7 @@
static inline MountEntries
getMountEntries()
{
- // use "/etc/mtab" by default,
- // fallback to "/proc/mounts"
- return Mount::getEntries(/* "/etc/mtab" */);
+ return Mount::getEntries();
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/zypp/media/MediaSource.h
new/libzypp-9.9.1/zypp/media/MediaSource.h
--- old/libzypp-9.8.7/zypp/media/MediaSource.h 2011-07-18 12:39:36.000000000
+0200
+++ new/libzypp-9.9.1/zypp/media/MediaSource.h 2011-07-25 16:31:21.000000000
+0200
@@ -118,7 +118,7 @@
};
/** \relates AttachPoint Stream output */
- inline std::ostream & operator<<( std::ostream & str, const AttachPoint &
obj );
+ std::ostream & operator<<( std::ostream & str, const AttachPoint & obj );
///////////////////////////////////////////////////////////////////
typedef zypp::RW_pointer<MediaSource> MediaSourceRef;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/zypp/media/MediaUserAuth.cc
new/libzypp-9.9.1/zypp/media/MediaUserAuth.cc
--- old/libzypp-9.8.7/zypp/media/MediaUserAuth.cc 2011-07-18
12:39:36.000000000 +0200
+++ new/libzypp-9.9.1/zypp/media/MediaUserAuth.cc 2011-07-25
16:31:21.000000000 +0200
@@ -11,6 +11,8 @@
*/
#include <list>
+#include <curl/curl.h>
+
#include <boost/format.hpp>
#include "zypp/base/Gettext.h"
@@ -64,12 +66,23 @@
return str;
}
+CurlAuthData::CurlAuthData()
+ : AuthData()
+ , _auth_type_str()
+ , _auth_type(CURLAUTH_NONE)
+{}
+
+CurlAuthData::CurlAuthData(const AuthData & authData)
+ : AuthData(authData)
+ , _auth_type_str()
+ , _auth_type(CURLAUTH_NONE)
+{}
+
bool CurlAuthData::valid() const
{
return username().size() && password().size();
}
-
std::ostream & CurlAuthData::dumpOn( std::ostream & str ) const
{
AuthData::dumpOn(str) << " auth_type: " << _auth_type_str
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/zypp/media/MediaUserAuth.h
new/libzypp-9.9.1/zypp/media/MediaUserAuth.h
--- old/libzypp-9.8.7/zypp/media/MediaUserAuth.h 2011-07-18
12:39:36.000000000 +0200
+++ new/libzypp-9.9.1/zypp/media/MediaUserAuth.h 2011-07-25
16:31:21.000000000 +0200
@@ -12,8 +12,6 @@
#ifndef ZYPP_MEDIA_USER_AUTH_H
#define ZYPP_MEDIA_USER_AUTH_H
-#include <curl/curl.h>
-
#include "zypp/base/Deprecated.h"
#include "zypp/Url.h"
@@ -79,14 +77,9 @@
* Default constructor. Initializes username and password to empty strings
* and authetication type to CURLAUTH_NONE.
*/
- CurlAuthData() : AuthData(), _auth_type_str(), _auth_type(CURLAUTH_NONE)
- {}
+ CurlAuthData();
- CurlAuthData(const AuthData & authData)
- : AuthData(authData)
- , _auth_type_str()
- , _auth_type(CURLAUTH_NONE)
- {}
+ CurlAuthData(const AuthData & authData);
CurlAuthData(std::string & username, std::string & password, std::string &
auth_type)
: AuthData(username,password), _auth_type_str(auth_type)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/zypp/media/Mount.cc
new/libzypp-9.9.1/zypp/media/Mount.cc
--- old/libzypp-9.8.7/zypp/media/Mount.cc 2011-07-18 12:39:36.000000000
+0200
+++ new/libzypp-9.9.1/zypp/media/Mount.cc 2011-07-25 16:31:21.000000000
+0200
@@ -25,6 +25,8 @@
#include "zypp/media/Mount.h"
#include "zypp/media/MediaException.h"
+#include "zypp/PathInfo.h"
+
#ifndef N_
#define N_(STR) STR
#endif
@@ -278,8 +280,15 @@
if( mtab.empty())
{
- mtabs.push_back("/etc/mtab");
mtabs.push_back("/proc/mounts");
+ // Also read /etc/mtab if it is a file (on newer sytems
+ // mtab is a symlink to /proc/mounts).
+ // Reason for this is the different representation of
+ // mounted loop devices:
+ // /etc/mtab: /tmp/SLES-11-SP2-MINI-ISO-x86_64-Beta2-DVD.iso on /mnt
type iso9660 (ro,loop=/dev/loop0)
+ // /proc/mounts: /dev/loop0 /mnt iso9660 ro,relatime 0 0
+ if ( PathInfo( "/etc/mtab", PathInfo::LSTAT ).isFile() )
+ mtabs.push_back("/etc/mtab");
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.8.7/zypp/media/Mount.h
new/libzypp-9.9.1/zypp/media/Mount.h
--- old/libzypp-9.8.7/zypp/media/Mount.h 2011-07-18 12:39:36.000000000
+0200
+++ new/libzypp-9.9.1/zypp/media/Mount.h 2011-07-25 16:31:21.000000000
+0200
@@ -128,8 +128,9 @@
*
* @param mtab The name of the (mounted) file system description
* file to read from. This file should be one /etc/mtab,
- * /etc/fstab or /proc/mounts. Default is to try the
- * /etc/mtab and fail back to /proc/mounts.
+ * /etc/fstab or /proc/mounts. Default is to read
+ * /proc/mounts and /etc/mtab in case is not a symlink
+ * to /proc/mounts.
* @returns A vector with mount entries or empty vector if reading
* or parsing of the mtab file(s) failed.
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
