[ooo-build-commit] .: patches/dev300

[René Engelhard]

 patches/dev300/apply                      |    3 +
 patches/dev300/unoxml-reset-secprefs.diff |   48 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 6227c098e86f0ae7c1bad76655bb407826a8ef2e
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Apr 1 22:27:47 2010 +0200

    reset security preferences in unoxml. (add patch from i#110523)
    
    * patches/dev300/apply:
    * patches/dev300/unoxml-reset-secprefs.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b046319..0f14038 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1556,8 +1556,9 @@ psprint-postscript-page-setup.diff, i#65491, n#80448, jholesov
 vcl-bitmap2-negative-height.diff
 
 [ SystemBits ]
-# remove redland patches; work around libredland bugs
+# remove redland patches; work around librdf/libraptor
 redland-remove-patches.diff, #i108911
+unoxml-reset-secprefs.diff, i#110523
 
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
diff --git a/patches/dev300/unoxml-reset-secprefs.diff b/patches/dev300/unoxml-reset-secprefs.diff
new file mode 100644
index 0000000..c15745e
--- /dev/null
+++ b/patches/dev300/unoxml-reset-secprefs.diff
@@ -0,0 +1,48 @@
+diff -r 21777680017e unoxml/source/rdf/librdf_repository.cxx
+--- unoxml/source/rdf/librdf_repository.cxx	Thu Mar 18 17:15:13 2010 +0000
++++ unoxml/source/rdf/librdf_repository.cxx	Thu Apr 01 16:23:56 2010 +0100
+@@ -52,6 +52,7 @@
+ #include <rtl/ustring.hxx>
+ 
+ #include <librdf.h>
++#include <libxslt/security.h>
+ 
+ #include <boost/utility.hpp>
+ #include <boost/shared_ptr.hpp>
+@@ -1887,7 +1888,11 @@
+             m_rRep);
+     }
+     //FIXME logger, digest, features?
++    xsltSecurityPrefsPtr origprefs = xsltGetDefaultSecurityPrefs();
+     librdf_world_open(pWorld);
++    xsltSecurityPrefsPtr newprefs = xsltGetDefaultSecurityPrefs();
++    if (newprefs != origprefs)
++        xsltSetDefaultSecurityPrefs(origprefs);
+     return pWorld;
+ }
+ 
+diff -r 21777680017e unoxml/source/rdf/makefile.mk
+--- unoxml/source/rdf/makefile.mk	Thu Mar 18 17:15:13 2010 +0000
++++ unoxml/source/rdf/makefile.mk	Thu Apr 01 16:23:56 2010 +0100
+@@ -41,6 +41,13 @@
+ CFLAGS+=-DSYSTEM_REDLAND $(REDLAND_CFLAGS)
+ .ENDIF
+ 
++.IF "$(SYSTEM_LIBXSLT)" == "YES"
++CFLAGS+= $(LIBXSLT_CFLAGS)
++.ELSE
++LIBXSLTINCDIR=external$/libxslt
++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ .IF "$(L10N_framework)"==""
+ 
+@@ -64,6 +71,7 @@
+ 
+ SHL1STDLIBS= \
+     $(REDLANDLIB) \
++    $(XSLTLIB) \
+ 	$(CPPUHELPERLIB) \
+ 	$(CPPULIB)	\
+ 	$(SALLIB) \