Imported Upstream version 17.9.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f2ec3d..bfdce57 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,8 +234,8 @@ INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION
 MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp")
 INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp )
 
-MESSAGE(STATUS "needreboot will be installed in /var/lib/zypp/")
-INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/needreboot DESTINATION /var/lib/zypp )
+MESSAGE(STATUS "needreboot will be installed in ${SYSCONFDIR}/zypp/")
+INSTALL( FILES ${LIBZYPP_SOURCE_DIR}/needreboot DESTINATION ${SYSCONFDIR}/zypp )
 
 #install systemCheck
 MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp")

diff --git a/VERSION.cmake b/VERSION.cmake
index d7ecb6c..22966dc 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -59,10 +59,10 @@
 #   See './mkChangelog -h' for help.
 #
 SET(LIBZYPP_MAJOR "17")
-SET(LIBZYPP_COMPATMINOR "2")
-SET(LIBZYPP_MINOR "8")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_COMPATMINOR "9")
+SET(LIBZYPP_MINOR "9")
+SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 17.8.1 (2)
+# LAST RELEASED: 17.9.0 (9)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 291aa39..5b0f81a 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -232,6 +232,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/systemCheck.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vars.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/needreboot.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/credentials.d
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
@@ -241,7 +242,6 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/urlresolver
 mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp
-mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp/needreboot.d
 mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp
 mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp
 
@@ -345,13 +345,13 @@ rm -rf "$RPM_BUILD_ROOT"
 %dir               %{_sysconfdir}/zypp/vars.d
 %dir               %{_sysconfdir}/zypp/vendors.d
 %dir               %{_sysconfdir}/zypp/multiversion.d
+%config(noreplace) %{_sysconfdir}/zypp/needreboot
+%dir               %{_sysconfdir}/zypp/needreboot.d
 %dir               %{_sysconfdir}/zypp/credentials.d
 %config(noreplace) %{_sysconfdir}/zypp/zypp.conf
 %config(noreplace) %{_sysconfdir}/zypp/systemCheck
 %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
 %dir               %{_var}/lib/zypp
-%config(noreplace) %{_var}/lib/zypp/needreboot
-%dir               %{_var}/lib/zypp/needreboot.d
 %dir               %{_var}/log/zypp
 %dir               %{_var}/cache/zypp
 %{_prefix}/lib/zypp

diff --git a/needreboot b/needreboot
index 3b467b9..9c0d6d8 100644 (file)
--- a/needreboot
+++ b/needreboot
@@ -1,14 +1,25 @@
-# This file contains the default list of packages
-# which will trigger the needreboot hint.
-# Do not edit this file, instead use the needreboot.d 
-# directory for adding additional packages to the list
-kernel-default
-kernel-default-base
-kernel-firmware
+##
+## This file contains packages which will trigger the needreboot hint.
+## So the user gets informed that the system should be rebooted after
+## one of these packages was updated.
+##
+## This config file is maintained by libzypp unless you manually amend it.
+## Additional configuration files can be placed in /etc/zypp/needreboot.d.
+##
+## Format: Each line must contain either a 'PACKAGENAME' or 'provides:CAPABILITY'
+##         to include all packages providing a dependency match for 'CAPABILITY'.
+##         Lines starting with '#' and empty lines are ignored.
+##
+## Example:
+##         provides:kernel
+##         glibc
+##
+provides:kernel
+dbus-1
 glibc
-systemd
-udev
+gnutls
+kernel-firmware
 libopenssl1_0_0
 libopenssl1_1
-gnutls
-dbus-1
+systemd
+udev

