The following commit has been merged in the master branch:
commit 4e496b6ca41cd67c3ce38f3f56b7dddba2053dc4
Author: Rene Engelhard <r...@debian.org>
Date: Mon May 7 19:10:58 2012 +0200
backport from master: fall back to without profile if path is invalid or
profile does not exist
diff --git a/changelog b/changelog
index 5305dbf..c6d57fc 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:3.5.3-2) UNRELEASED; urgency=low
* debian/patches/mozilla-profile-absolute-paths.diff: add patch from
libreoffice-3-5 branch to respect absolute paths for mozilla profile
(closes: #659733)
+ * debian/patches/more-robust-nss-initialization.diff: add patch from
+ master to fall back to without profile if path is invalid or profile
+ does not exist
-- Rene Engelhard <r...@debian.org> Thu, 03 May 2012 23:37:38 +0200
diff --git a/patches/more-robust-nss-initialization.diff
b/patches/more-robust-nss-initialization.diff
new file mode 100644
index 0000000..9a59f77
--- /dev/null
+++ b/patches/more-robust-nss-initialization.diff
@@ -0,0 +1,38 @@
+From 7ead068be9f865327da7aef1cdc01614f25fc4a6 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard <markus.mohrh...@googlemail.com>
+Date: Fri, 04 May 2012 13:12:21 +0000
+Subject: more robust nss initialization, related fdo#45171
+
+fall back to without profile if path is invalid or profile does not
+exist
+
+Change-Id: Ic9a73fbaaa288f8bc99dab2b1d679c2cbe6baa89
+---
+diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+index 531d716..1ed0b70 100644
+--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
++++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+@@ -261,6 +261,7 @@
+
+ PR_Init( PR_USER_THREAD, PR_PRIORITY_NORMAL, 1 ) ;
+
++ bool bSuccess = true;
+ // there might be no profile
+ if ( sCertDir.getLength() > 0 )
+ {
+@@ -280,10 +281,11 @@ bool nsscrypto_initialize( const css::uno::Reference<
css::lang::XMultiServiceFa
+ PR_GetErrorText(error);
+ if (error)
+ xmlsec_trace("%s",error);
+- return false ;
++ bSuccess = false;
+ }
+ }
+- else
++
++ if( sCertDir.isEmpty() || !bSuccess )
+ {
+ xmlsec_trace("Initializing NSS without profile.");
+ if ( NSS_NoDB_Init(NULL) != SECSuccess )
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index d6c6797..1a8e194 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
mozilla-profile-absolute-paths.diff
+more-robust-nss-initialization.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srrua-0003qx...@vasks.debian.org
