rpms
/
gnome-settings-daemon
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix subscription mananager registration with activation key 

The "enable_content" subscription manager option doesn't work for
RegisterWithActivationKey, only for Register (with username and
password).

Resolves: #2100467
This commit is contained in:
Felipe Borges 2022-07-15 15:48:33 +02:00
parent 2c1d966d1f
commit 1046d62fd3
2 changed files with 118 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnome-settings-daemon.spec
View File

@ -11,7 +11,7 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 40.0.1 Version: 40.0.1
Release: 7%{?dist} Release: 8%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
License: GPLv2+ License: GPLv2+
@ -195,6 +195,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
%{_libdir}/pkgconfig/gnome-settings-daemon.pc %{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog %changelog
* Mon Aug 01 2022 Felipe Borges <feborges@redhat.com> - 40.0.1-8
- Fix registration with activation key
Resolves: #2100467
* Wed Jul 13 2022 Carlos Garnacho <cgarnach@redhat.com> - 40.0.1-7 * Wed Jul 13 2022 Carlos Garnacho <cgarnach@redhat.com> - 40.0.1-7
- Manage im-context Xsetting dynamically - Manage im-context Xsetting dynamically
Resolves: #2087031 Resolves: #2087031

189
subscription-manager-support.patch
View File

@ -1,7 +1,7 @@
From d85d6eb0ceeaabc65f71ec9b163d00a1e0840b81 Mon Sep 17 00:00:00 2001 From f73e1e8187570ddbc2fe40a78176689f12859123 Mon Sep 17 00:00:00 2001
From: Richard Hughes <rhughes@redhat.com> From: Richard Hughes <rhughes@redhat.com>
Date: Thu, 20 Aug 2020 11:16:09 -0400 Date: Thu, 20 Aug 2020 11:16:09 -0400
Subject: [PATCH 01/19] subman: Add a new plugin to provide system subscription Subject: [PATCH 01/20] subman: Add a new plugin to provide system subscription
registration registration
--- ---
@ -10,7 +10,7 @@ Subject: [PATCH 01/19] subman: Add a new plugin to provide system subscription
plugins/subman/README.md | 56 + plugins/subman/README.md | 56 +
plugins/subman/gsd-subman-common.c | 36 + plugins/subman/gsd-subman-common.c | 36 +
plugins/subman/gsd-subman-common.h | 40 + plugins/subman/gsd-subman-common.h | 40 +
plugins/subman/gsd-subman-helper.c | 378 +++++++ plugins/subman/gsd-subman-helper.c | 372 +++++++
plugins/subman/gsd-subscription-manager.c | 982 ++++++++++++++++++ plugins/subman/gsd-subscription-manager.c | 982 ++++++++++++++++++
plugins/subman/gsd-subscription-manager.h | 63 ++ plugins/subman/gsd-subscription-manager.h | 63 ++
plugins/subman/main.c | 8 + plugins/subman/main.c | 8 +
@ -18,7 +18,7 @@ Subject: [PATCH 01/19] subman: Add a new plugin to provide system subscription
...ome.SettingsDaemon.Subscription.desktop.in | 9 + ...ome.SettingsDaemon.Subscription.desktop.in | 9 +
...ettings-daemon.plugins.subman.policy.in.in | 27 + ...ettings-daemon.plugins.subman.policy.in.in | 27 +
...gnome.settings-daemon.plugins.subman.rules | 7 + ...gnome.settings-daemon.plugins.subman.rules | 7 +
13 files changed, 1664 insertions(+) 13 files changed, 1658 insertions(+)
create mode 100644 plugins/subman/README.md create mode 100644 plugins/subman/README.md
create mode 100644 plugins/subman/gsd-subman-common.c create mode 100644 plugins/subman/gsd-subman-common.c
create mode 100644 plugins/subman/gsd-subman-common.h create mode 100644 plugins/subman/gsd-subman-common.h
@ -207,7 +207,7 @@ index 00000000..fccf9f6a
+#endif /* __GSD_SUBMAN_COMMON_H */ +#endif /* __GSD_SUBMAN_COMMON_H */
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
new file mode 100644 new file mode 100644
index 00000000..182f7190 index 00000000..69ebec7e
--- /dev/null --- /dev/null
+++ b/plugins/subman/gsd-subman-helper.c +++ b/plugins/subman/gsd-subman-helper.c
@@ -0,0 +1,372 @@ @@ -0,0 +1,372 @@
@ -1778,13 +1778,13 @@ index 00000000..1ed3a0ea
+ } + }
+}); +});
-- --
2.31.1 2.37.0
From dd5490fb4e962d82598bbf83d0dc600c030a10a3 Mon Sep 17 00:00:00 2001 From d85f9992ac4b413d07092363568213991f38d898 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Thu, 27 Jun 2019 16:12:00 +0200 Date: Thu, 27 Jun 2019 16:12:00 +0200
Subject: [PATCH 02/19] subman: Add InstalledProducts dbus property for g-c-c Subject: [PATCH 02/20] subman: Add InstalledProducts dbus property for g-c-c
--- ---
plugins/subman/gsd-subscription-manager.c | 135 ++++++++++++++++++++++ plugins/subman/gsd-subscription-manager.c | 135 ++++++++++++++++++++++
@ -2028,13 +2028,13 @@ index 08b13fa6..a8c18a26 100644
"Failed to get property: %s", property_name); "Failed to get property: %s", property_name);
return NULL; return NULL;
-- --
2.31.1 2.37.0
From c67554c7ab37a4fea6abc80ca199de2671c34ee2 Mon Sep 17 00:00:00 2001 From 65750e137dc591d34c1166de28ce2f73eb17d51e Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Fri, 28 Jun 2019 18:10:36 +0200 Date: Fri, 28 Jun 2019 18:10:36 +0200
Subject: [PATCH 03/19] subman: Increase RHSM dbus call timeouts Subject: [PATCH 03/20] subman: Increase RHSM dbus call timeouts
Increase the dbus timeouts to 5 minutes as the register/unregister calls Increase the dbus timeouts to 5 minutes as the register/unregister calls
seem to routinely take more than a minute. seem to routinely take more than a minute.
@ -2043,7 +2043,7 @@ seem to routinely take more than a minute.
1 file changed, 12 insertions(+), 5 deletions(-) 1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index 182f7190..af7a82e9 100644 index 69ebec7e..a649ae03 100644
--- a/plugins/subman/gsd-subman-helper.c --- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c +++ b/plugins/subman/gsd-subman-helper.c
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
@ -2085,7 +2085,7 @@ index 182f7190..af7a82e9 100644
return res != NULL; return res != NULL;
} }
@@ -305,7 +310,8 @@ main (int argc, char *argv[]) @@ -307,7 +312,8 @@ main (int argc, char *argv[])
subman_conopts, subman_conopts,
userlang), userlang),
G_DBUS_CALL_FLAGS_NO_AUTO_START, G_DBUS_CALL_FLAGS_NO_AUTO_START,
@ -2095,7 +2095,7 @@ index 182f7190..af7a82e9 100644
if (res == NULL) { if (res == NULL) {
g_dbus_error_strip_remote_error (error_local); g_dbus_error_strip_remote_error (error_local);
_helper_convert_error (error_local->message, &error); _helper_convert_error (error_local->message, &error);
@@ -339,7 +345,8 @@ main (int argc, char *argv[]) @@ -341,7 +347,8 @@ main (int argc, char *argv[])
subman_conopts, subman_conopts,
userlang), userlang),
G_DBUS_CALL_FLAGS_NO_AUTO_START, G_DBUS_CALL_FLAGS_NO_AUTO_START,
@ -2106,13 +2106,13 @@ index 182f7190..af7a82e9 100644
g_dbus_error_strip_remote_error (error_local); g_dbus_error_strip_remote_error (error_local);
_helper_convert_error (error_local->message, &error); _helper_convert_error (error_local->message, &error);
-- --
2.31.1 2.37.0
From efcbbf6a50eca888bde03f4425578bab9916ebaa Mon Sep 17 00:00:00 2001 From cbbaf0ac6b826e38c38eba401e4afc5f71708389 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Thu, 20 Aug 2020 11:20:47 -0400 Date: Thu, 20 Aug 2020 11:20:47 -0400
Subject: [PATCH 04/19] subman: Drop userlang field Subject: [PATCH 04/20] subman: Drop userlang field
It's currently always erroneously set to empty string. It's currently always erroneously set to empty string.
@ -2197,13 +2197,13 @@ index a8c18a26..46f051a5 100644
return FALSE; return FALSE;
if (!_client_subscription_status_update (manager, error)) if (!_client_subscription_status_update (manager, error))
-- --
2.31.1 2.37.0
From 3ff6f889049462b2b3029e26f7251e39904a3ddf Mon Sep 17 00:00:00 2001 From be0e7fdd2e19a1322e0c69081b8a2bf8d62d743a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 15:04:17 -0500 Date: Sun, 24 Jan 2021 15:04:17 -0500
Subject: [PATCH 05/19] subman: Use user locale for registration/subscription Subject: [PATCH 05/20] subman: Use user locale for registration/subscription
operations operations
This makes sure that error messages are in the correct locale. This makes sure that error messages are in the correct locale.
@ -2212,7 +2212,7 @@ This makes sure that error messages are in the correct locale.
1 file changed, 11 insertions(+), 6 deletions(-) 1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index af7a82e9..f84e91bf 100644 index a649ae03..3c892c33 100644
--- a/plugins/subman/gsd-subman-helper.c --- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c +++ b/plugins/subman/gsd-subman-helper.c
@@ -24,11 +24,13 @@ @@ -24,11 +24,13 @@
@ -2275,7 +2275,7 @@ index af7a82e9..f84e91bf 100644
g_option_context_add_main_entries (context, options, NULL); g_option_context_add_main_entries (context, options, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) { if (!g_option_context_parse (context, &argc, &argv, &error)) {
g_printerr ("Failed to parse arguments: %s\n", error->message); g_printerr ("Failed to parse arguments: %s\n", error->message);
@@ -308,7 +313,7 @@ main (int argc, char *argv[]) @@ -310,7 +315,7 @@ main (int argc, char *argv[])
activation_keys, activation_keys,
subman_options, subman_options,
subman_conopts, subman_conopts,
@ -2284,7 +2284,7 @@ index af7a82e9..f84e91bf 100644
G_DBUS_CALL_FLAGS_NO_AUTO_START, G_DBUS_CALL_FLAGS_NO_AUTO_START,
DBUS_TIMEOUT, DBUS_TIMEOUT,
NULL, &error_local); NULL, &error_local);
@@ -343,7 +348,7 @@ main (int argc, char *argv[]) @@ -345,7 +350,7 @@ main (int argc, char *argv[])
password, password,
subman_options, subman_options,
subman_conopts, subman_conopts,
@ -2294,13 +2294,13 @@ index af7a82e9..f84e91bf 100644
DBUS_TIMEOUT, DBUS_TIMEOUT,
NULL, &error_local); NULL, &error_local);
-- --
2.31.1 2.37.0
From 7bdca155acbe043c82e7abd9d2072c6502e10270 Mon Sep 17 00:00:00 2001 From a45af9d440fc55c1df3e4f12d15129d50d89f792 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Thu, 20 Aug 2020 13:34:19 -0400 Date: Thu, 20 Aug 2020 13:34:19 -0400
Subject: [PATCH 06/19] subman: Handle subscription-manager giving invalid Subject: [PATCH 06/20] subman: Handle subscription-manager giving invalid
status better status better
subscription-manager potentially returns status messages that the subscription-manager potentially returns status messages that the
@ -2423,13 +2423,13 @@ index 46f051a5..e2c16056 100644
/* emit notification for g-c-c */ /* emit notification for g-c-c */
if (priv->subscription_status != priv->subscription_status_last) { if (priv->subscription_status != priv->subscription_status_last) {
-- --
2.31.1 2.37.0
From 74fe856b8d2826520a7d324abe9727097cce8cfb Mon Sep 17 00:00:00 2001 From 609e78ba17ee5610b35dd40f9763ca91306c3535 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Tue, 25 Aug 2020 10:34:03 -0400 Date: Tue, 25 Aug 2020 10:34:03 -0400
Subject: [PATCH 07/19] subman: Force re-subscribe if the admin already Subject: [PATCH 07/20] subman: Force re-subscribe if the admin already
subscribed subscribed
It's possible for an admin to to half-enroll the system with RHN, It's possible for an admin to to half-enroll the system with RHN,
@ -2451,7 +2451,7 @@ before registering.
1 file changed, 9 insertions(+), 2 deletions(-) 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index f84e91bf..3931ef2e 100644 index 3c892c33..c248dbc3 100644
--- a/plugins/subman/gsd-subman-helper.c --- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c +++ b/plugins/subman/gsd-subman-helper.c
@@ -78,7 +78,6 @@ _helper_unregister (GError **error) @@ -78,7 +78,6 @@ _helper_unregister (GError **error)
@ -2470,7 +2470,7 @@ index f84e91bf..3931ef2e 100644
if (!_helper_unregister (&error)) { if (!_helper_unregister (&error)) {
g_printerr ("Failed to Unregister: %s\n", error->message); g_printerr ("Failed to Unregister: %s\n", error->message);
return G_IO_ERROR_NOT_INITIALIZED; return G_IO_ERROR_NOT_INITIALIZED;
@@ -304,6 +304,9 @@ main (int argc, char *argv[]) @@ -306,6 +306,9 @@ main (int argc, char *argv[])
return G_IO_ERROR_INVALID_DATA; return G_IO_ERROR_INVALID_DATA;
} }
@ -2480,7 +2480,7 @@ index f84e91bf..3931ef2e 100644
g_debug ("registering using activation key"); g_debug ("registering using activation key");
activation_keys = g_strsplit (activation_key, ",", -1); activation_keys = g_strsplit (activation_key, ",", -1);
res = g_dbus_proxy_call_sync (proxy, res = g_dbus_proxy_call_sync (proxy,
@@ -327,7 +330,6 @@ main (int argc, char *argv[]) @@ -329,7 +332,6 @@ main (int argc, char *argv[])
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
g_autoptr(GVariant) res = NULL; g_autoptr(GVariant) res = NULL;
@ -2488,7 +2488,7 @@ index f84e91bf..3931ef2e 100644
if (username == NULL) { if (username == NULL) {
g_printerr ("Required --username\n"); g_printerr ("Required --username\n");
return G_IO_ERROR_INVALID_DATA; return G_IO_ERROR_INVALID_DATA;
@@ -340,6 +342,11 @@ main (int argc, char *argv[]) @@ -342,6 +344,11 @@ main (int argc, char *argv[])
g_printerr ("Required --organisation\n"); g_printerr ("Required --organisation\n");
return G_IO_ERROR_INVALID_DATA; return G_IO_ERROR_INVALID_DATA;
} }
@ -2501,13 +2501,13 @@ index f84e91bf..3931ef2e 100644
"Register", "Register",
g_variant_new ("(sssa{ss}a{ss}s)", g_variant_new ("(sssa{ss}a{ss}s)",
-- --
2.31.1 2.37.0
From c0ca9c55632a52371acbbb76a279f28e26532e5e Mon Sep 17 00:00:00 2001 From c189fe1089c1f1975352b1a7fbe41f31ad3adc3b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Tue, 25 Aug 2020 16:20:42 -0400 Date: Tue, 25 Aug 2020 16:20:42 -0400
Subject: [PATCH 08/19] subman: Don't send secrets through command line Subject: [PATCH 08/20] subman: Don't send secrets through command line
The command line is introspectable with "ps", and it even gets logged The command line is introspectable with "ps", and it even gets logged
to syslog, so it's not suitable for passing secrets. to syslog, so it's not suitable for passing secrets.
@ -2523,7 +2523,7 @@ stdin, instead.
3 files changed, 66 insertions(+), 20 deletions(-) 3 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index 3931ef2e..edf1e41f 100644 index c248dbc3..03d2cd64 100644
--- a/plugins/subman/gsd-subman-helper.c --- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c +++ b/plugins/subman/gsd-subman-helper.c
@@ -21,12 +21,14 @@ @@ -21,12 +21,14 @@
@ -2570,7 +2570,7 @@ index 3931ef2e..edf1e41f 100644
{ "hostname", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, { "hostname", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING,
&hostname, "Registration server hostname", NULL }, &hostname, "Registration server hostname", NULL },
{ "prefix", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, { "prefix", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING,
@@ -294,16 +292,20 @@ main (int argc, char *argv[]) @@ -296,16 +294,20 @@ main (int argc, char *argv[])
g_auto(GStrv) activation_keys = NULL; g_auto(GStrv) activation_keys = NULL;
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
g_autoptr(GVariant) res = NULL; g_autoptr(GVariant) res = NULL;
@ -2595,7 +2595,7 @@ index 3931ef2e..edf1e41f 100644
g_debug ("trying to unregister in case machine is already registered"); g_debug ("trying to unregister in case machine is already registered");
_helper_unregister (NULL); _helper_unregister (NULL);
@@ -329,20 +331,24 @@ main (int argc, char *argv[]) @@ -331,20 +333,24 @@ main (int argc, char *argv[])
} else if (g_strcmp0 (kind, "register-with-username") == 0) { } else if (g_strcmp0 (kind, "register-with-username") == 0) {
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
g_autoptr(GVariant) res = NULL; g_autoptr(GVariant) res = NULL;
@ -2751,13 +2751,13 @@ index bfd073b6..e4b4589d 100644
install_rpath: gsd_pkglibdir, install_rpath: gsd_pkglibdir,
install_dir: gsd_libexecdir install_dir: gsd_libexecdir
-- --
2.31.1 2.37.0
From 590ad191dc3fec6c21dbfd22a5fc757a1409edbf Mon Sep 17 00:00:00 2001 From 3398c5037f9bdf2f6d3d2161146a6edea6c144f2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Thu, 21 Jan 2021 09:52:19 -0500 Date: Thu, 21 Jan 2021 09:52:19 -0500
Subject: [PATCH 09/19] subman: Don't treat failure to attach as fatal Subject: [PATCH 09/20] subman: Don't treat failure to attach as fatal
Many organizations don't require specific subscriptions to get Many organizations don't require specific subscriptions to get
updates (called "simple content access"). At the moment, updates (called "simple content access"). At the moment,
@ -2769,7 +2769,7 @@ This commit quiets the error.
1 file changed, 37 insertions(+), 9 deletions(-) 1 file changed, 37 insertions(+), 9 deletions(-)
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index edf1e41f..53a4d56b 100644 index 03d2cd64..ddfe389f 100644
--- a/plugins/subman/gsd-subman-helper.c --- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c +++ b/plugins/subman/gsd-subman-helper.c
@@ -52,6 +52,17 @@ _helper_convert_error (const gchar *json_txt, GError **error) @@ -52,6 +52,17 @@ _helper_convert_error (const gchar *json_txt, GError **error)
@ -2835,7 +2835,7 @@ index edf1e41f..53a4d56b 100644
g_variant_get (res, "(&s)", &str); g_variant_get (res, "(&s)", &str);
g_debug ("Attach.AutoAttach: %s", str); g_debug ("Attach.AutoAttach: %s", str);
return TRUE; return TRUE;
@@ -325,8 +349,10 @@ main (int argc, char *argv[]) @@ -327,8 +351,10 @@ main (int argc, char *argv[])
if (res == NULL) { if (res == NULL) {
g_dbus_error_strip_remote_error (error_local); g_dbus_error_strip_remote_error (error_local);
_helper_convert_error (error_local->message, &error); _helper_convert_error (error_local->message, &error);
@ -2848,7 +2848,7 @@ index edf1e41f..53a4d56b 100644
} }
} else if (g_strcmp0 (kind, "register-with-username") == 0) { } else if (g_strcmp0 (kind, "register-with-username") == 0) {
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
@@ -368,8 +394,10 @@ main (int argc, char *argv[]) @@ -370,8 +396,10 @@ main (int argc, char *argv[])
if (res == NULL) { if (res == NULL) {
g_dbus_error_strip_remote_error (error_local); g_dbus_error_strip_remote_error (error_local);
_helper_convert_error (error_local->message, &error); _helper_convert_error (error_local->message, &error);
@ -2862,13 +2862,13 @@ index edf1e41f..53a4d56b 100644
} else { } else {
g_printerr ("Invalid --kind specified: %s\n", kind); g_printerr ("Invalid --kind specified: %s\n", kind);
-- --
2.31.1 2.37.0
From 8c076516d48b5603132d3586a8040ef46011330f Mon Sep 17 00:00:00 2001 From ae88d09fd12a971d5f60c5eee5d3b7710e4884be Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 11:24:36 -0500 Date: Sun, 24 Jan 2021 11:24:36 -0500
Subject: [PATCH 10/19] subman: Add new no-installed-products state Subject: [PATCH 10/20] subman: Add new no-installed-products state
It's possible, though unlikley, the system has It's possible, though unlikley, the system has
no packages installed from Red Hat supported package sets. no packages installed from Red Hat supported package sets.
@ -2961,13 +2961,13 @@ index 0838d490..46f8d35c 100644
return FALSE; return FALSE;
-- --
2.31.1 2.37.0
From fad6580e4cf9e7f350d0d537a064bbb439457540 Mon Sep 17 00:00:00 2001 From 18e5e5862aba2031d1a93671ad8156dcc7709eaf Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 11:26:40 -0500 Date: Sun, 24 Jan 2021 11:26:40 -0500
Subject: [PATCH 11/19] subman: Fix some build warnings Subject: [PATCH 11/20] subman: Fix some build warnings
--- ---
plugins/subman/gsd-subscription-manager.c | 8 ++++---- plugins/subman/gsd-subscription-manager.c | 8 ++++----
@ -3000,13 +3000,13 @@ index 46f8d35c..1f9ca447 100644
/* FIXME: also do on error? */ /* FIXME: also do on error? */
-- --
2.31.1 2.37.0
From 6c99ee2eee9a1be3765db5a7b80ae86a4444f00b Mon Sep 17 00:00:00 2001 From f3f5369b1d68f002b020f803fb59cdcb3205e6dc Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 11:27:42 -0500 Date: Sun, 24 Jan 2021 11:27:42 -0500
Subject: [PATCH 12/19] subman: Add DBus API to subscribe for updates on Subject: [PATCH 12/20] subman: Add DBus API to subscribe for updates on
already registered system already registered system
It's possible an admin may have registered their system without It's possible an admin may have registered their system without
@ -3098,13 +3098,13 @@ index 1f9ca447..705f8b11 100644
g_assert_not_reached (); g_assert_not_reached ();
} }
-- --
2.31.1 2.37.0
From b340559f941ebd012711f357a8a0095776222d7a Mon Sep 17 00:00:00 2001 From d00d1c34921d6301579ee29a51be89ce8250e83d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 11:34:03 -0500 Date: Sun, 24 Jan 2021 11:34:03 -0500
Subject: [PATCH 13/19] subman: Improve subscription status handling Subject: [PATCH 13/20] subman: Improve subscription status handling
This commit improves how subscription-manager status is This commit improves how subscription-manager status is
parsed to give more detailed information about subscription parsed to give more detailed information about subscription
@ -3177,13 +3177,13 @@ index 705f8b11..6d80bfa9 100644
if (priv->subscription_status != priv->subscription_status_last) { if (priv->subscription_status != priv->subscription_status_last) {
_emit_property_changed (manager, "SubscriptionStatus", _emit_property_changed (manager, "SubscriptionStatus",
-- --
2.31.1 2.37.0
From e2caf6d353dfe6e3314be9c2e604dd4c025d7dc1 Mon Sep 17 00:00:00 2001 From a3d4e534a1dfa6a6ff68d0bede69e063ffeeb4d7 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 11:55:19 -0500 Date: Sun, 24 Jan 2021 11:55:19 -0500
Subject: [PATCH 14/19] subman: Drop "LAST" from status enum Subject: [PATCH 14/20] subman: Drop "LAST" from status enum
It's unused, so get rid of it. It's unused, so get rid of it.
--- ---
@ -3203,13 +3203,13 @@ index f8a3d9f4..88226564 100644
const gchar *gsd_subman_subscription_status_to_string (GsdSubmanSubscriptionStatus status); const gchar *gsd_subman_subscription_status_to_string (GsdSubmanSubscriptionStatus status);
-- --
2.31.1 2.37.0
From 26ff144e7c5230f8b27a27e6eef5c109ae31ab0f Mon Sep 17 00:00:00 2001 From 78859ea58014ee740de0c484308b6dedf4c59ab3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Sun, 24 Jan 2021 12:41:20 -0500 Date: Sun, 24 Jan 2021 12:41:20 -0500
Subject: [PATCH 15/19] subman: Clean up notification behavior Subject: [PATCH 15/20] subman: Clean up notification behavior
Notifications were only displayed for some status transitions. Notifications were only displayed for some status transitions.
@ -3427,13 +3427,13 @@ index 6d80bfa9..aaccbbc6 100644
/* expired */ /* expired */
priv->notification_expired = priv->notification_expired =
-- --
2.31.1 2.37.0
From e4ecab298c016127ab75634e1e04c6ff4eab3c4e Mon Sep 17 00:00:00 2001 From f9a405172b08607777b47c03dbd1034227690fce Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Fri, 12 Feb 2021 14:51:29 +0100 Date: Fri, 12 Feb 2021 14:51:29 +0100
Subject: [PATCH 16/19] subman: Update POTFILES.in Subject: [PATCH 16/20] subman: Update POTFILES.in
--- ---
po/POTFILES.in | 2 ++ po/POTFILES.in | 2 ++
@ -3453,13 +3453,13 @@ index e721f526..7d5b7e9d 100644
plugins/wacom/gsd-wacom-manager.c plugins/wacom/gsd-wacom-manager.c
plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
-- --
2.31.1 2.37.0
From 0da1131d81b5ddee23d5afe9c21e8c0963180cc5 Mon Sep 17 00:00:00 2001 From 957d7916a843140898f7a3ca2adeb826cd5e6a99 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Mon, 6 Sep 2021 21:31:14 +0200 Date: Mon, 6 Sep 2021 21:31:14 +0200
Subject: [PATCH 17/19] subman: Don't force X11 backend Subject: [PATCH 17/20] subman: Don't force X11 backend
All of this should work just fine with Wayland. All of this should work just fine with Wayland.
--- ---
@ -3479,13 +3479,13 @@ index 28ac995b..839c1b79 100644
#include "daemon-skeleton-gtk.h" #include "daemon-skeleton-gtk.h"
-- --
2.31.1 2.37.0
From 7b2f231fd6c87ca929bdd099177c53b14ccaaad5 Mon Sep 17 00:00:00 2001 From ea88e09c4e9cb2a6dc67740d556f52761297f5b6 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Tue, 7 Sep 2021 13:08:12 +0200 Date: Tue, 7 Sep 2021 13:08:12 +0200
Subject: [PATCH 18/19] subman: Fix desktop file hint for notifications Subject: [PATCH 18/20] subman: Fix desktop file hint for notifications
We don't have a separate subman-panel. It's all part of We don't have a separate subman-panel. It's all part of
info-overview-panel, as of now at least. info-overview-panel, as of now at least.
@ -3525,13 +3525,13 @@ index aaccbbc6..be978fc3 100644
notify_notification_set_urgency (priv->notification_registration_required, NOTIFY_URGENCY_CRITICAL); notify_notification_set_urgency (priv->notification_registration_required, NOTIFY_URGENCY_CRITICAL);
notify_notification_add_action (priv->notification_registration_required, notify_notification_add_action (priv->notification_registration_required,
-- --
2.31.1 2.37.0
From b610a954773262e60610c7732fbfeddbb3fa7fa0 Mon Sep 17 00:00:00 2001 From 3b21bc12315dba099d7377b55109bc5f942960f2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com> From: Kalev Lember <klember@redhat.com>
Date: Wed, 8 Sep 2021 13:25:07 +0200 Date: Wed, 8 Sep 2021 13:25:07 +0200
Subject: [PATCH 19/19] subman: Use preferences-system icon for notifications Subject: [PATCH 19/20] subman: Use preferences-system icon for notifications
Use it as a placeholder until we get a new icon for subscription Use it as a placeholder until we get a new icon for subscription
management. management.
@ -3571,5 +3571,42 @@ index be978fc3..dbb81098 100644
notify_notification_set_hint_string (priv->notification_registration_required, "desktop-entry", "gnome-info-overview-panel"); notify_notification_set_hint_string (priv->notification_registration_required, "desktop-entry", "gnome-info-overview-panel");
notify_notification_set_hint_string (priv->notification_registration_required, "x-gnome-privacy-scope", "system"); notify_notification_set_hint_string (priv->notification_registration_required, "x-gnome-privacy-scope", "system");
-- --
2.31.1 2.37.0
From b7da34ad4cfb05a3d50495da65a7d76abacc965f Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Fri, 15 Jul 2022 15:25:14 +0200
Subject: [PATCH 20/20] subman: Set "enable_content" option only for Register
The "enable_content" option doesn't work for
RegisterWithActivationKey.
---
plugins/subman/gsd-subman-helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index ddfe389f..bc56a8c2 100644
--- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c
@@ -299,8 +299,6 @@ main (int argc, char *argv[])
/* enable_content=1 auto attaches the subscription */
subman_options = g_variant_builder_new (G_VARIANT_TYPE("a{ss}"));
- g_variant_builder_add (subman_options, "{ss}", "enable_content", "1");
-
/* set registration server */
if (hostname == NULL || hostname[0] == '\0')
hostname = g_strdup ("subscription.rhsm.redhat.com");
@@ -361,6 +359,8 @@ main (int argc, char *argv[])
g_autoptr(GVariant) res = NULL;
gchar password[PIPE_BUF + 1] = "";
+ g_variant_builder_add (subman_options, "{ss}", "enable_content", "1");
+
if (username == NULL) {
g_printerr ("Required --username\n");
return G_IO_ERROR_INVALID_DATA;
--
2.37.0