summaryrefslogtreecommitdiff
path: root/gnu
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-22 23:00:30 -0400
commit936715c9f491ddbb943f4665cca1e7ec3c84ac22 (patch)
treeb4d5ee08b23d55e5391970d4d7449796fb45ab78 /gnu
parent8605321dd6f3c42590046be9d69112a8c8cf7cbf (diff)
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gnutls.scm6
-rw-r--r--gnu/packages/patches/gnutls-fix-duplicate-manpages.patch30
2 files changed, 2 insertions, 34 deletions
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 \