ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xorg-server: Update to 1.16.2.901, with many security fixes.

Browse source 
Includes fixes for CVE-2014-8091, CVE-2014-8092, CVE-2014-8093, CVE-2014-8094,
CVE-2014-8095, CVE-2014-8096, CVE-2014-8097, CVE-2014-8098, CVE-2014-8099,
CVE-2014-8100, CVE-2014-8101, CVE-2014-8102, and CVE-2014-8103.

See <http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/>

* gnu/packages/xorg.scm (xorg-server): Update to 1.16.2.901.  Move mesa,
  resourceproto, scrnsaverproto, and xf86driproto from inputs to
  propagated-inputs.  Add dri3proto and presentproto to propagated-inputs.
  Add eudev and libxshmfence to inputs.  Add a 'pre-configure' phase instead
  of modifying the 'configure' phase.  Adapt substitution that avoids trying
  to 'mkdir /var' to build system changes.

* gnu/services/xorg.scm (xserver.conf): Add xf86-input-evdev ModulePath line.
This commit is contained in:
Mark H Weaver 2014-12-19 21:30:37 -05:00
parent c0e40804b2
commit 073cd6092c
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/xorg.scm
View file

@ -4403,35 +4403,41 @@ (define-public libxcb
(define-public xorg-server (define-public xorg-server
(package (package
(name "xorg-server") (name "xorg-server")
(version "1.12.2") (version "1.16.2.901")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://xorg/X11R7.7/src/everything/xorg-server-" "mirror://xorg/individual/xserver/"
version name "-" version ".tar.bz2"))
".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) "19jb8v26wc332ramwjdg5vjh3s36kr7n46s6fdfaxrj1wif5m27g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("dri2proto" ,dri2proto) `(("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto)
("fontsproto" ,fontsproto) ("fontsproto" ,fontsproto)
("inputproto" ,inputproto) ("inputproto" ,inputproto)
("kbproto" ,kbproto) ("kbproto" ,kbproto)
("libpciaccess" ,libpciaccess) ("libpciaccess" ,libpciaccess)
("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("presentproto" ,presentproto)
("randrproto" ,randrproto) ("randrproto" ,randrproto)
("renderproto" ,renderproto) ("renderproto" ,renderproto)
("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto)
("videoproto" ,videoproto) ("videoproto" ,videoproto)
("xextproto" ,xextproto) ("xextproto" ,xextproto)
("xineramaproto" ,xineramaproto) ("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto)
("xproto" ,xproto))) ("xproto" ,xproto)))
(inputs (inputs
`(("bigreqsproto" ,bigreqsproto) `(("bigreqsproto" ,bigreqsproto)
("compositeproto" ,compositeproto) ("compositeproto" ,compositeproto)
("damageproto" ,damageproto) ("damageproto" ,damageproto)
("udev" ,eudev)
("dbus" ,dbus) ("dbus" ,dbus)
("dmxproto" ,dmxproto) ("dmxproto" ,dmxproto)
("libdmx" ,libdmx) ("libdmx" ,libdmx)
@ -4444,16 +4450,13 @@ (define-public xorg-server
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxres" ,libxres) ("libxres" ,libxres)
("libxshmfence" ,libxshmfence)
("libxt" ,libxt) ("libxt" ,libxt)
("libxv" ,libxv) ("libxv" ,libxv)
("mesa" ,mesa)
("recordproto" ,recordproto) ("recordproto" ,recordproto)
("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto)
("xcmiscproto" ,xcmiscproto) ("xcmiscproto" ,xcmiscproto)
("xf86bigfontproto" ,xf86bigfontproto) ("xf86bigfontproto" ,xf86bigfontproto)
("xf86dgaproto" ,xf86dgaproto) ("xf86dgaproto" ,xf86dgaproto)
("xf86driproto" ,xf86driproto)
("xf86vidmodeproto" ,xf86vidmodeproto) ("xf86vidmodeproto" ,xf86vidmodeproto)
("xkbcomp" ,xkbcomp) ("xkbcomp" ,xkbcomp)
("xkeyboard-config" ,xkeyboard-config) ("xkeyboard-config" ,xkeyboard-config)
@ -4476,21 +4479,18 @@ (define-public xorg-server
;; For the log file, etc. ;; For the log file, etc.
"--localstatedir=/var") "--localstatedir=/var")
#:phases
(alist-replace
'configure
(lambda* (#:key outputs #:allow-other-keys #:rest args)
(let ((configure (assoc-ref %standard-phases 'configure)))
(substitute* (find-files "." "\\.c$")
(("/bin/sh") (which "sh")))
;; Don't try to 'mkdir /var'. #:phases (alist-cons-before
(substitute* "hw/xfree86/Makefile.in" 'configure 'pre-configure
(("mkdir(.*)logdir.*") (lambda _
"true\n")) (substitute* (find-files "." "\\.c$")
(("/bin/sh") (which "sh")))
(apply configure args))) ;; Don't try to 'mkdir /var'.
%standard-phases))) (substitute* "hw/xfree86/Makefile.in"
(("\\$\\(MKDIR_P\\).*logdir.*")
"true\n")))
%standard-phases)))
(home-page "http://www.x.org/wiki/") (home-page "http://www.x.org/wiki/")
(synopsis "Xorg implementation of the X Window System") (synopsis "Xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System") (description "X.org provides an implementation of the X Window System")

1
gnu/services/xorg.scm
View file

@ -96,6 +96,7 @@ (define (xserver.conf)
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\" ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-nv "/lib/xorg/modules/drivers\" ModulePath \"" xf86-video-nv "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-sis "/lib/xorg/modules/drivers\" ModulePath \"" xf86-video-sis "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-input-evdev "/lib/xorg/modules/input\"
ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\" ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\"
ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\" ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\"
ModulePath \"" xf86-input-synaptics "/lib/xorg/modules/input\" ModulePath \"" xf86-input-synaptics "/lib/xorg/modules/input\"