rpms/PackageKit
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Remove upstreamed and no-longer-applied patches

Browse Source
This commit is contained in:
Richard Hughes 2012-06-28 15:03:19 +01:00
parent 4321e48be2
commit ac481a59ad
3 changed files with 0 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Fix-importing-GPG-signatures.patch
View File

@ -1,34 +0,0 @@
From 8380d8e0f91fc781919cbab68ba410c347cef0c2 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 17 May 2012 10:28:00 +0100
Subject: [PATCH] Fix importing GPG signatures
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=794927
---
lib/packagekit-glib2/pk-client.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index 6706331..d38c7b4 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -1323,11 +1323,11 @@ pk_client_signal_cb (GDBusProxy *proxy,
"package-id", tmp_str[0],
"repository-name", tmp_str[1],
"key-url", tmp_str[2],
- "key-userid", tmp_str[2],
- "key-id", tmp_str[3],
- "key-fingerprint", tmp_str[4],
- "key-timestamp", tmp_str[5],
- "type", pk_sig_type_enum_from_string (tmp_str[6]),
+ "key-userid", tmp_str[3],
+ "key-id", tmp_str[4],
+ "key-fingerprint", tmp_str[5],
+ "key-timestamp", tmp_str[6],
+ "type", pk_sig_type_enum_from_string (tmp_str[7]),
"role", state->role,
"transaction-id", state->transaction_id,
NULL);
--
1.7.10.1

35
PackageKit-0.7.4-yum-untrusted.patch
View File

@ -1,35 +0,0 @@
From 9f4fb9fe5bf123c99c4325c7b2a7091f728c466b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 26 Apr 2012 17:39:43 +0200
Subject: [PATCH] yum: don't perceive all updates as untrusted
Consider all packages as signed during simulation. Fixes rhbz#814945.
---
backends/yum/yumBackend.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index f800890..afd5127 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1975,7 +1975,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
self.status(STATUS_RUNNING)
txmbrs = []
- self._set_only_trusted(only_trusted)
+ self._set_only_trusted(only_trusted or simulate)
for package_id in package_ids:
grp = self._is_meta_package(package_id)
@@ -2314,7 +2314,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
self.percentage(0)
self.status(STATUS_RUNNING)
- self._set_only_trusted(only_trusted)
+ self._set_only_trusted(only_trusted or simulate)
txmbrs = []
try:
--
1.7.10.1

83
null-is-not-a-string.patch
View File

@ -1,83 +0,0 @@
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index f6d4026..9acb1ba 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -1426,7 +1426,7 @@ pk_client_proxy_connect (PkClientState *state)
/* coldplug properties */
props = g_dbus_proxy_get_cached_property_names (state->proxy);
- for (i = 0; props[i] != NULL; i++) {
+ for (i = 0; props != NULL && props[i] != NULL; i++) {
value_tmp = g_dbus_proxy_get_cached_property (state->proxy,
props[i]);
pk_client_set_property_value (state,
@@ -1844,8 +1844,8 @@ pk_client_set_hints_cb (GObject *source_object,
g_dbus_proxy_call (state->proxy, "RepoSetData",
g_variant_new ("(sss)",
state->repo_id,
- state->parameter,
- state->value),
+ state->parameter ? state->parameter : "",
+ state->value ? state->value : ""),
G_DBUS_CALL_FLAGS_NONE,
PK_CLIENT_DBUS_METHOD_TIMEOUT,
state->cancellable,
diff --git a/lib/packagekit-glib2/pk-control.c b/lib/packagekit-glib2/pk-control.c
index 3ae9d94..e205dcb 100644
--- a/lib/packagekit-glib2/pk-control.c
+++ b/lib/packagekit-glib2/pk-control.c
@@ -377,7 +377,7 @@ pk_control_proxy_connect (PkControlState *state)
/* coldplug properties */
props = g_dbus_proxy_get_cached_property_names (state->proxy);
- for (i = 0; props[i] != NULL; i++) {
+ for (i = 0; props != NULL && props[i] != NULL; i++) {
value_tmp = g_dbus_proxy_get_cached_property (state->proxy,
props[i]);
pk_control_set_property_value (state->control,
@@ -1175,12 +1175,13 @@ pk_control_set_proxy2_async (PkControl *control,
state->res = g_object_ref (res);
state->control = g_object_ref (control);
state->parameters = g_variant_new ("(ssssss)",
- proxy_http,
- proxy_https,
- proxy_ftp,
- proxy_socks,
- no_proxy,
- pac);
+ proxy_http ? proxy_http : "",
+ proxy_https ? proxy_https : "",
+ proxy_ftp ? proxy_ftp : "",
+ proxy_socks ? proxy_socks : "",
+ no_proxy ? no_proxy : "",
+ pac ? pac : "");
+ g_variant_ref_sink (state->parameters);
if (cancellable != NULL)
state->cancellable = g_object_ref (cancellable);
@@ -1425,7 +1426,8 @@ pk_control_set_root_async (PkControl *control,
state = g_slice_new0 (PkControlState);
state->res = g_object_ref (res);
state->control = g_object_ref (control);
- state->parameters = g_variant_new ("(s)", root);
+ state->parameters = g_variant_new ("(s)", root ? root : "");
+ g_variant_ref_sink (state->parameters);
if (cancellable != NULL)
state->cancellable = g_object_ref (cancellable);
@@ -1862,6 +1864,7 @@ pk_control_get_time_since_action_async (PkControl *control,
state->res = g_object_ref (res);
state->control = g_object_ref (control);
state->parameters = g_variant_new ("(s)", pk_role_enum_to_string (role));
+ g_variant_ref_sink (state->parameters);
if (cancellable != NULL)
state->cancellable = g_object_ref (cancellable);
@@ -2081,6 +2084,7 @@ pk_control_can_authorize_async (PkControl *control,
state->res = g_object_ref (res);
state->control = g_object_ref (control);
state->parameters = g_variant_new ("(s)", action_id);
+ g_variant_ref_sink (state->parameters);
if (cancellable != NULL)
state->cancellable = g_object_ref (cancellable);