From nobody Mon Nov 18 02:48:44 2024 X-Original-To: dev-commits-ports-main@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 4XsBs938MYz5dkSv; Mon, 18 Nov 2024 02:48:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XsBs90qt6z4dZp; Mon, 18 Nov 2024 02:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731898125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olleK5E+FyAy3tEPhlr6INs+7KTfizKwO17KXFnLQqs=; b=h9ez4ZoRhAf+C3x1u8sxk/NtGYL2OvvMpqCJe85+JnuCy2w5T0KwIw13Jbeh3nlKNnIxgj gC+HUU7bzqEgrKIYYpxYkTA2f/u/V70SiJPOuW3L7j8mZ+sLoFOFBqmAoGSDWP3p/qvhjk ef8GXhz1/9zU0CWnfCtjumpplj/ZSchwm7wskxqo10ogsw1Ryy5kdKC8+0MVgZz8X+2nls 2NEV7fcsqqF6BGyLO3Hk60bXtKTPzfGC2imn+yQdK5orZ3opO/GLOIapDdncZiPUMuzA8W yVaCAG3y7UVKptw2yRQYCycWdQ4Y4lJGbZSgwHCoBN0vDvjjk+h1TxHP9eiimQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731898125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olleK5E+FyAy3tEPhlr6INs+7KTfizKwO17KXFnLQqs=; b=n4Zhqff3d6h80CjZU251wAdDRAt1IL3NGfKtlUU87/pG3x1U+7urj3CkXWI0G2qK4+vtSo AmdEuU+gSeM5yVGkY53rZ9btNc/Ne+QsfYGO1P8H1JiewwoGM/CZ8fxzy6mOCD8Ha+Kg2/ /W7Wa6sa387Y7y2YFR6seDuHcvVIWMh25e5LHsbS+2IZDVhLrC1wTB9g6ArRSuDo2F0EVl inoEpdDLtv98I4wObBvRO0wbTOrFdo6bONyryFxF4Jkc2xxLE6I3EyeUG0kTqiXo1dxZpi LZmTmeXLsI8zd3QTamx3o09rbkfaaGhG/FIHWMhF3BDVghtwYHqqEFv1+UU0nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731898125; a=rsa-sha256; cv=none; b=PZXbpQZOm6dhUJ5monm23NzTXo87cyWZuZMyG//14x6vQ3K8cQwF60rbt1JMkQex5MnZ0a 7Gv/GqgRlY114erI9vLC+/0qzDVbeMWMtO8jrr72yFH1Xz72Vj4qvLj/NRKO/eC5gNZdjW 8YHGa89GdJWngDQ00LroEYbNfJu05exhaa1dGQWlGusxPHpNl8e+6rnl+lGHF4DQVLhcnX y4qQKb0gLY9oC0Y4Libv/yqyavASNEbs+uRupY4TVLlf6uzTBuQ5VBXVgA9dhTKdZwpUiV kHoG4i8B2sraqUOWqVe7zIZMfvIusR1KndXBlyqo5TXojzTI28f69mEW1jqSHA== 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 4XsBs86qn8zJpN; Mon, 18 Nov 2024 02:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AI2miMW046790; Mon, 18 Nov 2024 02:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AI2miJx046787; Mon, 18 Nov 2024 02:48:44 GMT (envelope-from git) Date: Mon, 18 Nov 2024 02:48:44 GMT Message-Id: <202411180248.4AI2miJx046787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: 431b502d84ff - main - editors/openoffice-devel: Upgrade to a newer snapshot List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 431b502d84fff74f9c9f86cd7005437779b1d739 Auto-Submitted: auto-generated The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=431b502d84fff74f9c9f86cd7005437779b1d739 commit 431b502d84fff74f9c9f86cd7005437779b1d739 Author: Don Lewis AuthorDate: 2024-11-17 20:03:07 +0000 Commit: Don Lewis CommitDate: 2024-11-18 02:48:03 +0000 editors/openoffice-devel: Upgrade to a newer snapshot Upgrade openoffice-devel to a new snapshot with multiple bug fixes. Some of our patches have been upstreamed. No longer use -Os optimization. It seems to be buggy. Some non-default options can generate debug symbols, so always strip the binaries when WITH_DEBUG is not set. --- editors/openoffice-devel/Makefile | 9 +- editors/openoffice-devel/distinfo | 8 +- .../files/patch-oox_source_core_filterdetect.cxx | 95 ---------------------- ...tch-writerfilter_source_ooxml_RefAndPointer.hxx | 24 ------ 4 files changed, 11 insertions(+), 125 deletions(-) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 22ca90bbcbe0..bb03301da9c9 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -132,8 +132,8 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m4\(Build:9823\) -GITREVISION= ed2e9b1ba7 -TIMESTAMP= 1707679630 +GITREVISION= 98a91fccb4 +TIMESTAMP= 1731847285 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz @@ -233,6 +233,8 @@ WITH= SDK .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-symbols +.else +CONFIGURE_ARGS+= --enable-strip-solver .endif .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER} @@ -246,6 +248,7 @@ CONFIGURE_ARGS+= --without-commons-logging .include <${FILESDIR}/Makefile.localized> GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \ + e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz \ d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz .if ${CHOSEN_COMPILER_TYPE} == clang diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index 00e51ebb3863..d869bdbfc8b7 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,10 +1,12 @@ -TIMESTAMP = 1707869994 -SHA256 (openoffice/apache-openoffice-1707679630-ed2e9b1ba7-src.tar.xz) = be7751598f3aed57d10cacdf4f3e50a7e113517b9190982048a8534f4b99b497 -SIZE (openoffice/apache-openoffice-1707679630-ed2e9b1ba7-src.tar.xz) = 246661448 +TIMESTAMP = 1731871087 +SHA256 (openoffice/apache-openoffice-1731847285-98a91fccb4-src.tar.xz) = 45b14fc91997dfa4bbcbc8d1734b6f19c5fef535ddfb4317152b99de51abd2a0 +SIZE (openoffice/apache-openoffice-1731847285-98a91fccb4-src.tar.xz) = 246797080 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/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-oox_source_core_filterdetect.cxx b/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx deleted file mode 100644 index c05f86fc22c6..000000000000 --- a/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx +++ /dev/null @@ -1,95 +0,0 @@ ---- oox/source/core/filterdetect.cxx.orig 2018-04-13 00:54:08 UTC -+++ oox/source/core/filterdetect.cxx -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include "oox/core/fastparser.hxx" -@@ -355,25 +356,39 @@ bool lclCheckEncryptionData( const sal_uInt8* pnKey, s - if ( nKeySize == 16 && nVerifierSize == 16 && nVerifierHashSize == 32 ) - { - // check password -+ EVP_CIPHER_CTX *pAes_ctx; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX aes_ctx; - EVP_CIPHER_CTX_init( &aes_ctx ); -- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 ); -- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 ); -+ pAes_ctx = &aes_ctx; -+#else -+ pAes_ctx = EVP_CIPHER_CTX_new(); -+#endif -+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 ); -+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 ); - int nOutLen = 0; - sal_uInt8 pnTmpVerifier[ 16 ]; - (void) memset( pnTmpVerifier, 0, sizeof(pnTmpVerifier) ); - -- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize ); -+ /*int*/ EVP_DecryptUpdate( pAes_ctx, pnTmpVerifier, &nOutLen, pnVerifier, nVerifierSize ); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX_cleanup( &aes_ctx ); - - EVP_CIPHER_CTX_init( &aes_ctx ); -- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 ); -- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 ); -+#else -+ EVP_CIPHER_CTX_reset( pAes_ctx ); -+#endif -+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, pnKey, 0 ); -+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 ); - sal_uInt8 pnTmpVerifierHash[ 32 ]; - (void) memset( pnTmpVerifierHash, 0, sizeof(pnTmpVerifierHash) ); - -- /*int*/ EVP_DecryptUpdate( &aes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize ); -+ /*int*/ EVP_DecryptUpdate( pAes_ctx, pnTmpVerifierHash, &nOutLen, pnVerifierHash, nVerifierHashSize ); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX_cleanup( &aes_ctx ); -+#else -+ EVP_CIPHER_CTX_free( pAes_ctx ); -+#endif - - rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); - rtlDigestError aError = rtl_digest_update( aDigest, pnTmpVerifier, sizeof( pnTmpVerifier ) ); -@@ -562,10 +577,16 @@ Reference< XInputStream > FilterDetect::extractUnencry - BinaryXOutputStream aDecryptedPackage( xDecryptedPackage, true ); - BinaryXInputStream aEncryptedPackage( xEncryptedPackage, true ); - -+ EVP_CIPHER_CTX *pAes_ctx; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX aes_ctx; - EVP_CIPHER_CTX_init( &aes_ctx ); -- EVP_DecryptInit_ex( &aes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 ); -- EVP_CIPHER_CTX_set_padding( &aes_ctx, 0 ); -+ pAes_ctx = &aes_ctx; -+#else -+ pAes_ctx = EVP_CIPHER_CTX_new(); -+#endif -+ EVP_DecryptInit_ex( pAes_ctx, EVP_aes_128_ecb(), 0, aVerifier.getKey(), 0 ); -+ EVP_CIPHER_CTX_set_padding( pAes_ctx, 0 ); - - sal_uInt8 pnInBuffer[ 1024 ]; - sal_uInt8 pnOutBuffer[ 1024 ]; -@@ -574,13 +595,17 @@ Reference< XInputStream > FilterDetect::extractUnencry - aEncryptedPackage.skip( 8 ); // decrypted size - while( (nInLen = aEncryptedPackage.readMemory( pnInBuffer, sizeof( pnInBuffer ) )) > 0 ) - { -- EVP_DecryptUpdate( &aes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen ); -+ EVP_DecryptUpdate( pAes_ctx, pnOutBuffer, &nOutLen, pnInBuffer, nInLen ); - aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen ); - } -- EVP_DecryptFinal_ex( &aes_ctx, pnOutBuffer, &nOutLen ); -+ EVP_DecryptFinal_ex( pAes_ctx, pnOutBuffer, &nOutLen ); - aDecryptedPackage.writeMemory( pnOutBuffer, nOutLen ); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX_cleanup( &aes_ctx ); -+#else -+ EVP_CIPHER_CTX_free( pAes_ctx ); -+#endif - xDecryptedPackage->flush(); - aDecryptedPackage.seekToStart(); - diff --git a/editors/openoffice-devel/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx b/editors/openoffice-devel/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx deleted file mode 100644 index 4222cbefefbe..000000000000 --- a/editors/openoffice-devel/files/patch-writerfilter_source_ooxml_RefAndPointer.hxx +++ /dev/null @@ -1,24 +0,0 @@ ---- writerfilter/source/ooxml/RefAndPointer.hxx.orig 2019-09-17 22:55:25 UTC -+++ writerfilter/source/ooxml/RefAndPointer.hxx -@@ -75,13 +75,14 @@ class RefAndPointer (public) - ChildClass * getPointer() const { return mpHandler; } - const uno::Reference getRef() const { return mRef; } - -- RefAndPointer & operator= -- (const RefAndPointer & rSrc) -- { -- set(rSrc.getHandler()); -- -- return *this; -- } -+// ...RefAndPointer.hxx:104:18: error: no member named 'getHandler' in 'RefAndPointer'; did you mean 'mpHandler'? -+// RefAndPointer & operator= -+// (const RefAndPointer & rSrc) -+// { -+// set(rSrc.getHandler()); -+// -+// return *this; -+// } - - bool is() { return getRef().is(); } -