Rebased ref, commits from common ancestor: commit da84b853a5680c87f61f1c7acf293d39e3794b1b Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Tue May 15 14:27:40 2018 +0200
download tarballs via HTTPS Change-Id: I5ba41e5d41765442067ed0c4bfa16bbf90a5fb6f diff --git a/Makefile.fetch b/Makefile.fetch index d3d67b92ab61..47a8f9802c7b 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -95,7 +95,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ $(call fetch_Optional,ZLIB,ZLIB_TARBALL) \ - ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) + ,$(call fetch_Download_item_special,https://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ $(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \ @@ -173,11 +173,11 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,WPG,$(WPG_TARBALL)) \ $(call fetch_Optional,WPS,$(WPS_TARBALL)) \ $(call fetch_Optional,XSLTML,$(XSLTML_TARBALL)) \ - ,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item))) + ,$(call fetch_Download_item,https://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ $(call fetch_Optional,DBGHELP,$(DBGHELP_DLL)) \ $(call fetch_Optional,ODK,$(UNOWINREG_DLL)) \ - ,$(call fetch_Download_item,http://dev-www.libreoffice.org/extern,$(item))) + ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) $(foreach item, \ $(BARCODE_EXTENSION_PACK) \ $(DIAGRAM_EXTENSION_PACK) \ @@ -200,7 +200,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_INC)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ - ,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item),no-sum)) + ,$(call fetch_Download_item,https://dev-www.libreoffice.org/mozilla,$(item),no-sum)) @mkdir -p $(dir $@) && touch $@ # vim: set noet sw=4 ts=4: commit ab67d7d1f0d8e4127274644f5dcf02c5ce092542 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Jun 23 08:26:36 2015 +0200 LinkUpdateMode is a global setting (cherry picked from commit 77cc71476bae2b3655102e2c29d36af40a393201) Conflicts: sw/source/core/doc/DocumentLinksAdministrationManager.cxx sw/source/filter/xml/xmlimp.cxx Reviewed-on: https://gerrit.libreoffice.org/16422 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Miklos Vajna <vmik...@collabora.co.uk> (cherry picked from commit c1c3c282be11bb383bd3d5401bf9397f18add48a) Conflicts: include/unotools/securityoptions.hxx sw/source/filter/xml/xmlimp.cxx Change-Id: Ida1257337c6e0916f2228fe053d9c9f085183af6 diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index dd150f17daba..f995afa97cb2 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -200,6 +200,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail */ bool isTrustedLocationUri(OUString const & uri) const; + bool isTrustedLocationUriForUpdatingLinks(OUString const & uri) const; + ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const ; void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ) ; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 5c5a761aea97..2f4e750f1ebb 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2619,6 +2619,9 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa OUString sCTName("TrackedChangesProtectionKey"); OUString sVBName("VBACompatibilityMode"); OUString sSCName("ScriptConfiguration"); + css::uno::Sequence<css::beans::PropertyValue> aFilteredProps( + aConfigProps.getLength()); + sal_Int32 nFilteredPropsLen = 0; for (sal_Int32 i = nCount - 1; i >= 0; --i) { if (aConfigProps[i].Name == sCTName) @@ -2653,11 +2656,16 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa xImportInfo->setPropertyValue( aConfigProps[i].Name, aConfigProps[i].Value ); } } + if (aConfigProps[i].Name != "LinkUpdateMode") + { + aFilteredProps[nFilteredPropsLen++] = aConfigProps[i]; + } } + aFilteredProps.realloc(nFilteredPropsLen); uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance("com.sun.star.comp.SpreadsheetSettings"); uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) - SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); + SvXMLUnitConverter::convertPropertySet(xProperties, aFilteredProps); } } } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 375b59dc4e08..806549a4ea78 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -48,6 +48,7 @@ using namespace ::com::sun::star; #include <svl/PasswordHelper.hxx> #include <svl/documentlockfile.hxx> #include <svl/sharecontrolfile.hxx> +#include <unotools/securityoptions.hxx> #include <comphelper/processfactory.hxx> #include "docuno.hxx" @@ -426,12 +427,23 @@ void ScDocShell::Execute( SfxRequest& rReq ) if (nCanUpdate == com::sun::star::document::UpdateDocMode::NO_UPDATE) nSet = LM_NEVER; - else if (nCanUpdate == com::sun::star::document::UpdateDocMode::QUIET_UPDATE && - nSet == LM_ON_DEMAND) - nSet = LM_NEVER; else if (nCanUpdate == com::sun::star::document::UpdateDocMode::FULL_UPDATE) nSet = LM_ALWAYS; + if (nSet == LM_ALWAYS + && !(SvtSecurityOptions() + .isTrustedLocationUriForUpdatingLinks( + GetMedium() == nullptr + ? OUString() : GetMedium()->GetName()))) + { + nSet = LM_ON_DEMAND; + } + if (nCanUpdate == css::document::UpdateDocMode::QUIET_UPDATE + && nSet == LM_ON_DEMAND) + { + nSet = LM_NEVER; + } + if(nSet==LM_ON_DEMAND) { QueryBox aBox( GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index a97e616c7824..e2f6d775ed2a 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -42,6 +42,7 @@ #include <svl/zforlist.hxx> #include <unotools/compatibility.hxx> #include <unotools/lingucfg.hxx> +#include <unotools/securityoptions.hxx> #include <svx/svdpage.hxx> #include <paratr.hxx> #include <fchrfmt.hxx> @@ -980,6 +981,15 @@ void SwDoc::UpdateLinks( bool bUI ) case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = false; break; case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = true; break; } + if (nLinkMode == AUTOMATIC && !bAskUpdate) + { + SfxMedium * medium = GetDocShell()->GetMedium(); + if (!SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks( + medium == nullptr ? OUString() : medium->GetName())) + { + bAskUpdate = true; + } + } if( bUpdate && (bUI || !bAskUpdate) ) { SfxMedium* pMedium = GetDocShell()->GetMedium(); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index c49a4635107c..af7f5fa62852 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1095,45 +1095,45 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !xInfo.is() ) return; - boost::unordered_set< OUString, OUStringHash > aSet; - aSet.insert(OUString("ForbiddenCharacters")); - aSet.insert(OUString("IsKernAsianPunctuation")); - aSet.insert(OUString("CharacterCompressionType")); - aSet.insert(OUString("LinkUpdateMode")); - aSet.insert(OUString("FieldAutoUpdate")); - aSet.insert(OUString("ChartAutoUpdate")); - aSet.insert(OUString("AddParaTableSpacing")); - aSet.insert(OUString("AddParaTableSpacingAtStart")); - aSet.insert(OUString("PrintAnnotationMode")); - aSet.insert(OUString("PrintBlackFonts")); - aSet.insert(OUString("PrintControls")); - aSet.insert(OUString("PrintDrawings")); - aSet.insert(OUString("PrintGraphics")); - aSet.insert(OUString("PrintLeftPages")); - aSet.insert(OUString("PrintPageBackground")); - aSet.insert(OUString("PrintProspect")); - aSet.insert(OUString("PrintReversed")); - aSet.insert(OUString("PrintRightPages")); - aSet.insert(OUString("PrintFaxName")); - aSet.insert(OUString("PrintPaperFromSetup")); - aSet.insert(OUString("PrintTables")); - aSet.insert(OUString("PrintSingleJobs")); - aSet.insert(OUString("UpdateFromTemplate")); - aSet.insert(OUString("PrinterIndependentLayout")); - aSet.insert(OUString("PrintEmptyPages")); - aSet.insert(OUString("SmallCapsPercentage66")); - aSet.insert(OUString("TabOverflow")); - aSet.insert(OUString("UnbreakableNumberings")); - aSet.insert(OUString("ClippedPictures")); - aSet.insert(OUString("BackgroundParaOverDrawings")); - aSet.insert(OUString("TabOverMargin")); + boost::unordered_set< OUString, OUStringHash > aExcludeAlways; + aExcludeAlways.insert("LinkUpdateMode"); + boost::unordered_set< OUString, OUStringHash > aExcludeWhenNotLoadingUserSettings; + aExcludeWhenNotLoadingUserSettings.insert(OUString("ForbiddenCharacters")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("IsKernAsianPunctuation")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("CharacterCompressionType")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("FieldAutoUpdate")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("ChartAutoUpdate")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("AddParaTableSpacing")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("AddParaTableSpacingAtStart")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintAnnotationMode")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintBlackFonts")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintControls")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintDrawings")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintGraphics")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintLeftPages")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintPageBackground")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintProspect")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintReversed")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintRightPages")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintFaxName")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintPaperFromSetup")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintTables")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintSingleJobs")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("UpdateFromTemplate")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrinterIndependentLayout")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("PrintEmptyPages")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("SmallCapsPercentage66")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("TabOverflow")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("UnbreakableNumberings")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("ClippedPictures")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("BackgroundParaOverDrawings")); + aExcludeWhenNotLoadingUserSettings.insert(OUString("TabOverMargin")); sal_Int32 nCount = aConfigProps.getLength(); const PropertyValue* pValues = aConfigProps.getConstArray(); SvtSaveOptions aSaveOpt; - sal_Bool bIsUserSetting = aSaveOpt.IsLoadUserSettings(), - bSet = bIsUserSetting; + sal_Bool bIsUserSetting = aSaveOpt.IsLoadUserSettings(); // for some properties we don't want to use the application // default if they're missing. So we watch for them in the loop @@ -1173,12 +1173,12 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC while( nCount-- ) { - if( !bIsUserSetting ) + bool bSet = aExcludeAlways.find(pValues->Name) == aExcludeAlways.end(); + if( bSet && !bIsUserSetting + && (aExcludeWhenNotLoadingUserSettings.find(pValues->Name) + != aExcludeWhenNotLoadingUserSettings.end()) ) { - // test over the hash value if the entry is in the table. - OUString aStr(pValues->Name); - - bSet = aSet.find(aStr) == aSet.end(); + bSet = false; } if( bSet ) diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 20df661470b4..34c4a8e5d33c 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -1082,6 +1082,14 @@ bool SvtSecurityOptions::isTrustedLocationUri(OUString const & uri) const { return false; } +bool SvtSecurityOptions::isTrustedLocationUriForUpdatingLinks( + OUString const & uri) const +{ + return GetMacroSecurityLevel() == 0 || uri.isEmpty() + || uri.startsWithIgnoreAsciiCase("private:") + || isTrustedLocationUri(uri); +} + sal_Int32 SvtSecurityOptions::GetMacroSecurityLevel() const { MutexGuard aGuard( GetInitMutex() ); commit 23d5123e7c617aace531bf252d476849650b7d22 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jan 26 11:26:41 2015 +0000 coverity#1266485 Untrusted value as argument (cherry picked from commit 0934ed1a40c59c169354b177d7dab4228de66171) min legal size here is > 4 (cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3) (cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab) (cherry picked from commit d4f07cdd244a6aa69de1fde0df4163b27a65556c) Conflicts: vcl/source/gdi/jobset.cxx 9f68d000b32623db4d949d13284043630f5689f4 Change-Id: I7708ecaf5412535055584ed6c71beaa9cd71c10c diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index a2ca658d55ca..16718f0ef628 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -235,19 +235,24 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version not set on rOStream" ); { - sal_Size nFirstPos = rIStream.Tell(); - sal_uInt16 nLen = 0; rIStream >> nLen; - if ( !nLen ) + if (nLen <= 4) return rIStream; sal_uInt16 nSystem = 0; rIStream >> nSystem; - - char* pTempBuf = new char[nLen]; - rIStream.Read( pTempBuf, nLen - sizeof( nLen ) - sizeof( nSystem ) ); - if ( nLen >= sizeof(ImplOldJobSetupData)+4 ) + const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem); + if (nRead > rIStream.remainingSize()) + { + SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() << + " max possible entries, but " << nRead << " claimed, truncating"); + return rIStream; + } + sal_Size nFirstPos = rIStream.Tell(); + char* pTempBuf = new char[nRead]; + rIStream.Read(pTempBuf, nRead); + if (nRead >= sizeof(ImplOldJobSetupData)) { ImplOldJobSetupData* pData = (ImplOldJobSetupData*)pTempBuf; if ( rJobSetup.mpData ) @@ -289,8 +294,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) } if( nSystem == JOBSET_FILE605_SYSTEM ) { - rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); - while( rIStream.Tell() < nFirstPos + nLen ) + rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); + while( rIStream.Tell() < nFirstPos + nRead ) { OUString aKey = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); OUString aValue = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); @@ -308,9 +313,9 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) else pJobData->maValueMap[ aKey ] = aValue; } - DBG_ASSERT( rIStream.Tell() == nFirstPos+nLen, "corrupted job setup" ); + DBG_ASSERT( rIStream.Tell() == nFirstPos+nRead, "corrupted job setup" ); // ensure correct stream position - rIStream.Seek( nFirstPos + nLen ); + rIStream.Seek(nFirstPos + nRead); } } } commit 2150f1a04f63f2f506dda058bf216bc8298c3cb7 Author: David Tardon <dtar...@redhat.com> Date: Thu Jun 15 16:02:48 2017 +0200 upload graphite 1.3.10 Reviewed-on: https://gerrit.libreoffice.org/38837 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> Conflicts: download.lst Change-Id: Ib70e1c08a11465f5a65be8cd0c892e8f7667b478 diff --git a/Makefile.fetch b/Makefile.fetch index 820aa952a460..d3d67b92ab61 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -83,6 +83,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \ $(call fetch_Optional,EXPAT,EXPAT_TARBALL) \ $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ + $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ @@ -123,7 +124,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MORE_FONTS,$(FONT_SOURCECODE_TARBALL)) \ $(call fetch_Optional,FONTCONFIG,$(FONTCONFIG_TARBALL)) \ $(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \ - $(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \ $(GOOGLE_DOCS_EXTENSION_PACK) \ $(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \ $(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \ diff --git a/download.lst b/download.lst index 64d233ba177b..c6ffa5e994b6 100644 --- a/download.lst +++ b/download.lst @@ -12,6 +12,8 @@ EXPAT_MD5SUM := f053af63ef5f39bd9b78d01fbc203334 export EXPAT_TARBALL := expat-2.2.3.tar.bz2 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2 +GRAPHITE_MD5SUM := 9c499b8ec9f1b81fd0bb6a3b986f4b0f +export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := d794625f156a9fb1c53b3f8a8aa13b5e @@ -68,7 +70,6 @@ export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1. export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 -export GRAPHITE_TARBALL := 17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz commit 9f5850e0129c653335d47d283c5df49ab9019794 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Nov 16 11:23:40 2015 +0000 bump png to 1.5.24 CVE-2015-7981 + CVE-2015-8126 Reviewed-on: https://gerrit.libreoffice.org/19985 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> Conflicts: download.lst Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446 diff --git a/download.lst b/download.lst index 980f1c3932a6..64d233ba177b 100644 --- a/download.lst +++ b/download.lst @@ -101,8 +101,8 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 -export PNG_TARBALL := libpng-1.5.18.tar.gz +export PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b +export PNG_TARBALL := libpng-1.5.24.tar.gz export POPPLER_TARBALL := 1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz diff --git a/external/libpng/configs/pnglibconf.h b/external/libpng/configs/pnglibconf.h index 9e97d1e7800a..8149f59394aa 100644 --- a/external/libpng/configs/pnglibconf.h +++ b/external/libpng/configs/pnglibconf.h @@ -1,9 +1,9 @@ -/* 1.5.18 STANDARD API DEFINITION */ +/* 1.5.24 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.18 - February 6, 2014 */ +/* libpng version 1.5.24 - November 12, 2015 */ -/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -95,8 +95,6 @@ #define PNG_SAVE_INT_32_SUPPORTED #define PNG_SEQUENTIAL_READ_SUPPORTED #define PNG_SETJMP_SUPPORTED -#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED -#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED /*#undef PNG_SET_OPTION_SUPPORTED*/ #define PNG_SET_USER_LIMITS_SUPPORTED #define PNG_STDIO_SUPPORTED @@ -114,6 +112,7 @@ #define PNG_WRITE_BGR_SUPPORTED #define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED #define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED #define PNG_WRITE_FILLER_SUPPORTED #define PNG_WRITE_FILTER_SUPPORTED @@ -172,15 +171,16 @@ /* end of options */ /* settings */ #define PNG_API_RULE 0 -#define PNG_CALLOC_SUPPORTED -#define PNG_COST_SHIFT 3 #define PNG_DEFAULT_READ_MACROS 1 #define PNG_GAMMA_THRESHOLD_FIXED 5000 #define PNG_MAX_GAMMA_8 11 #define PNG_QUANTIZE_BLUE_BITS 5 #define PNG_QUANTIZE_GREEN_BITS 5 #define PNG_QUANTIZE_RED_BITS 5 -#define PNG_WEIGHT_SHIFT 8 +#define PNG_USER_CHUNK_CACHE_MAX 1000 +#define PNG_USER_CHUNK_MALLOC_MAX 8000000 +#define PNG_USER_HEIGHT_MAX 1000000 +#define PNG_USER_WIDTH_MAX 1000000 #define PNG_ZBUF_SIZE 8192 #define PNG_sCAL_PRECISION 5 /* end of settings */ commit 61f72537ebf1b42a44b8bf97e6bba4cae578dc42 Author: Thomas Arnhold <tho...@arnhold.org> Date: Tue May 13 14:25:11 2014 +0200 upgrade to libpng-1.5.18 Change-Id: I500645d655fc7e7c850b09e47bece26e74197eb7 Reviewed-on: https://gerrit.libreoffice.org/9344 Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org> Reviewed-by: Thomas Arnhold <tho...@arnhold.org> diff --git a/download.lst b/download.lst index 23d20da53570..980f1c3932a6 100644 --- a/download.lst +++ b/download.lst @@ -101,7 +101,8 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz +export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 +export PNG_TARBALL := libpng-1.5.18.tar.gz export POPPLER_TARBALL := 1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz diff --git a/external/libpng/configs/pnglibconf.h b/external/libpng/configs/pnglibconf.h index 650098e10c4a..9e97d1e7800a 100644 --- a/external/libpng/configs/pnglibconf.h +++ b/external/libpng/configs/pnglibconf.h @@ -1,10 +1,9 @@ -/* libpng STANDARD API DEFINITION */ - +/* 1.5.18 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.0 - last changed on January 6, 2011 */ +/* libpng version 1.5.18 - February 6, 2014 */ -/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -15,164 +14,174 @@ /* Derived from: scripts/pnglibconf.dfa */ #ifndef PNGLCONF_H #define PNGLCONF_H -/* settings */ -#define PNG_MAX_GAMMA_8 11 -#define PNG_CALLOC_SUPPORTED -#define PNG_QUANTIZE_RED_BITS 5 -#define PNG_USER_WIDTH_MAX 1000000L -#define PNG_QUANTIZE_GREEN_BITS 5 -#define PNG_API_RULE 0 -#define PNG_QUANTIZE_BLUE_BITS 5 -#define PNG_USER_CHUNK_CACHE_MAX 0 -#define PNG_USER_HEIGHT_MAX 1000000L -#define PNG_sCAL_PRECISION 5 -#define PNG_COST_SHIFT 3 -#define PNG_WEIGHT_SHIFT 8 -#define PNG_USER_CHUNK_MALLOC_MAX 0 -#define PNG_DEFAULT_READ_MACROS 1 -#define PNG_ZBUF_SIZE 8192 -#define PNG_GAMMA_THRESHOLD_FIXED 5000 -/* end of settings */ /* options */ -#define PNG_INFO_IMAGE_SUPPORTED -#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED -#define PNG_POINTER_INDEXING_SUPPORTED -#define PNG_WARNINGS_SUPPORTED -#define PNG_FLOATING_ARITHMETIC_SUPPORTED -#define PNG_WRITE_SUPPORTED -#define PNG_WRITE_INTERLACING_SUPPORTED -#define PNG_WRITE_16BIT_SUPPORTED +#define PNG_16BIT_SUPPORTED +#define PNG_ALIGNED_MEMORY_SUPPORTED +/*#undef PNG_ARM_NEON_API_SUPPORTED*/ +/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ +#define PNG_BENIGN_ERRORS_SUPPORTED +#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED +#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_CHECK_cHRM_SUPPORTED +#define PNG_CONSOLE_IO_SUPPORTED +#define PNG_CONVERT_tIME_SUPPORTED #define PNG_EASY_ACCESS_SUPPORTED -#define PNG_ALIGN_MEMORY_SUPPORTED -#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED -#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_USER_LIMITS_SUPPORTED -#define PNG_FIXED_POINT_SUPPORTED /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ #define PNG_ERROR_TEXT_SUPPORTED -#define PNG_READ_SUPPORTED -/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/ -#define PNG_BENIGN_ERRORS_SUPPORTED -#define PNG_SETJMP_SUPPORTED -#define PNG_WRITE_FLUSH_SUPPORTED -#define PNG_MNG_FEATURES_SUPPORTED +#define PNG_FIXED_POINT_SUPPORTED +#define PNG_FLOATING_ARITHMETIC_SUPPORTED #define PNG_FLOATING_POINT_SUPPORTED +#define PNG_GET_PALETTE_MAX_SUPPORTED +#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED #define PNG_INCH_CONVERSIONS_SUPPORTED -#define PNG_STDIO_SUPPORTED -#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_USER_MEM_SUPPORTED +#define PNG_INFO_IMAGE_SUPPORTED #define PNG_IO_STATE_SUPPORTED -#define PNG_SET_USER_LIMITS_SUPPORTED +#define PNG_MNG_FEATURES_SUPPORTED +#define PNG_POINTER_INDEXING_SUPPORTED +#define PNG_PROGRESSIVE_READ_SUPPORTED +#define PNG_READ_16BIT_SUPPORTED +#define PNG_READ_ALPHA_MODE_SUPPORTED #define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED -#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED -#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED -#define PNG_WRITE_FILTER_SUPPORTED -#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED -#define PNG_WRITE_iCCP_SUPPORTED -#define PNG_READ_TRANSFORMS_SUPPORTED +#define PNG_READ_BACKGROUND_SUPPORTED +#define PNG_READ_BGR_SUPPORTED +#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_READ_COMPOSITE_NODIV_SUPPORTED +#define PNG_READ_COMPRESSED_TEXT_SUPPORTED +#define PNG_READ_EXPAND_16_SUPPORTED +#define PNG_READ_EXPAND_SUPPORTED +#define PNG_READ_FILLER_SUPPORTED #define PNG_READ_GAMMA_SUPPORTED -#define PNG_READ_bKGD_SUPPORTED -#define PNG_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_READ_sCAL_SUPPORTED -#define PNG_WRITE_hIST_SUPPORTED -#define PNG_READ_OPT_PLTE_SUPPORTED -#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED -#define PNG_WRITE_gAMA_SUPPORTED +#define PNG_READ_GET_PALETTE_MAX_SUPPORTED #define PNG_READ_GRAY_TO_RGB_SUPPORTED -#define PNG_WRITE_pCAL_SUPPORTED +#define PNG_READ_INTERLACING_SUPPORTED +#define PNG_READ_INT_FUNCTIONS_SUPPORTED #define PNG_READ_INVERT_ALPHA_SUPPORTED -#define PNG_WRITE_TRANSFORMS_SUPPORTED -#define PNG_READ_sBIT_SUPPORTED +#define PNG_READ_INVERT_SUPPORTED +#define PNG_READ_OPT_PLTE_SUPPORTED +#define PNG_READ_PACKSWAP_SUPPORTED #define PNG_READ_PACK_SUPPORTED -#define PNG_WRITE_SWAP_SUPPORTED -#define PNG_READ_cHRM_SUPPORTED -#define PNG_WRITE_tIME_SUPPORTED -#define PNG_READ_INTERLACING_SUPPORTED -#define PNG_READ_tRNS_SUPPORTED -#define PNG_WRITE_pHYs_SUPPORTED -#define PNG_WRITE_INVERT_SUPPORTED +#define PNG_READ_QUANTIZE_SUPPORTED #define PNG_READ_RGB_TO_GRAY_SUPPORTED -#define PNG_WRITE_sRGB_SUPPORTED -#define PNG_READ_oFFs_SUPPORTED -#define PNG_WRITE_FILLER_SUPPORTED -#define PNG_WRITE_TEXT_SUPPORTED -#define PNG_WRITE_SHIFT_SUPPORTED -#define PNG_PROGRESSIVE_READ_SUPPORTED +#define PNG_READ_SCALE_16_TO_8_SUPPORTED #define PNG_READ_SHIFT_SUPPORTED -#define PNG_CONVERT_tIME_SUPPORTED -#define PNG_READ_USER_TRANSFORM_SUPPORTED -#define PNG_READ_INT_FUNCTIONS_SUPPORTED +#define PNG_READ_STRIP_16_TO_8_SUPPORTED +#define PNG_READ_STRIP_ALPHA_SUPPORTED +#define PNG_READ_SUPPORTED +#define PNG_READ_SWAP_ALPHA_SUPPORTED +#define PNG_READ_SWAP_SUPPORTED +#define PNG_READ_TEXT_SUPPORTED +#define PNG_READ_TRANSFORMS_SUPPORTED +#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED #define PNG_READ_USER_CHUNKS_SUPPORTED +#define PNG_READ_USER_TRANSFORM_SUPPORTED +#define PNG_READ_bKGD_SUPPORTED +#define PNG_READ_cHRM_SUPPORTED +#define PNG_READ_gAMA_SUPPORTED #define PNG_READ_hIST_SUPPORTED -#define PNG_READ_16BIT_SUPPORTED -#define PNG_READ_SWAP_ALPHA_SUPPORTED -#define PNG_READ_COMPOSITE_NODIV_SUPPORTED -#define PNG_SEQUENTIAL_READ_SUPPORTED -#define PNG_READ_BACKGROUND_SUPPORTED -#define PNG_READ_QUANTIZE_SUPPORTED #define PNG_READ_iCCP_SUPPORTED -#define PNG_READ_STRIP_ALPHA_SUPPORTED -#define PNG_READ_PACKSWAP_SUPPORTED -#define PNG_READ_sRGB_SUPPORTED -#define PNG_WRITE_tEXt_SUPPORTED -#define PNG_READ_gAMA_SUPPORTED +#define PNG_READ_iTXt_SUPPORTED +#define PNG_READ_oFFs_SUPPORTED #define PNG_READ_pCAL_SUPPORTED -#define PNG_READ_EXPAND_SUPPORTED -#define PNG_WRITE_sPLT_SUPPORTED -#define PNG_READ_SWAP_SUPPORTED -#define PNG_READ_tIME_SUPPORTED #define PNG_READ_pHYs_SUPPORTED -#define PNG_WRITE_SWAP_ALPHA_SUPPORTED +#define PNG_READ_sBIT_SUPPORTED +#define PNG_READ_sCAL_SUPPORTED +#define PNG_READ_sPLT_SUPPORTED +#define PNG_READ_sRGB_SUPPORTED +#define PNG_READ_tEXt_SUPPORTED +#define PNG_READ_tIME_SUPPORTED +#define PNG_READ_tRNS_SUPPORTED +#define PNG_READ_zTXt_SUPPORTED +/*#undef PNG_SAFE_LIMITS_SUPPORTED*/ +#define PNG_SAVE_INT_32_SUPPORTED +#define PNG_SEQUENTIAL_READ_SUPPORTED +#define PNG_SETJMP_SUPPORTED +#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED +#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED +/*#undef PNG_SET_OPTION_SUPPORTED*/ +#define PNG_SET_USER_LIMITS_SUPPORTED +#define PNG_STDIO_SUPPORTED +#define PNG_TEXT_SUPPORTED #define PNG_TIME_RFC1123_SUPPORTED -#define PNG_READ_TEXT_SUPPORTED -#define PNG_WRITE_BGR_SUPPORTED +#define PNG_UNKNOWN_CHUNKS_SUPPORTED #define PNG_USER_CHUNKS_SUPPORTED -#define PNG_CONSOLE_IO_SUPPORTED +#define PNG_USER_LIMITS_SUPPORTED +#define PNG_USER_MEM_SUPPORTED +#define PNG_USER_TRANSFORM_INFO_SUPPORTED +#define PNG_USER_TRANSFORM_PTR_SUPPORTED +#define PNG_WARNINGS_SUPPORTED +#define PNG_WRITE_16BIT_SUPPORTED +#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED +#define PNG_WRITE_BGR_SUPPORTED +#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED +#define PNG_WRITE_FILLER_SUPPORTED +#define PNG_WRITE_FILTER_SUPPORTED +#define PNG_WRITE_FLUSH_SUPPORTED +#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED +#define PNG_WRITE_INTERLACING_SUPPORTED +#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED +#define PNG_WRITE_INVERT_ALPHA_SUPPORTED +#define PNG_WRITE_INVERT_SUPPORTED +#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED +#define PNG_WRITE_PACKSWAP_SUPPORTED #define PNG_WRITE_PACK_SUPPORTED -#define PNG_READ_FILLER_SUPPORTED +#define PNG_WRITE_SHIFT_SUPPORTED +#define PNG_WRITE_SUPPORTED +#define PNG_WRITE_SWAP_ALPHA_SUPPORTED +#define PNG_WRITE_SWAP_SUPPORTED +#define PNG_WRITE_TEXT_SUPPORTED +#define PNG_WRITE_TRANSFORMS_SUPPORTED +#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_WRITE_USER_TRANSFORM_SUPPORTED +#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED #define PNG_WRITE_bKGD_SUPPORTED -#define PNG_WRITE_tRNS_SUPPORTED -#define PNG_READ_sPLT_SUPPORTED -#define PNG_WRITE_sCAL_SUPPORTED +#define PNG_WRITE_cHRM_SUPPORTED +#define PNG_WRITE_gAMA_SUPPORTED +#define PNG_WRITE_hIST_SUPPORTED +#define PNG_WRITE_iCCP_SUPPORTED +#define PNG_WRITE_iTXt_SUPPORTED #define PNG_WRITE_oFFs_SUPPORTED -#define PNG_READ_tEXt_SUPPORTED +#define PNG_WRITE_pCAL_SUPPORTED +#define PNG_WRITE_pHYs_SUPPORTED #define PNG_WRITE_sBIT_SUPPORTED -#define PNG_READ_INVERT_SUPPORTED -#define PNG_READ_16_TO_8_SUPPORTED -#define PNG_WRITE_cHRM_SUPPORTED -#define PNG_16BIT_SUPPORTED -#define PNG_WRITE_USER_TRANSFORM_SUPPORTED -#define PNG_READ_BGR_SUPPORTED -#define PNG_WRITE_PACKSWAP_SUPPORTED -#define PNG_WRITE_INVERT_ALPHA_SUPPORTED -#define PNG_sCAL_SUPPORTED +#define PNG_WRITE_sCAL_SUPPORTED +#define PNG_WRITE_sPLT_SUPPORTED +#define PNG_WRITE_sRGB_SUPPORTED +#define PNG_WRITE_tEXt_SUPPORTED +#define PNG_WRITE_tIME_SUPPORTED +#define PNG_WRITE_tRNS_SUPPORTED #define PNG_WRITE_zTXt_SUPPORTED -#define PNG_sBIT_SUPPORTED -#define PNG_cHRM_SUPPORTED #define PNG_bKGD_SUPPORTED -#define PNG_tRNS_SUPPORTED -#define PNG_WRITE_iTXt_SUPPORTED -#define PNG_oFFs_SUPPORTED -#define PNG_USER_TRANSFORM_PTR_SUPPORTED -#define PNG_USER_TRANSFORM_INFO_SUPPORTED +#define PNG_cHRM_SUPPORTED +#define PNG_gAMA_SUPPORTED #define PNG_hIST_SUPPORTED #define PNG_iCCP_SUPPORTED -#define PNG_sRGB_SUPPORTED -#define PNG_READ_zTXt_SUPPORTED -#define PNG_gAMA_SUPPORTED +#define PNG_iTXt_SUPPORTED +#define PNG_oFFs_SUPPORTED #define PNG_pCAL_SUPPORTED -#define PNG_CHECK_cHRM_SUPPORTED -#define PNG_tIME_SUPPORTED #define PNG_pHYs_SUPPORTED -#define PNG_READ_iTXt_SUPPORTED -#define PNG_TEXT_SUPPORTED -#define PNG_SAVE_INT_32_SUPPORTED +#define PNG_sBIT_SUPPORTED +#define PNG_sCAL_SUPPORTED #define PNG_sPLT_SUPPORTED +#define PNG_sRGB_SUPPORTED #define PNG_tEXt_SUPPORTED +#define PNG_tIME_SUPPORTED +#define PNG_tRNS_SUPPORTED #define PNG_zTXt_SUPPORTED -#define PNG_iTXt_SUPPORTED -#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED -#define PNG_READ_COMPRESSED_TEXT_SUPPORTED -#define PNG_READ_STRIP_16_TO_8_SUPPORTED /* end of options */ +/* settings */ +#define PNG_API_RULE 0 +#define PNG_CALLOC_SUPPORTED +#define PNG_COST_SHIFT 3 +#define PNG_DEFAULT_READ_MACROS 1 +#define PNG_GAMMA_THRESHOLD_FIXED 5000 +#define PNG_MAX_GAMMA_8 11 +#define PNG_QUANTIZE_BLUE_BITS 5 +#define PNG_QUANTIZE_GREEN_BITS 5 +#define PNG_QUANTIZE_RED_BITS 5 +#define PNG_WEIGHT_SHIFT 8 +#define PNG_ZBUF_SIZE 8192 +#define PNG_sCAL_PRECISION 5 +/* end of settings */ #endif /* PNGLCONF_H */ commit 54948763a9df0c2d6c29bf5206e8d481a3e1534a Author: Michael Stahl <mst...@redhat.com> Date: Wed Jan 24 11:44:26 2018 +0100 curl: upgrade to release 7.58.0 * fixes 2 CVEs * disable some new optional dependencies Change-Id: If7725d126e68de04b67969a83c0ea08573a43679 Reviewed-on: https://gerrit.libreoffice.org/48493 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> (cherry picked from commit 5e3799a0c8a92918b9e1868c942f8918ff61c003) Reviewed-on: https://gerrit.libreoffice.org/48539 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/download.lst b/download.lst index 2546b381f655..23d20da53570 100644 --- a/download.lst +++ b/download.lst @@ -2,8 +2,8 @@ ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d export ABW_TARBALL := libabw-0.0.2.tar.bz2 CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998 export CDR_TARBALL := libcdr-0.0.15.tar.bz2 -CURL_MD5SUM := 7ce35f207562674e71dbada6891b37e3f043c1e7a82915cb9c2a17ad3a9d659b -export CURL_TARBALL := curl-7.57.0.tar.gz +CURL_MD5SUM := 7e9e9d5405c61148d53035426f162b0a +export CURL_TARBALL := curl-7.58.0.tar.gz EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978 export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2 ETONYEK_MD5SUM := 3c50bc60394d1f2675fbf9bd22581363 diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 4efc3ef03cff..457b66239cc2 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -40,13 +40,21 @@ $(call gb_ExternalProject_get_state_target,curl,build): CPPFLAGS="$(curl_CPPFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \ ./configure \ - $(if $(filter MACOSX IOS,$(OS)),\ - --with-darwinssl, \ - --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ - --without-ssl \ - --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ - --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter IOS MACOSX,$(OS)),\ + --with-darwinssl,\ + $(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \ + --without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls --without-mbedtls \ + --enable-ftp --enable-http --enable-ipv6 \ + --without-libidn2 --without-libpsl --without-librtmp \ + --without-libssh2 --without-metalink --without-nghttp2 \ + --without-libssh --without-brotli \ + --disable-ares \ + --disable-dict --disable-file --disable-gopher --disable-imap \ + --disable-ldap --disable-ldaps --disable-manual --disable-pop3 \ + --disable-rtsp --disable-smb --disable-smtp --disable-telnet \ + --disable-tftp \ + $(if $(filter LINUX,$(OS)),--without-ca-bundle --without-ca-path) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ && cd lib \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits