Imported Upstream version 17.29.2

diff --git a/VERSION.cmake b/VERSION.cmake
index 36d4e58..0928c1d 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "22")
 SET(LIBZYPP_MINOR "29")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 17.29.1 (22)
+# LAST RELEASED: 17.29.2 (22)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 98c10a4..35e6fa9 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,7 +1,14 @@
 -------------------------------------------------------------------
+Thu Jan 20 17:29:52 CET 2022 - ma@suse.de
+
+- Fix Legacy include (bsc#1194597)
+- version 17.29.2 (22)
+
+-------------------------------------------------------------------
 Mon Jan 10 13:02:11 CET 2022 - ma@suse.de
 
-- Fix broken install path for parser compat headers (fixes #372)
+- Fix broken install path for parser compat headers (fixes #372,
+  bsc#1194597)
 - RepoManager: remember exec errors in exception history
   (bsc#1193007)
 - version 17.29.1 (22)

diff --git a/po/es.po b/po/es.po
index 849b72f..879918a 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-26 11:04+0200\n"
-"PO-Revision-Date: 2021-12-30 03:11+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"PO-Revision-Date: 2022-01-26 19:12+0000\n"
+"Last-Translator: Matías Silva Bustos <matiasasb@gmail.com>\n"
 "Language-Team: Spanish <https://l10n.opensuse.org/projects/libzypp/master/es/"
 ">\n"
 "Language: es\n"
@@ -1281,7 +1281,7 @@ msgstr "Conflictos"
 
 #: zypp/Dep.cc:100
 msgid "Obsoletes"
-msgstr "Obsoletos"
+msgstr "Desplaza"
 
 #: zypp/Dep.cc:101
 msgid "Recommends"
@@ -3725,14 +3725,14 @@ msgstr[1] "(expira en %d días)"
 #: zypp/RepoInfo.cc:547
 #, boost-format
 msgid "Looking for gpg key ID %1% in cache %2%."
-msgstr "Buscando la llave gpg con identificador ID %1% en la caché %2%."
+msgstr "Buscando la clave gpg identificada con %1% en la caché %2%."
 
 #. translator: %1% is a gpg key ID like 3DBDC284
 #. %2% is a repositories name
 #: zypp/RepoInfo.cc:575
 #, boost-format
 msgid "Looking for gpg key ID %1% in repository %2%."
-msgstr "Buscando la llave gpg con identificador %1% en el repositorio %2%."
+msgstr "Buscando la clave gpg identificada con %1% en el repositorio %2%."
 
 #. translator: %1% is a repositories name
 #: zypp/RepoInfo.cc:599
@@ -3862,7 +3862,7 @@ msgstr "No es posible suprimir %s"
 
 #: zypp/RepoManager.cc:2003 zypp/RepoManager.cc:2453
 msgid "Can't figure out where the service is stored."
-msgstr "No es posible determinar donde está almacenado el servicio."
+msgstr "No es posible determinar dónde está almacenado el servicio."
 
 # clients/support_registration.ycp:225 include/support/registration.ycp:77
 # clients/support_askkey.ycp:246 include/support/supportio.ycp:79
@@ -3947,7 +3947,7 @@ msgid "Unknown support option. Description not available"
 msgstr "Opción de asistencia desconocida. Descripción no disponible."
 
 #: zypp/ZYppFactory.cc:403
-#, c-format, boost-format
+#, boost-format, c-format, fuzzy
 msgid ""
 "System management is locked by the application with pid %d (%s).\n"
 "Close this application before trying again."
@@ -4061,6 +4061,7 @@ msgid "Path '%s' on medium '%s' is not a directory."
 msgstr "La vía %s del medio %s no es un directorio."
 
 #: zypp/media/MediaException.cc:101
+#, fuzzy
 msgid "Malformed URI"
 msgstr "Formato de URI incorrecto"
 
@@ -4141,7 +4142,7 @@ msgstr "La descarga de datos ha excedido el tamaño esperado '%s 1' de '%s 2'."
 #: zypp/zyppng/media/network/networkrequesterror.cc:118
 #, c-format, boost-format
 msgid "Location '%s' is temporarily unaccessible."
-msgstr "La ubicación '%s' está momentaneamente inaccesible."
+msgstr "La ubicación '%s' está momentáneamente inaccesible."
 
 #: zypp/media/MediaException.cc:213
 #, c-format, boost-format
@@ -4225,6 +4226,7 @@ msgstr "No hay ninguna URL en el repositorio."
 #, boost-format
 msgid "Expected medium %1%/%2% identified by file '%3%' with content:"
 msgstr ""
+"Medio esperado %1%/%2% identificado por el archivo «%3%», el cual contiene:"
 
 #. [lhs][rhs] 0 = installed; 1 = to be installed
 #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2)
@@ -4384,7 +4386,7 @@ msgstr "romper %s ignorando algunas de sus dependencias"
 
 #: zypp/solver/detail/ProblemSolutionIgnore.cc:48
 msgid "generally ignore of some dependencies"
-msgstr "generalmente se ignoran algunas dependencias"
+msgstr "ignorar en general algunas dependencias"
 
 #: zypp/solver/detail/SATResolver.cc:1089
 #, boost-format
@@ -4507,30 +4509,30 @@ msgstr ""
 #, boost-format
 msgid "the installed %1% obsoletes '%2%' provided by the installed %3%"
 msgstr ""
-"el elemento %1% instalado deja obsoleto a %2%, proporcionado por el elemento "
-"%3% instalado"
+"el elemento %1% instalado desplaza a %2%, proporcionado por el elemento %3% "
+"instalado"
 
 #: zypp/solver/detail/SATResolver.cc:1155
 #, boost-format
 msgid "the installed %1% obsoletes '%2%' provided by the to be installed %3%"
 msgstr ""
-"el elemento %1% instalado deja obsoleto a %2%, proporcionado por el elemento "
-"%3% que se va a instalar"
+"el elemento %1% instalado desplaza a %2%, proporcionado por el elemento %3% "
+"que se va a instalar"
 
 #: zypp/solver/detail/SATResolver.cc:1159
 #, boost-format
 msgid "the to be installed %1% obsoletes '%2%' provided by the installed %3%"
 msgstr ""
-"el elemento %1% que se va a instalar deja obsoleto a %2%, proporcionado por "
-"el elemento %3% instalado"
+"el elemento %1% que se va a instalar desplaza a %2%, proporcionado por el "
+"elemento %3% instalado"
 
 #: zypp/solver/detail/SATResolver.cc:1161
 #, boost-format
 msgid ""
 "the to be installed %1% obsoletes '%2%' provided by the to be installed %3%"
 msgstr ""
-"el elemento %1% que se va a instalar deja obsoleto a %2%, proporcionado por "
-"el elemento %3% que se va a instalar"
+"el elemento %1% que se va a instalar desplaza a %2%, proporcionado por el "
+"elemento %3% que se va a instalar"
 
 #: zypp/solver/detail/SATResolver.cc:1166
 #, boost-format
@@ -4691,6 +4693,8 @@ msgid ""
 "install %1% from vendor %2%\n"
 "  replacing %3% from vendor %4%"
 msgstr ""
+"instalar %1% del proveedor %2%\n"
+" reemplazando %3% del proveedor %4%"
 
 #: zypp/solver/detail/SATResolver.cc:1507
 #, boost-format
@@ -4751,7 +4755,7 @@ msgstr "Nuevo mensaje de actualización"
 
 #: zypp/target/TargetImpl.cc:2619
 msgid "Executing the transaction failed because of the following problems:"
-msgstr ""
+msgstr "Falló la ejecución de la transacción debido a los siguientes problemas:"
 
 #. TranslatorExplanation after semicolon is error message
 #. TranslatorExplanation the colon is followed by an error message
@@ -5067,22 +5071,22 @@ msgstr "No es posible hacer fork (%s)."
 #: zypp-core/zyppng/io/forkspawnengine.cc:306
 #, c-format, boost-format
 msgid "Can't exec '%s', chdir failed (%s)."
-msgstr ""
+msgstr "No es posible ejecutar '%s', chdir falló (%s)."
 
 #: zypp-core/zyppng/io/forkspawnengine.cc:309
 #, c-format, boost-format
 msgid "Can't exec '%s', chroot failed (%s)."
-msgstr ""
+msgstr "No es posible ejecutar '%s', falló chroot (%s)."
 
 #: zypp-core/zyppng/io/forkspawnengine.cc:312
 #, c-format, boost-format
 msgid "Can't exec '%s', exec failed (%s)."
-msgstr ""
+msgstr "No es posible ejecutar '%s', falló exec (%s)."
 
 #: zypp-core/zyppng/io/forkspawnengine.cc:316
 #, c-format, boost-format
 msgid "Can't exec '%s', unexpected error."
-msgstr ""
+msgstr "No es posible ejecutar '%s', error inesperado."
 
 #~ msgid "%s does not belong to a distupgrade repository"
 #~ msgstr "%s no pertenece a un repositorio distupgrade"

diff --git a/zypp/ZYppCallbacks.h b/zypp/ZYppCallbacks.h
index b520719..a362b54 100644 (file)
--- a/zypp/ZYppCallbacks.h
+++ b/zypp/ZYppCallbacks.h
@@ -23,6 +23,7 @@
 #include <zypp/Url.h>
 #include <zypp-core/ui/ProgressData>
 #include <zypp-media/auth/AuthData>
+#include <zypp-curl/auth/CurlAuthData>  // bsc#1194597: CurlAuthData must be exposed for zypper
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp