Imported Upstream version 15.1.2

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 4ae67c0..6a321b0 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "15")
 SET(LIBZYPP_COMPATMINOR "1")
 SET(LIBZYPP_MINOR "1")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 15.1.1 (1)
+# LAST RELEASED: 15.1.2 (1)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/cmake/modules/FindGettext.cmake b/cmake/modules/FindGettext.cmake
index a6bf9d1..3af7a62 100644 (file)
--- a/cmake/modules/FindGettext.cmake
+++ b/cmake/modules/FindGettext.cmake
@@ -20,8 +20,8 @@ FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
 # Macro to be called if .po files are shipped as tar ball.
 #
 # _translation_set_basename: Serves two purposes; a) the stem of the
-# default tarball %{_translation_set_basename}-po.tar.bz2 unless its over
-# riden by -DUSE_TRANSLATION_SET; b) the basename of the .gmo files.
+# default tarball %{_translation_set_basename}-po.tar.bz2, optionally
+# overlayed by -DUSE_TRANSLATION_SET; b) the basename of the .gmo files.
 #
 # We expect a po-file tarball to unpack the .po file to the current
 # directory!
@@ -32,14 +32,26 @@ MACRO( GETTEXT_CREATE_TARBALL_TRANSLATIONS _translation_set_basename )
                 SET( USE_TRANSLATION_SET ${_translation_set_basename} )
         ENDIF( NOT USE_TRANSLATION_SET )
 
-        SET( TRANSLATION_SET "${USE_TRANSLATION_SET}-po.tar.bz2" )
-        MESSAGE( STATUS "Translation set: ${TRANSLATION_SET}" )
+       SET( DEFAULT_TRANSLATION_SET "${_translation_set_basename}-po.tar.bz2" )
+        SET( OVERLAY_TRANSLATION_SET "${USE_TRANSLATION_SET}-po.tar.bz2" )
+
+        MESSAGE( STATUS "Translation set: ${OVERLAY_TRANSLATION_SET}" )
+
+       EXECUTE_PROCESS(
+         COMMAND tar tfj ${CMAKE_CURRENT_SOURCE_DIR}/${DEFAULT_TRANSLATION_SET}
+         OUTPUT_VARIABLE TRANSLATION_SET_CONTENT_D
+       )
+       EXECUTE_PROCESS(
+         COMMAND tar tfj ${CMAKE_CURRENT_SOURCE_DIR}/${OVERLAY_TRANSLATION_SET}
+         OUTPUT_VARIABLE TRANSLATION_SET_CONTENT_O
+       )
 
         # For those not familiar with 'sed': the tarball might list './' and './*.po'.
         # We process just the '*.po' lines and strip off any leading './'.
         EXECUTE_PROCESS(
-                COMMAND tar tfj ${CMAKE_CURRENT_SOURCE_DIR}/${TRANSLATION_SET}
+                COMMAND echo ${TRANSLATION_SET_CONTENT_D} ${TRANSLATION_SET_CONTENT_O}
                 COMMAND sed -n "/\\.po$/s%.*/%%p"
+               COMMAND sort -u
                 COMMAND awk "{printf $1\";\"}"
                 OUTPUT_VARIABLE TRANSLATION_SET_CONTENT
         )
@@ -48,10 +60,9 @@ MACRO( GETTEXT_CREATE_TARBALL_TRANSLATIONS _translation_set_basename )
         # Create 'LANG.po's from po.tar.bz2
         ADD_CUSTOM_COMMAND(
                 OUTPUT ${TRANSLATION_SET_CONTENT}
-                COMMAND tar xfj ${CMAKE_CURRENT_SOURCE_DIR}/${TRANSLATION_SET}
-                COMMAND sed -i  '/^msgid/s/do not forbid installation of %s/remove lock to allow installation of %s/' *.po
-                COMMAND sed -i  '/^msgid/s/do not keep %s installed/remove lock to allow removal of %s/' *.po
-                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${TRANSLATION_SET}
+                COMMAND tar xfj ${CMAKE_CURRENT_SOURCE_DIR}/${DEFAULT_TRANSLATION_SET}
+                COMMAND tar xfj ${CMAKE_CURRENT_SOURCE_DIR}/${OVERLAY_TRANSLATION_SET}
+                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${OVERLAY_TRANSLATION_SET} ${CMAKE_CURRENT_SOURCE_DIR}/${DEFAULT_TRANSLATION_SET}
         )
 
         # LANG.po ->msgfmt-> LANG.gmo

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index b4a1d5a..9b98c51 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -203,7 +203,7 @@ unset EXTRA_CMAKE_OPTIONS
 #      1110            SLES11
 #      1315            SLES12
 %if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
