download.lst | 4 - external/neon/neon.patch | 47 -------------- external/neon/neon_ne_set_request_flag.patch | 6 - external/nss/ExternalProject_nss.mk | 1 external/nss/UnpackedTarball_nss.mk | 2 external/nss/nss.cygwin64.in32bit.patch | 14 ++++ external/nss/nss.patch | 42 +++++++++++- external/nss/ubsan.patch.0 | 28 ++------ lotuswordpro/qa/cppunit/data/fail/loop-2.lwp |binary lotuswordpro/source/filter/lwpdivinfo.cxx | 8 -- lotuswordpro/source/filter/lwpfont.cxx | 2 lotuswordpro/source/filter/lwptablelayout.cxx | 4 - lotuswordpro/source/filter/lwptblformula.cxx | 2 lotuswordpro/source/filter/xfilter/xfcontent.hxx | 21 +++++- lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 2 lotuswordpro/source/filter/xfilter/xftextspan.cxx | 6 - 16 files changed, 99 insertions(+), 90 deletions(-)
New commits: commit 24a332ebb65615a79f8f01c42470855fd22a5add Author: Michael Stahl <[email protected]> Date: Wed Mar 9 12:55:25 2016 +0100 nss: upgrade to release 3.22.2 fixing CVE-2016-1950 Reviewed-on: https://gerrit.libreoffice.org/23070 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 4d77c8088b52c649e80c12e208131a6844a53b12) Reviewed-on: https://gerrit.libreoffice.org/23104 Reviewed-by: David Ostrovsky <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 7864fe9f7c83c865d1dc8e27ae652d2c89673f68) Change-Id: Idc89778b488f2c84e5b0d495d2f44e623cc542b5 diff --git a/download.lst b/download.lst index 10562b4..7ef2c0f 100644 --- a/download.lst +++ b/download.lst @@ -103,7 +103,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz -export NSS_TARBALL := d45f17e742acd490d1df7256cb4356b6-nss-3.22.1-with-nspr-4.12.tar.gz +export NSS_TARBALL := 6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 commit cc15a1d9bc0da65c200efbd00d01a54c83500b66 Author: David Ostrovsky <[email protected]> Date: Fri Mar 4 19:59:18 2016 +0100 nss: Fix pointer truncation from 'char *' to 'long' Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005 Reviewed-on: https://gerrit.libreoffice.org/22916 Tested-by: Jenkins <[email protected]> Reviewed-by: Norbert Thiebaud <[email protected]> (cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b) Reviewed-on: https://gerrit.libreoffice.org/23103 Reviewed-by: Michael Stahl <[email protected]> Reviewed-by: David Ostrovsky <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 5e4f1ab7c0450000f46d2c21639e69b96c38b1f0) diff --git a/external/nss/nss.patch b/external/nss/nss.patch index 2cb23be..5483635 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -1,3 +1,14 @@ +--- a/nss.orig/nspr/pr/src/misc/prnetdb.c 2016-02-12 14:51:25.000000000 +0100 ++++ b/nss/nspr/pr/src/misc/prnetdb.c 2016-03-04 19:23:00.462892600 +0100 +@@ -438,7 +438,7 @@ + char *buf = *bufp; + PRIntn buflen = *buflenp; + +- if (align && ((long)buf & (align - 1))) { ++ if (align && ((ptrdiff_t)buf & (align - 1))) { + PRIntn skip = align - ((ptrdiff_t)buf & (align - 1)); + if (buflen < skip) { + return 0; diff -ru a/nspr/configure b/nspr/configure --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100 +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100 commit 7092e388f475f33fc905174326fbc016a4e46863 Author: David Ostrovsky <[email protected]> Date: Tue Feb 23 22:25:06 2016 +0100 Bump nss to 3.22.1 and nspr to 4.12 It seems like nss has activated -Werror, even though the code is not warning free: [1]. This applies also to the additional patches that would need to be patched to be a warning free patch, endless recursion. To avoid messing around with something like that: [2], we disable -Werror option for now. Also note, that [2] doesn't fix all warnings, but only part of them so that we let with unsolved non-trivially to fix warnings on different supported compilers if we would choose the warning-free-compilation-path. [1] https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion [2] https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec Reviewed-on: https://gerrit.libreoffice.org/22650 Tested-by: Jenkins <[email protected]> Reviewed-by: David Ostrovsky <[email protected]> (cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f) Reviewed-on: https://gerrit.libreoffice.org/23102 Reviewed-by: David Ostrovsky <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 8e6ee22f2bffecff9d85058c6c21312585c6f1cc) Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2 diff --git a/download.lst b/download.lst index 7d94e97..10562b4 100644 --- a/download.lst +++ b/download.lst @@ -103,7 +103,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz -export NSS_TARBALL := 478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz +export NSS_TARBALL := d45f17e742acd490d1df7256cb4356b6-nss-3.22.1-with-nspr-4.12.tar.gz export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 17ea6f1..bd64971 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -22,6 +22,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure): nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \ + $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \ ,,nss_configure.log) ifeq ($(OS),WNT) diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index d297ee4b..ba358cb 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -27,6 +27,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-chromium-nss-static.patch \ external/nss/nss-more-static.patch \ external/nss/nss-ios.patch) \ + $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \ + external/nss/nss.cygwin64.in32bit.patch) \ )) # nss-pem is only needed for internal curl to read the NSS CA database diff --git a/external/nss/nss.cygwin64.in32bit.patch b/external/nss/nss.cygwin64.in32bit.patch new file mode 100755 index 0000000..b00761a --- /dev/null +++ b/external/nss/nss.cygwin64.in32bit.patch @@ -0,0 +1,14 @@ +This fixes architecture mismatch, when building +on Cygwin 64bit and in 32bit mode +diff -ru nss.orig/nss/Makefile nss/nss/Makefile +--- a/nss.orig/nss/Makefile 2016-02-26 01:00:52.146713100 +0100 ++++ b/nss/nss/Makefile 2016-02-26 01:02:05.303560100 +0100 +@@ -59,6 +59,8 @@ + # Translate coreconf build options to NSPR configure options. + # + ++NSPR_CONFIGURE_OPTS += --host=i686-pc-cygwin ++ + ifeq ($(OS_TARGET),Android) + NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \ + --target=$(ANDROID_PREFIX) \ diff --git a/external/nss/nss.patch b/external/nss/nss.patch index e555d6e..2cb23be 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -40,24 +40,34 @@ diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk endif endif -diff -ru a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk ---- a/a/nss/coreconf/arch.mk 2014-09-29 16:46:38.175421471 +0100 -+++ b/b/nss/coreconf/arch.mk 2014-09-29 16:47:42.986012244 +0100 -@@ -280,10 +280,15 @@ +diff -ru nss.orig/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk +--- a/nss.orig/nss/coreconf/arch.mk 2016-02-12 15:36:18.000000000 +0100 ++++ b/nss/nss/coreconf/arch.mk 2016-02-23 20:48:31.595941079 +0100 +@@ -280,15 +280,21 @@ # IMPL_STRATEGY may be defined too. # +-ifdef CROSS_COMPILE +-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +-else -OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +-endif +# OBJDIR_NAME is used to build the directory containing the built objects, for +# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ +# We need to deliver the contents of that folder into instdir. To make that +# easier in the makefile we rename this directory to "out". ++#ifdef CROSS_COMPILE ++#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++#else +#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++#endif +OBJDIR_NAME = out + ifeq (,$(filter-out WIN%,$(OS_TARGET))) -ifndef BUILD_OPT +ifdef THIS_HAS_BEEN_DISABLED_TO_GET_out ++ # # Define USE_DEBUG_RTL if you want to use the debug runtime library # (RTL) in the debug build @@ -151,3 +161,16 @@ diff -ru a/nss/Makefile b/nss/Makefile #! gmake # # This Source Code Form is subject to the terms of the Mozilla Public +diff -ru nss.orig/nss/coreconf/Werror.mk nss/nss/coreconf/Werror.mk +--- a/nss.orig/nss/coreconf/Werror.mk 2016-02-12 15:36:18.000000000 +0100 ++++ b/nss/nss/coreconf/Werror.mk 2016-02-23 23:58:15.119584046 +0100 +@@ -60,7 +60,8 @@ + endif #ndef NSS_ENABLE_WERROR + + ifeq ($(NSS_ENABLE_WERROR),1) +- WARNING_CFLAGS += -Werror ++# We do not treat warnings as errors. ++# WARNING_CFLAGS += -Werror + else + # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions. + # Use this to disable use of that #pragma and the warnings it suppresses. diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0 index 956e07b..ccf04b9 100644 --- a/external/nss/ubsan.patch.0 +++ b/external/nss/ubsan.patch.0 @@ -1,24 +1,12 @@ ---- nss/lib/certdb/crl.c -+++ nss/lib/certdb/crl.c -@@ -2150,7 +2150,7 @@ +diff -ru nss.orig/nss/lib/certdb/crl.c nss/nss/lib/certdb/crl.c +--- nss/lib/certdb/crl.c 2016-02-12 15:36:18.000000000 +0100 ++++ nss/lib/certdb/crl.c 2016-02-23 20:57:17.067924598 +0100 +@@ -1982,7 +1982,7 @@ return SECSuccess; } /* all CRLs are good, sort them by thisUpdate */ -- qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), -+ if (cache->ncrls != 0) qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), - SortCRLsByThisUpdate); - - if (cache->ncrls) ---- nss/lib/libpkix/pkix/util/pkix_tools.h -+++ nss/lib/libpkix/pkix/util/pkix_tools.h -@@ -1458,8 +1458,8 @@ - - extern PRLogModuleInfo *pkixLog; - --#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FF, 0xEEFACADE) --#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00D, 0xDEADBEEF) -+#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FFU, 0xEEFACADEU) -+#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00DU, 0xDEADBEEFU) - - /* see source file for function documentation */ +- qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortCRLsByThisUpdate); ++ if (cache->ncrls != 0) qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortCRLsByThisUpdate); + if (cache->ncrls) { + /* pick the newest CRL */ commit 5258d830c021c3d217e75bf974aec3ac1b52fbc0 Author: Caolán McNamara <[email protected]> Date: Tue Mar 8 12:09:55 2016 +0000 avoid infinite regress in busted documents Change-Id: I639617e41cd9a9a51a3dd3efa32ac1cf2991b9d2 (cherry picked from commit f16ceae46dd8f3974a379c6fb07feaffb8012b25) Reviewed-on: https://gerrit.libreoffice.org/23031 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> (cherry picked from commit 69e4ce0716f7998dbeab954a43b912e72f0f4947) diff --git a/lotuswordpro/qa/cppunit/data/fail/loop-2.lwp b/lotuswordpro/qa/cppunit/data/fail/loop-2.lwp new file mode 100644 index 0000000..6342cc5 Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/loop-2.lwp differ diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx index 11d4f0e..80884f7 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.cxx +++ b/lotuswordpro/source/filter/lwpdivinfo.cxx @@ -112,15 +112,11 @@ void LwpDivInfo::Read() m_FillerPageTextID.ReadIndexed(m_pObjStrm); // read external file object stuff -#if !defined(NDEBUG) - sal_uInt16 type = -#endif - m_pObjStrm->QuickReaduInt16(); + sal_uInt16 type = m_pObjStrm->QuickReaduInt16(); //cpExternalFile = LNULL; - assert(type==0); + SAL_WARN_IF(type != 0, "lwp", "should be 0"); m_pObjStrm->SkipExtra(); - } void LwpDivInfo::SkipFront() diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index 4307d29..79e94bf 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -262,7 +262,7 @@ void LwpFontTable::Read(LwpObjectStream *pStrm) OUString LwpFontTable::GetFaceName(sal_uInt16 index) //index: start from 1 { - assert(index <= m_nCount && index > 0); + SAL_WARN_IF(index > m_nCount || index <= 0, "lwp", "bad font index"); return (index <= m_nCount && index > 0) ? m_pFontEntries[index-1].GetFaceName() : OUString(); } diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 6f1b73c..ec18542 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -218,13 +218,13 @@ double LwpSuperTableLayout::GetTableWidth() LwpTableLayout* pTableLayout = GetTableLayout(); if(!pTableLayout) { - assert(false); + SAL_WARN("lwp", "missing table layout, early return"); return 0; } LwpTable *pTable = pTableLayout->GetTable(); if(!pTable) { - assert(false); + SAL_WARN("lwp", "missing table, early return"); return 0; } double dDefaultWidth = pTable->GetWidth(); diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index 7f8ea4a..699b7ce 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -389,7 +389,7 @@ void LwpFormulaInfo::Read() } else { - assert(false); + SAL_WARN("lwp", "missing row list"); } } // sal_uInt8 cFlags = (sal_uInt8) m_pObjStrm->QuickReaduInt16(); // written as a sal_uInt16 diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx index 2d1dfa7..29a2fd0 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx @@ -64,6 +64,7 @@ #include <rtl/ustring.hxx> #include <salhelper/simplereferenceobject.hxx> +#include <stdexcept> #include "xfdefs.hxx" @@ -92,14 +93,28 @@ public: */ OUString GetStyleName() {return m_strStyleName;} - virtual void ToXml(IXFStream * stream) = 0; + void DoToXml(IXFStream* stream) + { + if (m_bDoingToXml) + throw std::runtime_error("recursion in content"); + m_bDoingToXml = true; + ToXml(stream); + m_bDoingToXml = false; + } protected: - XFContent() {} + XFContent() + : m_bDoingToXml(false) + { + } + + virtual void ToXml(IXFStream* stream) = 0; virtual ~XFContent() {} - OUString m_strStyleName; + OUString m_strStyleName; +private: + bool m_bDoingToXml; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index ece407e..4e3576d 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -131,7 +131,7 @@ void XFContentContainer::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } } diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx b/lotuswordpro/source/filter/xfilter/xftextspan.cxx index 4de6bad..90f6e32 100644 --- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx @@ -112,7 +112,7 @@ void XFTextSpan::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } pStrm->EndElement( "text:span" ); @@ -135,7 +135,7 @@ void XFTextSpanStart::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } } void XFTextSpanEnd::ToXml(IXFStream *pStrm) @@ -145,7 +145,7 @@ void XFTextSpanEnd::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } pStrm->EndElement( "text:span" ); } commit 755da7b2ea070dedc174f2aef12a93092ad96b8f Author: Caolán McNamara <[email protected]> Date: Mon Mar 7 09:52:51 2016 +0000 upgrade neon to 0.30.1 Reviewed-on: https://gerrit.libreoffice.org/22977 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 1827987fd11cd726005977e49d001283033f0419) Reviewed-on: https://gerrit.libreoffice.org/23001 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit e6a8fb33a948adf367baca31d54e1eb2f3ff0dc4) Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30 diff --git a/download.lst b/download.lst index 0c7187f..7d94e97 100644 --- a/download.lst +++ b/download.lst @@ -102,7 +102,7 @@ export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz -export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz +export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz export NSS_TARBALL := 478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 diff --git a/external/neon/neon.patch b/external/neon/neon.patch index de52043..5abc3c9 100644 --- a/external/neon/neon.patch +++ b/external/neon/neon.patch @@ -319,51 +319,10 @@ /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU, /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, ---- src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 -+++ src/ne_utils.c 2011-02-03 10:26:21.000000000 +0100 -@@ -118,6 +118,9 @@ - #ifdef HAVE_GNUTLS - ", GNU TLS " LIBGNUTLS_VERSION - #endif /* HAVE_GNUTLS */ -+#ifdef HAVE_SSPI -+ ", SSPI" -+#endif /* HAVE_SSPI */ - "." - ; - -@@ -137,7 +140,7 @@ - switch (feature) { - #if defined(NE_HAVE_SSL) || defined(NE_HAVE_ZLIB) || defined(NE_HAVE_IPV6) \ - || defined(NE_HAVE_SOCKS) || defined(NE_HAVE_LFS) \ -- || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) -+ || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) || defined(HAVE_SSPI) - #ifdef NE_HAVE_SSL - case NE_FEATURE_SSL: - #endif -@@ -159,6 +162,9 @@ - #ifdef NE_HAVE_I18N - case NE_FEATURE_I18N: - #endif -+#ifdef HAVE_SSPI -+ case NE_FEATURE_SSPI: -+#endif - return 1; - #endif /* NE_HAVE_* */ - default: ---- src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 -+++ src/ne_utils.h 2011-02-03 10:26:21.000000000 +0100 -@@ -54,6 +54,7 @@ - #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ - #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ - #define NE_FEATURE_I18N (7) /* i18n error message support */ -+#define NE_FEATURE_SSPI (8) /* NTLM/Negotiate authentication protocol via SSPI */ - - /* Returns non-zero if library is built with support for the given - * NE_FEATURE_* feature code 'code'. */ --- src/ne_openssl.c +++ src/ne_openssl.c -@@ -41,6 +41,13 @@ - #include <pthread.h> +@@ -43,6 +43,13 @@ + #endif #endif +#ifdef WIN32 @@ -376,7 +335,7 @@ #include "ne_ssl.h" #include "ne_string.h" #include "ne_session.h" -@@ -798,6 +798,31 @@ +@@ -798,6 +805,31 @@ X509_STORE_load_locations(store, NE_SSL_CA_BUNDLE, NULL); #else X509_STORE_set_default_paths(store); diff --git a/external/neon/neon_ne_set_request_flag.patch b/external/neon/neon_ne_set_request_flag.patch index 3bcafd6..5189406 100644 --- a/external/neon/neon_ne_set_request_flag.patch +++ b/external/neon/neon_ne_set_request_flag.patch @@ -1,11 +1,11 @@ --- src/ne_request.c 2010-09-28 13:57:26.000000000 +0200 +++ src/ne_request.c 2011-05-18 12:39:05.134445529 +0200 -@@ -529,7 +529,7 @@ +@@ -585,7 +585,7 @@ void ne_set_request_flag(ne_request *req, ne_request_flag flag, int value) { -- if (flag < NE_SESSFLAG_LAST) { -+ if (flag < NE_REQFLAG_LAST) { +- if (flag < (ne_request_flag)NE_SESSFLAG_LAST) { ++ if (flag < (ne_request_flag)NE_REQFLAG_LAST) { req->flags[flag] = value; } }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
