Accepting request 579026 from GNOME:Factory
Update to 1.1.8 (forwarded request 578903 from dimstar) OBS-URL: https://build.opensuse.org/request/show/579026 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PackageKit?expand=0&rev=169
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2deb81dffe
@ -1,65 +0,0 @@
|
||||
From 6c97a7f05953e91b156fdb783e24357ed03b20c7 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Kang <jonathan121537@gmail.com>
|
||||
Date: Mon, 7 Aug 2017 14:48:37 +0800
|
||||
Subject: [PATCH] zypp: Return error if invalid package IDs are detected
|
||||
|
||||
---
|
||||
backends/zypp/pk-backend-zypp.cpp | 24 +++++++++++++++++++++++-
|
||||
1 file changed, 23 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: PackageKit-1.1.7/backends/zypp/pk-backend-zypp.cpp
|
||||
===================================================================
|
||||
--- PackageKit-1.1.7.orig/backends/zypp/pk-backend-zypp.cpp
|
||||
+++ PackageKit-1.1.7/backends/zypp/pk-backend-zypp.cpp
|
||||
@@ -1805,7 +1805,7 @@ pk_backend_destroy (PkBackend *backend)
|
||||
static bool
|
||||
zypp_is_no_solvable (const sat::Solvable &solv)
|
||||
{
|
||||
- return solv.id() == sat::detail::noSolvableId;
|
||||
+ return solv == sat::Solvable::noSolvable;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2111,6 +2111,13 @@ backend_get_details_thread (PkBackendJob
|
||||
|
||||
sat::Solvable solv = zypp_get_package_by_id( package_ids[i] );
|
||||
|
||||
+ if (zypp_is_no_solvable(solv)) {
|
||||
+ // Previously stored package_id no longer matches any solvable.
|
||||
+ zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
|
||||
+ "couldn't find package");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
ResObject::constPtr obj = make<ResObject>( solv );
|
||||
if (obj == NULL) {
|
||||
zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
|
||||
@@ -2584,6 +2591,13 @@ backend_install_packages_thread (PkBacke
|
||||
for (guint i = 0; package_ids[i]; i++) {
|
||||
MIL << package_ids[i] << endl;
|
||||
sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
|
||||
+
|
||||
+ if (zypp_is_no_solvable(solvable)) {
|
||||
+ // Previously stored package_id no longer matches any solvable.
|
||||
+ zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
|
||||
+ "couldn't find package");
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
to_install++;
|
||||
PoolItem item(solvable);
|
||||
@@ -3222,6 +3236,14 @@ backend_update_packages_thread (PkBacken
|
||||
|
||||
for (guint i = 0; package_ids[i]; i++) {
|
||||
sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
|
||||
+
|
||||
+ if (zypp_is_no_solvable(solvable)) {
|
||||
+ // Previously stored package_id no longer matches any solvable.
|
||||
+ zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
|
||||
+ "couldn't find package");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
ui::Selectable::Ptr sel( ui::Selectable::get( solvable ));
|
||||
|
||||
PoolItem item(solvable);
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9fe34ee5657e45267e829bc7a1c9cf4d024e0ea00d3accfb40dda4be8cac606a
|
||||
size 1431648
|
||||
@ -1,10 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEcBAABAgAGBQJZtn09AAoJEBesuo36lw4XW1gIAKfrSjPauos98MkarrNkLmLa
|
||||
KI1fmXuhesdKXSNahjR+QsDYOJWEdyoRHJNbUj04UYiV1o52DqJv+ZpvFQOO6cnJ
|
||||
d2oAv5ZGjjBSOCo6CWUjAi6oqWlBKiJUEVC6HZU1QhqR+NNJ/dkykp48lE1ZAZay
|
||||
v2TIJp07uOLwv565zAmF+fgo+xJsbNj8fgrWGsSLcN9VconGv6OZAh8gXkXgpZ3a
|
||||
nQHVAKlwt+IJFkl2HNyMQRRAGUWkkCe7dUmfeRfYBd3bsY6vUt3erBbveJngOGuF
|
||||
jrk+rMYu5k3FfEZ2ANmj/1vHtIHdNG74TAhd52kn78Jc7F5glxP2ecVMl/SIm3k=
|
||||
=gPRf
|
||||
-----END PGP SIGNATURE-----
|
||||
3
PackageKit-1.1.8.tar.xz
Normal file
3
PackageKit-1.1.8.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:757f902f2fb295790b64c345a561124300d54945cd33c690c2a176cc8dba885d
|
||||
size 1439380
|
||||
16
PackageKit-1.1.8.tar.xz.asc
Normal file
16
PackageKit-1.1.8.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABAgAGBQJaVLodAAoJEICFj6OPYq90GVwQAJtrEAOubkQ9ma2DroyPw2RK
|
||||
gGvqQsNOG7YWCC9t8VbbHezhoKfjzPmJ9jaE46F7RzPKi523DQcPYL3eqCH8EoWi
|
||||
X6X/3S+GzyPiJr3kzfPFk8nZvgmDbAU+xhuWFa96k+NgBwnEuD2tg02YCSlIz157
|
||||
Iby9zoAnUXG5lMplwqBiJ0FzJtMFqXLk6tjbFf9x4ajMJZjst7LEBoJAspuT3xN5
|
||||
o9LRyaGnuJ1H2ZjH58/EBSXgJf9I94luf38Hf7RjAOid8dlJ7C1HkLiQOft2BY7H
|
||||
WYfnjMJkMPuSGVRQe2869t7oEydRR/b+rlbvwpEtcMDBB1XxQWIQiY/PH/kdFtvs
|
||||
+vtClY/hjSJVKU+ovtyy62woz+SKHLU5KBP/5oX9x52ZMhaQXr32k6L7PyfbXZly
|
||||
Z/giAhxatj9LqSK0CpLdydjAHOb90JH7OX52NjxJsLALVyOtYAu0gT5y20w9n2B4
|
||||
JSi64iuDQKukqUDdSAzca7vdpfSyFBbBmdn91UxRpq2vLfYaVmKRm46cZq6N1vbk
|
||||
ACM5QkyN/1rjO7yMqs8e7befldIzxUxuln1H8Ytd3+zAWjKBnXa0+WU7xNaWaHKC
|
||||
bhN19T2ZhXeoQlBgjtfxFhhDdnTZ4wgM5fhEkbU9PbMDIgO2GGQiHoY/GaWtfs0L
|
||||
dFYDwqPO3Mw2XpUDLEAs
|
||||
=cJQN
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 19 11:25:34 UTC 2018 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 1.1.8:
|
||||
+ Notes: The Slackware backend was renamed from "katja" to
|
||||
"slack".
|
||||
+ Libraries:
|
||||
- Add getters for PkEulaRequired.
|
||||
- Add new pk_results_set_role() API.
|
||||
+ New Features: Save transaction role to the offline update
|
||||
results file.
|
||||
+ Bugfixes:
|
||||
- Various fixes to docs.
|
||||
- Bring introspection and vapigen m4 macros into the source.
|
||||
- command-not-found: Be more explicit when ignoring path
|
||||
components.
|
||||
- service: Use ConditionPathExists=!/run/ostree-booted.
|
||||
+ Backends:
|
||||
- zypp: Return error if invalid package IDs are detected.
|
||||
- Various changes related to aptcc and slack.
|
||||
- Drop PK-zypp-return-error-invalid-package-ids.patch: fixed
|
||||
upstream.
|
||||
- Drop autoconf-archive and automake BuildRequires and no longer
|
||||
call autoreconf: no patch changes the build system.
|
||||
- Replace --enable/disable-systemd-updates configure parameter with
|
||||
--enable/disable-offline-update: the relevant systemd-updates
|
||||
parameters have not been valid since PackageKit 1.0.0.
|
||||
- Drop --with-default-backend=zypp configure parameter: this has
|
||||
not been udnerstood since PackageKit 1.0. PK just used the one
|
||||
and only backend installed in the distro.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 6 12:48:41 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package PackageKit
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,7 +25,7 @@
|
||||
%define BUILD_CNF 0
|
||||
%define with_offline_updates 1
|
||||
Name: PackageKit
|
||||
Version: 1.1.7
|
||||
Version: 1.1.8
|
||||
Release: 0
|
||||
Summary: Simple software installation management software
|
||||
License: GPL-2.0+
|
||||
@ -39,14 +39,9 @@ Source99: PackageKit.keyring
|
||||
Patch0: PackageKit-avoid-endless-loop-on-autoupdate.patch
|
||||
# PATCH-FIX-OPENSUSE PackageKit-zypp-backend-improve-refresh-cache.patch bsc#899755 sckang@suse.com -- Improve refresh-cache function in zypp backend.
|
||||
Patch1: PackageKit-zypp-backend-improve-refresh-cache.patch
|
||||
# PATCH-FIX-UPSTREAM PK-zypp-return-error-invalid-package-ids.patch bsc#981011 sckang@suse.com -- zypp: Return error if invalid package IDs are detected
|
||||
Patch2: PK-zypp-return-error-invalid-package-ids.patch
|
||||
# PATCH-FIX-OPENSUSE PackageKit-cron-without-sleep.patch boo#1071521 dimstar@opensuse.org -- Do not sleep in the cron job; our cron mechansim has sufficient randomization
|
||||
Patch3: PackageKit-cron-without-sleep.patch
|
||||
Patch2: PackageKit-cron-without-sleep.patch
|
||||
BuildRequires: NetworkManager-devel
|
||||
# Needed in order to be able to bootstrap (patch2)
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: automake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gobject-introspection-devel
|
||||
@ -231,14 +226,11 @@ This package provides the upstream default configuration for PackageKit.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
translation-update-upstream
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Needed for patch2
|
||||
autoreconf -fiv
|
||||
%if !0%{?is_opensuse}
|
||||
export CFLAGS="%{optflags} -DSLE"
|
||||
%endif
|
||||
@ -246,7 +238,6 @@ export CFLAGS="%{optflags} -DSLE"
|
||||
--disable-static \
|
||||
--enable-zypp \
|
||||
--enable-gstreamer-plugin \
|
||||
--with-default-backend=zypp \
|
||||
%if ! %{BUILD_CNF}
|
||||
--disable-command-not-found \
|
||||
%else
|
||||
@ -254,9 +245,9 @@ export CFLAGS="%{optflags} -DSLE"
|
||||
%endif
|
||||
--enable-systemd \
|
||||
%if %{with_offline_updates}
|
||||
--enable-systemd-updates \
|
||||
--enable-offline-update \
|
||||
%else
|
||||
--disable-systemd-updates \
|
||||
--disable-offline-update \
|
||||
%endif
|
||||
%{nil}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user