From 99f0d6659296a20cd2376abe7f90f99092aeba72037803dfc620b2d9e51a07d0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 8 Oct 2014 15:31:12 +0000 Subject: [PATCH] Accepting request 254729 from home:dimstar:branches:GNOME:Factory - Add gnome-software-nouser-proxy.patch: Do not pass proxy settings between user session and packagekitd. openSUSE does not grant the required polkit privileges, as user settings should not have an impact on the package manager in our view. The proxy settings for packagekitd are handled by libzypp/libproxy and are loaded from yast proxy settings. OBS-URL: https://build.opensuse.org/request/show/254729 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=35 --- gnome-software-nouser-proxy.patch | 35 +++++++++++++++++++++++++++++++ gnome-software.changes | 10 +++++++++ gnome-software.spec | 3 +++ 3 files changed, 48 insertions(+) create mode 100644 gnome-software-nouser-proxy.patch diff --git a/gnome-software-nouser-proxy.patch b/gnome-software-nouser-proxy.patch new file mode 100644 index 0000000..5be800a --- /dev/null +++ b/gnome-software-nouser-proxy.patch @@ -0,0 +1,35 @@ +From 583ebeac8fab17a25527360c499f9a4dbd084f6f Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Tue, 7 Oct 2014 11:01:36 +0200 +Subject: [PATCH] packagekit: openSUSE relies on libzypp/libproxy to have the + correct proxy settings for packagekitd. + +This avoids having to pass on proxy settings between the user session +(which user, in a multi-seat env?) and the packagekitd service. +--- + src/gs-proxy-settings.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gs-proxy-settings.c b/src/gs-proxy-settings.c +index 494ad2f..17b5724 100644 +--- a/src/gs-proxy-settings.c ++++ b/src/gs-proxy-settings.c +@@ -144,6 +144,7 @@ set_proxy_cb (GObject *object, GAsyncResult *res, gpointer user_data) + static void + reload_proxy_settings (GsProxySettings *proxy_settings) + { ++/* openSUSE relies on libzypp/libproxy to get the right proxy settings + gchar *proxy_http; + gchar *proxy_ftp; + +@@ -160,6 +161,7 @@ reload_proxy_settings (GsProxySettings *proxy_settings) + proxy_settings); + g_free (proxy_http); + g_free (proxy_ftp); ++*/ + } + + static void +-- +2.1.1 + diff --git a/gnome-software.changes b/gnome-software.changes index e7bbdc1..fa16a46 100644 --- a/gnome-software.changes +++ b/gnome-software.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 7 09:04:24 UTC 2014 - dimstar@opensuse.org + +- Add gnome-software-nouser-proxy.patch: Do not pass proxy settings + between user session and packagekitd. openSUSE does not grant the + required polkit privileges, as user settings should not have an + impact on the package manager in our view. The proxy settings for + packagekitd are handled by libzypp/libproxy and are loaded from + yast proxy settings. + ------------------------------------------------------------------- Mon Oct 6 08:58:25 UTC 2014 - dimstar@opensuse.org diff --git a/gnome-software.spec b/gnome-software.spec index 2db9903..3d73dfb 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -30,6 +30,8 @@ Source1: InstallAppdata.sh Patch0: gnome-software-PK-updates.patch # PATCH-FEATURE-OPENSUSE gnome-software-add-default-yast-appfolder.patch boo#897713 badshah400@gmail.com -- Adds a YaST app-folder by default, in addition to existing app-folders Sundry and Utilities Patch1: gnome-software-add-default-yast-appfolder.patch +# PATCH-FIX-OPENSUSE gnome-software-nouser-proxy.patch dimstar@opensuse.org -- Do not pass user settings between the user session and packagekitd +Patch100: gnome-software-nouser-proxy.patch BuildRequires: intltool >= 0.35.0 BuildRequires: suse-xsl-stylesheets BuildRequires: update-desktop-files @@ -72,6 +74,7 @@ At this moment, gnome-software is the only known implementation making use of it # Disables - let's try the systemd offline updater #patch0 -p1 %patch1 -p1 +%patch100 -p1 %build %configure \