Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=54f60e49c0c1acd0b6117945794246c4d29a333f
commit 54f60e49c0c1acd0b6117945794246c4d29a333f Author: VÃRÃSKÅI András <voros...@frugalware.org> Date: Sat Jun 26 18:15:29 2010 +0200 neon-0.28.5-4-i686 backport a fix to avoid linking issues diff --git a/source/network/neon/FrugalBuild b/source/network/neon/FrugalBuild index 7b3a700..171dd4b 100644 --- a/source/network/neon/FrugalBuild +++ b/source/network/neon/FrugalBuild @@ -3,7 +3,7 @@ pkgname=neon pkgver=0.28.5 -pkgrel=3 +pkgrel=4 pkgdesc="An HTTP and WebDAV client library, with a C interface." url="http://www.webdav.org/neon/"; depends=('libkrb5' 'expat' 'zlib' 'openssl>=1.0.0') @@ -11,9 +11,10 @@ makedepends=('krb5>=1.7-6') groups=('network') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.gz) +source=($url/$pkgname-$pkgver.tar.gz openssl.diff) options=('force') Fconfopts="$Fconfopts --disable-debug --with-expat --with-ssl --enable-threadsafe-ssl --enable-shared" -sha1sums=('cc07c9d2967cf9b290514ad2fc756abe1f854eba') +sha1sums=('cc07c9d2967cf9b290514ad2fc756abe1f854eba' \ + 'c31d6b35bc16c22327de4c72bf440378c0201746') # optimization OK diff --git a/source/network/neon/openssl.diff b/source/network/neon/openssl.diff new file mode 100644 index 0000000..5132c4c --- /dev/null +++ b/source/network/neon/openssl.diff @@ -0,0 +1,62 @@ +Modified: neon/trunk/macros/neon.m4 +============================================================================== +--- neon/macros/neon.m4 (original) ++++ neon/macros/neon.m4 Sat Sep 12 13:03:49 2009 +@@ -923,7 +923,7 @@ + if test "$ne_cv_lib_ssl097" = "yes"; then + AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) + NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL (0.9.7 or later)]) +- NE_CHECK_FUNCS(CRYPTO_set_idptr_callback) ++ NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) + else + # Fail if OpenSSL is older than 0.9.6 + NE_CHECK_OPENSSLVER(ne_cv_lib_ssl096, 0.9.6, 0x00906000L) + +Modified: neon/trunk/src/ne_openssl.c +============================================================================== +--- neon/src/ne_openssl.c (original) ++++ neon/src/ne_openssl.c Sat Sep 12 13:03:49 2009 +@@ -34,6 +34,7 @@ + #include <openssl/pkcs12.h> + #include <openssl/x509v3.h> + #include <openssl/rand.h> ++#include <openssl/opensslv.h> + + #ifdef NE_HAVE_TS_SSL + #include <stdlib.h> /* for abort() */ +@@ -632,6 +633,19 @@ + ne_free(ctx); + } + ++#if !defined(HAVE_SSL_SESSION_CMP) && !defined(SSL_SESSION_cmp) \ ++ && defined(OPENSSL_VERSION_NUMBER) \ ++ && OPENSSL_VERSION_NUMBER > 0x10000000L ++/* OpenSSL 1.0 removed SSL_SESSION_cmp for no apparent reason - hoping ++ * it is reasonable to assume that comparing the session IDs is ++ * sufficient. */ ++static int SSL_SESSION_cmp(SSL_SESSION *a, SSL_SESSION *b) ++{ ++ return a->session_id_length == b->session_id_length ++ && memcmp(a->session_id, b->session_id, a->session_id_length) == 0; ++} ++#endif ++ + /* For internal use only. */ + int ne__negotiate_ssl(ne_session *sess) + { + +Modified: neon/trunk/src/ne_socket.c +============================================================================== +--- neon/src/ne_socket.c (original) ++++ neon/src/ne_socket.c Sat Sep 12 13:03:49 2009 +@@ -1639,6 +1639,10 @@ + if (ret != 1) { + return error_ossl(sock, ret); + } ++ ++ if (SSL_session_reused(ssl)) { ++ NE_DEBUG(NE_DBG_SSL, "ssl: Server reused session.\n"); ++ } + #elif defined(HAVE_GNUTLS) + gnutls_init(&ssl, GNUTLS_SERVER); + gnutls_credentials_set(ssl, GNUTLS_CRD_CERTIFICATE, ctx->cred);
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
