Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Wed Apr 14 16:49:28 CEST 2010.
--------
--- libzypp/libzypp.changes 2010-03-26 19:49:05.000000000 +0100
+++ libzypp/libzypp.changes 2010-04-14 16:06:59.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Apr 14 15:09:18 CEST 2010 - ma@suse.de
+
+- Using boost-1.42 requires -fno-strict-aliasing (bnc#595545)
+- Bump major version for 11.3 development.
+- version 7.0.0 (0)
+
+-------------------------------------------------------------------
+Tue Apr 13 14:36:31 CEST 2010 - ma@suse.de
+
+- Fix parsing port from IPv6 URL (bnc#593385)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-6.31.3.tar.bz2
New:
----
libzypp-7.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.CCjuGL/_old 2010-04-14 16:48:32.000000000 +0200
+++ /var/tmp/diff_new_pack.CCjuGL/_new 2010-04-14 16:48:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 6.31.3)
+# spec file for package libzypp (Version 7.0.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management
-Version: 6.31.3
+Version: 7.0.0
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ libzypp-6.31.3.tar.bz2 -> libzypp-7.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/CMakeLists.txt new/libzypp-7.0.0/CMakeLists.txt
--- old/libzypp-6.31.3/CMakeLists.txt 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/CMakeLists.txt 2010-04-14 16:03:58.000000000 +0200
@@ -20,8 +20,8 @@
MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" )
SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" )
-SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed" )
-SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g -Wall -Werror=format-security -Wl,-as-needed" )
+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -fPIC -g -Wall -Werror=format-security -Woverloaded-virtual -Wnon-virtual-dtor -Wl,-as-needed" )
+SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -fPIC -g -Wall -Werror=format-security -Wl,-as-needed" )
set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3" )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/VERSION.cmake new/libzypp-7.0.0/VERSION.cmake
--- old/libzypp-6.31.3/VERSION.cmake 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/VERSION.cmake 2010-04-14 16:04:00.000000000 +0200
@@ -58,11 +58,11 @@
# - Consider calling ./mkChangelog to edit the
# changes file. See './mkChangelog -h' for help.
#
-SET(LIBZYPP_MAJOR "6")
-SET(LIBZYPP_COMPATMINOR "31")
-SET(LIBZYPP_MINOR "31")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_MAJOR "7")
+SET(LIBZYPP_COMPATMINOR "0")
+SET(LIBZYPP_MINOR "0")
+SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 6.31.3 (31)
+# LAST RELEASED: 7.0.0 (0)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/devel/devel.ma/Main.cc new/libzypp-7.0.0/devel/devel.ma/Main.cc
--- old/libzypp-6.31.3/devel/devel.ma/Main.cc 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/devel/devel.ma/Main.cc 2010-04-14 16:03:59.000000000 +0200
@@ -5,6 +5,7 @@
#include
#include "zypp/pool/GetResolvablesToInsDel.h"
#include "zypp/sat/WhatObsoletes.h"
+#include "zypp/ExternalProgram.h"
///////////////////////////////////////////////////////////////////
@@ -65,6 +66,14 @@
return str;
}
+namespace zypp {
+std::ostream & dumpOn( std::ostream & str, const Url & obj )
+{
+ str << "{" << obj.getHost() << "}{" << obj.getPort() << "}";
+ return str;
+}
+}
+
int main( int argc, char * argv[] )
try {
--argc;
@@ -74,7 +83,16 @@
///////////////////////////////////////////////////////////////////
if ( sysRoot == "/" )
::unsetenv( "ZYPP_CONF" );
- ZConfig::instance().setTextLocale( Locale("de_DE") );
+
+ #if 0
+ DBG << dump(Url("http://[fd9b:3658:1416:9c85::1]/os/SLES11SP1-x64/DVD1")) << endl;
+ DBG << dump(Url("http://[fd9b:3658:1416:9c85::1]:80/os/SLES11SP1-x64/DVD1")) << endl;
+ ///////////////////////////////////////////////////////////////////
+ INT << "===[END]============================================" << endl << endl;
+ zypp::base::LogControl::instance().logNothing();
+ return 0;
+ #endif
+
ResPool pool( ResPool::instance() );
sat::Pool satpool( sat::Pool::instance() );
///////////////////////////////////////////////////////////////////
@@ -82,14 +100,6 @@
TestSetup::LoadSystemAt( sysRoot, Arch_i586 );
///////////////////////////////////////////////////////////////////
- ui::Selectable::Ptr s( getSel<Package>( "libzypp" ) );
- MIL << s << endl;
- DBG << s->setStatus( ui::S_Taboo ) << endl;
- DBG << s->setStatus( ui::S_Protected ) << endl;
- MIL << s << endl;
- DBG << s->setStatus( ui::S_Update ) << endl;
- MIL << s << endl;
-
///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/devel/devel.ma/Tools.h new/libzypp-7.0.0/devel/devel.ma/Tools.h
--- old/libzypp-6.31.3/devel/devel.ma/Tools.h 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/devel/devel.ma/Tools.h 2010-04-14 16:03:59.000000000 +0200
@@ -51,7 +51,7 @@
void waitForInput()
{
- int i;
+ std::string i;
USR << "WAITING FOR INPUT!" << endl;
std::cin >> i;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/devel/devel.ma/Xml.cc new/libzypp-7.0.0/devel/devel.ma/Xml.cc
--- old/libzypp-6.31.3/devel/devel.ma/Xml.cc 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/devel/devel.ma/Xml.cc 2010-04-14 16:03:59.000000000 +0200
@@ -72,20 +72,20 @@
switch ( reader_r->nodeType() )
{
case XML_READER_TYPE_ELEMENT:
- //MIL << *reader_r << endl;
+ MIL << *reader_r << endl;
for ( int i = 0; i < reader_r->attributeCount(); ++i )
{
- //MIL << " attr no " << i << " '" << reader_r->getAttributeNo( i ) << "'" << endl;
+ MIL << " attr no " << i << " '" << reader_r->getAttributeNo( i ) << "'" << endl;
}
break;
case XML_READER_TYPE_ATTRIBUTE:
- //WAR << *reader_r << endl;
+ WAR << *reader_r << endl;
break;
case XML_READER_TYPE_TEXT:
case XML_READER_TYPE_CDATA:
- //DBG << *reader_r << endl;
+ DBG << *reader_r << endl;
break;
default:
@@ -120,7 +120,7 @@
for ( ; argc; --argc, ++argv )
{
input = *argv;
- if( 0 )
+
try {
Measure m( input.basename() );
// zypp::base::LogControl::TmpLineWriter shutUp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/package/libzypp.changes new/libzypp-7.0.0/package/libzypp.changes
--- old/libzypp-6.31.3/package/libzypp.changes 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/package/libzypp.changes 2010-04-14 16:03:59.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Apr 14 15:09:18 CEST 2010 - ma@suse.de
+
+- Using boost-1.42 requires -fno-strict-aliasing (bnc#595545)
+- Bump major version for 11.3 development.
+- version 7.0.0 (0)
+
+-------------------------------------------------------------------
+Tue Apr 13 14:36:31 CEST 2010 - ma@suse.de
+
+- Fix parsing port from IPv6 URL (bnc#593385)
+
+-------------------------------------------------------------------
Fri Mar 26 19:23:59 CET 2010 - ma@suse.de
- Propagate ZConfig::setTextLocale to pool. (bnc#588850)
Files old/libzypp-6.31.3/po/zypp-po.tar.bz2 and new/libzypp-7.0.0/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/tests/zypp/Url_test.cc new/libzypp-7.0.0/tests/zypp/Url_test.cc
--- old/libzypp-6.31.3/tests/zypp/Url_test.cc 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/tests/zypp/Url_test.cc 2010-04-14 16:03:59.000000000 +0200
@@ -19,15 +19,36 @@
using boost::unit_test::test_case;
using namespace zypp;
+void testUrlAuthority( const Url & url_r,
+ const std::string & host_r, const std::string & port_r = std::string(),
+ const std::string & user_r = std::string(), const std::string & pass_r = std::string() )
+{
+ BOOST_CHECK_EQUAL( url_r.getUsername(), user_r );
+ BOOST_CHECK_EQUAL( url_r.getPassword(), pass_r );
+ BOOST_CHECK_EQUAL( url_r.getHost(), host_r );
+ BOOST_CHECK_EQUAL( url_r.getPort(), port_r );
+}
+
+
BOOST_AUTO_TEST_CASE(test_ipv6_url)
{
- std::string str, one, two;
+ std::string str;
zypp::Url url;
str = "http://[2001:DB8:0:F102::1]/64/sles11/RC1/CD1?device=eth0";
- url = "http://[2001:db8:0:f102::1]/64/sles11/RC1/CD1?device=eth0";
-
- BOOST_CHECK_EQUAL( str, url.asString() );
+ url = Url( str );
+ BOOST_CHECK_EQUAL( str,url.asString() );
+ testUrlAuthority( url, "[2001:DB8:0:F102::1]", "", "", "" );
+
+ // bnc#
+ str = "http://[2001:DB8:0:F102::1]:8080/64/sles11/RC1/CD1?device=eth0";
+ url = Url( str );
+ testUrlAuthority( url, "[2001:DB8:0:F102::1]", "8080", "", "" );
+
+
+ str = "http://user:pass@[2001:DB8:0:F102::1]:8080/64/sles11/RC1/CD1?device=eth0";
+ url = Url( str );
+ testUrlAuthority( url, "[2001:DB8:0:F102::1]", "8080", "user", "pass" );
}
BOOST_AUTO_TEST_CASE(test_url1)
@@ -97,7 +118,7 @@
str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)#x";
BOOST_CHECK_THROW( zypp::Url(str).asString(), url::UrlNotAllowedException );
-
+
str = "ldap://example.net/dc=example,dc=net?cn,sn?sub?(cn=*)";
BOOST_CHECK_EQUAL( str, zypp::Url(str).asString() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/tools/NameReqPrv.cc new/libzypp-7.0.0/tools/NameReqPrv.cc
--- old/libzypp-6.31.3/tools/NameReqPrv.cc 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/tools/NameReqPrv.cc 2010-04-14 16:04:00.000000000 +0200
@@ -36,6 +36,10 @@
cerr << " -n/-N turn on/off looking for names (default on)" << endl;
cerr << " -p/-P turn on/off looking for provides (default off)" << endl;
cerr << " -r/-R turn on/off looking for requires (default off)" << endl;
+ cerr << " -c/-C turn on/off looking for conflicts (default off)" << endl;
+ cerr << " -o/-O turn on/off looking for obsoletes (default off)" << endl;
+ cerr << " -m/-M turn on/off looking for recommends (default off)" << endl;
+ cerr << " -s/-S turn on/off looking for suggests (default off)" << endl;
cerr << " -a short for -n -p -r" << endl;
cerr << " -A short for -n -P -R" << endl;
cerr << "" << endl;
@@ -163,6 +167,10 @@
bool names ( true );
bool provides ( false );
bool requires ( false );
+ bool conflicts ( false );
+ bool obsoletes ( false );
+ bool recommends( false );
+ bool suggests ( false );
for ( ; argc; --argc,++argv )
{
@@ -180,6 +188,14 @@
case 'R': requires = false; break;
case 'p': provides = true; break;
case 'P': provides = false; break;
+ case 'c': conflicts = true; break;
+ case 'C': conflicts = false; break;
+ case 'o': obsoletes = true; break;
+ case 'O': obsoletes = false; break;
+ case 'm': recommends = true; break;
+ case 'M': recommends = false; break;
+ case 's': suggests = true; break;
+ case 'S': suggests = false; break;
}
continue;
}
@@ -213,9 +229,18 @@
q.addDependency( sat::SolvAttr::provides );
if ( requires )
q.addDependency( sat::SolvAttr::requires );
+ if ( conflicts )
+ q.addDependency( sat::SolvAttr::conflicts );
+ if ( obsoletes )
+ q.addDependency( sat::SolvAttr::obsoletes );
+ if ( recommends )
+ q.addDependency( sat::SolvAttr::recommends );
+ if ( suggests )
+ q.addDependency( sat::SolvAttr::suggests );
}
- message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_') << "] {" << endl;
+ message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_')
+ << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (suggests?'s':'_') << "] {" << endl;
for_( it, q.begin(), q.end() )
{
@@ -225,7 +250,7 @@
{
for_( match, it.matchesBegin(), it.matchesEnd() )
{
- tableOut( "", "", "", match->inSolvAttr().asString().substr( 9, 1 )+" " +match->asString() );
+ tableOut( "", "", "", match->inSolvAttr().asString().substr( 9, 3 )+": " +match->asString() );
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.31.3/zypp/url/UrlBase.cc new/libzypp-7.0.0/zypp/url/UrlBase.cc
--- old/libzypp-6.31.3/zypp/url/UrlBase.cc 2010-03-31 00:45:37.000000000 +0200
+++ new/libzypp-7.0.0/zypp/url/UrlBase.cc 2010-04-14 16:04:00.000000000 +0200
@@ -850,10 +850,8 @@
setUsername(s.substr(0, p), zypp::url::E_ENCODED);
s = s.substr(p+1);
}
- q = s.rfind(']');
- if ((p = s.rfind(':')) != std::string::npos && p > q+1)
+ if ((p = s.rfind(':')) != std::string::npos && ( (q = s.rfind(']')) == std::string::npos || q < p) )
{
-
setHost(s.substr(0, p));
setPort(s.substr(p+1));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org