aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-05-21 14:30:43 -0400
committerMark H Weaver <mhw@netris.org>2015-05-23 00:17:48 -0400
commitf28084285af289c4649457208c98dcc66566add2 (patch)
treefc14d27a97d08e16a1c84a7c4fc97f4f7852425e
parent281c21567de4687ba55451cadca07e1743546e2b (diff)
downloadguix-f28084285af289c4649457208c98dcc66566add2.tar.gz
guix-f28084285af289c4649457208c98dcc66566add2.zip
gnu: gnutls: Update to 3.4.1.
* gnu/packages/patches/gnutls-fix-duplicate-manpages.patch: Remove file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/gnutls.scm (gnutls): Update to 3.4.1. Remove patch.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/gnutls.scm6
-rw-r--r--gnu/packages/patches/gnutls-fix-duplicate-manpages.patch30
3 files changed, 2 insertions, 35 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 23113bb16c..a79495480a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -439,7 +439,6 @@ 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-fix-duplicate-manpages.patch \
gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
gnu/packages/patches/gobject-introspection-cc.patch \
gnu/packages/patches/gobject-introspection-girepository.patch \
diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm
index c549ff3410..4ed339a09b 100644
--- a/gnu/packages/gnutls.scm
+++ b/gnu/packages/gnutls.scm
@@ -104,7 +104,7 @@ living in the same process.")
(define-public gnutls
(package
(name "gnutls")
- (version "3.4.0")
+ (version "3.4.1")
(source (origin
(method url-fetch)
(uri
@@ -115,9 +115,7 @@ living in the same process.")
"/gnutls-" version ".tar.xz"))
(sha256
(base32
- "0bj7ydvsyvml59b6040wg7694iz37rwnqnv09bic9ddz652588ml"))
- (patches
- (list (search-patch "gnutls-fix-duplicate-manpages.patch")))))
+ "0bmih0zyiplr4v8798w0v9g3215zmganq18n8935cizkxj5zbdg9"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
diff --git a/gnu/packages/patches/gnutls-fix-duplicate-manpages.patch b/gnu/packages/patches/gnutls-fix-duplicate-manpages.patch
deleted file mode 100644
index 95a25560e5..0000000000
--- a/gnu/packages/patches/gnutls-fix-duplicate-manpages.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Remove duplicate manpage entries from Makefile.
-
---- gnutls-3.4.0/doc/manpages/Makefile.am.orig 2015-04-06 04:48:30.000000000 -0400
-+++ gnutls-3.4.0/doc/manpages/Makefile.am 2015-04-12 16:52:58.029694525 -0400
-@@ -134,11 +134,8 @@
- APIMANS += gnutls_certificate_get_peers_subkey_id.3
- APIMANS += gnutls_certificate_get_trust_list.3
- APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_key.3
--APIMANS += gnutls_certificate_get_x509_key.3
- APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
- APIMANS += gnutls_certificate_server_set_request.3
- APIMANS += gnutls_certificate_set_dh_params.3
---- gnutls-3.4.0/doc/manpages/Makefile.in.orig 2015-04-08 02:08:30.000000000 -0400
-+++ gnutls-3.4.0/doc/manpages/Makefile.in 2015-04-12 16:53:13.319694530 -0400
-@@ -1275,11 +1275,8 @@
- gnutls_certificate_get_peers_subkey_id.3 \
- gnutls_certificate_get_trust_list.3 \
- gnutls_certificate_get_verify_flags.3 \
-- gnutls_certificate_get_verify_flags.3 \
-- gnutls_certificate_get_x509_crt.3 \
- gnutls_certificate_get_x509_crt.3 \
- gnutls_certificate_get_x509_key.3 \
-- gnutls_certificate_get_x509_key.3 \
- gnutls_certificate_send_x509_rdn_sequence.3 \
- gnutls_certificate_server_set_request.3 \
- gnutls_certificate_set_dh_params.3 \