From owner-svn-ports-all@freebsd.org Wed Nov 11 00:15:03 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 19BCA467A62; Wed, 11 Nov 2020 00:15:03 +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.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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CW4xM0D7Jz3MyC; Wed, 11 Nov 2020 00:15:03 +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 DF34F37A7; Wed, 11 Nov 2020 00:15:02 +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 0AB0F2vg045513; Wed, 11 Nov 2020 00:15:02 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AB0F232045510; Wed, 11 Nov 2020 00:15:02 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <202011110015.0AB0F232045510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 11 Nov 2020 00:15:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r554863 - in branches/2020Q4/editors/openoffice-devel: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in branches/2020Q4/editors/openoffice-devel: . files X-SVN-Commit-Revision: 554863 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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, 11 Nov 2020 00:15:03 -0000 Author: truckman Date: Wed Nov 11 00:15:01 2020 New Revision: 554863 URL: https://svnweb.freebsd.org/changeset/ports/554863 Log: MFH: r551736 Upgrade editors/openoffice-devel to a newer snapshot, fixing CVE-2020-13958. patch-gmake43 has been upstreamed. Fix LICENSE_MPL11 generation. Approved by: ports-secteam (fluffy) Security: 4f15ca7b-23ae-11eb-9f59-1c1b0d9ea7e6 Deleted: branches/2020Q4/editors/openoffice-devel/files/patch-gmake43 Modified: branches/2020Q4/editors/openoffice-devel/Makefile branches/2020Q4/editors/openoffice-devel/distinfo branches/2020Q4/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/editors/openoffice-devel/Makefile ============================================================================== --- branches/2020Q4/editors/openoffice-devel/Makefile Wed Nov 11 00:11:41 2020 (r554862) +++ branches/2020Q4/editors/openoffice-devel/Makefile Wed Nov 11 00:15:01 2020 (r554863) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 3 +PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -117,9 +117,9 @@ AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO420m1\(Build:9821\) -GITREVISION= 6fb151b2c8 -TIMESTAMP= 1589199787 +AOOTAG= AOO420m3\(Build:9822\) +GITREVISION= d92770c00e +TIMESTAMP= 1602022694 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz @@ -394,8 +394,9 @@ post-extract: -e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT} ${SED} -e '\|^For Saxon|,/^__/p' \ -e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10} - ${SED} -e '\|^For Saxon|,$$d' \ - ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11} + ${SED} -e '\|^The following Licenses have some restrictions|,/^- For Network/p' \ + -e d ${WRKSRC}/LICENSE_category_b | \ + ${SED} -e :a -e '$d;N;2,3ba' -e 'P;D' > ${LICENSE_FILE_MPL11} ${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL} ${SED} -e '\|^For main/twain|,/^__/p' \ Modified: branches/2020Q4/editors/openoffice-devel/distinfo ============================================================================== --- branches/2020Q4/editors/openoffice-devel/distinfo Wed Nov 11 00:11:41 2020 (r554862) +++ branches/2020Q4/editors/openoffice-devel/distinfo Wed Nov 11 00:15:01 2020 (r554863) @@ -1,6 +1,6 @@ -TIMESTAMP = 1589755463 -SHA256 (openoffice/apache-openoffice-1589199787-6fb151b2c8-src.tar.xz) = 6a6923c7db49c82c31eba1288f93f05e64485db2995913e3fa62e1220cd502b9 -SIZE (openoffice/apache-openoffice-1589199787-6fb151b2c8-src.tar.xz) = 239665804 +TIMESTAMP = 1602076603 +SHA256 (openoffice/apache-openoffice-1602022694-d92770c00e-src.tar.xz) = 0091c200b250701d734fddfc094589716afa590beff9d3c24a03c54d5a205bf4 +SIZE (openoffice/apache-openoffice-1602022694-d92770c00e-src.tar.xz) = 239804844 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/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c Modified: branches/2020Q4/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y ============================================================================== --- branches/2020Q4/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y Wed Nov 11 00:11:41 2020 (r554862) +++ branches/2020Q4/editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y Wed Nov 11 00:15:01 2020 (r554863) @@ -5,11 +5,12 @@ %{ /************************************************************** * -@@ -123,8 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : +@@ -123,9 +124,6 @@ static connectivity::OSQLInternalNode* newNode(const : connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; - +-#define YYDEBUG 1 -#define YYERROR_VERBOSE #define SQLyyerror(s) \