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

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Don Lewis <truckman_at_FreeBSD.org>
Date: Mon, 14 Sep 2026 22:25:33 UTC
The branch main has been updated by truckman:

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

commit fd8236c53ba4ea8ba1929f50565b0bcf7de95384
Author:     Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2026-09-14 22:16:04 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2026-09-14 22:25:25 +0000

    editors/openoffice-devel: Upgrade to a new snapshot
    
    Upgrade to a new snapshot of the upstream AOO42X branch.
    
    Switch from system textproc/libtextcat to bundled libtextcat.
    The system version probably never worked properly because it
    lacks UTF-8 support, whereas the bundled version has been patched
    to support UTF-8.  Longer term, libtextcat should be replaced
    by libexttextcat.
    
    Disable WIKI_PUBLISHER and mark BROKEN.  It relies on
    apache-commons-httpclient which has an open MITM CVE.  It should
    be upgraded to Apache HttpComponents, but that requires a newer
    java.
    
    Disable bridgetest on i386 due to a uno core dump in testtools.
    
    Removed old code optimization tweak that is probably left over
    from when we used the buggy -Os compiler optimization flag.
    
    Remove obsolete comment.
    
    MFH:            2026Q3
---
 editors/openoffice-devel/Makefile                  | 26 ++++++++++------------
 editors/openoffice-devel/distinfo                  |  8 ++++---
 .../files/patch-framework_Library__fwk.mk          | 15 -------------
 .../patch-testtools_source_bridgetest_makefile.mk  | 13 +++++++++++
 4 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 6034f7995f7a..f0a634a51c5e 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 .endif
 PKGNAMESUFFIX=		-devel
 DISTFILES=	${AOOSRC}${AOODISTTAG} ${EXTSRC}:extsrc \
-		${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
+		${EXTRA_DISTFILES:C/.*/&:sf/g}
 DIST_SUBDIR=	openoffice
 EXTRACT_ONLY=	${AOOSRC}
 
@@ -49,11 +49,11 @@ LICENSE_PERMS_ICU=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-DEPRECATED=	Depends on expired textproc/libtextcat
-EXPIRATION_DATE=2026-10-31
-
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
 
+# When building testtools ...
+#BROKEN_i386=	"creation of executable memory area failed: Permission denied"
+
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\
 		${LOCALBASE}/bin/unzip:archivers/unzip			\
@@ -97,7 +97,6 @@ LIB_DEPENDS=								\
 		libexpat.so:textproc/expat2				\
 		libhunspell-1.7.so:textproc/hunspell			\
 		libhyphen.so:textproc/hyphen				\
-		libtextcat.so:textproc/libtextcat			\
 		libmythes-1.2.so:textproc/mythes			\
 		librdf.so:textproc/redland				\
 		libfontconfig.so:x11-fonts/fontconfig
@@ -123,9 +122,6 @@ USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
 
-# ftp/curl uses OpenSSL by default. However, curl 8.18.0 drops OpenSSL 1.x support
-# which is used in FreeBSD 13 base system. Therefore, we change the curl defaults to
-# wolfSSL instead.
 CONFLICTS_INSTALL=	apache-openoffice-4*
 
 AOOVERSION1=	4
@@ -133,8 +129,8 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m6\(Build:9825\)
-GITREVISION=	a4e34e8bd2
-TIMESTAMP=	1768900765
+GITREVISION=	38b1ce9df0
+TIMESTAMP=	1786138564
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
@@ -165,7 +161,7 @@ CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CRASHDUMP CUPS DBGUTIL DEBUG GNOME MMEDIA \
 			MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER
-OPTIONS_DEFAULT=	CUPS GNOME MMEDIA WIKI_PUBLISHER
+OPTIONS_DEFAULT=	CUPS GNOME MMEDIA
 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}
@@ -211,6 +207,8 @@ REPORT_BUILDER_JAR_DEPENDS=
 REPORT_BUILDER_BUILD_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 REPORT_BUILDER_RUN_DEPENDS=	${REPORT_BUILDER_JAR_DEPENDS}
 
