From nobody Wed Feb 14 19:32:37 2024 X-Original-To: dev-commits-ports-all@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 4TZpHn5nlkz52fD9; Wed, 14 Feb 2024 19:32:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpHn5GxKz4gmd; Wed, 14 Feb 2024 19:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707939157; 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=/Vb7aJAWuuPa2yqWpaNevME49Om78JuG3qi5vJtTZoc=; b=kb+TN642ld4cZiU8aHyGORDeRFJ10kT+aMEeNt1Mj//i8lJpeCbKWqOrI6ByUvyTWwQOB4 Gp1PjAGUER5UWDnfmsuY+uhJzqH7Pl+KyUm0nLOYo1vdHYlEF5Rjl+Rif73RSkWDqMTwTq 9qPImEhmBOiiwHrCdQLBesJfoXBWzgXqOu3FnRp5mt5W8tPhiBTJRW1gJNKwyo9WNxlnxM TdBkPl11iop+7E83XYQN/sEAFfR753q92jWP1N4HPqhK+FZ5jW8UXmI/tL4haDGJis1z3x A+0MJKkPDD61iiAygsHrMX930wXEr15+AQoDPPktkVg2YosmjBx8AXIfIbwlSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707939157; a=rsa-sha256; cv=none; b=Q09S4p1cYEEiHR2Z61woJlRsS7cRZ91rCS5tpJaUlRPIlyy8DS+/Hmh/9OgywnN+m5JlZg Dv6KpcxAes9bfCea0YwHgZGt7dEVEyjUgFDQ3/mg8em79FWQtE0rB9BK3KPC4gDB33Dug9 kllWn8Nf0YpyocRA2Kg5W9Ip1shpq7QwN9n0htlaQThpUAyF9CSYvmaxeE0brJi2BP0NzM AoroL5Llm3eYib8D0nBVCMNwvv0jA/S+5FILupx9/7BjQRz2fFfbqwKdanmM8mhWJK5GQF DBGnMkGl9/ouUeyjNB/2TvYQPqf2I3Y0Gc/gHnPR2EALWC/eA1JRVCMIvyrDwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707939157; 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=/Vb7aJAWuuPa2yqWpaNevME49Om78JuG3qi5vJtTZoc=; b=wJgpr0h03H1v73oi0rqECiaSCGmaHruG9NEHS8MUBMpYbCP8IY4jK06eT4wssneOfqSibV v+EczgPDAg0bAsiM7UK4k41zGBdg7G/x3FD7Kz5167A4pyktZ0fVkfBeQBaHmKrSKcpsi/ p+SNYLcz/HC9BgvoNkorNLw+7MHczMQbftIUojBKjeVi0ClVPuLp1cYJB85/OnoI0hCO5y AUrfKkeSUV5jVVBr0s5kLqzqyIi5N//AOsRA6vVRtTlwmnRT8cKX9iT8hnuJexQdnrvXwU wRg4uwAO1nyj3lBOf0kZ6CH8E5rNDpKlGY5cD/V5WIi4Z8WMGcBrInrInWOAHw== 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 4TZpHn4LRzz19X3; Wed, 14 Feb 2024 19:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJWbCi050727; Wed, 14 Feb 2024 19:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJWbTl050724; Wed, 14 Feb 2024 19:32:37 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:32:37 GMT Message-Id: <202402141932.41EJWbTl050724@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: 4e00a34cb88d - main - editors/openoffice-devel: Upgrade to a newer snapshot List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4e00a34cb88d408879d28ffb9dff11aa01a833e2 Auto-Submitted: auto-generated The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e00a34cb88d408879d28ffb9dff11aa01a833e2 commit 4e00a34cb88d408879d28ffb9dff11aa01a833e2 Author: Don Lewis AuthorDate: 2024-02-14 19:10:31 +0000 Commit: Don Lewis CommitDate: 2024-02-14 19:32:24 +0000 editors/openoffice-devel: Upgrade to a newer snapshot Upgrade openoffice-devel to a newer snapshot with bug and security fixes. Remove the point release and snapshot timestamp from the suffix appended to the names of the wrapper script and the program directory. It is annoying when the suffix changes and we'll never support the simultaneous installation of multiple versions where these values differ. patch-boost_boost__1__55__0.patch was upstreamed. MFH: 2024Q1 Security: CVE-2012-5639 Security: CVE-2023-1183 Security: CVE-2023-47804 --- editors/openoffice-devel/Makefile | 10 ++++------ editors/openoffice-devel/distinfo | 6 +++--- .../files/patch-boost_boost__1__55__0.patch | 18 ------------------ 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index d836a26a5271..f6ecd7cda423 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 6 +PORTREVISION= 0 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -54,7 +54,6 @@ BROKEN_powerpc64= fails to compile: aoo-4.2.0/main/solver/420/unxfbsdppc64.pro/i BUILD_DEPENDS= \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ - ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ ${LOCALBASE}/bin/unzip:archivers/unzip \ zip:archivers/zip \ ant:devel/apache-ant \ @@ -133,20 +132,19 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m4\(Build:9823\) -GITREVISION= e501375395 -TIMESTAMP= 1678061694 +GITREVISION= ed2e9b1ba7 +TIMESTAMP= 1707679630 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} +AOOSUFFIX= ${AOOVERSION1}.${AOOVERSION2} .if defined(AOORC) -AOOSUFFIX= ${AOOVERSION}-${AOORC} AOOSRC= apache-openoffice-${AOOVERSION}-${GITREVISION}-src${EXTRACT_SUFX} AOODISTTAG= TARTYPE= bzip2 .else -AOOSUFFIX= ${PORTVERSION} AOOSRC= apache-openoffice-${TIMESTAMP}-${GITREVISION}-src${EXTRACT_SUFX} AOODISTTAG= :snap TARTYPE= xz diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index 0e5a8f0e774e..00e51ebb3863 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1678253253 -SHA256 (openoffice/apache-openoffice-1678061694-e501375395-src.tar.xz) = bbd933690fd09f0c059a03dc2918f1aa5a82497678bdee996bfe32b7b56c4de1 -SIZE (openoffice/apache-openoffice-1678061694-e501375395-src.tar.xz) = 247232044 +TIMESTAMP = 1707869994 +SHA256 (openoffice/apache-openoffice-1707679630-ed2e9b1ba7-src.tar.xz) = be7751598f3aed57d10cacdf4f3e50a7e113517b9190982048a8534f4b99b497 +SIZE (openoffice/apache-openoffice-1707679630-ed2e9b1ba7-src.tar.xz) = 246661448 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 diff --git a/editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch b/editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch deleted file mode 100644 index a2656de477ac..000000000000 --- a/editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- boost/boost_1_55_0.patch.orig 2021-04-02 12:58:20 UTC -+++ boost/boost_1_55_0.patch -@@ -359,3 +359,15 @@ +# if defined(__VARIADIC_TEMPLATES) - # define BOOST_HAS_VARIADIC_TMPL - # else - # define BOOST_NO_CXX11_VARIADIC_TEMPLATES -+diff -ur misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp -+--- misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp 2012-05-15 04:57:21.000000000 -0700 -++++ misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp -+@@ -19,7 +19,7 @@ -+ -+ #define BOOST_HAS_THREADS -+ -+-#ifdef _LIBCPP_HAS_NO_VARIADICS -++#if defined(_LIBCPP_HAS_NO_VARIADICS) || (__cplusplus < 201103) -+ # define BOOST_NO_CXX11_HDR_TUPLE -+ #endif -+