git: b2858e26080a - main - editors/openoffice-devel: Upgrade to a new snapshot

The branch main has been updated by truckman:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b2858e26080a6c8f34217c43a2402a8217dd527f

commit b2858e26080a6c8f34217c43a2402a8217dd527f
Author:     Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2021-10-09 21:40:12 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2021-10-09 21:53:03 +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
---
 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