+# commons-httpclient replacement by Apache HttpComponents requires new java
+WIKI_PUBLISHER_BROKEN=		CVE-2012-6153 MITM
 WIKI_PUBLISHER_CONFIGURE_ENABLE=	wiki-publisher
 WIKI_PUBLISHER_CONFIGURE_WITH=						\
 	commons-codec-jar=${JAVALIBDIR}/commons-codec.jar		\
@@ -253,8 +251,9 @@ CONFIGURE_ARGS+=	--without-commons-logging
 
 .include <${FILESDIR}/Makefile.localized>
 
-GCC_EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
+EXTRA_DISTFILES=	d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
 			e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \
+			128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz \
 			d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
@@ -314,7 +313,6 @@ CONFIGURE_ARGS+=							\
 			--with-jdk-home=${JAVA_HOME}			\
 			--with-system-jpeg				\
 			--with-junit=${JAVALIBDIR}/junit.jar		\
-			--with-system-libtextcat			\
 			--disable-kde					\
 			--disable-kde4					\
 			--with-system-libxml				\
@@ -365,7 +363,7 @@ do-extract-SDK-on:
 
 post-extract:
 	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
-.for f in ${GCC_EXTRA_DISTFILES}
+.for f in ${EXTRA_DISTFILES}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
 .endfor
 	${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 06a85ede8c7d..d5de14792da1 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,12 +1,14 @@
-TIMESTAMP = 1769059316
-SHA256 (openoffice/apache-openoffice-1768900765-a4e34e8bd2-src.tar.xz) = 67ddafe7c872a0660051c4546e7577d628f282ffdc9d2eafc17808e631e6add1
-SIZE (openoffice/apache-openoffice-1768900765-a4e34e8bd2-src.tar.xz) = 249704272
+TIMESTAMP = 1788924698
+SHA256 (openoffice/apache-openoffice-1786138564-38b1ce9df0-src.tar.xz) = 95696e6a07cf97e249944907c232b5936b11e35d9431da7323b6b0936b1fc78b
+SIZE (openoffice/apache-openoffice-1786138564-38b1ce9df0-src.tar.xz) = 249744200
 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/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
 SIZE (openoffice/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2) = 58146647
 SHA256 (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 814de31e1413df945cdd34939b424c4cf7a94d1c481f2d44c99c8ca52b288063
 SIZE (openoffice/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz) = 13161131
+SHA256 (openoffice/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz) = 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
+SIZE (openoffice/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz) = 540999
 SHA256 (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 SIZE (openoffice/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz) = 16525605
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/editors/openoffice-devel/files/patch-framework_Library__fwk.mk b/editors/openoffice-devel/files/patch-framework_Library__fwk.mk
deleted file mode 100644
index 59851178df6a..000000000000
--- a/editors/openoffice-devel/files/patch-framework_Library__fwk.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- framework/Library_fwk.mk.orig	2018-04-13 00:55:26 UTC
-+++ framework/Library_fwk.mk
-@@ -196,5 +196,12 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
- 	framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \
- ))
- endif
-+# Also affects FreeBSD 10.3 with clang 3.4.1.
-+# Appears to be a clang optimization bug in versions less than 3.8.0
-+ifeq ($(COM)$(CPUNAME),CLANGX86_64)
-+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
-+	framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \
-+))
-+endif
- 
- # vim: set noet sw=4 ts=4:
diff --git a/editors/openoffice-devel/files/patch-testtools_source_bridgetest_makefile.mk b/editors/openoffice-devel/files/patch-testtools_source_bridgetest_makefile.mk
new file mode 100644
index 000000000000..8cb7343f7340
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-testtools_source_bridgetest_makefile.mk
@@ -0,0 +1,13 @@
+--- testtools/source/bridgetest/makefile.mk.orig	2026-09-08 18:56:04 UTC
++++ testtools/source/bridgetest/makefile.mk
+@@ -134,8 +134,8 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_se
+ 
+ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
+         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
+-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="FREEBSDP"
+-	@echo "Mac OSX PPC GCC and Solaris fails this test! likely broken UNO bridge. Fix me."
++.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="FREEBSDP" || "$(OS)$(CPU)"=="FREEBSDI"
++	@echo "Mac OSX PPC GCC X86 and Solaris fails this test! likely broken UNO bridge. Fix me."
+ .ELSE
+         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
+ 		-ro uno_services.rdb -ro uno_types.rdb \