mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-11 22:36:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ppp: Update to 2.4.8-1.8d45443 [fixes CVE-2020-8597].

Browse source 
* gnu/packages/samba.scm (ppp): Update to 2.4.8-1.8d45443.
Use GIT-FETCH and GIT-FILE-NAME.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
This commit is contained in:
Vincent Legoll 2020-03-07 14:10:37 +01:00 • committed by Tobias Geerinckx-Rice
parent 4f236f84a9
commit 4c8b874f95
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
gnu/packages/samba.scm
View file

@ -421,47 +421,51 @@ key-value pair databases and a real LDAP database.")
(license lgpl3+))) (license lgpl3+)))
(define-public ppp (define-public ppp
(package ;; This git commit contains unreleased fixes for CVE-2020-8597.
(name "ppp") (let ((revision "1")
(version "2.4.8") (commit "8d45443bb5c9372b4c6a362ba2f443d41c5636af"))
(source (origin (package
(method git-fetch) (name "ppp")
(uri (git-reference (version (git-version "2.4.8" revision commit))
(url "https://github.com/paulusmack/ppp") (source (origin
(commit (string-append "ppp-" version)))) (method git-fetch)
(file-name (git-file-name name version)) (uri (git-reference
(sha256 (url "https://github.com/paulusmack/ppp")
(base32 (commit commit)))
"1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv")))) (file-name (git-file-name name version))
(build-system gnu-build-system) (sha256
(arguments (base32
'(#:tests? #f ; no check target "06cf8fb84l3h2zy5da4j7k2j1qjv2gfqn986sf43xgj75605aks2"))))
#:make-flags '("CC=gcc") (build-system gnu-build-system)
#:phases (arguments
(modify-phases %standard-phases '(#:tests? #f ; no check target
(add-before 'configure 'patch-Makefile #:make-flags '("CC=gcc")
(lambda* (#:key inputs #:allow-other-keys) #:phases
(let ((libc (assoc-ref inputs "libc")) (modify-phases %standard-phases
(openssl (assoc-ref inputs "openssl")) (add-before 'configure 'patch-Makefile
(libpcap (assoc-ref inputs "libpcap"))) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "pppd/Makefile.linux" (let ((libc (assoc-ref inputs "libc"))
(("/usr/include/crypt\\.h") (openssl (assoc-ref inputs "openssl"))
(string-append libc "/include/crypt.h")) (libpcap (assoc-ref inputs "libpcap")))
(("/usr/include/openssl") (substitute* "pppd/Makefile.linux"
(string-append openssl "/include/openssl")) (("/usr/include/crypt\\.h")
(("/usr/include/pcap-bpf.h") (string-append libc "/include/crypt.h"))
(string-append libpcap "/include/pcap-bpf.h"))) (("/usr/include/openssl")
#t)))))) (string-append openssl "/include/openssl"))
(inputs (("/usr/include/pcap-bpf.h")
`(("libpcap" ,libpcap) (string-append libpcap "/include/pcap-bpf.h")))
("openssl" ,(@ (gnu packages tls) openssl)))) #t))))))
(synopsis "Implementation of the Point-to-Point Protocol") (inputs
(home-page "https://ppp.samba.org/") `(("libpcap" ,libpcap)
(description ("openssl" ,(@ (gnu packages tls) openssl))))
"The Point-to-Point Protocol (PPP) provides a standard way to establish (synopsis "Implementation of the Point-to-Point Protocol")
(home-page "https://ppp.samba.org/")
(description
"The Point-to-Point Protocol (PPP) provides a standard way to establish
a network connection over a serial link. At present, this package supports IP a network connection over a serial link. At present, this package supports IP
and IPV6 and the protocols layered above them, such as TCP and UDP.") and IPV6 and the protocols layered above them, such as TCP and UDP.")
;; pppd, pppstats and pppdump are under BSD-style notices. ;; pppd, pppstats and pppdump are under BSD-style notices.
;; some of the pppd plugins are GPL'd. ;; some of the pppd plugins are GPL'd.
;; chat is public domain. ;; chat is public domain.
(license (list bsd-3 bsd-4 gpl2+ public-domain)))) (license (list bsd-3 bsd-4 gpl2+ public-domain)))))