From owner-svn-ports-all@freebsd.org Wed Nov 7 22:29:44 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B79CE11304DB; Wed, 7 Nov 2018 22:29:44 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47E377BFBF; Wed, 7 Nov 2018 22:29:44 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25E571BAED; Wed, 7 Nov 2018 22:29:44 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7MThJf067844; Wed, 7 Nov 2018 22:29:43 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7MThxq067840; Wed, 7 Nov 2018 22:29:43 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201811072229.wA7MThxq067840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 7 Nov 2018 22:29:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484413 - in branches/2018Q4/editors: openoffice-4 openoffice-4/files openoffice-devel openoffice-devel/files X-SVN-Group: ports-branches X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in branches/2018Q4/editors: openoffice-4 openoffice-4/files openoffice-devel openoffice-devel/files X-SVN-Commit-Revision: 484413 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 47E377BFBF X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.78), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2018 22:29:45 -0000 Author: truckman Date: Wed Nov 7 22:29:43 2018 New Revision: 484413 URL: https://svnweb.freebsd.org/changeset/ports/484413 Log: MFH: r482164 editors/openoffice-4, editors/openoffice-devel: Fix build with OpenSSL 1.1.x Pet portlint (USES block location) PR: 232265 Reported by: pkg-fallout Approved by: ports-secteam blanket (unbreak build) Added: branches/2018Q4/editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx - copied unchanged from r482164, head/editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx branches/2018Q4/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx - copied unchanged from r482164, head/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx Modified: branches/2018Q4/editors/openoffice-4/Makefile branches/2018Q4/editors/openoffice-devel/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/editors/openoffice-4/Makefile ============================================================================== --- branches/2018Q4/editors/openoffice-4/Makefile Wed Nov 7 21:13:16 2018 (r484412) +++ branches/2018Q4/editors/openoffice-4/Makefile Wed Nov 7 22:29:43 2018 (r484413) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -96,6 +96,21 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf +USES= autoreconf bison compiler:c++11-lib cpe \ + desktop-file-utils \ + gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \ + shared-mime-info ssl tar:bzip2 +USE_GL= gl glu +USE_GNOME= gtk20 libxslt libidl glib20 +USE_JAVA= yes +JAVA_BUILD= jdk +JAVA_RUN= jdk +JAVA_VENDOR= openjdk +JAVA_VERSION= 1.6+ +USE_PERL5= build +USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ + xinerama xrandr xrender xt + CONFLICTS_INSTALL= apache-openoffice-devel-* AOOVERSION1= 4 @@ -119,20 +134,6 @@ XDGDIR= ${OOPATH}/share/xdg XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} -USES= autoreconf bison compiler:c++11-lib cpe \ - desktop-file-utils \ - gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \ - shared-mime-info ssl tar:bzip2 -USE_GL= gl glu -USE_GNOME= gtk20 libxslt libidl glib20 -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_RUN= jdk -JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ -USE_PERL5= build -USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ - xinerama xrandr xrender xt INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} Copied: branches/2018Q4/editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx (from r482164, head/editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx Wed Nov 7 22:29:43 2018 (r484413, copy of r482164, head/editors/openoffice-4/files/patch-oox_source_core_filterdetect.cxx) @@ -0,0 +1,95 @@ +--- oox/source/core/filterdetect.cxx.orig 2017-11-27 13:44: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(); + Modified: branches/2018Q4/editors/openoffice-devel/Makefile ============================================================================== --- branches/2018Q4/editors/openoffice-devel/Makefile Wed Nov 7 21:13:16 2018 (r484412) +++ branches/2018Q4/editors/openoffice-devel/Makefile Wed Nov 7 22:29:43 2018 (r484413) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -98,6 +98,21 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf +USES= autoreconf bison compiler:c++11-lib cpe \ + desktop-file-utils \ + gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \ + shared-mime-info ssl tar:${TARTYPE} +USE_GL= gl glu +USE_GNOME= gtk20 libxslt libidl glib20 +USE_JAVA= yes +JAVA_BUILD= jdk +JAVA_RUN= jdk +JAVA_VENDOR= openjdk +JAVA_VERSION= 1.6+ +USE_PERL5= build +USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ + xinerama xrandr xrender xt + CONFLICTS_INSTALL= apache-openoffice-4* AOOVERSION1= 4 @@ -131,20 +146,6 @@ XDGDIR= ${OOPATH}/share/xdg XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} -USES= autoreconf bison compiler:c++11-lib cpe \ - desktop-file-utils \ - gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \ - shared-mime-info ssl tar:${TARTYPE} -USE_GL= gl glu -USE_GNOME= gtk20 libxslt libidl glib20 -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_RUN= jdk -JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ -USE_PERL5= build -USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ - xinerama xrandr xrender xt INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} Copied: branches/2018Q4/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx (from r482164, head/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx Wed Nov 7 22:29:43 2018 (r484413, copy of r482164, head/editors/openoffice-devel/files/patch-oox_source_core_filterdetect.cxx) @@ -0,0 +1,95 @@ +--- 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(); +