summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-03-03 13:44:48 -0500
committerLeo Famulari <leo@famulari.name>2017-03-08 03:52:03 -0500
commit9a91b00fd08e652d158bd6bf96bdcb045f7c72cb (patch)
tree0ff171dbdd4e503dde21b5ec60c908ad91cca30c
parente3ff83834b6b55256410b7f7eb94a81d226c8a29 (diff)
downloadguix-9a91b00fd08e652d158bd6bf96bdcb045f7c72cb.tar.gz
gnu: xorg-server: Update to 1.19.2 [fixes CVE-2017-2624].
* gnu/packages/xorg.scm (xorg-server): Update to 1.19.2.
[native-inputs]: Add font-util, libtool, autoconf, and automake.
[arguments]: Add 'bootstrap' phase.
-rw-r--r--gnu/packages/xorg.scm15
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 31ea296d4e..5c9300e209 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4982,7 +4982,7 @@ over Xlib, including:
 (define-public xorg-server
   (package
     (name "xorg-server")
-    (version "1.19.1")
+    (version "1.19.2")
     (source
       (origin
         (method url-fetch)
@@ -4991,7 +4991,7 @@ over Xlib, including:
               name "-" version ".tar.bz2"))
         (sha256
          (base32
-          "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"))))
+          "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("dri2proto" ,dri2proto)
@@ -5050,7 +5050,12 @@ over Xlib, including:
         ("xcb-util-wm" ,xcb-util-wm)))
     (native-inputs
        `(("python" ,python-minimal-wrapper)
-         ("pkg-config" ,pkg-config)))
+         ("pkg-config" ,pkg-config)
+         ;; XXX Bootstrapping inputs for 1.19.2. Remove for > 1.19.2.
+         ("font-util" ,font-util)
+         ("libtool" ,libtool)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)))
     (arguments
      `(#:parallel-tests? #f
        #:configure-flags
@@ -5077,6 +5082,10 @@ over Xlib, including:
 
        #:phases
        (modify-phases %standard-phases
+         ;; XXX The 1.19.2 release of xorg-server was not bootstrapped:
+         ;; <https://lists.x.org/archives/xorg-announce/2017-March/002780.html>
+         (add-before 'configure 'bootstrap
+           (lambda _ (zero? (system* "autoreconf" "-vfi"))))
          (add-before
           'configure 'pre-configure
           (lambda _