sbergmann pushed to libreoffice (f21). "Resolves: rhbz#1134285 redundant user/password request for WebDAV access"

Tue Apr 14 09:00:47 UTC 2015

>From 05f524c2791b92eea5d8467efd3a54ab76f64aba Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman at redhat.com>
Date: Tue, 14 Apr 2015 11:00:11 +0200
Subject: Resolves: rhbz#1134285 redundant user/password request for WebDAV
 access

diff --git a/0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch b/0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch
new file mode 100644
index 0000000..b8e7a94
--- /dev/null
+++ b/0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch
@@ -0,0 +1,79 @@
+From 51e0d789c344547956764c3b5f0ef5a304f4e0aa Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Mon, 13 Apr 2015 18:27:33 +0200
+Subject: [PATCH] rhbz#1134285: Access dav, davs URLs via GVFS
+
+...so that LO shares the credentials with Nautilus once the connection has been
+set up in Nautilus.
+
+The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS and
+successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME-
+specific gnomevfs resp. gio UCP since b07a5fcc600ad564315d36fbd18495184fdf69cf
+"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at
+<https://bz.apache.org/ooo/show_bug.cgi?id=84676> "mixing neon and the hidden
+embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is
+unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio one.
+So keep handling dav, davs URLs via LO's internal webdav UCP under legacy
+--enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the
+default --enable-gio.
+
+Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594
+---
+ officecfg/Configuration_officecfg.mk                         | 1 +
+ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 6 ++++--
+ postprocess/CustomTarget_registry.mk                         | 3 +++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
+index 7e2af03..af992b9 100644
+--- a/officecfg/Configuration_officecfg.mk
++++ b/officecfg/Configuration_officecfg.mk
+@@ -121,6 +121,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
+ 	org/openoffice/TypeDetection/UISort-math.xcu \
+ 	org/openoffice/ucb/Configuration-gio.xcu \
+ 	org/openoffice/ucb/Configuration-neon.xcu \
++	org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \
+ 	org/openoffice/ucb/Configuration-win.xcu \
+ ))
+ 
+diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+index e9704d3..9cb2a1a 100644
+--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
++++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+@@ -89,7 +89,8 @@
+                 <value/>
+               </prop>
+             </node>
+-            <node oor:name="Provider7" oor:op="replace" install:module="neon">
++            <node oor:name="Provider7" oor:op="replace"
++                install:module="neon_gnomevfs">
+               <prop oor:name="ServiceName">
+                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
+               </prop>
+@@ -155,7 +156,8 @@
+                 <value/>
+               </prop>
+             </node>
+-            <node oor:name="Provider13" oor:op="replace" install:module="neon">
++            <node oor:name="Provider13" oor:op="replace"
++                install:module="neon_gnomevfs">
+               <prop oor:name="ServiceName">
+                 <value>com.sun.star.ucb.WebDAVContentProvider</value>
+               </prop>
+diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
+index a568832..e12640f 100644
+--- a/postprocess/CustomTarget_registry.mk
++++ b/postprocess/CustomTarget_registry.mk
+@@ -328,6 +328,9 @@ postprocess_DRIVERS += ado
+ endif
+ ifneq ($(WITH_WEBDAV),)
+ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
++ifeq ($(ENABLE_GNOMEVFS),TRUE)
++postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu
++endif
+ endif
+ ifeq ($(ENABLE_EVOAB2),TRUE)
+ postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+-- 
+2.1.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 6ba3be9..b14c990 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -380,6 +380,7 @@ Patch80: 0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch
 Patch81: 0001-Related-fdo-88455-crash-using-delete-in-available-fi.patch
 Patch82: 0001-negative-after-text-indents-ignored-by-msword-for-ap.patch
 Patch83: 0001-rhbz-1197614-Fix-calculation-of-m_bHasActive-when-re.patch
+Patch84: 0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2356,8 +2357,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Fri Apr 10 2015 Stephan Bergmann <sbergman at redhat.com> - 1:4.3.6.2-9-UNBUILT
+* Tue Apr 14 2015 Stephan Bergmann <sbergman at redhat.com> - 1:4.3.6.2-9
 - Resolves: rhbz#1197614 crash when updating extension
+- Resolves: rhbz#1134285 redundant user/password request for WebDAV access
 
 * Tue Apr 07 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-8
 - negative after-text indents ignored by msword for apos
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f21&id=05f524c2791b92eea5d8467efd3a54ab76f64aba
