From bced395cab17d1b688ddd2bdf1c9e3ca9d8c02f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 17 Jun 2016 15:41:45 +0300 Subject: [PATCH 01/13] gnu: aria2: Update to 1.24.0. * gnu/packages/bittorrent.scm (aria2): Updat eto 1.24.0. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 409731d1d6..75e5519a77 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -207,7 +207,7 @@ interface, for the Transmission BitTorrent daemon.") (define-public aria2 (package (name "aria2") - (version "1.23.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/tatsuhiro-t/aria2/" @@ -215,7 +215,7 @@ interface, for the Transmission BitTorrent daemon.") name "-" version ".tar.xz")) (sha256 (base32 - "14qz7686zxnhbaqj6l1hqpkykhpygm74h2mzwhh13gqmcj38alaq")))) + "0dxzyy3x20vla4c4563zjqkl71djv731db6wn3h0gysgf399d91m")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-libaria2") From 65924b10bc4bcd71ea5c5f3f0d889b3e93eb523c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 17 Jun 2016 00:45:52 -0400 Subject: [PATCH 02/13] gnu: certbot, python-acme: Update to 0.8.1. These packages should be updated together. * gnu/packages/tls.scm (certbot): Update to 0.8.1. (python-acme, python2-acme): Update to 0.8.1 --- gnu/packages/tls.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 0add9ef96e..9a8a03b695 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -360,16 +360,16 @@ security, and applying best practice development processes.") (define-public python-acme (package (name "python-acme") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "https://pypi.python.org/packages/" - "45/17/6fdcede92c7fe4d9c1ab9d7513ded5aa969a0b9c90f3d7b3b074cd37e898/" + "f5/7a/11a99b5d1d1c692f6eed27cfab69e6ba4d2f0c2a461d2607e6a930ff2c68/" "acme-" version ".tar.gz")) (sha256 (base32 - "1nk48p0pi6xmqpsqjvw6xkx5vv4vl33yzq67fpr33ci8fra6pa6z")))) + "17vx2miczpd8ww4xizmc0nca2c7jf04wnhfnswx2bxhb537lmsnk")))) (build-system python-build-system) (arguments `(#:phases @@ -422,16 +422,16 @@ security, and applying best practice development processes.") (define-public certbot (package (name "certbot") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "https://pypi.python.org/packages/" - "da/b8/fa6d7f0f8c0d37944ca4a1940b1e933fc6673498995a45db03c034bb11dd/" + "a2/3b/4756e6a0ceb14e084042a2a65c615d68d25621c6fd446d0fc10d14c4ce7d/" name "-" version ".tar.gz")) (sha256 (base32 - "052338jdiy8dniskqxm2hzbca084ms0xqnjicshl6cpvhjs70g1w")))) + "0w972cf2mk74aji5d8dylg3jw6wczg01gb4asf3ndv8c64yxza3c")))) (build-system python-build-system) (arguments `(#:python ,python-2 From d1dbeddd5553bb2f67a6bbbe5282baa9967ffbe5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Jun 2016 08:11:49 +0200 Subject: [PATCH 03/13] gnu: Add emacs-company. * gnu/packages/emacs.scm (emacs-company): New variable. --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cb6464df9d..bbb4baa30f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1333,6 +1333,29 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) +(define-public emacs-company + (package + (name "emacs-company") + (version "0.8.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/company-mode/company-mode/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vwmbqm7h4lrszv2qxy6fqzznm9raigi84cadx982c9m7shp0zzz")))) + (build-system emacs-build-system) + (home-page "http://company-mode.github.io/") + (synopsis "Modular text completion framework") + (description + "Company is a modular completion mechanism. Modules for retrieving +completion candidates are called back-ends, modules for displaying them are +front-ends. Company comes with many back-ends, e.g. @code{company-elisp}. +These are distributed in separate files and can be used individually.") + (license license:gpl3+))) + (define-public typo (package (name "emacs-typo") From 0de78c95b5ea286c5cb75a846b5d65a1fe82d0f8 Mon Sep 17 00:00:00 2001 From: Daniel Pimentel Date: Thu, 16 Jun 2016 09:08:24 -0300 Subject: [PATCH 04/13] gnu: Add python2-jsonrpclib * gnu/packages/python.scm (python2-jsonrpclib): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 97f4e6cdb7..b2948141e2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016 Daniel Pimentel ;;; ;;; This file is part of GNU Guix. ;;; @@ -9253,3 +9254,30 @@ specified in POSIX.1-2001 and POSIX.1-2008.") (inherit (package-with-python2 (strip-python2-variant python-wcwidth))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python2-jsonrpclib + (package + (name "python2-jsonrpclib") + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/j/jsonrpclib/" + "jsonrpclib-" version ".tar.gz")) + (sha256 + (base32 + "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z")))) + (build-system python-build-system) + (native-inputs + `(("python2-setuptools" ,python2-setuptools))) + (arguments + `(#:tests? #f + #:python ,python-2)) + (home-page "https://github.com/joshmarshall/jsonrpclib/") + (synopsis "Implementation of JSON-RPC specification for Python") + (description + "This library is an implementation of the JSON-RPC specification. +It supports both the original 1.0 specification, as well as the +new (proposed) 2.0 spec, which includes batch submission, keyword arguments, +etc.") + (license asl2.0))) From 922e21f43646e73545940bff5b508956f5ad5d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 15 Jun 2016 23:14:01 +0800 Subject: [PATCH 05/13] gnu: services: Add bluetooth-service. * gnu/services/desktop.scm (bluetooth-shepherd-service) (bluetooth-service): New Prodecures. (bluetooth-service-type): New variable. * doc/guix.text (Desktop Services): Document it. --- doc/guix.texi | 7 +++++++ gnu/services/desktop.scm | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index a47d37667e..0bb68bb477 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7998,6 +7998,13 @@ location databases. See web site} for more information. @end deffn +@deffn {Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] +Return a service that runs the @command{bluetoothd} daemon, which manages +all the Bluetooth devices and provides a number of D-Bus interfaces. + +Users need to be in the @code{lp} group to access the D-Bus service. +@end deffn + @node Database Services @subsubsection Database Services diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index f427d35777..2fb08cd1b3 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2016 Sou Bunnbu ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages suckless) + #:use-module (gnu packages linux) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) @@ -49,6 +51,7 @@ geoclue-application %standard-geoclue-applications geoclue-service + bluetooth-service polkit-service elogind-configuration elogind-service @@ -344,6 +347,38 @@ site} for more information." (submission-nick submission-nick) (applications applications)))) + +;;; +;;; Bluetooth. +;;; + +(define (bluetooth-shepherd-service bluez) + "Return a shepherd service for @command{bluetoothd}." + (shepherd-service + (provision '(bluetooth)) + (requirement '(dbus-system udev)) + (documentation "Run the bluetoothd daemon.") + (start #~(make-forkexec-constructor + (string-append #$bluez "/libexec/bluetooth/bluetoothd"))) + (stop #~(make-kill-destructor)))) + +(define bluetooth-service-type + (service-type + (name 'bluetooth) + (extensions + (list (service-extension dbus-root-service-type list) + (service-extension udev-service-type list) + (service-extension shepherd-root-service-type + (compose list bluetooth-shepherd-service)))))) + +(define* (bluetooth-service #:key (bluez bluez)) + "Return a service that runs the @command{bluetoothd} daemon, which manages +all the Bluetooth devices and provides a number of D-Bus interfaces. + +Users need to be in the @code{lp} group to access the D-Bus service. +" + (service bluetooth-service-type bluez)) + ;;; ;;; Polkit privilege management service. From f3dbc62664d94e88a84ff007e5103d6972573a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 17 Jun 2016 19:14:10 +0800 Subject: [PATCH 06/13] gnu: bluez: Set sysconfdir and localstatedir. * gnu/packages/linux.scm (bluez)[arguments]: Add '--sysconfdir=/etc' and '--localstatedir=/var'. --- gnu/packages/linux.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b6fa7c0545..42001175dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2423,7 +2423,9 @@ Bluetooth audio output devices like headphones or loudspeakers.") (arguments '(#:configure-flags (let ((out (assoc-ref %outputs "out"))) - (list "--enable-library" + (list "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-library" "--disable-systemd" ;; Install dbus/udev files to the correct location. (string-append "--with-dbusconfdir=" out "/etc") From c80920462e871276748feaa187feb6b645980df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 17 Jun 2016 19:23:52 +0800 Subject: [PATCH 07/13] gnu: bluez: Update to 5.40. * gnu/packages/linux.scm (bluez): Update to 5.40. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 42001175dc..e71ecbe5d7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2410,7 +2410,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.39") + (version "5.40") (source (origin (method url-fetch) (uri (string-append @@ -2418,7 +2418,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "0fsrf9rdmrdyx0vmcpfji4imjsvliawyy5sjb6b64myka28vrl91")))) + "09ywk3lvgis0nbi0d5z8d4qp5r33lzwnd6bdakacmbsm420qpnns")))) (build-system gnu-build-system) (arguments '(#:configure-flags From 87a16de7441cf6af8e786a5bcba854c5e1484599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 17 Jun 2016 20:35:21 +0800 Subject: [PATCH 08/13] gnu: bluez: Install 'org.bluez.obex.service' and fix '97-hid2hci.rules'. * gnu/packages/linux.scm (bluez)[arguments]: Add 'post-install' phase. --- gnu/packages/linux.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e71ecbe5d7..16fd5d0ab3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2429,7 +2429,28 @@ Bluetooth audio output devices like headphones or loudspeakers.") "--disable-systemd" ;; Install dbus/udev files to the correct location. (string-append "--with-dbusconfdir=" out "/etc") - (string-append "--with-udevdir=" out "/lib/udev"))))) + (string-append "--with-udevdir=" out "/lib/udev"))) + #:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (servicedir (string-append out "/share/dbus-1/services")) + (service "obexd/src/org.bluez.obex.service") + (rule (string-append + out "/lib/udev/rules.d/97-hid2hci.rules"))) + ;; Install the obex dbus service file. + (substitute* service + (("/bin/false") + (string-append out "/libexec/bluetooth/obexd"))) + (install-file service servicedir) + ;; Fix paths in the udev rule. + (substitute* rule + (("hid2hci --method") + (string-append out "/lib/udev/hid2hci --method")) + (("/sbin/udevadm") + (string-append (assoc-ref inputs "eudev") "/bin/udevadm"))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext))) From e8ac1f8f1fad72a1f5159d47a4f7a0b55557ef1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 18 Jun 2016 15:09:08 +0200 Subject: [PATCH 09/13] gnu: Add guile-sqlite3. * gnu/packages/guile.scm (guile-sqlite3): New variable. --- gnu/packages/guile.scm | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6f00edb06b..6e4722c182 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -705,6 +705,55 @@ inspired by the SCSH regular expression system.") Guile's foreign function interface.") (license gpl3+))) +(define-public guile-sqlite3 + (let ((commit "607721fe1174a299e45d457acacf94eefb964071")) + (package + (name "guile-sqlite3") + (version (string-append "0.0-0." (string-take commit 7))) + + ;; XXX: Gitorious being dead, this is not a reliable home page. + (home-page "https://www.gitorious.org/guile-sqlite3/guile-sqlite3.git/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "09gaffhh5rawz5kdmqx2ahvj1ngvxddp469r18bmjz3sz8p0slj2")) + (file-name (string-append name "-" version "-checkout")) + (modules '((guix build utils))) + (snippet + ;; Upgrade 'Makefile.am' to the current way of doing things. + '(substitute* "Makefile.am" + (("TESTS_ENVIRONMENT") + "TEST_LOG_COMPILER"))))) + + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.0) + ("sqlite" ,sqlite))) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi")))) + (add-before 'build 'set-sqlite3-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "sqlite3.scm" + (("\"libsqlite3\"") + (string-append "\"" (assoc-ref inputs "sqlite") + "/lib/libsqlite3\""))) + #t))))) + (synopsis "Access SQLite databases from Guile") + (description + "This package provides Guile bindings to the SQLite database system.") + (license gpl3+)))) + (define-public haunt (package (name "haunt") From 7c438099acd19fafb4a14cb2015d5c41e889a2f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Jun 2016 22:23:03 +0200 Subject: [PATCH 10/13] gnu: Add emacs-multiple-cursors. * gnu/packages/emacs.scm (emacs-multiple-cursors): New variable. --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bbb4baa30f..ecefc97bac 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1356,6 +1356,27 @@ front-ends. Company comes with many back-ends, e.g. @code{company-elisp}. These are distributed in separate files and can be used individually.") (license license:gpl3+))) +(define-public emacs-multiple-cursors + (package + (name "emacs-multiple-cursors") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/magnars/multiple-cursors.el/" + "archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hihihlvcvzayg5fnqzcg45fhvlmq6xlq58syy00rjwbry9w389k")))) + (build-system emacs-build-system) + (home-page "https://github.com/magnars/multiple-cursors.el") + (synopsis "Multiple cursors for Emacs") + (description + "This package adds support to Emacs for editing text with multiple +simultaneous cursors.") + (license license:gpl3+))) + (define-public typo (package (name "emacs-typo") From 669b7b83d8a5d968905ca4f371869d2eac23c14c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Jun 2016 16:43:09 +0200 Subject: [PATCH 11/13] gnu: Add lbzip2. * gnu/packages/compression.scm (lbzip2): New variable. --- gnu/packages/compression.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index dd107487fb..97f0546229 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Eric Bavier -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2015, 2016 Efraim Flashner @@ -249,6 +249,29 @@ decompression.") "See LICENSE in the distribution.")) (home-page "http://www.bzip.org/")))) +(define-public lbzip2 + (package + (name "lbzip2") + (version "2.5") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.lbzip2.org/lbzip2-" + version ".tar.gz")) + (sha256 + (base32 + "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6")))) + (build-system gnu-build-system) + (synopsis "Parallel bzip2 compression utility") + (description + "lbzip2 is a multi-threaded compression utility with support for the +bzip2 compressed file format. lbzip2 can process standard bz2 files in +parallel. It uses POSIX threading model (pthreads), which allows it to take +full advantage of symmetric multiprocessing (SMP) systems. It has been proven +to scale linearly, even to over one hundred processor cores. lbzip2 is fully +compatible with bzip2 – both at file format and command line level.") + (home-page "http://www.lbzip2.org/") + (license license:gpl3+))) + (define-public pbzip2 (package (name "pbzip2") From cb1436d8d24fba75dccd8b9574479acc35d8a1b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Jun 2016 21:26:58 +0200 Subject: [PATCH 12/13] gnu: synthv1: Update to 0.7.5. * gnu/packages/music.scm (synthv1): Update to 0.7.5. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 23fe9224c4..70757149f1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -689,7 +689,7 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") (define-public synthv1 (package (name "synthv1") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri @@ -697,7 +697,7 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") version ".tar.gz")) (sha256 (base32 - "16n0v4jk0ilirq84rrildvdwqxgxav78rk58ilhl622v5n893c7w")))) + "0h5zja78phf9705i9g54zh61iczb24iv7rxhljyms30sjgajig1y")))) (build-system gnu-build-system) ;; There are no tests. (arguments `(#:tests? #f)) From 3ebba94d45e4cc9c5242f812b29c826904506b02 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 19 Jun 2016 13:56:53 -0400 Subject: [PATCH 13/13] gnu: libxslt: Replace with 1.1.29 [fixes CVE-2016-{1683,1684}]. * gnu/packages/xml.scm (libxslt)[replacement]: New field. (libxslt/fixed): New variable. --- gnu/packages/xml.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 81a71bde6c..812539f397 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2016 Ricardo Wurmus -;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2015 Raimon Grau ;;; Copyright © 2016 Leo Famulari @@ -154,6 +154,7 @@ project (but it is usable outside of the Gnome platform).") (package (name "libxslt") (version "1.1.28") + (replacement libxslt/fixed) ; CVE-2016-1683 and CVE-2016-1684 (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" @@ -174,6 +175,19 @@ project (but it is usable outside of the Gnome platform).") based on libxml for XML parsing, tree manipulation and XPath support.") (license license:x11))) +(define-public libxslt/fixed + (package + (inherit libxslt) + (source + (let ((version "1.1.29")) + (origin + (method url-fetch) + (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" + version ".tar.gz")) + (sha256 + (base32 + "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"))))))) + (define-public perl-xml-parser (package (name "perl-xml-parser")