mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
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>
This commit is contained in:
Andre McCurdy
Armin Kuster
parent
0c31b49526
commit
222091bdc2
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
24
meta-oe/recipes-support/iksemel/iksemel_1.5.bb
Normal file
24
meta-oe/recipes-support/iksemel/iksemel_1.5.bb
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
SUMMARY = "Fast and portable XML parser and Jabber protocol library"
|
||||
HOMEPAGE = "https://github.com/meduketto/iksemel"
|
||||
SECTION = "libs"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
|
||||
|
||||
SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa"
|
||||
PV = "1.5+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \
|
||||
file://fix-configure-option-parsing.patch \
|
||||
file://avoid-obsolete-gnutls-apis.patch"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools pkgconfig lib_package
|
||||
|
||||
# TLS support requires either openssl or gnutls (if both are enabled openssl will be used).
|
||||
PACKAGECONFIG ?= "gnutls"
|
||||
|
||||
PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
|
||||
PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
|
||||
|
||||
EXTRA_OECONF = "--disable-python"
|
||||
Loading…
Reference in New Issue
Block a user