summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-10-23 14:29:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:34 +0000
commit2d3b484ccecef7f16d70b04384744b277ad57b3f (patch)
treee9cbea29a2ce781642b9b4a5d94f6c1e9ddf2262 /meta
parent39a3763103eb76f8519af2205be6ec7b72940cac (diff)
downloadpoky-2d3b484ccecef7f16d70b04384744b277ad57b3f.tar.gz
neon: Upgrade 0.30.1 -> 0.30.2
Remove "gnutls_4.3_fixup.patch" since fix for PKCS#11 support under GnuTLS 3.x is included in version 0.30.2 (From OE-Core rev: 7371436749b74ae91942d1e130b096087aa483c0) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch68
-rw-r--r--meta/recipes-support/neon/neon_0.30.2.bb (renamed from meta/recipes-support/neon/neon_0.30.1.bb)6
2 files changed, 3 insertions, 71 deletions
diff --git a/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch b/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
deleted file mode 100644
index 459f5e3857..0000000000
--- a/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1replace deprecated GnuTLS functions with newer ones if available
2
3Upstream-Status: Pending
4
5Signed-off-by: Armin Kuster <akuster808@gmail.com>
6
7Index: neon-0.30.1/macros/neon.m4
8===================================================================
9--- neon-0.30.1.orig/macros/neon.m4
10+++ neon-0.30.1/macros/neon.m4
11@@ -987,6 +987,10 @@ gnutls)
12 gnutls_certificate_get_x509_cas \
13 gnutls_x509_crt_sign2])
14
15+ # gnutls 4.3 check
16+ AC_CHECK_LIB(gnutls, gnutls_global_init)
17+ AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,)
18+
19 # fail if gnutls_x509_crt_sign2 is not found (it was introduced in 1.2.0, which is required)
20 if test x${ac_cv_func_gnutls_x509_crt_sign2} != xyes; then
21 AC_MSG_ERROR([GnuTLS version predates gnutls_x509_crt_sign2, newer version required (at least 1.2.0)])
22Index: neon-0.30.1/src/ne_gnutls.c
23===================================================================
24--- neon-0.30.1.orig/src/ne_gnutls.c
25+++ neon-0.30.1/src/ne_gnutls.c
26@@ -553,7 +553,13 @@ dup_error:
27 static int provide_client_cert(gnutls_session_t session,
28 const gnutls_datum_t *req_ca_rdn, int nreqs,
29 const gnutls_pk_algorithm_t *sign_algos,
30- int sign_algos_length, gnutls_retr_st *st)
31+ int sign_algos_length,
32+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION
33+ gnutls_retr2_st* st
34+#else
35+ gnutls_retr_st *st
36+#endif
37+ )
38 {
39 ne_session *sess = gnutls_session_get_ptr(session);
40
41@@ -617,8 +623,11 @@ static int provide_client_cert(gnutls_se
42 #endif
43 ) {
44 NE_DEBUG(NE_DBG_SSL, "Supplying client certificate.\n");
45-
46+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION
47+ st->cert_type = type;
48+#else
49 st->type = type;
50+#endif
51 st->ncerts = 1;
52 st->cert.x509 = &sess->client_cert->cert.subject;
53 st->key.x509 = sess->client_cert->pkey;
54@@ -649,8 +658,14 @@ ne_ssl_context *ne_ssl_context_create(in
55 ne_ssl_context *ctx = ne_calloc(sizeof *ctx);
56 gnutls_certificate_allocate_credentials(&ctx->cred);
57 if (flags == NE_SSL_CTX_CLIENT) {
58+
59+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION
60+ gnutls_certificate_set_retrieve_function(ctx->cred,
61+ provide_client_cert);
62+#else
63 gnutls_certificate_client_set_retrieve_function(ctx->cred,
64 provide_client_cert);
65+#endif
66 }
67 gnutls_certificate_set_verify_flags(ctx->cred,
68 GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
diff --git a/meta/recipes-support/neon/neon_0.30.1.bb b/meta/recipes-support/neon/neon_0.30.2.bb
index b6cfd5076f..5792c56f3a 100644
--- a/meta/recipes-support/neon/neon_0.30.1.bb
+++ b/meta/recipes-support/neon/neon_0.30.2.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a
7 7
8SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ 8SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
9 file://pkgconfig.patch \ 9 file://pkgconfig.patch \
10 file://gnutls_4.3_fixup.patch" 10 "
11 11
12SRC_URI[md5sum] = "231adebe5c2f78fded3e3df6e958878e" 12SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
13SRC_URI[sha256sum] = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" 13SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
14 14
15inherit autotools binconfig-disabled lib_package pkgconfig 15inherit autotools binconfig-disabled lib_package pkgconfig
16 16