net-libs/gnutls: remove unused patches

Package-Manager: portage-2.3.0

2 files changed, 0 insertions, 183 deletions

diff --git a/net-libs/gnutls/files/gnutls-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch b/net-libs/gnutls/files/gnutls-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch
deleted file mode 100644
index cf108f07a09d..000000000000
--- a/net-libs/gnutls/files/gnutls-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 86f039f8c78f87edd6346265010abc679d9283a9 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 18 Dec 2015 12:14:08 +0200
-Subject: [PATCH] build: allow installing man(1) even with --disable-doc
-
-Currently these man pages are installed only if --enable-doc
-is provided, while these are not actually docs, do not require any
-special dependency, nor consume large space.
-
-This adds --enable-manpages to enable/disable manpages installation, and
-install the man(1) regardless of --disable-doc.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-
----
- Makefile.am              |  4 ++++
- configure.ac             | 11 +++++++++++
- doc/Makefile.am          |  2 +-
- doc/manpages/Makefile.am |  2 ++
- 5 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 19fcb90..b94af06 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -42,6 +42,10 @@ if HAVE_GUILE
- SUBDIRS += guile
- endif
- 
-+if ENABLE_MANPAGES
-+SUBDIRS += doc/manpages
-+endif
-+
- if ENABLE_DOC
- SUBDIRS += doc
- endif
-diff --git a/configure.ac b/configure.ac
-index e634236..0b1625b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,6 +51,16 @@ AC_ARG_ENABLE(doc,
-     enable_doc=$enableval, enable_doc=yes)
- AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
- 
-+AC_ARG_ENABLE(manpages,
-+  AS_HELP_STRING([--enable-manpages], [install manpages even if disable-doc is given]),
-+    enable_manpages=$enableval,enable_manpages=auto)
-+
-+if test "${enable_manpages}" = "auto";then
-+  enable_manpages="${enable_doc}"
-+fi
-+
-+AM_CONDITIONAL(ENABLE_MANPAGES, test "$enable_manpages" != "no")
-+
- AC_ARG_ENABLE(tools,
-   AS_HELP_STRING([--disable-tools], [don't compile any tools]),
-     enable_tools=$enableval, enable_tools=yes)
-@@ -920,6 +930,7 @@ AC_MSG_NOTICE([summary of build options:
-   Local libopts:        ${included_libopts}
-   Local libtasn1:       ${included_libtasn1}
-   Use nettle-mini:      ${mini_nettle}
-+  Documentation:        ${enable_doc} (manpages: ${enable_manpages})
- ])
- 
- AC_MSG_NOTICE([External hardware support:
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 1e99dd0..05c2188 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -24,7 +24,7 @@ EXTRA_DIST = TODO certtool.cfg gnutls.pdf gnutls.html	\
- 	gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions \
- 	doc.mk
- 
--SUBDIRS = examples cyclo scripts manpages credentials latex
-+SUBDIRS = examples cyclo scripts credentials latex
- if ENABLE_GTK_DOC
- SUBDIRS += reference
- endif
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
-index 8a1613d..10365a9 100644
---- a/doc/manpages/Makefile.am
-+++ b/doc/manpages/Makefile.am
-@@ -1127,7 +1127,9 @@ APIMANS += gnutls_x509_trust_list_verify_crt.3
- APIMANS += gnutls_x509_trust_list_verify_crt2.3
- APIMANS += gnutls_x509_trust_list_verify_named_crt.3
- 
-+if ENABLE_DOC
- dist_man_MANS += $(APIMANS)
-+endif
- 
- $(APIMANS): stamp_mans
- 
--- 
-2.4.10
-
diff --git a/net-libs/gnutls/files/gnutls-3.5.7-idn.patch b/net-libs/gnutls/files/gnutls-3.5.7-idn.patch
deleted file mode 100644
index aa301169426d..000000000000
--- a/net-libs/gnutls/files/gnutls-3.5.7-idn.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ddca30ed625d9f5f7efb628e4467ff7ab5a65701 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Thu, 8 Dec 2016 15:54:07 +0100
-Subject: [PATCH] tests: make conditional (to HAVE_LIBIDN) any IDN related checks
-
-This allows the test suite to successfully complete even when compiled
-without libidn.
----
- tests/crq_apis.c | 2 ++
- tests/crt_apis.c | 4 ++++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/tests/crq_apis.c b/tests/crq_apis.c
-index 99c02cb..7ad717f 100644
---- a/tests/crq_apis.c
-+++ b/tests/crq_apis.c
-@@ -448,8 +448,10 @@ void doit(void)
- 
- 	assert(gnutls_x509_crq_export2(crq, GNUTLS_X509_FMT_PEM, &out) >= 0);
- 
-+#ifdef HAVE_LIBIDN
- 	assert(out.size == saved_crq.size);
- 	assert(memcmp(out.data, saved_crq.data, out.size)==0);
-+#endif
- 
- 	gnutls_free(out.data);
- 	gnutls_x509_crq_deinit(crq);
-diff --git a/tests/crt_apis.c b/tests/crt_apis.c
-index 8b8ebbe..ed31640 100644
---- a/tests/crt_apis.c
-+++ b/tests/crt_apis.c
-@@ -183,10 +183,12 @@ void doit(void)
- 	if (ret != 0)
- 		fail("gnutls_x509_crt_set_subject_alt_name\n");
- 
-+#ifdef HAVE_LIBIDN
- 	ret = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_RFC822NAME,
- 						   "test@νίκο.org", strlen("test@νίκο.org"), 1);
- 	if (ret != 0)
- 		fail("gnutls_x509_crt_set_subject_alt_name\n");
-+#endif
- 
- 	s = 0;
- 	ret = gnutls_x509_crt_get_key_purpose_oid(crt, 0, NULL, &s, NULL);
-@@ -275,8 +277,10 @@ void doit(void)
- 	}
- 	assert(gnutls_x509_crt_export2(crt, GNUTLS_X509_FMT_PEM, &out) >= 0);
- 
-+#ifdef HAVE_LIBIDN
- 	assert(out.size == saved_crt.size);
- 	assert(memcmp(out.data, saved_crt.data, out.size)==0);
-+#endif
- 
- 	gnutls_free(out.data);
- 
---
-libgit2 0.24.0
-
-From e40393e5685743e185ea284337b6a0ed5d756a0f Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Thu, 8 Dec 2016 15:44:28 +0100
-Subject: [PATCH] str: do not call gnutls_assert in inline function
-
-This allows the build to succeed when compiled without libidn.
----
- lib/str.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/str.h b/lib/str.h
-index fe8b38e..d341baa 100644
---- a/lib/str.h
-+++ b/lib/str.h
-@@ -52,9 +52,10 @@ int _gnutls_idna_email_map(const char *input, unsigned ilen, gnutls_datum_t *out
- inline static
- int __gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
- {
-+	/* no call to gnutls_assert() due to header dependency issues */
- 	out->data = gnutls_malloc(ilen+1);
- 	if (out->data == NULL)
--		return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
-+		return GNUTLS_E_MEMORY_ERROR;
- 	out->size = ilen;
- 	memcpy(out->data, input, ilen);
- 	out->data[ilen] = 0;
---
-libgit2 0.24.0
-