kpriv
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Don Lewis 2024-02-14 11:10:31 -08:00
parent 5ee4d6fde8
commit 4e00a34cb8
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/openoffice-devel/Makefile
View File

@ -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

6
editors/openoffice-devel/distinfo
View File

@ -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

18
editors/openoffice-devel/files/patch-boost_boost__1__55__0.patch
View File

@ -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
+