diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2021-04-29 22:44:20 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2021-04-29 22:55:40 +0000 |
| commit | 6925bbd0c370bd21415233ee017a851be9ee102e (patch) | |
| tree | 9927062979a6f28490dd5734c7c4b341f53c76b8 | |
| parent | ba749872c186a6f45fa42f77780ace2a2b38a2bd (diff) | |
| download | ports-6925bbd0c370bd21415233ee017a851be9ee102e.tar.gz ports-6925bbd0c370bd21415233ee017a851be9ee102e.zip | |
editors/openoffice-devel: Upgrade to a newer upstream snapshot
Upgrade to upstream commit 6aec515561
* Fixes CVE-2021-30245
* Misc other fixes
The building using the archive format on FreeBSD does not require epm.
(cherry picked from commit 3c571fd4ae012e11ea68b05fcc2149f7fbe16a4d)
| -rw-r--r-- | editors/openoffice-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-configure.ac | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index dde685d2a96d..69e236943eae 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -117,8 +117,8 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m3\(Build:9822\) -GITREVISION= d92770c00e -TIMESTAMP= 1602022694 +GITREVISION= 6aec515561 +TIMESTAMP= 1619649022 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index adee0e35cefd..9cded48f3353 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1602076603 -SHA256 (openoffice/apache-openoffice-1602022694-d92770c00e-src.tar.xz) = 0091c200b250701d734fddfc094589716afa590beff9d3c24a03c54d5a205bf4 -SIZE (openoffice/apache-openoffice-1602022694-d92770c00e-src.tar.xz) = 239804844 +TIMESTAMP = 1619681235 +SHA256 (openoffice/apache-openoffice-1619649022-6aec515561-src.tar.xz) = 3025eacaff138565410beb930088d5dd6da974dcdba683695952473ff4da4021 +SIZE (openoffice/apache-openoffice-1619649022-6aec515561-src.tar.xz) = 239704376 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 diff --git a/editors/openoffice-devel/files/patch-configure.ac b/editors/openoffice-devel/files/patch-configure.ac new file mode 100644 index 000000000000..d7178782fa9d --- /dev/null +++ b/editors/openoffice-devel/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2021-04-17 18:43:53 UTC ++++ configure.ac +@@ -3407,7 +3407,7 @@ if test "$enable_epm" = "yes"; then + dnl =================================================================== + dnl Check for epm - not needed for Windows + dnl =================================================================== +- if test "$_os" != "WINNT"; then ++ if test "$_os" != "WINNT" -a "$with_package_format" != "archive"; then + if test -n "$with_epm"; then + EPM=$with_epm + else |