diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2017-11-01 15:08:37 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-11-15 16:34:05 -0800 |
commit | 222091bdc218a19a6643a62f70be6cac3371a683 (patch) | |
tree | 9a18de2dc984554903894099bd50294b292af73d /meta-oe/recipes-support/iksemel/iksemel | |
parent | 0c31b49526028606d09417dc87d180006b8938df (diff) | |
download | meta-openembedded-222091bdc218a19a6643a62f70be6cac3371a683.tar.gz |
iksemel: reinstate recipe with build fixes and update 1.4 -> 1.5
The recipe for iksemel 1.4 was blacklisted and eventually removed as
it depended on an older version of gnutls which was no longer
available in oe-core.
Reinstate iksemel with a new recipe for iksemel 1.5, which can use
either openssl or gnutls for TLS support. Fix build issues.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/iksemel/iksemel')
-rw-r--r-- | meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch | 55 | ||||
-rw-r--r-- | meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch | 62 |
2 files changed, 117 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch b/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch new file mode 100644 index 0000000000..41fccc3ab0 --- /dev/null +++ b/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch @@ -0,0 +1,55 @@ +From 7136a908a056d0e36c89b6e1c39adff8ce2bb1d4 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Wed, 1 Nov 2017 13:17:34 -0700 +Subject: [PATCH] avoid obsolete gnutls apis + +The gnutls_*_set_priority() family of functions was marked deprecated +in gnutls 2.12.x and removed completely in 3.5.x. These functions +have been superceded by gnutls_priority_set_direct(), which was added +in gnutls 2.2.0 (released 2007-12-14). + +Rather than simply update the custom gnutls_*_set_priority() calls to +use gnutls_priority_set_direct(), drop the custom priority selection +completely and use the recommended approach of letting gnutls pick a +reasonable set of defaults. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + src/tls-gnutls.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/src/tls-gnutls.c b/src/tls-gnutls.c +index d7b7c91..749e9ef 100644 +--- a/src/tls-gnutls.c ++++ b/src/tls-gnutls.c +@@ -48,11 +48,6 @@ tls_pull (struct ikstls_data *data, char *buffer, size_t len) + static int + tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock) + { +- 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 }; + struct ikstls_data *data; + int ret; + +@@ -81,11 +76,8 @@ tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock) + 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_set_default_priority (data->sess); ++ + gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred); + + gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push); +-- +1.9.1 + diff --git a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch b/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch new file mode 100644 index 0000000000..05accdd9c8 --- /dev/null +++ b/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch @@ -0,0 +1,62 @@ +From 17a5cf8f70b86d8a2195562e2d9dcccb4fa35c83 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Tue, 31 Oct 2017 20:05:58 -0700 +Subject: [PATCH] fix configure option parsing + +Don't over-write with_openssl etc by trying to set to $enablevar + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + configure.ac | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 82e6d2d..823e6c1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,17 +56,17 @@ fi + dnl Options for overriding TLS checks + AC_ARG_WITH([openssl], + AS_HELP_STRING([--without-openssl],[disable checking for openssl]), +- [with_openssl=$enableval], +- [with_openssl=yes] ++ [], ++ [with_openssl=auto] + ) + AC_ARG_WITH([gnutls], + AS_HELP_STRING([--without-gnutls],[disable checking for GNU TLS]), +- [with_gnutls=$enableval], +- [with_gnutls=yes] ++ [], ++ [with_gnutls=auto] + ) + + dnl Check OpenSSL +-if test "x$with_openssl" = "xyes"; then ++if test "x$with_openssl" != "xno"; then + PKG_CHECK_MODULES([OPENSSL], openssl >= 0.9.8, have_openssl=yes, have_openssl=no) + if test "x$have_openssl" = "xyes"; then + LIBOPENSSL_CFLAGS="$OPENSSL_CFLAGS" +@@ -78,7 +78,7 @@ if test "x$with_openssl" = "xyes"; then + fi + + dnl Check GNU TLS +-if test "x$with_gnutls" = "xyes"; then ++if test "x$with_gnutls" != "xno"; then + if test "x$have_openssl" != "xyes"; then + PKG_CHECK_MODULES([GNUTLS], gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no) + if test "x$have_gnutls" = "xyes"; then +@@ -94,7 +94,7 @@ fi + dnl Option for overriding Python check + AC_ARG_ENABLE([python], + AS_HELP_STRING([--disable-python],[disable checking for Python bindings]), +- [with_python=$enableval], ++ [], + [with_python=yes] + ) + +-- +1.9.1 + |