rpms/openoffice.org/devel openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch, 1.2, 1.3 openoffice.org.spec, 1.1358, 1.1359

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14398

Modified Files:
	openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#384401 attempt to allow davs:// to work

openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch:

Index: openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch	7 Dec 2007 08:54:49 -0000	1.2
+++ openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch	8 Dec 2007 15:53:12 -0000	1.3
@@ -158,3 +158,26 @@
            </node>
          </node>
        </node>
+--- openoffice.org.orig/ucb/source/ucp/webdav.orig/NeonSession.cxx	2007-12-08 15:44:24.000000000 +0000
++++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx	2007-12-08 15:47:02.000000000 +0000
+@@ -256,6 +256,11 @@
+     return 0;
+ }
+ 
++extern "C" int ignore_verify(void *, int , const ne_ssl_certificate *)
++{
++    return 0;
++}
++
+ // -------------------------------------------------------------------
+ extern "C" int NeonSession_NeonAuth( void *       inUserData,
+                                      const char * inRealm,
+@@ -621,6 +626,8 @@
+         //       checked: 0.22.0)
+         ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
+         ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
++
++        ne_ssl_set_verify( m_pHttpSession, ignore_verify, this);
+     }
+ }
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1358
retrieving revision 1.1359
diff -u -r1.1358 -r1.1359
--- openoffice.org.spec	7 Dec 2007 08:54:49 -0000	1.1358
+++ openoffice.org.spec	8 Dec 2007 15:53:12 -0000	1.1359
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 9
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2839,6 +2839,9 @@
 
 
 %changelog
+* Sat Dec 08 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.8
+- Resolves: rhbz#384401 attempt to allow davs:// to work
+
 * Mon Dec 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.7
 - Resolves: rhbz#206400 add long awaited workspace.notes2.patch
     + drop openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch