From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 0/2] Enlightenment Desktop Service Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 May 2018 16:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31342@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152527953021730 (code B ref -1); Wed, 02 May 2018 16:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2018 16:45:30 +0000 Received: from localhost ([127.0.0.1]:47248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDusk-0005eQ-5h for submit@debbugs.gnu.org; Wed, 02 May 2018 12:45:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDuse-0005eA-KJ for submit@debbugs.gnu.org; Wed, 02 May 2018 12:45:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDusY-0004Gg-Ee for submit@debbugs.gnu.org; Wed, 02 May 2018 12:45:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54075) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDusY-0004GX-8w for submit@debbugs.gnu.org; Wed, 02 May 2018 12:45:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDusX-0005dZ-6u for guix-patches@gnu.org; Wed, 02 May 2018 12:45:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDusT-0004Dq-KH for guix-patches@gnu.org; Wed, 02 May 2018 12:45:17 -0400 Received: from flashner.co.il ([178.62.234.194]:43174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDusT-0004Cz-0D for guix-patches@gnu.org; Wed, 02 May 2018 12:45:13 -0400 Received: from localhost (46-117-130-5.bb.netvision.net.il [46.117.130.5]) by flashner.co.il (Postfix) with ESMTPSA id 2D9F54023D; Wed, 2 May 2018 16:45:11 +0000 (UTC) From: Efraim Flashner Date: Wed, 2 May 2018 19:44:50 +0300 Message-Id: <20180502164450.13727-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) These two patches create a usable desktop service for Enlightenment. I've been running it for a few weeks while working out the kinks, and almost everything works as expected. The default screen locker now works, so as far as I'm concerned it seems ready for upstreaming. Currently the remaining issue that I have is the language switcher doesn't work. I can change the language flag at the bottom but it currently doesn't affect the language typed in or the Caps->Meta conversion. Efraim Flashner (2): gnu: enlightenment: Fix setuid program locations. gnu: services: Add Enlightenment desktop service. doc/guix.texi | 10 +- gnu/local.mk | 1 + gnu/packages/enlightenment.scm | 3 +- .../enlightenment-fix-setuid-path.patch | 168 ++++++++++++++++++ gnu/services/desktop.scm | 61 +++++++ 5 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/enlightenment-fix-setuid-path.pa= tch --=20 2.17.0 From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 1/2] gnu: enlightenment: Fix setuid program locations. References: <20180502164450.13727-1-efraim@flashner.co.il> In-Reply-To: <20180502164450.13727-1-efraim@flashner.co.il> Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 May 2018 16:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31342@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.152527965921968 (code B ref 31342); Wed, 02 May 2018 16:48:02 +0000 Received: (at 31342) by debbugs.gnu.org; 2 May 2018 16:47:39 +0000 Received: from localhost ([127.0.0.1]:47257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDuuo-0005iG-Ql for submit@debbugs.gnu.org; Wed, 02 May 2018 12:47:39 -0400 Received: from flashner.co.il ([178.62.234.194]:44828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDuuk-0005hs-Gl for 31342@debbugs.gnu.org; Wed, 02 May 2018 12:47:37 -0400 Received: from localhost (46-117-130-5.bb.netvision.net.il [46.117.130.5]) by flashner.co.il (Postfix) with ESMTPSA id 83D2940260; Wed, 2 May 2018 16:47:28 +0000 (UTC) From: Efraim Flashner Date: Wed, 2 May 2018 19:47:22 +0300 Message-Id: <20180502164723.13994-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/enlightenment.scm (enlightenment)[source]: Add patch. * gnu/packages/patches/enlightenment-fix-setuid-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/enlightenment.scm | 3 +- .../enlightenment-fix-setuid-path.patch | 168 ++++++++++++++++++ 3 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/enlightenment-fix-setuid-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index cfe698d3f..df8d22d09 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -644,6 +644,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ + %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index d6c11e4fe..54205978a 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -262,7 +262,8 @@ Libraries with some extra bells and whistles.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad")))) + "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad")) + (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch new file mode 100644 index 000000000..90e16d3e6 --- /dev/null +++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch @@ -0,0 +1,168 @@ +diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c +index 00b0e5d84..98ab4518f 100644 +--- a/src/bin/e_auth.c ++++ b/src/bin/e_auth.c +@@ -9,8 +9,7 @@ e_auth_begin(char *passwd) + + if (strlen(passwd) == 0) goto out; + +- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_ckpasswd", +- e_prefix_lib_get()); ++ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); + + exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); + if (ecore_exe_send(exe, passwd, strlen(passwd)) != EINA_TRUE) goto out; +diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c +index 2bced6766..208e583ba 100644 +--- a/src/bin/e_backlight.c ++++ b/src/bin/e_backlight.c +@@ -521,8 +521,8 @@ _bl_sys_level_set(double val) + } + // fprintf(stderr, "SET: %1.3f\n", val); + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_backlight %i %s", +- e_prefix_lib_get(), (int)(val * 1000.0), bl_sysval); ++ "/run/setuid-programs/enlightenment_backlight %i %s", ++ (int)(val * 1000.0), bl_sysval); + bl_sys_set_exe = ecore_exe_run(buf, NULL); + } + #endif // HAVE_EEZE || __FreeBSD_kernel__ +diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c +index b7d9e3eba..d8a9eb82c 100644 +--- a/src/bin/e_fm/e_fm_main_eeze.c ++++ b/src/bin/e_fm/e_fm_main_eeze.c +@@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v) + { + char buf[PATH_MAX]; + +- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx)); ++ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_sys"); + eeze_disk_mount_wrapper_set(v->disk, buf); + } + v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v); +@@ -512,7 +512,7 @@ _e_fm_main_eeze_volume_unmount(E_Volume *v) + { + char buf[PATH_MAX]; + +- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx)); ++ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_sys"); + eeze_disk_mount_wrapper_set(v->disk, buf); + } + v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v); +@@ -548,7 +548,7 @@ _e_fm_main_eeze_volume_mount(E_Volume *v) + { + char buf2[PATH_MAX]; + +- snprintf(buf2, sizeof(buf2), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx)); ++ snprintf(buf2, sizeof(buf2), "/run/setuid-programs/enlightenment_sys"); + eeze_disk_mount_wrapper_set(v->disk, buf2); + } + v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v); +diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c +index 6781a9b5a..8cd140f1b 100644 +--- a/src/bin/e_sys.c ++++ b/src/bin/e_sys.c +@@ -653,20 +653,16 @@ _e_sys_cb_timer(void *data EINA_UNUSED) + + e_init_status_set(_("Checking System Permissions")); + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys -t halt", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys -t halt"); + _e_sys_halt_check_exe = ecore_exe_run(buf, NULL); + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys -t reboot", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys -t reboot"); + _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL); + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys -t suspend", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys -t suspend"); + _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL); + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys -t hibernate", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys -t hibernate"); + _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL); + return ECORE_CALLBACK_CANCEL; + } +@@ -1079,8 +1075,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) + /* shutdown -h now */ + if (e_util_immortal_check()) return 0; + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys halt", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys halt"); + if (_e_sys_exe) + { + if ((ecore_time_get() - _e_sys_begin_time) > 2.0) +@@ -1114,8 +1109,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) + /* shutdown -r now */ + if (e_util_immortal_check()) return 0; + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys reboot", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys reboot"); + if (_e_sys_exe) + { + if ((ecore_time_get() - _e_sys_begin_time) > 2.0) +@@ -1148,8 +1142,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) + case E_SYS_SUSPEND: + /* /etc/acpi/sleep.sh force */ + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys suspend", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys suspend"); + if (_e_sys_exe) + { + if ((ecore_time_get() - _e_sys_begin_time) > 2.0) +@@ -1208,8 +1201,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) + case E_SYS_HIBERNATE: + /* /etc/acpi/hibernate.sh force */ + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_sys hibernate", +- e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_sys hibernate"); + if (_e_sys_exe) + { + if ((ecore_time_get() - _e_sys_begin_time) > 2.0) +diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c +index 4b5148634..47d34b07f 100644 +--- a/src/modules/bluez4/e_mod_main.c ++++ b/src/modules/bluez4/e_mod_main.c +@@ -49,8 +49,8 @@ _ebluez_l2ping_poller(void *data EINA_UNUSED) + + if (tmp) + { +- eina_strbuf_append_printf(buf, "%s/enlightenment/utils/enlightenment_sys l2ping %s", +- e_prefix_lib_get(), tmp); ++ eina_strbuf_append_printf(buf, "/run/setuid-programs/enlightenment_sys l2ping %s", ++ tmp); + autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); + } + +@@ -692,8 +692,7 @@ e_modapi_init(E_Module *m) + autolock_desklock = ecore_event_handler_add(E_EVENT_DESKLOCK, _ebluez_desklock, NULL); + + buf = eina_strbuf_new(); +- eina_strbuf_append_printf(buf, "%s/enlightenment/utils/enlightenment_sys -t l2ping", +- e_prefix_lib_get()); ++ eina_strbuf_append_printf(buf, "/run/setuid-programs/enlightenment_sys -t l2ping"); + autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); + eina_strbuf_free(buf); + +diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c +index f4ba259b6..ae228bae3 100644 +--- a/src/modules/cpufreq/e_mod_main.c ++++ b/src/modules/cpufreq/e_mod_main.c +@@ -1450,8 +1450,7 @@ e_modapi_init(E_Module *m) + } + E_CONFIG_LIMIT(cpufreq_config->poll_interval, 1, 1024); + +- snprintf(buf, sizeof(buf), "%s/%s/freqset", +- e_module_dir_get(m), MODULE_ARCH); ++ snprintf(buf, sizeof(buf), "/run/setuid-programs/freqset"); + cpufreq_config->set_exe_path = strdup(buf); + + if (stat(buf, &st) < 0) -- 2.17.0 From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 2/2] gnu: services: Add Enlightenment desktop service. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 May 2018 16:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31342@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.152527966021976 (code B ref 31342); Wed, 02 May 2018 16:48:02 +0000 Received: (at 31342) by debbugs.gnu.org; 2 May 2018 16:47:40 +0000 Received: from localhost ([127.0.0.1]:47259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDuuq-0005iO-9U for submit@debbugs.gnu.org; Wed, 02 May 2018 12:47:40 -0400 Received: from flashner.co.il ([178.62.234.194]:44832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDuun-0005hx-EG for 31342@debbugs.gnu.org; Wed, 02 May 2018 12:47:38 -0400 Received: from localhost (46-117-130-5.bb.netvision.net.il [46.117.130.5]) by flashner.co.il (Postfix) with ESMTPSA id 99C76402BF; Wed, 2 May 2018 16:47:31 +0000 (UTC) From: Efraim Flashner Date: Wed, 2 May 2018 19:47:23 +0300 Message-Id: <20180502164723.13994-2-efraim@flashner.co.il> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180502164723.13994-1-efraim@flashner.co.il> References: <20180502164723.13994-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/desktop.scm (, enlightenment-desktop-service-type): New variables. (enlightenment-desktop-service): New public variable. * doc/guix.texi (Desktop Services): Document the service. --- doc/guix.texi | 10 +++---- gnu/services/desktop.scm | 61 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index dc9894173..4fd3464ad 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12584,11 +12584,11 @@ field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}}). Additionally, the @code{gnome-desktop-service}, -@code{xfce-desktop-service} and @code{mate-desktop-service} -procedures can add GNOME, XFCE and/or MATE to a system. -To ``add GNOME'' means that system-level services like the -backlight adjustment helpers and the power management utilities are -added to the system, extending @code{polkit} and @code{dbus} +@code{xfce-desktop-service}, @code{mate-desktop-service} and +@code{enlightenment-desktop-service} procedures can add GNOME, XFCE, MATE +and/or Enlightenment to a system. To ``add GNOME'' means that system-level +services like the backlight adjustment helpers and the power management +utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service made by @code{gnome-desktop-service} adds the GNOME diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 517d5d3ef..605d06c23 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (gnu services networking) #:use-module ((gnu system file-systems) #:select (%elogind-file-systems)) + #:use-module (gnu system) #:use-module (gnu system shadow) #:use-module (gnu system pam) #:use-module (gnu packages glib) @@ -44,9 +46,11 @@ #:use-module (gnu packages linux) #:use-module (gnu packages libusb) #:use-module (gnu packages mate) + #:use-module (gnu packages enlightenment) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) + #:use-module (guix utils) #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (ice-9 match) @@ -96,6 +100,11 @@ x11-socket-directory-service + enlightenment-desktop-configuration + enlightenment-desktop-configuration? + enlightenment-desktop-service + enlightenment-desktop-service-type + %desktop-services)) ;;; Commentary: @@ -899,6 +908,58 @@ with the administrator's password." (let ((directory "/tmp/.X11-unix")) (mkdir-p directory) (chmod directory #o777)))))) + +;;; +;;; Enlightenment desktop service. +;;; + +(define-record-type* + enlightenment-desktop-configuration + make-enlightenment-desktop-configuration + enlightenment-desktop-configuration + (enlightenment enlightenment-package (default enlightenment))) + +(define (enlightenment-setuid-programs enlightenment-desktop-configuration) + (match-record enlightenment-desktop-configuration + + (enlightenment) + (list (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_sys") + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_backlight") + ;; TODO: Move this binary to a screen-locker service. + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_ckpasswd") + (file-append enlightenment + (string-append + "/lib/enlightenment/modules/cpufreq/linux-gnu-" + (string-drop-right (%current-system) 6) ; drop '-linux' + "-" + (version-major+minor (package-version enlightenment)) + "/freqset"))))) + +(define enlightenment-desktop-service-type + (service-type + (name 'enlightenment-desktop) + (extensions + (list (service-extension dbus-root-service-type + (compose list + (package-direct-input-selector + "efl") + enlightenment-package)) + (service-extension setuid-program-service-type + enlightenment-setuid-programs) + (service-extension profile-service-type + (compose list + enlightenment-package)))))) + +(define* (enlightenment-desktop-service + #:key (config (enlightenment-desktop-configuration))) + "Return a service that adds the @code{enlightenment} package to the system +profile, and extends dbus with the ability for @code{efl} to generate +thumbnails and makes setuid the programs which enlightenment expects to have +their setuid bit set." + (service enlightenment-desktop-service-type config)) ;;; -- 2.17.0 From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 1/2] gnu: enlightenment: Fix setuid program locations. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 May 2018 16:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 31342@debbugs.gnu.org Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.152571133716548 (code B ref 31342); Mon, 07 May 2018 16:43:02 +0000 Received: (at 31342) by debbugs.gnu.org; 7 May 2018 16:42:17 +0000 Received: from localhost ([127.0.0.1]:53009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFjDN-0004Iq-4S for submit@debbugs.gnu.org; Mon, 07 May 2018 12:42:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFjDJ-0004Ie-W8 for 31342@debbugs.gnu.org; Mon, 07 May 2018 12:42:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFjDB-0003mr-27 for 31342@debbugs.gnu.org; Mon, 07 May 2018 12:42:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFjDA-0003mb-Ud; Mon, 07 May 2018 12:42:04 -0400 Received: from [193.50.110.223] (port=49804 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fFjDA-0004kF-BY; Mon, 07 May 2018 12:42:04 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180502164450.13727-1-efraim@flashner.co.il> <20180502164723.13994-1-efraim@flashner.co.il> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 18 =?UTF-8?Q?Flor=C3=A9al?= an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 07 May 2018 18:42:02 +0200 In-Reply-To: <20180502164723.13994-1-efraim@flashner.co.il> (Efraim Flashner's message of "Wed, 2 May 2018 19:47:22 +0300") Message-ID: <87h8nj5sf9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Efraim Flashner skribis: > * gnu/packages/enlightenment.scm (enlightenment)[source]: Add patch. > * gnu/packages/patches/enlightenment-fix-setuid-path.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. LGTM! From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 2/2] gnu: services: Add Enlightenment desktop service. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 May 2018 16:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 31342@debbugs.gnu.org Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.152571179617187 (code B ref 31342); Mon, 07 May 2018 16:50:02 +0000 Received: (at 31342) by debbugs.gnu.org; 7 May 2018 16:49:56 +0000 Received: from localhost ([127.0.0.1]:53013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFjKl-0004T9-UT for submit@debbugs.gnu.org; Mon, 07 May 2018 12:49:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFjKk-0004Sv-Th for 31342@debbugs.gnu.org; Mon, 07 May 2018 12:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFjKc-0000tz-0Y for 31342@debbugs.gnu.org; Mon, 07 May 2018 12:49:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFjKb-0000tv-Sr; Mon, 07 May 2018 12:49:45 -0400 Received: from [193.50.110.223] (port=50168 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fFjKb-0005Il-Ds; Mon, 07 May 2018 12:49:45 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180502164723.13994-1-efraim@flashner.co.il> <20180502164723.13994-2-efraim@flashner.co.il> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 18 =?UTF-8?Q?Flor=C3=A9al?= an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 07 May 2018 18:49:43 +0200 In-Reply-To: <20180502164723.13994-2-efraim@flashner.co.il> (Efraim Flashner's message of "Wed, 2 May 2018 19:47:23 +0300") Message-ID: <87bmdr5s2g.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Efraim Flashner skribis: > * gnu/services/desktop.scm (, > enlightenment-desktop-service-type): New variables. > (enlightenment-desktop-service): New public variable. > * doc/guix.texi (Desktop Services): Document the service. In guix.texi, could you document =E2=80=98enlightenment-desktop-service-typ= e=E2=80=99 and =E2=80=98enlightenment-desktop-configuration=E2=80=99? [...] > +(define-record-type* > + enlightenment-desktop-configuration > + make-enlightenment-desktop-configuration > + enlightenment-desktop-configuration > + (enlightenment enlightenment-package (default enlightenment))) Actually, unless you expect more configuration elements to be added to this record eventually, you might be better off without a record and simply using the package as the value for that service. WDYT? > +(define (enlightenment-setuid-programs enlightenment-desktop-configurati= on) > + (match-record enlightenment-desktop-configuration > + > + (enlightenment) > + (list (file-append enlightenment > + "/lib/enlightenment/utils/enlightenment_sys") > + (file-append enlightenment > + "/lib/enlightenment/utils/enlightenment_backlight= ") > + ;; TODO: Move this binary to a screen-locker service. > + (file-append enlightenment > + "/lib/enlightenment/utils/enlightenment_ckpasswd") Perhaps enlightenment_ckpasswd needs a PAM entry as well, like =E2=80=98screen-locker-service-type=E2=80=99 does? > + (file-append enlightenment > + (string-append > + "/lib/enlightenment/modules/cpufreq/linux-gnu-" > + (string-drop-right (%current-system) 6) ; drop = '-linux' Rather: (match (string-tokenize (%current-system) (char-set-complement (char-set = #\-))) ((arch "linux") (string-append "linux-gnu-" arch)) ((arch "gnu") (string-append "gnu-" arch))) > +(define* (enlightenment-desktop-service > + #:key (config (enlightenment-desktop-configuration))) > + "Return a service that adds the @code{enlightenment} package to the sy= stem > +profile, and extends dbus with the ability for @code{efl} to generate > +thumbnails and makes setuid the programs which enlightenment expects to = have > +their setuid bit set." > + (service enlightenment-desktop-service-type config)) Not needed! :-) Thank you, Ludo=E2=80=99. From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 2/2] gnu: services: Add Enlightenment desktop service. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 May 2018 19:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 31342@debbugs.gnu.org Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.15257198234326 (code B ref 31342); Mon, 07 May 2018 19:04:01 +0000 Received: (at 31342) by debbugs.gnu.org; 7 May 2018 19:03:43 +0000 Received: from localhost ([127.0.0.1]:53181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFlQF-00017i-15 for submit@debbugs.gnu.org; Mon, 07 May 2018 15:03:43 -0400 Received: from flashner.co.il ([178.62.234.194]:56098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFlQC-00017T-6t for 31342@debbugs.gnu.org; Mon, 07 May 2018 15:03:40 -0400 Received: from localhost (46-117-130-5.bb.netvision.net.il [46.117.130.5]) by flashner.co.il (Postfix) with ESMTPSA id 6FE0F40A2A; Mon, 7 May 2018 19:03:34 +0000 (UTC) Date: Mon, 7 May 2018 22:03:27 +0300 From: Efraim Flashner Message-ID: <20180507190327.GA2707@macbook41> References: <20180502164723.13994-1-efraim@flashner.co.il> <20180502164723.13994-2-efraim@flashner.co.il> <87bmdr5s2g.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="BwCQnh7xodEAoBMC" Content-Disposition: inline In-Reply-To: <87bmdr5s2g.fsf@gnu.org> User-Agent: Mutt/1.9.5 (2018-04-13) X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --BwCQnh7xodEAoBMC Content-Type: multipart/mixed; boundary="LQksG6bCIzRHxTLp" Content-Disposition: inline --LQksG6bCIzRHxTLp Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 07, 2018 at 06:49:43PM +0200, Ludovic Court=C3=A8s wrote: > Efraim Flashner skribis: >=20 > > * gnu/services/desktop.scm (, > > enlightenment-desktop-service-type): New variables. > > (enlightenment-desktop-service): New public variable. > > * doc/guix.texi (Desktop Services): Document the service. >=20 > In guix.texi, could you document =E2=80=98enlightenment-desktop-service-t= ype=E2=80=99 > and =E2=80=98enlightenment-desktop-configuration=E2=80=99? >=20 > [...] >=20 > > +(define-record-type* > > + enlightenment-desktop-configuration > > + make-enlightenment-desktop-configuration > > + enlightenment-desktop-configuration > > + (enlightenment enlightenment-package (default enlightenment))) >=20 > Actually, unless you expect more configuration elements to be added to > this record eventually, you might be better off without a record and > simply using the package as the value for that service. >=20 > WDYT? >=20 > > +(define (enlightenment-setuid-programs enlightenment-desktop-configura= tion) > > + (match-record enlightenment-desktop-configuration > > + > > + (enlightenment) > > + (list (file-append enlightenment > > + "/lib/enlightenment/utils/enlightenment_sys") > > + (file-append enlightenment > > + "/lib/enlightenment/utils/enlightenment_backlig= ht") > > + ;; TODO: Move this binary to a screen-locker service. > > + (file-append enlightenment > > + "/lib/enlightenment/utils/enlightenment_ckpassw= d") >=20 > Perhaps enlightenment_ckpasswd needs a PAM entry as well, like > =E2=80=98screen-locker-service-type=E2=80=99 does? >=20 I'm not sure, enlightenment's screen locker code was refactored in 0.22.2 so that it would behave identically on Linux and BSD, and I'm not sure that the BSDs use PAM, and it seems to with as-is. > > + (file-append enlightenment > > + (string-append > > + "/lib/enlightenment/modules/cpufreq/linux-gnu= -" > > + (string-drop-right (%current-system) 6) ; dro= p '-linux' >=20 > Rather: >=20 > (match (string-tokenize (%current-system) (char-set-complement (char-se= t #\-))) > ((arch "linux") (string-append "linux-gnu-" arch)) > ((arch "gnu") (string-append "gnu-" arch))) >=20 > > +(define* (enlightenment-desktop-service > > + #:key (config (enlightenment-desktop-configuration))) > > + "Return a service that adds the @code{enlightenment} package to the = system > > +profile, and extends dbus with the ability for @code{efl} to generate > > +thumbnails and makes setuid the programs which enlightenment expects t= o have > > +their setuid bit set." > > + (service enlightenment-desktop-service-type config)) >=20 > Not needed! :-) >=20 > Thank you, > Ludo=E2=80=99. I looked at the xfce service especially, and it actually has the same fields and declarations as enlightenment. I'd like to leave the option in place to add '(enlightenment-desktop-service)' to an OS-config since it is then identical to the other desktop services we have. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --LQksG6bCIzRHxTLp Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-services-Add-Enlightenment-desktop-service.patch" Content-Transfer-Encoding: quoted-printable =46rom 197db9e742508958a93a0ce606bd8a770f103745 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Sat, 10 Mar 2018 22:24:00 +0200 Subject: [PATCH 1/2] gnu: services: Add Enlightenment desktop service. * gnu/services/desktop.scm (, enlightenment-desktop-service-type): New variables. (enlightenment-desktop-service): New public variable. * doc/guix.texi (Desktop Services): Document the service. --- doc/guix.texi | 15 ++++++---- gnu/services/desktop.scm | 64 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index dc9894173..fca2c8e13 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12584,11 +12584,11 @@ field of an @code{operating-system} declaration (= @pxref{operating-system Reference, @code{services}}). =20 Additionally, the @code{gnome-desktop-service}, -@code{xfce-desktop-service} and @code{mate-desktop-service} -procedures can add GNOME, XFCE and/or MATE to a system. -To ``add GNOME'' means that system-level services like the -backlight adjustment helpers and the power management utilities are -added to the system, extending @code{polkit} and @code{dbus} +@code{xfce-desktop-service}, @code{mate-desktop-service} and +@code{enlightenment-desktop-service} procedures can add GNOME, XFCE, MATE +and/or Enlightenment to a system. To ``add GNOME'' means that system-level +services like the backlight adjustment helpers and the power management +utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service made by @code{gnome-desktop-service} adds the GNOME @@ -12601,7 +12601,10 @@ To ``add MATE'' means that @code{polkit} and @code= {dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service made by @code{mate-desktop-service} adds the MATE -metapackage to the system profile. +metapackage to the system profile. ``Adding ENLIGHTENMENT'' means that +@code{dbus} is extended appropriately, and several of Enlightenment's bina= ries +are set as setuid, allowing Enlightenment's screen locker and other +functionality to work as expetected. =20 The desktop environments in Guix use the Xorg display server by default. If you'd like to use the newer display server protocol diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 517d5d3ef..74073fab9 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2016 Sou Bunnbu ;;; Copyright =C2=A9 2017 Maxim Cournoyer ;;; Copyright =C2=A9 2017 Nils Gillmann +;;; Copyright =C2=A9 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (gnu services networking) #:use-module ((gnu system file-systems) #:select (%elogind-file-systems)) + #:use-module (gnu system) #:use-module (gnu system shadow) #:use-module (gnu system pam) #:use-module (gnu packages glib) @@ -44,9 +46,11 @@ #:use-module (gnu packages linux) #:use-module (gnu packages libusb) #:use-module (gnu packages mate) + #:use-module (gnu packages enlightenment) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) + #:use-module (guix utils) #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (ice-9 match) @@ -96,6 +100,11 @@ =20 x11-socket-directory-service =20 + enlightenment-desktop-configuration + enlightenment-desktop-configuration? + enlightenment-desktop-service + enlightenment-desktop-service-type + %desktop-services)) =20 ;;; Commentary: @@ -899,6 +908,61 @@ with the administrator's password." (let ((directory "/tmp/.X11-unix")) (mkdir-p directory) (chmod directory #o777)))))) +=0C +;;; +;;; Enlightenment desktop service. +;;; + +(define-record-type* + enlightenment-desktop-configuration + make-enlightenment-desktop-configuration + enlightenment-desktop-configuration + (enlightenment enlightenment-package (default enlightenment))) + +(define (enlightenment-setuid-programs enlightenment-desktop-configuration) + (match-record enlightenment-desktop-configuration + + (enlightenment) + (list (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_sys") + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_backlight") + ;; TODO: Move this binary to a screen-locker service. + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_ckpasswd") + (file-append enlightenment + (string-append + "/lib/enlightenment/modules/cpufreq/" + (match (string-tokenize (%current-system) + (char-set-complement (cha= r-set #\-))) + ((arch "linux") (string-append "linux-gnu-= " arch)) + ((arch "gnu") (string-append "gnu-" arch= ))) + "-" + (version-major+minor (package-version enlightenme= nt)) + "/freqset"))))) + +(define enlightenment-desktop-service-type + (service-type + (name 'enlightenment-desktop) + (extensions + (list (service-extension dbus-root-service-type + (compose list + (package-direct-input-selector + "efl") + enlightenment-package)) + (service-extension setuid-program-service-type + enlightenment-setuid-programs) + (service-extension profile-service-type + (compose list + enlightenment-package)))))) + +(define* (enlightenment-desktop-service + #:key (config (enlightenment-desktop-configuration))) + "Return a service that adds the @code{enlightenment} package to the syst= em +profile, and extends dbus with the ability for @code{efl} to generate +thumbnails and makes setuid the programs which enlightenment needs to func= tion +as expected." + (service enlightenment-desktop-service-type config)) =20 =0C ;;; --=20 2.17.0 --LQksG6bCIzRHxTLp-- --BwCQnh7xodEAoBMC Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlrwovcACgkQQarn3Mo9 g1EoRBAAk9ICtfja1f0XW4HbctNHEeKusC6j4+pRxAbbmK+K7YHSQx91HsXtjiDe yVQi56LCukP51eQNLabgXMIA63I1Zsg87brSew1jS9yIb0hDnR2qv1IIHyhzJlQF IC+IbYoz5Df+Si1UlreBSsSTNAL6PGX4TiiI4In2tUvl5c/3sDQNuDY5JK7q/+fK uXv86sPwIVKBXcL9/UjbD5uCOLCWOsWIDg4C15VdRg69Kg2Bk10IRxJ+5Jq79uGR 9DnBAKZbwsxaTvG75vdRLHQfmdv+m7NHUjboUu4zuk/q2C27Ya/sHG1g/NXIKSPL S4WkE9kqTtO9C3q3bWP5iH57DsFxkk9J661kGX12VxH+kHYUn/euuCeRDboQov/s R6lF035fAV81Lfemv+GkS1mcm2LB30AU0DOvjSoi2LO12I7BW1NFvTu4ozWi/u98 Rt8w1RrjX/jPu4s3gBhSxAWhb45kastDUCHJoxV/7EGvE2OSPfgAaz9eykQJYaK2 nayKbPZ8gSsEmc7Y1Ho9ebQaKj6JGbr498597Kp2VskWpyd5MT4RRKmXjaD0022z bQf4hLGeX2NKNLRxiIsV7e19b09y7KrQg+c2k8oEWzJqlf886i1anqmK+AEdmTD3 5Pgt0dLV5vpLHExqIAmAknkfNYxI6Vjlhd+/tt/+JPE3J3GU0oo= =tOmD -----END PGP SIGNATURE----- --BwCQnh7xodEAoBMC-- From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 2/2] gnu: services: Add Enlightenment desktop service. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 May 2018 13:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 31342@debbugs.gnu.org Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.152578591218990 (code B ref 31342); Tue, 08 May 2018 13:26:01 +0000 Received: (at 31342) by debbugs.gnu.org; 8 May 2018 13:25:12 +0000 Received: from localhost ([127.0.0.1]:53593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fG2cB-0004wE-Sa for submit@debbugs.gnu.org; Tue, 08 May 2018 09:25:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fG2cA-0004w1-8s for 31342@debbugs.gnu.org; Tue, 08 May 2018 09:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG2c1-0007C0-8y for 31342@debbugs.gnu.org; Tue, 08 May 2018 09:25:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG2c1-0007Bu-5W; Tue, 08 May 2018 09:25:01 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54538 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fG2c0-0006sb-O4; Tue, 08 May 2018 09:25:01 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180502164723.13994-1-efraim@flashner.co.il> <20180502164723.13994-2-efraim@flashner.co.il> <87bmdr5s2g.fsf@gnu.org> <20180507190327.GA2707@macbook41> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 19 =?UTF-8?Q?Flor=C3=A9al?= an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 08 May 2018 15:24:59 +0200 In-Reply-To: <20180507190327.GA2707@macbook41> (Efraim Flashner's message of "Mon, 7 May 2018 22:03:27 +0300") Message-ID: <87bmdq46vo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello! Efraim Flashner skribis: > On Mon, May 07, 2018 at 06:49:43PM +0200, Ludovic Court=C3=A8s wrote: [...] >> Perhaps enlightenment_ckpasswd needs a PAM entry as well, like >> =E2=80=98screen-locker-service-type=E2=80=99 does? >>=20 > > I'm not sure, enlightenment's screen locker code was refactored in > 0.22.2 so that it would behave identically on Linux and BSD, and I'm not > sure that the BSDs use PAM, and it seems to with as-is. If you confirm it works as-is, that=E2=80=99s fine! >> > +(define* (enlightenment-desktop-service >> > + #:key (config (enlightenment-desktop-configuration))) >> > + "Return a service that adds the @code{enlightenment} package to the= system >> > +profile, and extends dbus with the ability for @code{efl} to generate >> > +thumbnails and makes setuid the programs which enlightenment expects = to have >> > +their setuid bit set." >> > + (service enlightenment-desktop-service-type config)) >>=20 >> Not needed! :-) >>=20 >> Thank you, >> Ludo=E2=80=99. > > I looked at the xfce service especially, and it actually has the same > fields and declarations as enlightenment. Sounds good. > I'd like to leave the option in place to add > '(enlightenment-desktop-service)' to an OS-config since it is then > identical to the other desktop services we have. This style has been (informally, I admit) deprecated since we introduced the =E2=80=98service=E2=80=99 form. The recommended way is to write: (service enlightenment-service-type) I agree it=E2=80=99s slightly more verbose, but it=E2=80=99s more =E2=80=9C= transparent.=E2=80=9D Thanks, Ludo=E2=80=99. From unknown Sun Jun 15 01:08:48 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31342] [PATCH 2/2] gnu: services: Add Enlightenment desktop service. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 May 2018 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 31342@debbugs.gnu.org Received: via spool by 31342-submit@debbugs.gnu.org id=B31342.152622582720930 (code B ref 31342); Sun, 13 May 2018 15:38:02 +0000 Received: (at 31342) by debbugs.gnu.org; 13 May 2018 15:37:07 +0000 Received: from localhost ([127.0.0.1]:60957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fHt3a-0005RW-SH for submit@debbugs.gnu.org; Sun, 13 May 2018 11:37:07 -0400 Received: from flashner.co.il ([178.62.234.194]:47612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fHt3X-0005R0-5R for 31342@debbugs.gnu.org; Sun, 13 May 2018 11:37:05 -0400 Received: from localhost (unknown [77.139.113.200]) by flashner.co.il (Postfix) with ESMTPSA id 3EE56400EF; Sun, 13 May 2018 15:36:57 +0000 (UTC) Date: Sun, 13 May 2018 18:36:53 +0300 From: Efraim Flashner Message-ID: <20180513153653.GD1074@macbook41> References: <20180502164723.13994-1-efraim@flashner.co.il> <20180502164723.13994-2-efraim@flashner.co.il> <87bmdr5s2g.fsf@gnu.org> <20180507190327.GA2707@macbook41> <87bmdq46vo.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="9UV9rz0O2dU/yYYn" Content-Disposition: inline In-Reply-To: <87bmdq46vo.fsf@gnu.org> User-Agent: Mutt/1.9.5 (2018-04-13) X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --9UV9rz0O2dU/yYYn Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 08, 2018 at 03:24:59PM +0200, Ludovic Court=C3=A8s wrote: > Hello! >=20 > Efraim Flashner skribis: >=20 > > On Mon, May 07, 2018 at 06:49:43PM +0200, Ludovic Court=C3=A8s wrote: >=20 > [...] >=20 > >> Perhaps enlightenment_ckpasswd needs a PAM entry as well, like > >> =E2=80=98screen-locker-service-type=E2=80=99 does? > >>=20 > > > > I'm not sure, enlightenment's screen locker code was refactored in > > 0.22.2 so that it would behave identically on Linux and BSD, and I'm not > > sure that the BSDs use PAM, and it seems to with as-is. >=20 > If you confirm it works as-is, that=E2=80=99s fine! >=20 > >> > +(define* (enlightenment-desktop-service > >> > + #:key (config (enlightenment-desktop-configuration))) > >> > + "Return a service that adds the @code{enlightenment} package to t= he system > >> > +profile, and extends dbus with the ability for @code{efl} to genera= te > >> > +thumbnails and makes setuid the programs which enlightenment expect= s to have > >> > +their setuid bit set." > >> > + (service enlightenment-desktop-service-type config)) > >>=20 > >> Not needed! :-) > >>=20 > >> Thank you, > >> Ludo=E2=80=99. > > > > I looked at the xfce service especially, and it actually has the same > > fields and declarations as enlightenment. >=20 > Sounds good. >=20 > > I'd like to leave the option in place to add > > '(enlightenment-desktop-service)' to an OS-config since it is then > > identical to the other desktop services we have. >=20 > This style has been (informally, I admit) deprecated since we introduced > the =E2=80=98service=E2=80=99 form. The recommended way is to write: >=20 > (service enlightenment-service-type) >=20 > I agree it=E2=80=99s slightly more verbose, but it=E2=80=99s more =E2=80= =9Ctransparent.=E2=80=9D >=20 > Thanks, > Ludo=E2=80=99. I think I have it this time. No 'enlightenment-desktop-service', yes 'enlightenment-desktop-service-type', which takes a configure option of an enlightenment package. I moved the description from up to the service-type and added a "table" detailing all the configure options available. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --9UV9rz0O2dU/yYYn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlr4W5UACgkQQarn3Mo9 g1GouhAAiImd2UaY7xiafcCjTLkrlIrthHKYkj6Qx1AgnqLpjsYWtHlaXrkLSK23 eA2rDurrExM4K6DY5DhIWADXMdmKTIPRVBaIFtSzJeqZq19nFvXfNoouWSkOpJW8 Ds41ZuCWIWwpxVSXc8NjNgnfpo1eixLIPozqY6IuIVjd61vxHK1FbQVFVdnblX2X K2yr/zViOG96uC5KD5xL6ZI5rb+WKXBq+CqfQOaFPBWOhD4xqi0BuLASGr5m5WIt yjUCA3MOGS1e7QT0lnv/ELUyiVRJkWmSy+4Yf4HrRROHcXnYPO0F4spJNqUEQzpZ PUBLGiM3Ce9mN+c5+dY38n4byUgGgAnSPrYbS3IsX8fa72mqVeyp3yuetuwlAyky bGl6r2nuFzoVhptxOcX9q3XxHEMWPRAV181vVG+AR9AbynizyF7/MZ12Y4TcxQK9 H578LJD/FV0vF2x/GpWiVVr5ECSLbym3Q97NN0QkoE3D7yc95MzQtpnlciQgy2yc zLT5C3R/tllhSjXFKT1O+IjUqiFN3SlQ8H5WV3oXoMtfF5rJOvLyUAPKj86PNpNw H+plVmOxXpCEhaDApLS6zQo44Xvw/TZ4Hy374kB1IK5sqfY0RAJqFBxAPc24FcWO xufy11Yca4WAZQEvMGl42H9TLMAjDgghyn25siu6td6aPVoffBA= =gzaD -----END PGP SIGNATURE----- --9UV9rz0O2dU/yYYn-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 21 03:57:45 2018 Received: (at control) by debbugs.gnu.org; 21 May 2018 07:57:45 +0000 Received: from localhost ([127.0.0.1]:42439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKfhP-0004Y2-SH for submit@debbugs.gnu.org; Mon, 21 May 2018 03:57:45 -0400 Received: from flashner.co.il ([178.62.234.194]:51876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKfhO-0004Xo-8O for control@debbugs.gnu.org; Mon, 21 May 2018 03:57:42 -0400 Received: from localhost (46-117-130-5.bb.netvision.net.il [46.117.130.5]) by flashner.co.il (Postfix) with ESMTPSA id 4A35940102 for ; Mon, 21 May 2018 07:57:36 +0000 (UTC) Date: Mon, 21 May 2018 10:57:27 +0300 From: Efraim Flashner To: control@debbugs.gnu.org Subject: debbugs commands Message-ID: <20180521075727.GC1239@macbook41> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GpGaEY17fSl8rd50" Content-Disposition: inline User-Agent: Mutt/1.9.5 (2018-04-13) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --GpGaEY17fSl8rd50 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable close 31473 close 31342 close 31429 thanks --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --GpGaEY17fSl8rd50 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlsCe+IACgkQQarn3Mo9 g1FWaQ//RsMVJQws6YAxACrJUkIrTQZWk9Gzzt5JYDr25C9Bjoh+wQ5EV1/iwaMt i0FbDBzRBnLLVv1UUbKeTlBWXrfZMf0XgkjcYx36CgqNVqDj2DOXHsTZQEBI+L4a 05MXpFjEmB+zNwle01eXWdn3rnjSR6MDnQ1ZJiGtfCuvRINJZhNjUvGfYj8rTQkj aAz46SUeI9dwToJsXsuvI/DZc8rNbfYsjefg5bM5cQX8+SVyt8kWsu2W14PbsAVm 1hjI0OR8KGOVg1gfdj+3ZH1C4x+HBKNeYwa10S18s29/J2MbN1GZW9fs+kXFnZEo 0GyibnB8tN2UGwy1DzRFZMdHej7OJv+v/CKKgrIFubppMMt5/37ZStkvlCTnkvOS ej0CAxseuJzPaZc2Mw1oDC4SvMRA2tuCTd8RBtPPxNer60WyRRcRLaEOr0ZPmwhw kBsH8+48biwEExyzYjviEhGD+Aj7rcfYw/HIVwZ3g/hVQ0O0W8wsnnQ2NIIdTGty kNKzweSr6WsYtynDWwov8CyyThpbCjOeGIOD3Ao9dkbdR476PxY83wqEvmmhzn7D /iuED7e3zBjnDwRCusxCZzPLmN7nnxZ3ukxcGj+R5c07gkBtIN2++Cf/0l8fAeTe VJJTyMcJo2bc3KQIFnilW5IgAcNUiQSw1zMseo/pRqXFbtMbVBw= =Z3Ir -----END PGP SIGNATURE----- --GpGaEY17fSl8rd50--