Skip to content
Snippets Groups Projects
Commit 9cdce047 authored by Mark H Weaver's avatar Mark H Weaver
Browse files

gnu: gnutls: Update to 3.4.4.1.

* gnu/packages/patches/gnutls-doc-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/tls.scm (gnutls): Update to 3.4.4.1.  Add patch.
  [arguments]: Add 'delete-prebuilt-unfixed-info-file' phase.
  In 'move-doc' phase, copy man pages to the correct directory.
  [native-inputs]: Add 'texinfo'.
parent 80601ec1
No related branches found
No related tags found
No related merge requests found
......@@ -468,6 +468,7 @@ dist_patch_DATA = \
gnu/packages/patches/glibc-ldd-x86_64.patch \
gnu/packages/patches/glibc-locales.patch \
gnu/packages/patches/gmp-arm-asm-nothumb.patch \
gnu/packages/patches/gnutls-doc-fix.patch \
gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
gnu/packages/patches/gobject-introspection-cc.patch \
gnu/packages/patches/gobject-introspection-girepository.patch \
......
This diff is collapsed.
......@@ -105,7 +105,7 @@ (define-public p11-kit
(define-public gnutls
(package
(name "gnutls")
(version "3.4.1")
(version "3.4.4.1")
(source (origin
(method url-fetch)
(uri
......@@ -116,7 +116,8 @@ (define-public gnutls
"/gnutls-" version ".tar.xz"))
(sha256
(base32
"0bmih0zyiplr4v8798w0v9g3215zmganq18n8935cizkxj5zbdg9"))))
"1xf354xafavqhi207ll1m1isd4l5b31lic2sz9lw0j0r0fcxfnsj"))
(patches (list (search-patch "gnutls-doc-fix.patch")))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
......@@ -139,13 +140,20 @@ (define-public gnutls
"--without-p11-kit")
#:phases (modify-phases %standard-phases
(add-after
'unpack 'delete-prebuilt-unfixed-info-file
(lambda _
;; XXX Delete the prebuilt info file, so that it will be
;; rebuilt with the fixes in gnutls-doc-fix.patch.
(delete-file "doc/gnutls.info")
#t))
(add-after
'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
;; Copy the 4.1 MiB of section 3 man pages to "doc".
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(mandir (string-append doc "/share/man"))
(mandir (string-append doc "/share/man/man3"))
(oldman (string-append out "/share/man/man3")))
(mkdir-p mandir)
(copy-recursively oldman mandir)
......@@ -156,6 +164,7 @@ (define-public gnutls
"doc")) ;4.1 MiB of man pages
(native-inputs
`(("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; XXX needed only to replace prebuilt, unfixed docs.
("which" ,which)))
(inputs
`(("guile" ,guile-2.0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment