[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: gnu: lxterminal: Update to 0.3.1.
From: |
Tobias Geerinckx-Rice |
Subject: |
05/10: gnu: lxterminal: Update to 0.3.1. |
Date: |
Wed, 17 Jan 2018 22:24:04 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit b87bf3bbd4fbf064b2d22e4ba5a0727b1fb983b5
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Thu Jan 18 01:02:51 2018 +0100
gnu: lxterminal: Update to 0.3.1.
* gnu/packages/lxde.scm (lxterminal): Update to 0.3.1.
[source]: Remove patch for fixed CVE.
[arguments]: No longer skip test suite which appear to be fixed.
* gnu/packages/patches/lxterminal-CVE-2016-10369.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/lxde.scm | 10 ++----
.../patches/lxterminal-CVE-2016-10369.patch | 37 ----------------------
3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b89077e..5d43fac 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -889,7 +889,6 @@ 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/make-impure-dirs.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index c616917..02dacd3 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2017 ng0 <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Brendan Tildesley <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -157,21 +158,16 @@ toolkit. It allows users to monitor and control of
running processes.")
(define-public lxterminal
(package
(name "lxterminal")
- (version "0.3.0")
+ (version "0.3.1")
(source (origin
(method url-fetch)
(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"))))
+ "0jrc3m0hbxcmcgahwjlm46s2350gh80ggb6a90xy0h6xqa3z73fd"))))
(build-system gnu-build-system)
- (arguments
- `(;; Tests for "po" fail with "No rule to make target '../src/encoding.c'
- ;; needed by 'lxterminal.pot'. Stop."
- #:tests? #f))
(inputs `(("gtk+" ,gtk+-2)
("vte" ,vte/gtk+-2)))
(native-inputs `(("intltool" ,intltool)
diff --git a/gnu/packages/patches/lxterminal-CVE-2016-10369.patch
b/gnu/packages/patches/lxterminal-CVE-2016-10369.patch
deleted file mode 100644
index 809eef0..0000000
--- a/gnu/packages/patches/lxterminal-CVE-2016-10369.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 <address@hidden>
-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
-
- branch master updated (d86db8d -> 70260b3), Tobias Geerinckx-Rice, 2018/01/17
- 01/10: gnu: rlwrap: Update to 0.43., Tobias Geerinckx-Rice, 2018/01/17
- 06/10: gnu: vim: Update to 8.0.1428., Tobias Geerinckx-Rice, 2018/01/17
- 10/10: gnu: slurm: Add detailed licence information., Tobias Geerinckx-Rice, 2018/01/17
- 02/10: gnu: package-management: Alphabetise module imports., Tobias Geerinckx-Rice, 2018/01/17
- 03/10: gnu: package-management: Prefix licenses., Tobias Geerinckx-Rice, 2018/01/17
- 04/10: gnu: glib: Remove duplicate module import., Tobias Geerinckx-Rice, 2018/01/17
- 09/10: gnu: slurm: Use HTTPS for home page., Tobias Geerinckx-Rice, 2018/01/17
- 08/10: gnu: slurm: Update to 17.11.2., Tobias Geerinckx-Rice, 2018/01/17
- 07/10: gnu: Add sl., Tobias Geerinckx-Rice, 2018/01/17
- 05/10: gnu: lxterminal: Update to 0.3.1.,
Tobias Geerinckx-Rice <=