gentoo resync : 14.07.2018

3 files changed, 0 insertions, 89 deletions

diff --git a/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch b/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch
deleted file mode 100644
index 48d19cf9ccfb..000000000000
--- a/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,7 +45,12 @@
- AC_CHECK_FUNCS(getopt_long)
- AC_CHECK_FUNCS(getaddrinfo)
- 
--AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
-+AC_ARG_WITH([gnutls],
-+            [AS_HELP_STRING([--with-gnutls],
-+                            [Enable use of GnuTLS])])
-+if test "$with_gnutls" != "no"; then
-+  PKG_CHECK_MODULES(LIBGNUTLS, gnutls, AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
-+fi
- 
- dnl Check -Wall flag of GCC
- if test "x$GCC" = "xyes"; then
diff --git a/dev-libs/iksemel/files/iksemel-1.4-gnutls-3.4.patch b/dev-libs/iksemel/files/iksemel-1.4-gnutls-3.4.patch
deleted file mode 100644
index bf09e17a8ae7..000000000000
--- a/dev-libs/iksemel/files/iksemel-1.4-gnutls-3.4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Last-Update: 2015-10-28
-Bug-Upstream: https://github.com/meduketto/iksemel/issues/48
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803204
-From: Marc Dequènes (duck) <duck@duckcorp.org>
-Description: fix security problem (and compatibility problem with servers rejecting low grade ciphers).
-
---- a/src/stream.c
-+++ b/src/stream.c
-@@ -62,13 +62,9 @@
- 
- static int
- handshake (struct stream_data *data)
- {
--	const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
--	const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
--	const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--	const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
--	const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
-+	const char *priority_string = "SECURE256:+SECURE192:-VERS-TLS-ALL:+VERS-TLS1.2";
- 	int ret;
- 
- 	if (gnutls_global_init () != 0)
- 		return IKS_NOMEM;
-@@ -79,13 +75,9 @@
- 	if (gnutls_init (&data->sess, GNUTLS_CLIENT) != 0) {
- 		gnutls_certificate_free_credentials (data->cred);
- 		return IKS_NOMEM;
- 	}
--	gnutls_protocol_set_priority (data->sess, protocol_priority);
--	gnutls_cipher_set_priority(data->sess, cipher_priority);
--	gnutls_compression_set_priority(data->sess, comp_priority);
--	gnutls_kx_set_priority(data->sess, kx_priority);
--	gnutls_mac_set_priority(data->sess, mac_priority);
-+	gnutls_priority_set_direct(data->sess, priority_string, NULL);
- 	gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
- 
- 	gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
- 	gnutls_transport_set_pull_function (data->sess, (gnutls_pull_func) tls_pull);
diff --git a/dev-libs/iksemel/files/iksemel-1.4-ikstack.patch b/dev-libs/iksemel/files/iksemel-1.4-ikstack.patch
deleted file mode 100644
index 0dff76b409da..000000000000
--- a/dev-libs/iksemel/files/iksemel-1.4-ikstack.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3095fe8c9686de79509fd49db5e8f39fe6c52f43 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 22 Mar 2017 12:14:33 +0200
-Subject: [PATCH] fix alignment issue in ikstack
-
-tst-ikstack
-=================
-
-ikstack bug, addr 0x100357b4 should be a multiply of 8
-FAIL tst-ikstack (exit status: 1)
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/ikstack.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/ikstack.c b/src/ikstack.c
-index bed4656..814a91c 100644
---- a/src/ikstack.c
-+++ b/src/ikstack.c
-@@ -88,9 +88,11 @@ iks_stack_alloc (ikstack *s, size_t size)
- 	if (size < MIN_ALLOC_SIZE) size = MIN_ALLOC_SIZE;
- 	if (size & ALIGN_MASK) size = ALIGN (size);
- 
-+	size += DEFAULT_ALIGNMENT; /* to enable alignment of space */
- 	c = find_space (s, s->meta, size);
- 	if (!c) return NULL;
- 	mem = c->data + c->used;
-+	mem = (void *)ALIGN((char *)mem - (char *)0);
- 	c->used += size;
- 	return mem;
- }
--- 
-2.10.2
-