diff --git a/package/libzypp.changes b/package/libzypp.changes
index d2dbeeb..0f4ed27 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Nov 14 11:48:35 CET 2018 - ma@suse.de
+
+- Provide needreboot config files in /etc/zypp (fate#326451, fixes #140)
+- Need to fix soname due to libsolv ABI changes (bsc#1115341)
+- version 17.9.0 (9)
+
+-------------------------------------------------------------------
 Mon Oct 29 12:20:40 CET 2018 - ma@suse.de
 
 - Adapt to changed type names in libsolv-0.7

diff --git a/po/es.po b/po/es.po
index f9e660f..2e09306 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -17,10 +17,10 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-03 11:09+0200\n"
-"PO-Revision-Date: 2018-04-12 23:13+0000\n"
-"Last-Translator: Juan Sarria <juansarriam@gmail.com>\n"
-"Language-Team: Spanish <https://l10n.opensuse.org/projects/libzypp/master/es/"
-">\n"
+"PO-Revision-Date: 2018-10-31 20:02+0000\n"
+"Last-Translator: jc sl <trcs@gmx.com>\n"
+"Language-Team: Spanish "
+"<https://l10n.opensuse.org/projects/libzypp/master/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3788,20 +3788,20 @@ msgstr[1] "(expira en %d días)"
 #: zypp/RepoInfo.cc:513
 #, boost-format
 msgid "Looking for gpg key ID %1% in cache %2%."
-msgstr ""
+msgstr "Buscando la llave gpg con identificador ID %1% en la caché %2%."
 
 #. translator: %1% is a gpg key ID like 3DBDC284
 #. %2% is a repositories name
 #: zypp/RepoInfo.cc:541
 #, boost-format
 msgid "Looking for gpg key ID %1% in repository %2%."
-msgstr ""
+msgstr "Buscando la llave gpg con identificador %1% en el repositorio %2%."
 
 #. translator: %1% is a repositories name
 #: zypp/RepoInfo.cc:565
 #, boost-format
 msgid "Repository %1% does not define additional 'gpgkey=' URLs."
-msgstr ""
+msgstr "El repositorio %1% no define ningún URL 'gpgkey=' adicional."
 
 #: zypp/RepoManager.cc:314
 #, boost-format
@@ -4220,7 +4220,7 @@ msgstr "Se ha superado el tiempo de espera al acceder a %s."
 #: zypp/media/MediaException.cc:195
 #, c-format, boost-format
 msgid "Downloaded data exceeded the expected filesize '%s' of '%s'."
-msgstr ""
+msgstr "La descarga de datos ha excedido el tamaño esperado '%s 1' de '%s 2'."
 
 #: zypp/media/MediaException.cc:203
 #, c-format, boost-format

diff --git a/po/it.po b/po/it.po
index 2dc945f..f91ba54 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -15,10 +15,10 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-03 11:09+0200\n"
-"PO-Revision-Date: 2018-04-12 15:03+0000\n"
+"PO-Revision-Date: 2018-11-11 14:55+0000\n"
 "Last-Translator: Alessio Adamo <alessio.adamo@gmail.com>\n"
-"Language-Team: Italian <https://l10n.opensuse.org/projects/libzypp/master/it/"
-">\n"
+"Language-Team: Italian "
+"<https://l10n.opensuse.org/projects/libzypp/master/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3781,20 +3781,20 @@ msgstr[1] "(scade entro %d giorni)"
 #: zypp/RepoInfo.cc:513
 #, boost-format
 msgid "Looking for gpg key ID %1% in cache %2%."
-msgstr ""
+msgstr "Ricerca dell'ID %1% della chiave GPG nella cache %2%."
 
 #. translator: %1% is a gpg key ID like 3DBDC284
 #. %2% is a repositories name
 #: zypp/RepoInfo.cc:541
 #, boost-format
 msgid "Looking for gpg key ID %1% in repository %2%."
-msgstr ""
+msgstr "Ricerca dell'ID %1% della chiave GPG nel repository %2%."
 
 #. translator: %1% is a repositories name
 #: zypp/RepoInfo.cc:565
 #, boost-format
 msgid "Repository %1% does not define additional 'gpgkey=' URLs."
-msgstr ""
+msgstr "Il repository %1% non definisce URL aggiuntivi 'gpgkey=' ."
 
 #: zypp/RepoManager.cc:314
 #, boost-format
@@ -4209,7 +4209,7 @@ msgstr "Timeout superato durante l'accesso a '%s'."
 #: zypp/media/MediaException.cc:195
 #, c-format, boost-format
 msgid "Downloaded data exceeded the expected filesize '%s' of '%s'."
-msgstr ""
+msgstr "I dati scaricati eccedono la dimensione attesa '%s' di '%s'."
 
 #: zypp/media/MediaException.cc:203
 #, c-format, boost-format

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 34d1ebd..dd81eaf 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -961,3 +961,12 @@ INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 # install XML schemas
 FILE( GLOB YUM_SCHEMA_FILES ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
 INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" )
+
+ADD_CUSTOM_TARGET ( buildmon
+  COMMAND test ! -x ./buildmon || ./buildmon
+)
+
+ADD_CUSTOM_COMMAND (
+  TARGET zypp POST_BUILD
+  COMMAND test ! -x ./buildmon || ./buildmon
+)

diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index 2a063c3..2be2503 100644 (file)
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -976,6 +976,12 @@ namespace zypp
         ? (configPath()/"services.d") : _pimpl->cfg_known_services_path );
   }
 
+  Pathname ZConfig::needrebootFile() const
+  { return configPath()/"needreboot"; }
+
+  Pathname ZConfig::needrebootPath() const
+  { return configPath()/"needreboot.d"; }
+
   Pathname ZConfig::varsPath() const
   {
     return ( _pimpl->cfg_vars_path.empty()

diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index bc6d176..f8820f9 100644 (file)
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -207,6 +207,18 @@ namespace zypp
       Pathname knownServicesPath() const;
 
       /**
+       * Path of the default needreboot config file (configPath()/needreboot).
+       * \ingroup g_ZC_CONFIGFILES
+       */
+      Pathname needrebootFile() const;
+
+      /**
+       * Path where the custom needreboot config files are kept (configPath()/needreboot.d).
+       * \ingroup g_ZC_CONFIGFILES
+       */
+      Pathname needrebootPath() const;
+
+      /**
        * Path containing custom repo variable definitions (configPath()/vars.d).
        * \see \ref zypp::repo::RepoVarExpand Repo variable expander
        * \ingroup g_ZC_CONFIGFILES

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index 2e1ea4c..924a065 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -387,7 +387,7 @@ namespace zypp
       return myPool().isOnSystemByAuto( ident_r );
     }
 
-    bool Solvable::identTriggersRebootHint ( const IdString &ident_r )
+    bool Solvable::identTriggersRebootNeededHint ( const IdString &ident_r )
     {
       return myPool().triggersRebootNeededHint( ident_r );
     }

diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h
index 3e7a3a5..38db264 100644 (file)
--- a/zypp/sat/Solvable.h
+++ b/zypp/sat/Solvable.h
@@ -137,9 +137,9 @@ namespace zypp
       static bool identIsAutoInstalled( const IdString & ident_r );
 
       /** Whether installing or upgrading a solvable with the same \ref ident will trigger the reboot needed hint. */
-      bool identTriggersRebootHint() const
-      { return identTriggersRebootHint( ident() ); }
-      static bool identTriggersRebootHint ( const IdString &ident_r );
+      bool identTriggersRebootNeededHint() const
+      { return identTriggersRebootNeededHint( ident() ); }
+      static bool identTriggersRebootNeededHint ( const IdString &ident_r );
 
       /** Whether different versions of this package can be installed at the same time.
        * Per default \c false. \see also \ref ZConfig::multiversion.

diff --git a/zypp/sat/SolvableType.h b/zypp/sat/SolvableType.h
index aad678c..65f4d36 100644 (file)
--- a/zypp/sat/SolvableType.h
+++ b/zypp/sat/SolvableType.h
@@ -80,7 +80,7 @@ namespace zypp
       bool             onSystemByAuto() const                  { return satSolvable().onSystemByAuto(); }
       bool             identIsAutoInstalled() const            { return satSolvable().identIsAutoInstalled(); }
       bool             multiversionInstall() const             { return satSolvable().multiversionInstall(); }
-      bool              identTriggersRebootHint() const         { return satSolvable().identTriggersRebootHint(); }
+      bool              identTriggersRebootNeededHint() const   { return satSolvable().identTriggersRebootNeededHint(); }
 
       Date             buildtime() const                       { return satSolvable().buildtime(); }
       Date             installtime() const                     { return satSolvable().installtime(); }

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 687af9b..ec5cd7b 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -1077,15 +1077,33 @@ namespace zypp
       //load the packages that will trigger the update flag being set
       {
         sat::StringQueue q;
-        filesystem::Pathname needRebootFile = home() / "needreboot";
+        filesystem::Pathname needRebootFile { Pathname::assertprefix( root(), ZConfig::instance().needrebootFile() ) };
         if ( filesystem::PathInfo ( needRebootFile ).isExist() ) {
           SolvIdentFile file ( needRebootFile );
           for ( const auto & idstr : file.data() ) {
             q.push( idstr.id() );
           }
-        }
+#if 1
+#warning Hotfix: temp workaround missing SolvableSpec Parser
+         // Also consider excluding .rpmnew/.rpmsave/.rpmorig files in needreboot.d
+          q.push( IdString("kernel-azure").id() );
+         q.push( IdString("kernel-azure-base").id() );
+         q.push( IdString("kernel-debug").id() );
+         q.push( IdString("kernel-debug-base").id() );
+         q.push( IdString("kernel-default").id() );
+         q.push( IdString("kernel-default-base").id() );
+         q.push( IdString("kernel-kvmsmall").id() );
+         q.push( IdString("kernel-kvmsmall-base").id() );
+         q.push( IdString("kernel-rt").id() );
+         q.push( IdString("kernel-rt-base").id() );
+         q.push( IdString("kernel-rt_debug").id() );
+         q.push( IdString("kernel-rt_debug-base").id() );
+         q.push( IdString("kernel-vanilla").id() );
+         q.push( IdString("kernel-vanilla-base").id() );
+#endif
+       }
 
-        filesystem::Pathname needRebootDir = home() / "needreboot.d";
+        filesystem::Pathname needRebootDir { Pathname::assertprefix( root(), ZConfig::instance().needrebootPath() ) };
         if ( filesystem::PathInfo ( needRebootDir ).isExist() ) {
           filesystem::DirContent ls;
           filesystem::readdir( ls, needRebootDir, false );
@@ -1501,7 +1519,7 @@ namespace zypp
               }
               else
               {
-                if ( citem.identTriggersRebootHint() ) {
+                if ( citem.identTriggersRebootNeededHint() ) {
                   auto rebootNeededFile = root() / "/var/run/reboot-needed";
                   if ( filesystem::assert_file( rebootNeededFile ) == EEXIST)
                     filesystem::touch( rebootNeededFile );