Date: Sat, 9 Oct 2021 21:53:10 GMT From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 35590404fef2 - main - editors/openoffice-4: Upgrade to version 4.1.11: Message-ID: <202110092153.199LrACb083895@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=35590404fef2c7b60e562b1d4f61f2ef2986c2a3 commit 35590404fef2c7b60e562b1d4f61f2ef2986c2a3 Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2021-10-09 21:25:33 +0000 Commit: Don Lewis <truckman@FreeBSD.org> CommitDate: 2021-10-09 21:53:03 +0000 editors/openoffice-4: Upgrade to version 4.1.11: - Fix CVE-2021-33035 - Buffer overflow from a crafted DBF file Release Notes: https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.11+Release+Notes The CVE-2021-40439 - Billion Laughs issue for the FreeBSD port was fixed some time ago when the textproc/expat2 port was updated. Unlike other distributions, the FreeBSD port uses the system expat2 instead of bundling an old version. Update MASTER_SITES, the source is not mirrored on the usual Apache mirror sites. Prefer the Apache CDN. Update dependencies, mostly due to math/coinmp refactoring. Remove some bundled python shared libraries that look less than useful and link to other dependencies. MFH: 2021Q4 Security: 04d2cf7f-2942-11ec-b48c-1c1b0d9ea7e6 Differential Revision: https://reviews.freebsd.org/D32400 --- editors/openoffice-4/Makefile | 28 ++++++++++++++++++---- editors/openoffice-4/distinfo | 6 ++--- .../patch-connectivity_source_parse_sqlbison.y | 16 ------------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index d08c46a4b4d8..0aee52fbbc34 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -2,9 +2,10 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= editors java -MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ +MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \ + https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ LOCAL/truckman/openoffice:extsrc \ SF/oooextras.mirror/:sf @@ -75,8 +76,19 @@ LIB_DEPENDS= \ libcairo.so:graphics/cairo \ libpng.so:graphics/png \ libgraphite.so:graphics/silgraphite \ + libblas.so:math/blas \ + libCbcSolver.so:math/cbc \ + libCgl.so:math/cgl \ + libcoinasl.so:math/asl \ + libClpSolver.so:math/clp \ libCoinMP.so:math/coinmp \ + libCoinUtils.so:math/coinutils \ + libcoinmumps.so:math/ipopt \ + libnauty.so:math/nauty \ + libopenblas.so:math/openblas \ + libOsi.so:math/osi \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libhunspell-1.7.so:textproc/hunspell \ @@ -93,6 +105,9 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf +# For libgfortran.so and libquadmath.so +BUILD_DEPENDS+= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} +RUN_DEPENDS+= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ @@ -111,10 +126,10 @@ CONFLICTS_INSTALL= apache-openoffice-devel-* AOOVERSION1= 4 AOOVERSION2= 1 -AOOVERSION3= 10 +AOOVERSION3= 11 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO4110m2\(Build:9807\) -GITREVISION= b1cdbd2c1b +AOOTAG= AOO4111m1\(Build:9808\) +GITREVISION= bdb20b2a64 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} @@ -441,6 +456,8 @@ do-build: . ../${FREEBSD_ENV_SET} ; \ build.pl --all -P$${numproc} -- -P$${dmproc} +PYDL= ${STAGEDIR}${OOPATH}/program/python-core-2.7.18/lib/lib-dynload + do-install: @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ ${STAGEDIR}${PREFIX}/share/mime/packages @@ -452,6 +469,7 @@ do-install: ${TAR} -s '|./[^/]*/||' -xz -f $$i \ -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \ done + ${RM} ${PYDL}/_sqlite3.so ${PYDL}/gdbm.so ${PYDL}/readline.so ${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; ${REINPLACE_CMD} \ -e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \ diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo index 1e093e1d8ab8..0d1932f54a41 100644 --- a/editors/openoffice-4/distinfo +++ b/editors/openoffice-4/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1618947315 -SHA256 (openoffice/apache-openoffice-4.1.10-b1cdbd2c1b-src.tar.bz2) = 20edd0701d2bf84ee565b7f29796efc97fc1296193fa021344d97391d8ee3f31 -SIZE (openoffice/apache-openoffice-4.1.10-b1cdbd2c1b-src.tar.bz2) = 229222379 +TIMESTAMP = 1632829665 +SHA256 (openoffice/apache-openoffice-4.1.11-bdb20b2a64-src.tar.bz2) = 646f0dae6f45a3a3014f092a697969f5c581d5d87b61ee2a12d673a95b7df268 +SIZE (openoffice/apache-openoffice-4.1.11-bdb20b2a64-src.tar.bz2) = 229542139 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/38c84292658ed4456157195f1c9bcbe1-Python-2.7.18.tgz) = da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814 diff --git a/editors/openoffice-4/files/patch-connectivity_source_parse_sqlbison.y b/editors/openoffice-4/files/patch-connectivity_source_parse_sqlbison.y deleted file mode 100644 index e152cf41e8a0..000000000000 --- a/editors/openoffice-4/files/patch-connectivity_source_parse_sqlbison.y +++ /dev/null @@ -1,16 +0,0 @@ ---- connectivity/source/parse/sqlbison.y.orig 2019-08-14 17:32:43 UTC -+++ connectivity/source/parse/sqlbison.y -@@ -1,3 +1,4 @@ -+%define parse.error verbose - %{ - /************************************************************** - * -@@ -123,8 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : - - - connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; -- --#define YYERROR_VERBOSE - - #define SQLyyerror(s) \ - { \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110092153.199LrACb083895>