gnu: aspell: Incorporate grafted changes.
* gnu/packages/aspell.scm (aspell)[replacement]: Remove. [source](patches): Add aspell-CVE-2019-25051.patch. * gnu/packages/aspell.scm (aspell/replacement): Remove variable.master
parent
191ff93b31
commit
22b6eb8740
|
@ -47,7 +47,6 @@
|
||||||
(package
|
(package
|
||||||
(name "aspell")
|
(name "aspell")
|
||||||
(version "0.60.8")
|
(version "0.60.8")
|
||||||
(replacement aspell/replacement)
|
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -56,7 +55,8 @@
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
|
"1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
|
||||||
(patches (search-patches "aspell-default-dict-dir.patch"))))
|
(patches (search-patches "aspell-default-dict-dir.patch"
|
||||||
|
"aspell-CVE-2019-25051.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
|
@ -93,16 +93,6 @@ documents written in the UTF-8 encoding and its ability to use multiple
|
||||||
dictionaries, including personal ones.")
|
dictionaries, including personal ones.")
|
||||||
(license lgpl2.1+)))
|
(license lgpl2.1+)))
|
||||||
|
|
||||||
;; Replacement package with security fixes.
|
|
||||||
(define aspell/replacement
|
|
||||||
(package
|
|
||||||
(inherit aspell)
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(inherit (package-source aspell))
|
|
||||||
(patches (append (origin-patches (package-source aspell))
|
|
||||||
(search-patches "aspell-CVE-2019-25051.patch")))))))
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; Dictionaries.
|
;;; Dictionaries.
|
||||||
;;;
|
;;;
|
||||||
|
|
Reference in New Issue