[meego-commits] 9526: Changes to Trunk/neon

[Peter Zhu]

Hi,
I have made the following changes to neon in project Trunk. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #9526:

  submit:   Trunk:Testing/neon(r3) -> Trunk/neon


Message:
    Move to Trunk

State:   new          2010-11-17T00:23:00 peter
Comment: None



changes files:
--------------
--- neon.changes
+++ neon.changes
@@ -0,0 +1,6 @@
+* Fri Nov 12 2010 Patrick Ohly <patrick.ohly at intel.com> - 0.28.6-3
+- include patch for 'Neon WebDAV: SSL problem with Yahoo!' (BMC #9984)
+
+* Wed Nov 10 2010 Patrick Ohly <patrick.ohly at intel.com> - 0.28.6-2
+- compile with --with-ca-bundle (BMC #9904)
+

new:
----
  neon-0.28.6-nocert.patch

spec files:
-----------
--- neon.spec
+++ neon.spec
@@ -7,6 +7,7 @@
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
+Patch1: neon-0.28.6-nocert.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig, pakchois-devel
@@ -34,13 +35,14 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1
 
 %build
 export CC="%{__cc} -pthread"
 # Use standard OpenSSL-provided CA bundle:
-# %define cabundle %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-# --with-ca-bundle=%{cabundle} 
+%define cabundle %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 %configure --with-expat --enable-shared --disable-static \
+        --with-ca-bundle=%{cabundle} \
         --enable-warnings --with-ssl=gnutls --enable-threadsafe-ssl=posix
 make %{?_smp_mflags}
 

other changes:
--------------

++++++ neon-0.28.6-nocert.patch (new)
--- neon-0.28.6-nocert.patch
+++ neon-0.28.6-nocert.patch
+Patch from upstream commit.
+http://lists.manyfish.co.uk/pipermail/neon-commits/2010-November/000905.html
+
+Author: joe
+Date: Thu Nov 11 12:26:45 2010
+New Revision: 1829
+
+Modified:
+   neon/branches/0.29.x/src/ne_gnutls.c
+
+Log:
+Merge r1828 from trunk:
+
+* src/ne_gnutls.c (provide_client_cert): Return success with no cert
+  if no cert is available; match behaviour with OpenSSL.  Thanks to
+  Patrick Ohly.
+
+Modified: neon/branches/0.29.x/src/ne_gnutls.c
+==============================================================================
+--- 0.29.x/src/ne_gnutls.c	(original)
++++ 0.29.x/src/ne_gnutls.c	Thu Nov 11 12:26:45 2010
+@@ -620,10 +620,12 @@
+         } else {
+             return GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE;
+         }
+-    } else {
++    } 
++    else {
+         NE_DEBUG(NE_DBG_SSL, "No client certificate supplied.\n");
++        st->ncerts = 0;
+         sess->ssl_cc_requested = 1;
+-        return GNUTLS_E_NO_CERTIFICATE_FOUND;
++        return 0;
+     }
+ 
+     return 0;
+