git: e5a8e3c915f1 - main - editors/openoffice-4: Upgrade to version 4.1.15

The branch main has been updated by truckman:

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

commit e5a8e3c915f143a3b9d3728a14deabf151f94f03
Author:     Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2024-02-15 21:51:41 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2024-02-16 19:02:51 +0000

    editors/openoffice-4: Upgrade to version 4.1.15
    
    Upgrade to version 4.1.15, which has bug and security fixes.
    
    Release notes:
      https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.15+Release+Notes
    
    Since we use the ports version of expat instead of bundling it into
    the openoffice-* packagea,
      CVE-2022-43680: "Use after free" fixed in libexpat
    does not apply to our ports. This issue was fixed when we upgraded the
    expat port.
    
    Remove the point release from the suffix appended to the names of
    the wrapper script and the program directory.  It is annoying when
    the suffix changes and we'll never support the simultaneous
    installation of multiple versions where these values differ.
    
    MFH:            2024Q1 tree branch name you plan to merge to.>
    Security:       CVE-2012-5639
    Security:       CVE-2023-1183
    Security:       CVE-2023-47804
---
 editors/openoffice-4/Makefile | 10 +++++-----
 editors/openoffice-4/distinfo | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 9084e5aec4b2..64d61116db1b 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	6
+PORTREVISION=	0
 CATEGORIES=	editors java
 MASTER_SITES=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
 		https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \
@@ -127,15 +127,15 @@ CONFLICTS_INSTALL=	apache-openoffice-devel
 
 AOOVERSION1=	4
 AOOVERSION2=	1
-AOOVERSION3=	14
+AOOVERSION3=	15
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG=		AOO4114m1\(Build:9811\)
-GITREVISION=	a0d24fb625
+AOOTAG=		AOO4115m2\(Build:9813\)
+GITREVISION=	5f13fa0070
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
 AOOVERSION=	${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
 AOOXXX=		${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
-AOOSUFFIX=	${PORTVERSION}
+AOOSUFFIX=	${AOOVERSION1}.${AOOVERSION2}
 AOOSRC=		apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX}
 
 AOOUDIR=		.openoffice.org\/${AOOVERSION1}
diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo
index 076bce564fe2..6d6a3a0ad777 100644
--- a/editors/openoffice-4/distinfo
+++ b/editors/openoffice-4/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1676701851
-SHA256 (openoffice/apache-openoffice-4.1.14-a0d24fb625-src.tar.bz2) = ea150bbd2a9c2e0fedbbff9c4c2dc7f1f129caf0236c5ddf9ec79d13bc109b59
-SIZE (openoffice/apache-openoffice-4.1.14-a0d24fb625-src.tar.bz2) = 243964178
+TIMESTAMP = 1707944647
+SHA256 (openoffice/apache-openoffice-4.1.15-5f13fa0070-src.tar.bz2) = 820b5a9e845d9f2476c89424648e68be66d3d54322ded93c60ebd40c930ac707
+SIZE (openoffice/apache-openoffice-4.1.15-5f13fa0070-src.tar.bz2) = 244099652
 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
 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
 SIZE (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = 58146647
 SHA256 (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 SIZE (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 16525605
+SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+SIZE (openoffice/unowinreg.dll) = 6144