-if [ -f ../po/sle-zypp-po.tar.bz ]; then
+if [ -f ../po/sle-zypp-po.tar.bz2 ]; then
   export TRANSLATION_SET=sle-zypp
 fi
 %endif

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 604db2d..b52ea86 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Fri May  8 11:44:44 CEST 2015 - ma@suse.de
+
+- gcc5 fixes
+- Fix repo alias containing ']' not handled correctly (bnc#929528)
+- Fix SEGV when dumping rpm header with epoch (bnc#929483)
+- version 15.1.2 (1)
+
+-------------------------------------------------------------------
 Mon Apr 27 14:43:53 CEST 2015 - ma@suse.de
 
 - PubliKey: fix reference to temporary data

diff --git a/tests/parser/inifile/data/2.ini b/tests/parser/inifile/data/2.ini
index 049247a..36d21c8 100644 (file)
--- a/tests/parser/inifile/data/2.ini
+++ b/tests/parser/inifile/data/2.ini
@@ -8,3 +8,5 @@ name1==foo
 name1= =foo
 name2=f=oo
 name3=foo=
+[te]st]
+name=foo

diff --git a/tests/parser/inifile/iniparser_test.cc b/tests/parser/inifile/iniparser_test.cc
index 8857bd3..fb43929 100644 (file)
--- a/tests/parser/inifile/iniparser_test.cc
+++ b/tests/parser/inifile/iniparser_test.cc
@@ -41,7 +41,7 @@ class WithSpacesTest : public IniParser
   virtual void consume( const std::string &section )
   {
     MIL << section << endl;
-    BOOST_CHECK(section == "base" || section == "equal");
+    BOOST_CHECK(section == "base" || section == "equal" || section == "te]st");
   }
 
   virtual void consume( const std::string &section, const std::string &key, const std::string &value )

diff --git a/zypp/parser/IniParser.cc b/zypp/parser/IniParser.cc
index cdead1e..9958f66 100644 (file)
--- a/zypp/parser/IniParser.cc
+++ b/zypp/parser/IniParser.cc
@@ -99,7 +99,7 @@ void IniParser::parse( const InputStream & input_r, const ProgressData::Receiver
 
     if (trimmed[0] == '[')
     {
-      std::string::size_type pos = trimmed.find(']');
+      std::string::size_type pos = trimmed.rfind(']');
       if ( pos != std::string::npos )
       {
        std::string section = trimmed.substr(1, pos-1);

diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc
index e4327e5..f09edfa 100644 (file)
--- a/zypp/target/rpm/RpmHeader.cc
+++ b/zypp/target/rpm/RpmHeader.cc
@@ -266,11 +266,13 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r,
 //
 std::ostream & RpmHeader::dumpOn( std::ostream & str ) const
 {
-  return BinHeader::dumpOn( str ) << '{' << tag_name() << "-"
-         << (tag_epoch()==0?"":(tag_epoch()+":"))
-         << tag_version()
-         << (tag_release().empty()?"":(std::string("-")+tag_release()))
-         << ( isSrc() ? ".src}" : "}");
+  BinHeader::dumpOn( str ) << '{' << tag_name() << "-";
+  if ( tag_epoch() != 0 )
+    str << tag_epoch() << ":";
+  str << tag_version()
+      << (tag_release().empty()?"":(std::string("-")+tag_release()))
+      << ( isSrc() ? ".src}" : "}");
+  return str;
 }