From 8b1e572d0f19de39225ae6e6935b1d53e9e1215c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 9 Apr 2017 12:02:35 +0200 Subject: gnu: lxde: Add leafpad. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxde)[propagated-inputs]: Add leafpad. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lxde.scm') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e7654053d8..7abaab2c7e 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) + #:use-module (gnu packages text-editors) #:use-module (gnu packages wm) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -433,9 +435,10 @@ in LXDE.") (arguments '(#:builder (mkdir %output))) (propagated-inputs ;; TODO: - ;; lxshortcut, lxsession-edit, gpicview, leafpad, + ;; lxshortcut, lxsession-edit, gpicview ;; lxappearance-obconf `(("menu-cache" ,menu-cache) + ("leafpad" ,leafpad) ("lxappearance" ,lxappearance) ("lxde-icon-theme" ,lxde-icon-theme) ("lxde-common" ,lxde-common) -- cgit v1.2.3 From ed3a9ec5acfb96cf79ede69b96ecc396d2312185 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 20:33:22 +0200 Subject: gnu: Add gpicview. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-viewers.scm (gpicview): New variable. * gnu/packages/lxde.scm (lxde)[propagated-inputs]: Add gpicview. Signed-off-by: Ludovic Courtès --- gnu/packages/image-viewers.scm | 24 ++++++++++++++++++++++++ gnu/packages/lxde.scm | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lxde.scm') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index ce75b1d835..a7e108a292 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,6 +123,29 @@ image formats; tools for image comparison, sorting and managing photo collection. Geeqie was initially based on GQview.") (license license:gpl2+))) +(define-public gpicview + (package + (name "gpicview") + (version "0.2.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/lxde/" + "GPicView%20%28image%20Viewer%29/0.2.x/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq")))) + (build-system gnu-build-system) + (inputs `(("gtk+" ,gtk+-2) + ("libjpeg" ,libjpeg))) + (native-inputs `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (synopsis "Simple and fast image viewer for X") + (description "gpicview is a lightweight GTK+ 2.x based image viewer. +It is the default image viewer on LXDE desktop environment.") + (home-page "http://lxde.sourceforge.net/gpicview/") + (license license:gpl2+))) + (define-public sxiv (package (name "sxiv") diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 7abaab2c7e..1164ba8cbb 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages image-viewers) #:use-module (gnu packages linux) #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) @@ -435,9 +436,10 @@ in LXDE.") (arguments '(#:builder (mkdir %output))) (propagated-inputs ;; TODO: - ;; lxshortcut, lxsession-edit, gpicview + ;; lxshortcut, lxsession-edit ;; lxappearance-obconf `(("menu-cache" ,menu-cache) + ("gpicview" ,gpicview) ("leafpad" ,leafpad) ("lxappearance" ,lxappearance) ("lxde-icon-theme" ,lxde-icon-theme) -- cgit v1.2.3 From 8775fc10c61f493c9363ca288402f5f764b6d949 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 May 2017 13:02:12 -0400 Subject: gnu: lxterminal: Fix CVE-2016-10369. * gnu/packages/patches/lxterminal-CVE-2016-10369.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/lxde.scm (lxterminal)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/lxde.scm | 1 + .../patches/lxterminal-CVE-2016-10369.patch | 37 ++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/lxterminal-CVE-2016-10369.patch (limited to 'gnu/packages/lxde.scm') diff --git a/gnu/local.mk b/gnu/local.mk index af37e67647..0d8daf766a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -790,6 +790,7 @@ dist_patch_DATA = \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ + %D%/packages/patches/lxterminal-CVE-2016-10369.patch \ %D%/packages/patches/lz4-fix-test-failures.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mars-install.patch \ diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 1164ba8cbb..cc1156ae60 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -162,6 +162,7 @@ toolkit. It allows users to monitor and control of running processes.") (uri (string-append "mirror://sourceforge/lxde/LXTerminal" "%20%28terminal%20emulator%29/LXTerminal%20" version "/" name "-" version ".tar.xz")) + (patches (search-patches "lxterminal-CVE-2016-10369.patch")) (sha256 (base32 "1yf76s15zvfw0h42b0ay1slpq47khgjmcry8ki2z812zar9lchia")))) diff --git a/gnu/packages/patches/lxterminal-CVE-2016-10369.patch b/gnu/packages/patches/lxterminal-CVE-2016-10369.patch new file mode 100644 index 0000000000..809eef08da --- /dev/null +++ b/gnu/packages/patches/lxterminal-CVE-2016-10369.patch @@ -0,0 +1,37 @@ +Fix CVE-2016-10369: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10369 + +Patch copied from upstream source repository: + +https://git.lxde.org/gitweb/?p=lxde/lxterminal.git;a=commit;h=f99163c6ff8b2f57c5f37b1ce5d62cf7450d4648 + +From f99163c6ff8b2f57c5f37b1ce5d62cf7450d4648 Mon Sep 17 00:00:00 2001 +From: Yao Wei +Date: Mon, 8 May 2017 00:47:55 +0800 +Subject: [PATCH] fix: use g_get_user_runtime_dir for socket directory + +This bug is pointed out by stackexchange user that putting socket file in +/tmp is a potential risk. Putting the socket dir in user directory could +mitigate the risk. +--- + src/unixsocket.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/unixsocket.c b/src/unixsocket.c +index 4c660ac..f88284c 100644 +--- a/src/unixsocket.c ++++ b/src/unixsocket.c +@@ -140,7 +140,8 @@ gboolean lxterminal_socket_initialize(LXTermWindow * lxtermwin, gint argc, gchar + * This function returns TRUE if this process should keep running and FALSE if it should exit. */ + + /* Formulate the path for the Unix domain socket. */ +- gchar * socket_path = g_strdup_printf("/tmp/.lxterminal-socket%s-%s", gdk_display_get_name(gdk_display_get_default()), g_get_user_name()); ++ gchar * socket_path = g_strdup_printf("%s/.lxterminal-socket-%s", g_get_user_runtime_dir(), gdk_display_get_name(gdk_display_get_default())); ++ printf("%s\n", socket_path); + + /* Create socket. */ + int fd = socket(PF_UNIX, SOCK_STREAM, 0); +-- +2.1.4 + -- cgit v1.2.3 From d5e7d014dd304474692e47a7d48d33e99b81e18a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 May 2017 22:38:48 +0200 Subject: gnu: lxde-common: Provide 'startlxde' with the 'lxsession' file name. Fixes . * gnu/packages/lxde.scm (lxde-common)[arguments, inputs]: New fields. --- gnu/packages/lxde.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/lxde.scm') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index cc1156ae60..bf70bd6013 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -289,11 +289,26 @@ menu spec-compliant desktop menus for LXDE.") (base32 "0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-lxsession + (lambda* (#:key inputs #:allow-other-keys) + ;; Set the right file name for 'lxsession'. + (let ((lxsession (assoc-ref inputs "lxsession"))) + (substitute* "startlxde.in" + (("^exec .*/bin/lxsession") + (string-append "exec " lxsession + "/bin/lxsession"))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("lxmenu-data" ,lxmenu-data) ("lxde-icon-theme" ,lxde-icon-theme))) + (inputs + `(("lxsession" ,lxsession) + ;; ("lxlock" ,lxlock) ;for 'lxde-screenlock.desktop' + )) (synopsis "Common files of the LXDE Desktop") (description "Lxde-common provides common files of the LXDE Desktop.") -- cgit v1.2.3