Page MenuHomeSolus
Files F11032627

D10290.id24747.diff
No OneTemporary
Actions

D10290.id24747.diff
View Options

diff --git a/files/0001-Fix-binary-location-of-passwd.patch b/files/0001-Fix-binary-location-of-passwd.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Fix-binary-location-of-passwd.patch
@@ -0,0 +1,29 @@
+From 5c449ac4a9a15fd9d14069e56a90e1cf122e48dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Abdulkadir=20Furkan=20=C5=9Eanl=C4=B1?= <me@abdulocra.cy>
+Date: Sun, 3 Jan 2021 15:54:41 +0100
+Subject: [PATCH] Fix binary location of passwd
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Abdulkadir Furkan Şanlı <me@abdulocra.cy>
+---
+ panels/user-accounts/run-passwd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
+index 56eea9f29..ac8743272 100644
+--- a/panels/user-accounts/run-passwd.c
++++ b/panels/user-accounts/run-passwd.c
+@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
+ gchar **envp;
+ gint my_stdin, my_stdout, my_stderr;
+
+- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
++ argv[0] = "/bin/passwd"; /* Is it safe to rely on a hard-coded path? Josh: No, no it isn't. */
+ argv[1] = NULL;
+
+ envp = g_get_environ ();
+--
+2.30.0
+
diff --git a/files/0004-Fix-GDM-specific-functionality-and-binary-location-o.patch b/files/0004-Fix-GDM-specific-functionality-and-binary-location-o.patch
deleted file mode 100644
--- a/files/0004-Fix-GDM-specific-functionality-and-binary-location-o.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 63954e012e259ec1cd1b92089551d313409930c5 Mon Sep 17 00:00:00 2001
-From: Joshua Strobl <joshua@streambits.io>
-Date: Fri, 6 Nov 2020 17:14:50 +0200
-Subject: [PATCH 1/1] Fix GDM specific functionality and binary location of
- passwd.
-
----
- panels/user-accounts/cc-user-panel.c | 11 +----------
- panels/user-accounts/run-passwd.c | 2 +-
- 2 files changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
-index 5a9b5c221..e82a99ce5 100644
---- a/panels/user-accounts/cc-user-panel.c
-+++ b/panels/user-accounts/cc-user-panel.c
-@@ -67,7 +67,6 @@ struct _CcUserPanel {
- CcPanel parent_instance;
-
- ActUserManager *um;
-- GSettings *login_screen_settings;
-
- GtkBox *accounts_box;
- GtkBox *account_settings_box;
-@@ -918,11 +917,7 @@ show_user (ActUser *user, CcUserPanel *self)
- g_free (name);
-
- /* Fingerprint: show when self, local, enabled, and possible */
-- show = (act_user_get_uid (user) == getuid() &&
-- act_user_is_local_account (user) &&
-- (self->login_screen_settings &&
-- g_settings_get_boolean (self->login_screen_settings,
-- "enable-fingerprint-authentication")));
-+ show = FALSE;
-
- if (show) {
- if (!self->fingerprint_manager) {
-@@ -1583,8 +1578,6 @@ cc_user_panel_init (CcUserPanel *self)
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
- g_object_unref (provider);
-
-- self->login_screen_settings = settings_or_null ("org.gnome.login-screen");
--
- self->avatar_chooser = cc_avatar_chooser_new (GTK_WIDGET (self->user_icon_button));
- setup_main_window (self);
- }
-@@ -1596,8 +1589,6 @@ cc_user_panel_dispose (GObject *object)
-
- g_clear_object (&self->selected_user);
-
-- g_clear_object (&self->login_screen_settings);
--
- g_clear_pointer ((GtkWidget **)&self->language_chooser, gtk_widget_destroy);
- g_clear_object (&self->permission);
- G_OBJECT_CLASS (cc_user_panel_parent_class)->dispose (object);
-diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
-index 56eea9f29..ac8743272 100644
---- a/panels/user-accounts/run-passwd.c
-+++ b/panels/user-accounts/run-passwd.c
-@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
- gchar **envp;
- gint my_stdin, my_stdout, my_stderr;
-
-- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
-+ argv[0] = "/bin/passwd"; /* Is it safe to rely on a hard-coded path? Josh: No, no it isn't. */
- argv[1] = NULL;
-
- envp = g_get_environ ();
---
-2.29.1
-
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,5 +1,5 @@
0001-Remove-NoDisplay-from-desktop-files.patch
0002-Add-black-as-a-color-option.patch
0003-Make-Info-panel-more-relevant-to-Solus.patch
-0004-Fix-GDM-specific-functionality-and-binary-location-o.patch
+0001-Fix-binary-location-of-passwd.patch
0001-What-do-we-say-to-libhandy-as-a-shared-lib.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : gnome-control-center
version : 3.38.2
-release : 103
+release : 104
source :
- git|https://gitlab.gnome.org/GNOME/gnome-control-center.git : 3.38.2
license : GPL-2.0-only
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>gnome-control-center</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Abdulkadir Furkan Şanlı</Name>
+ <Email>me@abdulocra.cy</Email>
</Packager>
<License>GPL-2.0-only</License>
<PartOf>desktop.gnome</PartOf>
@@ -366,19 +366,19 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="103">gnome-control-center</Dependency>
+ <Dependency release="104">gnome-control-center</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/pkgconfig/gnome-keybindings.pc</Path>
</Files>
</Package>
<History>
- <Update release="103">
- <Date>2021-01-02</Date>
+ <Update release="104">
+ <Date>2021-01-03</Date>
<Version>3.38.2</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Abdulkadir Furkan Şanlı</Name>
+ <Email>me@abdulocra.cy</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 2:31 PM (1 d, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5792582
Default Alt Text
D10290.id24747.diff (6 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.