diff options
Diffstat (limited to 'editors/openoffice-devel/files')
3 files changed, 25 insertions, 219 deletions
diff --git a/editors/openoffice-devel/files/patch-security b/editors/openoffice-devel/files/patch-security deleted file mode 100644 index d8e033e173d9..000000000000 --- a/editors/openoffice-devel/files/patch-security +++ /dev/null @@ -1,215 +0,0 @@ -Index: comphelper/source/container/embeddedobjectcontainer.cxx -=================================================================== ---- comphelper/source/container/embeddedobjectcontainer.cxx (revision 1813062) -+++ comphelper/source/container/embeddedobjectcontainer.cxx (working copy) -@@ -127,7 +127,7 @@ - pImpl = new EmbedImpl; - pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); - pImpl->mbOwnsStorage = true; -- pImpl->mbUserAllowsLinkUpdate = false; -+ pImpl->mbUserAllowsLinkUpdate = true; - pImpl->mpTempObjectContainer = 0; - } - -@@ -136,7 +136,7 @@ - pImpl = new EmbedImpl; - pImpl->mxStorage = rStor; - pImpl->mbOwnsStorage = false; -- pImpl->mbUserAllowsLinkUpdate = false; -+ pImpl->mbUserAllowsLinkUpdate = true; - pImpl->mpTempObjectContainer = 0; - } - -@@ -145,7 +145,7 @@ - pImpl = new EmbedImpl; - pImpl->mxStorage = rStor; - pImpl->mbOwnsStorage = false; -- pImpl->mbUserAllowsLinkUpdate = false; -+ pImpl->mbUserAllowsLinkUpdate = true; - pImpl->mpTempObjectContainer = 0; - pImpl->m_xModel = xModel; - } -Index: sc/source/core/data/documen2.cxx -=================================================================== ---- sc/source/core/data/documen2.cxx (revision 1813062) -+++ sc/source/core/data/documen2.cxx (working copy) -@@ -229,7 +229,10 @@ - if ( eMode == SCDOCMODE_DOCUMENT ) - { - if ( pDocShell ) -- pLinkManager = new sfx2::LinkManager( pDocShell ); -+ { -+ pLinkManager = new sfx2::LinkManager(pDocShell); -+ pLinkManager->SetAutoAskUpdateAllLinks(); -+ } - - xPoolHelper = new ScPoolHelper( this ); - -@@ -269,6 +272,7 @@ - if ( bAutoCalc && !pLinkManager && pShell) - { - pLinkManager = new sfx2::LinkManager( pShell ); -+ pLinkManager->SetAutoAskUpdateAllLinks(); - } - return pLinkManager; - } -Index: sfx2/inc/sfx2/linkmgr.hxx -=================================================================== ---- sfx2/inc/sfx2/linkmgr.hxx (revision 1813062) -+++ sfx2/inc/sfx2/linkmgr.hxx (working copy) -@@ -54,6 +54,13 @@ - SvLinkSources aServerTbl; - - SfxObjectShell *pPersist; // LinkMgr has to be deallocated before SfxObjectShell -+ -+ sal_Bool mAutoAskUpdateAllLinks; -+ sal_Bool mUpdateAsked; -+ sal_Bool mAllowUpdate; -+ -+ sal_Bool GetUserAllowsLinkUpdate(Window *pParent); -+ void SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows); - protected: - sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType, - const String* pName = 0 ); -@@ -104,6 +111,10 @@ - - SvLinkSourceRef CreateObj( SvBaseLink* ); - -+ -+ // Automatically ask user about update all links, on first insert -+ void SetAutoAskUpdateAllLinks(); -+ - void UpdateAllLinks( sal_Bool bAskUpdate = sal_True, - sal_Bool bCallErrHdl = sal_True, - sal_Bool bUpdateGrfLinks = sal_False, -Index: sfx2/source/appl/linkmgr2.cxx -=================================================================== ---- sfx2/source/appl/linkmgr2.cxx (revision 1813062) -+++ sfx2/source/appl/linkmgr2.cxx (working copy) -@@ -65,11 +65,12 @@ - SV_IMPL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr ) - - LinkManager::LinkManager(SfxObjectShell* p) -- : pPersist( p ) -+ : pPersist(p), -+ mUpdateAsked(sal_False), -+ mAutoAskUpdateAllLinks(sal_False) - { - } - -- - LinkManager::~LinkManager() - { - SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData(); -@@ -157,6 +158,12 @@ - SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink ); - pLink->SetLinkManager( this ); - aLinkTbl.Insert( pTmp, aLinkTbl.Count() ); -+ Window *parent = GetPersist()->GetDialogParent(); -+ if (mAutoAskUpdateAllLinks) -+ { -+ SetUserAllowsLinkUpdate(pLink, GetUserAllowsLinkUpdate(parent)); -+ } -+ - return sal_True; - } - -@@ -268,7 +275,36 @@ - return bRet; - } - -+void LinkManager::SetAutoAskUpdateAllLinks() -+{ -+ mAutoAskUpdateAllLinks = sal_True; -+} - -+sal_Bool LinkManager::GetUserAllowsLinkUpdate(Window *pParentWin) -+{ -+ if (!mUpdateAsked) -+ { -+ if (QueryBox(pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId(STR_QUERY_UPDATE_LINKS)).Execute() == RET_YES) -+ mAllowUpdate = sal_True; -+ else -+ mAllowUpdate = sal_False; -+ mUpdateAsked = sal_True; -+ } -+ return mAllowUpdate; -+} -+ -+void LinkManager::SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows) -+{ -+ SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist(); -+ -+ if (pShell) -+ { -+ comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer(); -+ rEmbeddedObjectContainer.setUserAllowsLinkUpdate(allows); -+ } -+} -+ -+ - void LinkManager::UpdateAllLinks( - sal_Bool bAskUpdate, - sal_Bool /*bCallErrHdl*/, -@@ -312,26 +348,20 @@ - if( !pLink->IsVisible() || - ( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == pLink->GetObjType() )) - continue; -- -- if( bAskUpdate ) -+ -+ sal_Bool allows = sal_True; -+ -+ if (bAskUpdate) - { -- int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute(); -- SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist(); -+ allows = GetUserAllowsLinkUpdate(pParentWin); -+ } - -- if(pShell) -- { -- comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer(); -- rEmbeddedObjectContainer.setUserAllowsLinkUpdate(RET_YES == nRet); -- } -+ SetUserAllowsLinkUpdate(pLink, allows); -+ bAskUpdate = sal_False; // one time is OK - -- if (RET_YES != nRet) -- { -- return; // nothing should be updated -- } -- bAskUpdate = sal_False; // one time is OK -- } -+ if (allows) -+ pLink->Update(); - -- pLink->Update(); - } - } - -Index: sw/source/filter/ww8/ww8scan.cxx -=================================================================== ---- sw/source/filter/ww8/ww8scan.cxx (revision 1813062) -+++ sw/source/filter/ww8/ww8scan.cxx (working copy) -@@ -6467,6 +6467,12 @@ - - if( nMax ) - { -+ // Check size consistency -+ if(nMax > nFFn) -+ { -+ throw std::out_of_range("WW8 beyond end of buffer"); -+ } -+ - // allocate Index Array - pFontA = new WW8_FFN[ nMax ]; - p = pFontA; -@@ -6585,6 +6591,7 @@ - - // Zeiger auf Ursprungsarray einen Font nach hinten setzen - pVer8 = (WW8_FFN_Ver8*)( ((sal_uInt8*)pVer8) + pVer8->cbFfnM1 + 1 ); -+ - } - } - } diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk index acee2d1a51ee..34dfe1b4a5d1 100644 --- a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk +++ b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk @@ -1,6 +1,6 @@ ---- solenv/gbuild/platform/freebsd.mk.orig 2017-11-27 13:50:25 UTC +--- solenv/gbuild/platform/freebsd.mk.orig 2018-01-25 18:01:47 UTC +++ solenv/gbuild/platform/freebsd.mk -@@ -94,6 +94,7 @@ gb_CXXFLAGS := \ +@@ -95,6 +95,7 @@ gb_CXXFLAGS := \ -fno-use-cxa-atexit \ -fvisibility-inlines-hidden \ -fvisibility=hidden \ @@ -8,3 +8,16 @@ -pipe ifeq ($(COM),CLANG) gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH +@@ -143,6 +144,12 @@ gb_LinkTarget_LDFLAGS += \ + -Wl,--dynamic-list-cpp-typeinfo \ + -Wl,-Bsymbolic-functions \ + ++endif ++ ++ifneq ($(filter $(CPUNAME),INTEL X86_64),) ++gb_CFLAGS += -fstack-protector ++gb_CXXFLAGS += -fstack-protector ++gb_LinkTarget_LDFLAGS += -fstack-protector + endif + + ifeq ($(gb_DEBUGLEVEL),2) diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk index f91d88004b2d..d4229f98d886 100644 --- a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk +++ b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk @@ -1,6 +1,6 @@ ---- solenv/inc/unxfbsd.mk.orig 2017-11-27 13:50:28 UTC +--- solenv/inc/unxfbsd.mk.orig 2017-01-23 03:29:47 UTC +++ solenv/inc/unxfbsd.mk -@@ -96,7 +96,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +@@ -105,10 +105,15 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible @@ -9,3 +9,11 @@ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++ ++.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64" ++CFLAGSCC += -fstack-protector ++CFLAGSCXX += -fstack-protector ++.ENDIF + + # Compiler flags for compiling static object in multi threaded environment with graphical user interface + CFLAGSOBJGUIMT= |