From nobody Sat Oct 09 21:58:25 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 840C317F4CBB; Sat, 9 Oct 2021 21:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HRf821dcKz4rNY; Sat, 9 Oct 2021 21:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 12EB722009; Sat, 9 Oct 2021 21:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 199LwPpV084439; Sat, 9 Oct 2021 21:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 199LwPDr084438; Sat, 9 Oct 2021 21:58:25 GMT (envelope-from git) Date: Sat, 9 Oct 2021 21:58:25 GMT Message-Id: <202110092158.199LwPDr084438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Don Lewis Subject: git: 5c56f2c3d83d - 2021Q4 - editors/openoffice-devel: Upgrade to a new snapshot List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 5c56f2c3d83d3c71861d6ddb0b9c82e3aa2e4c80 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c56f2c3d83d3c71861d6ddb0b9c82e3aa2e4c80 commit 5c56f2c3d83d3c71861d6ddb0b9c82e3aa2e4c80 Author: Don Lewis AuthorDate: 2021-10-09 21:40:12 +0000 Commit: Don Lewis CommitDate: 2021-10-09 21:58:16 +0000 editors/openoffice-devel: Upgrade to a new snapshot - Fix CVE-2021-33035 - Buffer overflow from a crafted DBF file 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 dependencies, mostly due to math/coinmp refactoring. MFH: 2021Q4 Security: 04d2cf7f-2942-11ec-b48c-1c1b0d9ea7e6 (cherry picked from commit b2858e26080a6c8f34217c43a2402a8217dd527f) --- editors/openoffice-devel/Makefile | 23 +++++++++++++++++++---- editors/openoffice-devel/distinfo | 6 +++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 8f974f16ac59..0bee92b8bbd9 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 5 +PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -78,8 +78,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 \ @@ -96,6 +107,10 @@ 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 \ @@ -116,9 +131,9 @@ AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO420m3\(Build:9822\) -GITREVISION= 6aec515561 -TIMESTAMP= 1619649022 +AOOTAG= AOO420m4\(Build:9823\) +GITREVISION= febe0adc7c +TIMESTAMP= 1633255994 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index 9cded48f3353..e33883d77ec9 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1619681235 -SHA256 (openoffice/apache-openoffice-1619649022-6aec515561-src.tar.xz) = 3025eacaff138565410beb930088d5dd6da974dcdba683695952473ff4da4021 -SIZE (openoffice/apache-openoffice-1619649022-6aec515561-src.tar.xz) = 239704376 +TIMESTAMP = 1633761637 +SHA256 (openoffice/apache-openoffice-1633255994-febe0adc7c-src.tar.xz) = b25041608e14ea9fbfebd0f34e29093ceb355ad4fec3ddc6b012d7ca2d6777a3 +SIZE (openoffice/apache-openoffice-1633255994-febe0adc7c-src.tar.xz) = 239737244 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/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c