Date: Mon, 18 Nov 2024 02:48:44 GMT From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 431b502d84ff - main - editors/openoffice-devel: Upgrade to a newer snapshot Message-ID: <202411180248.4AI2miJx046787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=431b502d84fff74f9c9f86cd7005437779b1d739 commit 431b502d84fff74f9c9f86cd7005437779b1d739 Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2024-11-17 20:03:07 +0000 Commit: Don Lewis <truckman@FreeBSD.org> 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 <com/sun/star/io/XStream.hpp> - #include <comphelper/docpasswordhelper.hxx> - #include <comphelper/mediadescriptor.hxx> -+#include <openssl/opensslv.h> - #include <openssl/evp.h> - #include <rtl/digest.h> - #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<Interface> 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<Interface, ChildClass>'; did you mean 'mpHandler'? -+// RefAndPointer & operator= -+// (const RefAndPointer & rSrc) -+// { -+// set(rSrc.getHandler()); -+// -+// return *this; -+// } - - bool is() { return getRef().is(); } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411180248.4AI2miJx046787>