ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rdesktop: Update to 1.9.0.

Browse source 
Fixes CVE-2019-15682.

* gnu/packages/rdesktop.scm (rdesktop): Update to version 1.9.0
[native-inputs]: New field.
[inputs]: Remove openssl.  Add gnutls, libxcursor, and nettle as new baseline
requirements.
[arguments]: Remove #:phases argument.  Remove "--with-openssl" from
configure-flags.
This commit is contained in:
Eric Bavier 2019-11-09 10:29:59 -06:00
parent 24aba982ca
commit c6be161dbd
No known key found for this signature in database
GPG key ID: FD73CAC719D32566
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/rdesktop.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,6 +36,7 @@ (define-module (gnu packages rdesktop)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
@ -46,7 +48,7 @@ (define-module (gnu packages rdesktop)
(define-public rdesktop (define-public rdesktop
(package (package
(name "rdesktop") (name "rdesktop")
(version "1.8.4") (version "1.9.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/rdesktop/rdesktop/" (uri (string-append "https://github.com/rdesktop/rdesktop/"
@ -54,32 +56,20 @@ (define-public rdesktop
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0bfd9nl2dfr1931fv6bpnrj5yf88ikijrs4s3nm96gm87bkvi64v")))) "1222f2srlq16bydhy44gph997iajg39sl774xxh9jdwi4cqjyg27"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "--with-openssl=" `(#:configure-flags (list ;; XXX: optional dependencies missing
(assoc-ref %build-inputs
"openssl"))
;; XXX: optional dependencies missing
"--disable-credssp" "--disable-credssp"
"--disable-smartcard") "--disable-smartcard")
#:tests? #f)) ; No 'check' target
#:phases (native-inputs
(modify-phases %standard-phases `(("pkg-config" ,pkg-config)))
(add-after 'install-license-files 'delete-extraneous-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(license-dir (string-append out "/share/doc/"
,name "-" ,version)))
;; XXX These files are installed erroneously.
(delete-file (string-append license-dir "/licence.c"))
(delete-file (string-append license-dir "/licence.o")))
#t)))
#:tests? #f)) ;no 'check' target
(inputs (inputs
`(("libx11" ,libx11) `(("gnutls" ,gnutls)
("openssl" ,openssl))) ("libx11" ,libx11)
("libxcursor" ,libxcursor)
("nettle" ,nettle)))
(home-page "https://www.rdesktop.org/") (home-page "https://www.rdesktop.org/")
(synopsis "Client for Windows Terminal Services") (synopsis "Client for Windows Terminal Services")
(description (description