svn commit: r554862 - in branches/2020Q4/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Wed Nov 11 00:11:42 UTC 2020
Author: truckman
Date: Wed Nov 11 00:11:41 2020
New Revision: 554862
URL: https://svnweb.freebsd.org/changeset/ports/554862
Log:
MFH: r554647 r554693
r554647:
Remove the MMEDIA option
openoffice depends on the expired gstreamer 0.10 for multimedia support,
gstreamer 0.10 is about to be removed from the ports tree, let's remove the
option in preparation for that
r554693:
Upgrade editors/openoffice-4 to version 4.1.8.
Fix bugs in LICENSE_FILE extraction.
Don't pass LD_FLAGS to the inner make. It can cause problems.
Many of our local patches have been upstreamed.
Fix CVE-2020-13958.
Approved by: ports-secteam (fluffy)
Security: 4f15ca7b-23ae-11eb-9f59-1c1b0d9ea7e6
Added:
branches/2020Q4/editors/openoffice-4/files/patch-configure.ac
- copied unchanged from r554693, head/editors/openoffice-4/files/patch-configure.ac
Deleted:
branches/2020Q4/editors/openoffice-4/files/patch-basebmp_inc_basebmp_packedpixeliterator.hxx
branches/2020Q4/editors/openoffice-4/files/patch-boost1.67
branches/2020Q4/editors/openoffice-4/files/patch-boost_boost__1__55__0.patch
branches/2020Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
branches/2020Q4/editors/openoffice-4/files/patch-clang40
branches/2020Q4/editors/openoffice-4/files/patch-configure.in
branches/2020Q4/editors/openoffice-4/files/patch-gmake43
branches/2020Q4/editors/openoffice-4/files/patch-icu_makefile.mk
branches/2020Q4/editors/openoffice-4/files/patch-l10ntools_source_inireader.cxx
branches/2020Q4/editors/openoffice-4/files/patch-lingucomponent_source_spellcheck_spell_sspellimp.cxx
branches/2020Q4/editors/openoffice-4/files/patch-nss
branches/2020Q4/editors/openoffice-4/files/patch-openjdk8
branches/2020Q4/editors/openoffice-4/files/patch-openoffice4_powerpc64
branches/2020Q4/editors/openoffice-4/files/patch-r1728872
branches/2020Q4/editors/openoffice-4/files/patch-scaddins_source_analysis_analysishelper.hxx
branches/2020Q4/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk
branches/2020Q4/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk
branches/2020Q4/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx
Modified:
branches/2020Q4/editors/openoffice-4/Makefile
branches/2020Q4/editors/openoffice-4/distinfo
Directory Properties:
branches/2020Q4/ (props changed)
Modified: branches/2020Q4/editors/openoffice-4/Makefile
==============================================================================
--- branches/2020Q4/editors/openoffice-4/Makefile Tue Nov 10 23:56:30 2020 (r554861)
+++ branches/2020Q4/editors/openoffice-4/Makefile Wed Nov 11 00:11:41 2020 (r554862)
@@ -3,7 +3,6 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
-PORTREVISION= 3
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -112,10 +111,10 @@ CONFLICTS_INSTALL= apache-openoffice-devel-*
AOOVERSION1= 4
AOOVERSION2= 1
-AOOVERSION3= 7
+AOOVERSION3= 8
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO417m1\(Build:9800\)
-GITREVISION= 46059c9192
+AOOTAG= AOO418m3\(Build:9803\)
+GITREVISION= 18848f57b6
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -136,15 +135,14 @@ WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
-OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \
+OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS \
SDK WIKI_PUBLISHER
-OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
+OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS WIKI_PUBLISHER
CRASHDUMP_DESC= Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
DBGUTIL_DESC= Enable assertions, object counting. (non-production)
DEBUG_DESC= Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN}
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= GNOME Virtual File System
-MMEDIA_DESC= Multimedia backend for impress
SDK_DESC= Build and install software development kit
WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
@@ -167,10 +165,6 @@ GNOMEVFS_CONFIGURE_OFF= --enable-gio
GNOMEVFS_CONFIGURE_ON= --disable-gio
GNOMEVFS_USE= GNOME=gnomevfs2
-MMEDIA_CONFIGURE_ENABLE= gstreamer
-MMEDIA_LIB_DEPENDS= libgstreamer-0.10.so:multimedia/gstreamer
-MMEDIA_USE= GSTREAMER=yes
-
SDK_CONFIGURE_ENABLE= odk
SDK_DISTFILES= unowinreg.dll:unoreg
@@ -204,7 +198,7 @@ CONFIGURE_ARGS+= --enable-symbols
.include <${FILESDIR}/Makefile.localized>
-PYTHON_DISTFILE= 1d8728eb0dfcac72a0fd99c17ec7f386-Python-2.7.6.tgz
+PYTHON_DISTFILE= 38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz
GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
@@ -239,7 +233,7 @@ PACKAGE_PREFIX= Apache_OpenOffice
LOCALIZED_LANG?= en-US
-AOO_MAKE_ENV= ${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*}
+AOO_MAKE_ENV= ${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*:NLDFLAGS=*}
GNU_CONFIGURE= yes
WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION}
@@ -368,10 +362,14 @@ post-extract:
-e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT}
${SED} -e '\|^For Saxon|,/^__/p' \
-e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10}
- ${SED} -e '\|^For Saxon|,$$d' \
- ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11}
+ ${SED} -e '\|^The following Licenses have some restrictions|,/^- For Network/p' \
+ -e d ${WRKSRC}/LICENSE_category_b | \
+ ${SED} -e :a -e '$d;N;2,3ba' -e 'P;D' > ${LICENSE_FILE_MPL11}
${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL}
+ ${ECHO} '' >> ${LICENSE_FILE_PSFL}
+ ${SED} -e '\|^For Python|,/^__/p' \
+ -e d ${WRKSRC}/LICENSE >> ${LICENSE_FILE_PSFL}
${SED} -e '\|^For main/twain|,/^__/p' \
-e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN}
${SED} -e '\|^For main/MathMLDTD|,/^__/p' \
@@ -382,8 +380,6 @@ post-patch:
${WRKSRC}/sysui/desktop/productversion.mk
${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
${WRKSRC}/desktop/scripts/soffice.sh
- ${REINPLACE_CMD} -e "/#test/i\\${.newline} return '${GITREVISION}';" \
- ${WRKSRC}/solenv/bin/modules/SvnRevision.pm
${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
.if ${CHOSEN_COMPILER_TYPE} == gcc
# g++49 -Os sometimes leaves inline class methods undefined,
Modified: branches/2020Q4/editors/openoffice-4/distinfo
==============================================================================
--- branches/2020Q4/editors/openoffice-4/distinfo Tue Nov 10 23:56:30 2020 (r554861)
+++ branches/2020Q4/editors/openoffice-4/distinfo Wed Nov 11 00:11:41 2020 (r554862)
@@ -1,10 +1,10 @@
-TIMESTAMP = 1589749652
-SHA256 (openoffice/apache-openoffice-4.1.7-46059c9192-src.tar.bz2) = 512952c78b3ec22b15bc1a444b4fa7e7c76c25c985a75b6977e62c6ddae2e3ed
-SIZE (openoffice/apache-openoffice-4.1.7-46059c9192-src.tar.bz2) = 220014716
+TIMESTAMP = 1604092476
+SHA256 (openoffice/apache-openoffice-4.1.8-18848f57b6-src.tar.bz2) = 7ae5ef30dd931f369fff6d9d33a089ba749d019dce94403a1a7c9aeb4a100098
+SIZE (openoffice/apache-openoffice-4.1.8-18848f57b6-src.tar.bz2) = 228610492
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
-SHA256 (openoffice/1d8728eb0dfcac72a0fd99c17ec7f386-Python-2.7.6.tgz) = 99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58
-SIZE (openoffice/1d8728eb0dfcac72a0fd99c17ec7f386-Python-2.7.6.tgz) = 14725931
+SHA256 (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814
+SIZE (openoffice/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = 17539408
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
SHA256 (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
Copied: branches/2020Q4/editors/openoffice-4/files/patch-configure.ac (from r554693, head/editors/openoffice-4/files/patch-configure.ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q4/editors/openoffice-4/files/patch-configure.ac Wed Nov 11 00:11:41 2020 (r554862, copy of r554693, head/editors/openoffice-4/files/patch-configure.ac)
@@ -0,0 +1,32 @@
+--- configure.ac.orig 2019-11-12 05:10:21 UTC
++++ configure.ac
+@@ -367,11 +367,11 @@ AC_ARG_WITH(bundled-extension-blobs,
+ and comply with their distribution requirements by updating the
+ files LICENSE_aggregated and NOTICE_aggregated accordingly
+ ],,)
+-#AC_ARG_WITH(bundled-prereg-extensions,
+-#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
+-# are to be bundled as pre-registered extensions. Make sure to only bundle
+-# extensions which can be installed without requiring a license dialog
+-#],,)
++AC_ARG_WITH(bundled-prereg-extensions,
++[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
++ are to be bundled as pre-registered extensions. Make sure to only bundle
++ extensions which can be installed without requiring a license dialog
++],,)
+ AC_ARG_ENABLE(bundled-dictionaries,
+ [ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus)
+ according to main/extensions.lst and bundle them. Make sure to
+@@ -1538,9 +1538,9 @@ else
+ fi
+ AC_SUBST(BUNDLED_EXTENSION_BLOBS)
+
+-#dnl ===================================================================
+-#dnl Check extensions that are to be bundled as pre-registerd
+-#dnl ===================================================================
++dnl ===================================================================
++dnl Check extensions that are to be bundled as pre-registerd
++dnl ===================================================================
+ if test -n "$with_bundled_prereg_extensions"; then
+ BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions"
+ else
More information about the svn-ports-all
mailing list