aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xorg.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-25 16:38:51 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-25 16:38:51 +0200
commit173d291466175fd8c2ba117272685ef9722a5b7f (patch)
tree5658fb5ea06aba970e8ae26fe88f8ba4fd0c8255 /gnu/packages/xorg.scm
parent233df51ebc162bf95dfadf914914cbfbc6984651 (diff)
parent94e9d750a22e30459732d2ae14d71c5f3acabd91 (diff)
downloadpatches-173d291466175fd8c2ba117272685ef9722a5b7f.tar
patches-173d291466175fd8c2ba117272685ef9722a5b7f.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r--gnu/packages/xorg.scm15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 0a78b8ee70..3875765d25 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5239,6 +5239,7 @@ draggable titlebars and borders.")
(package
(name "libx11")
(version "1.6.5")
+ (replacement libx11-1.6.6)
(source
(origin
(method url-fetch)
@@ -5268,6 +5269,20 @@ draggable titlebars and borders.")
(description "Xorg Core X11 protocol client library.")
(license license:x11)))
+;; Replacement package to fix multiple security bugs:
+;; <http://seclists.org/oss-sec/2018/q3/146>.
+(define-public libx11-1.6.6
+ (package
+ (inherit libx11)
+ (version "1.6.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/lib/libX11-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5"))))))
+
;; packages of height 5 in the propagated-inputs tree
(define-public libxcursor