mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: libvorbis: Integrate grafted patches.
* gnu/packages/xiph.scm (libvorbis)[replacement]: Remove field. [source]: Add patches from libvorbis/fixed. (libvorbis/fixed): Remove variable.
This commit is contained in:
parent
4adb40bffc
commit
e6ebc7b132
1 changed files with 2 additions and 9 deletions
|
@ -79,12 +79,13 @@ (define libogg
|
||||||
(define libvorbis
|
(define libvorbis
|
||||||
(package
|
(package
|
||||||
(name "libvorbis")
|
(name "libvorbis")
|
||||||
(replacement libvorbis/fixed)
|
|
||||||
(version "1.3.5")
|
(version "1.3.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://downloads.xiph.org/releases/vorbis/"
|
(uri (string-append "http://downloads.xiph.org/releases/vorbis/"
|
||||||
"libvorbis-" version ".tar.xz"))
|
"libvorbis-" version ".tar.xz"))
|
||||||
|
(patches (search-patches "libvorbis-CVE-2017-14633.patch"
|
||||||
|
"libvorbis-CVE-2017-14632.patch"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"))))
|
"1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"))))
|
||||||
|
@ -103,14 +104,6 @@ (define libvorbis
|
||||||
"See COPYING in the distribution."))
|
"See COPYING in the distribution."))
|
||||||
(home-page "http://xiph.org/vorbis/")))
|
(home-page "http://xiph.org/vorbis/")))
|
||||||
|
|
||||||
(define libvorbis/fixed
|
|
||||||
(package
|
|
||||||
(inherit libvorbis)
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source libvorbis))
|
|
||||||
(patches (search-patches "libvorbis-CVE-2017-14633.patch"
|
|
||||||
"libvorbis-CVE-2017-14632.patch"))))))
|
|
||||||
|
|
||||||
(define libtheora
|
(define libtheora
|
||||||
(package
|
(package
|
||||||
(name "libtheora")
|
(name "libtheora")
|
||||||
|
|
Loading…
Reference in a new issue