rpms/openoffice.org/F-8 openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch, NONE, 1.1 openoffice.org.spec, 1.1336, 1.1337
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Dec 18 13:46:39 UTC 2007
- Previous message (by thread): rpms/mfiler2/devel .cvsignore, 1.5, 1.6 mfiler2.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message (by thread): rpms/libgnome/devel im-setting.patch, NONE, 1.1 libgnome.spec, 1.107, 1.108
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26893
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
Log Message:
Resolves: rhbz#410381/rhbz#384401 openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch:
--- NEW FILE openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch ---
Index: source/ucp/webdav/webdavcontent.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/webdavcontent.cxx,v
retrieving revision 1.56
diff -u -r1.56 webdavcontent.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/webdavcontent.cxx 3 Jul 2007 12:14:36 -0000 1.56
+++ openoffice.org/ucb/source/ucp/webdav/webdavcontent.cxx 7 Dec 2007 08:42:30 -0000
@@ -2600,6 +2600,18 @@
sourceURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
}
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ {
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ }
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+ {
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
+ }
else
{
if ( !aScheme.equalsAsciiL(
@@ -2622,6 +2634,11 @@
RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
targetURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ targetURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+
// @@@ This implementation of 'transfer' only works
// if the source and target are located at same host.
Index: source/ucp/webdav/webdavprovider.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/webdavprovider.cxx,v
retrieving revision 1.18
diff -u -r1.18 webdavprovider.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/webdavprovider.cxx 5 Jun 2007 18:22:00 -0000 1.18
+++ openoffice.org/ucb/source/ucp/webdav/webdavprovider.cxx 7 Dec 2007 08:42:30 -0000
@@ -146,8 +146,11 @@
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) )
- &&
+ RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) &&
+ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
+ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
)
@@ -177,6 +180,24 @@
HTTP_URL_SCHEME ) );
bNewId = true;
}
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ {
+ aURL = aURL.replaceAt( 0,
+ DAV_URL_SCHEME_LENGTH,
+ rtl::OUString::createFromAscii(
+ HTTP_URL_SCHEME ) );
+ bNewId = true;
+ }
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+ {
+ aURL = aURL.replaceAt( 0,
+ DAVS_URL_SCHEME_LENGTH,
+ rtl::OUString::createFromAscii(
+ HTTPS_URL_SCHEME ) );
+ bNewId = true;
+ }
sal_Int32 nPos = aURL.lastIndexOf( '/' );
if ( nPos != aURL.getLength() - 1 )
Index: source/ucp/webdav/webdavprovider.hxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/webdavprovider.hxx,v
retrieving revision 1.9
diff -u -r1.9 webdavprovider.hxx
--- openoffice.org.orig/ucb/source/ucp/webdav/webdavprovider.hxx 5 Jun 2007 18:22:16 -0000 1.9
+++ openoffice.org/ucb/source/ucp/webdav/webdavprovider.hxx 7 Dec 2007 08:42:30 -0000
@@ -79,6 +79,14 @@
#define HTTPS_URL_SCHEME "https"
#define HTTPS_URL_SCHEME_LENGTH 5
+#define DAV_URL_SCHEME "dav"
+#define DAV_URL_SCHEME_LENGTH 3
+
+#define DAVS_URL_SCHEME "davs"
+#define DAVS_URL_SCHEME_LENGTH 4
+
+
+
#define FTP_URL_SCHEME "ftp"
#define HTTP_CONTENT_TYPE \
Index: registry/data/org/openoffice/ucb/Configuration.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu,v
retrieving revision 1.9
diff -u -r1.9 Configuration.xcu
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 8 Sep 2005 15:07:17 -0000 1.9
+++ openoffice.org/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 7 Dec 2007 08:46:39 -0000
@@ -106,6 +106,17 @@
<value/>
</prop>
</node>
+ <node oor:name="Provider7" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
+ </prop>
+ <prop oor:name="URLTemplate">
+ <value>dav</value>
+ </prop>
+ <prop oor:name="Arguments">
+ <value/>
+ </prop>
+ </node>
<node oor:name="Provider8" oor:op="replace">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.PackageContentProvider</value>
@@ -150,6 +161,28 @@
<value/>
</prop>
</node>
+ <node oor:name="Provider12" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
+ </prop>
+ <prop oor:name="URLTemplate">
+ <value>https</value>
+ </prop>
+ <prop oor:name="Arguments">
+ <value/>
+ </prop>
+ </node>
+ <node oor:name="Provider13" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
+ </prop>
+ <prop oor:name="URLTemplate">
+ <value>davs</value>
+ </prop>
+ <prop oor:name="Arguments">
+ <value/>
+ </prop>
+ </node>
</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/F-8/openoffice.org.spec,v
retrieving revision 1.1336
retrieving revision 1.1337
diff -u -r1.1336 -r1.1337
--- openoffice.org.spec 16 Dec 2007 13:47:10 -0000 1.1336
+++ openoffice.org.spec 18 Dec 2007 13:45:49 -0000 1.1337
@@ -157,6 +157,7 @@
Patch75: workspace.allowcurloldies.patch
Patch76: workspace.locales24.patch
Patch77: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch78: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
%define instdir %{_libdir}/openoffice.org
@@ -1109,6 +1110,7 @@
%patch75 -p1 -b .workspace.allowcurloldies.patch
%patch76 -p1 -b .workspace.locales24.patch
%patch77 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch78 -p1 -b .ooo84676.ucb.davprotocol.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2809,9 +2811,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Sun Dec 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8-UNRELEASED
+* Tue Dec 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8
- Resolves: rhbz#425701 add workspace.locales24.patch
- Resolves: rhbz#423371 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+- Resolves: rhbz#410381/rhbz#384401 openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
* Wed Dec 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
- Resolves: rhbz#303601 CVE-2007-4575 workspace.hsql1808.patch
- Previous message (by thread): rpms/mfiler2/devel .cvsignore, 1.5, 1.6 mfiler2.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message (by thread): rpms/libgnome/devel im-setting.patch, NONE, 1.1 libgnome.spec, 1.107, 1.108
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list