From 7371436749b74ae91942d1e130b096087aa483c0 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Sun, 23 Oct 2016 14:29:49 +0300 Subject: 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 Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- .../neon/neon/gnutls_4.3_fixup.patch | 68 ---------------------- meta/recipes-support/neon/neon_0.30.1.bb | 38 ------------ meta/recipes-support/neon/neon_0.30.2.bb | 38 ++++++++++++ 3 files changed, 38 insertions(+), 106 deletions(-) delete mode 100644 meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch delete mode 100644 meta/recipes-support/neon/neon_0.30.1.bb create mode 100644 meta/recipes-support/neon/neon_0.30.2.bb 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 @@ -replace deprecated GnuTLS functions with newer ones if available - -Upstream-Status: Pending - -Signed-off-by: Armin Kuster - -Index: neon-0.30.1/macros/neon.m4 -=================================================================== ---- neon-0.30.1.orig/macros/neon.m4 -+++ neon-0.30.1/macros/neon.m4 -@@ -987,6 +987,10 @@ gnutls) - gnutls_certificate_get_x509_cas \ - gnutls_x509_crt_sign2]) - -+ # gnutls 4.3 check -+ AC_CHECK_LIB(gnutls, gnutls_global_init) -+ AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,) -+ - # fail if gnutls_x509_crt_sign2 is not found (it was introduced in 1.2.0, which is required) - if test x${ac_cv_func_gnutls_x509_crt_sign2} != xyes; then - AC_MSG_ERROR([GnuTLS version predates gnutls_x509_crt_sign2, newer version required (at least 1.2.0)]) -Index: neon-0.30.1/src/ne_gnutls.c -=================================================================== ---- neon-0.30.1.orig/src/ne_gnutls.c -+++ neon-0.30.1/src/ne_gnutls.c -@@ -553,7 +553,13 @@ dup_error: - static int provide_client_cert(gnutls_session_t session, - const gnutls_datum_t *req_ca_rdn, int nreqs, - const gnutls_pk_algorithm_t *sign_algos, -- int sign_algos_length, gnutls_retr_st *st) -+ int sign_algos_length, -+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION -+ gnutls_retr2_st* st -+#else -+ gnutls_retr_st *st -+#endif -+ ) - { - ne_session *sess = gnutls_session_get_ptr(session); - -@@ -617,8 +623,11 @@ static int provide_client_cert(gnutls_se - #endif - ) { - NE_DEBUG(NE_DBG_SSL, "Supplying client certificate.\n"); -- -+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION -+ st->cert_type = type; -+#else - st->type = type; -+#endif - st->ncerts = 1; - st->cert.x509 = &sess->client_cert->cert.subject; - st->key.x509 = sess->client_cert->pkey; -@@ -649,8 +658,14 @@ ne_ssl_context *ne_ssl_context_create(in - ne_ssl_context *ctx = ne_calloc(sizeof *ctx); - gnutls_certificate_allocate_credentials(&ctx->cred); - if (flags == NE_SSL_CTX_CLIENT) { -+ -+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION -+ gnutls_certificate_set_retrieve_function(ctx->cred, -+ provide_client_cert); -+#else - gnutls_certificate_client_set_retrieve_function(ctx->cred, - provide_client_cert); -+#endif - } - gnutls_certificate_set_verify_flags(ctx->cred, - 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.1.bb deleted file mode 100644 index b6cfd5076f..0000000000 --- a/meta/recipes-support/neon/neon_0.30.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "An HTTP and WebDAV client library with a C interface" -HOMEPAGE = "http://www.webdav.org/neon/" -SECTION = "libs" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ - file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" - -SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ - file://pkgconfig.patch \ - file://gnutls_4.3_fixup.patch" - -SRC_URI[md5sum] = "231adebe5c2f78fded3e3df6e958878e" -SRC_URI[sha256sum] = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" - -inherit autotools binconfig-disabled lib_package pkgconfig - -# Enable gnutls or openssl, not both -PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" -PACKAGECONFIG_class-native = "expat gnutls webdav zlib" - -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" -PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" -PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" -PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" -PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -EXTRA_OECONF += "--enable-shared" - -do_compile_append() { - oe_runmake -C test -} - -BINCONFIG = "${bindir}/neon-config" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/neon/neon_0.30.2.bb b/meta/recipes-support/neon/neon_0.30.2.bb new file mode 100644 index 0000000000..5792c56f3a --- /dev/null +++ b/meta/recipes-support/neon/neon_0.30.2.bb @@ -0,0 +1,38 @@ +SUMMARY = "An HTTP and WebDAV client library with a C interface" +HOMEPAGE = "http://www.webdav.org/neon/" +SECTION = "libs" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ + file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" + +SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ + file://pkgconfig.patch \ + " + +SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41" +SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca" + +inherit autotools binconfig-disabled lib_package pkgconfig + +# Enable gnutls or openssl, not both +PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" +PACKAGECONFIG_class-native = "expat gnutls webdav zlib" + +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" +PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" +PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" +PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF += "--enable-shared" + +do_compile_append() { + oe_runmake -C test +} + +BINCONFIG = "${bindir}/neon-config" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg