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

MFH: r551736

Browse Source 
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
This commit is contained in:
Don Lewis 2020-11-11 00:15:01 +00:00
parent bd5c791d52
commit 3d1a91c125
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=554863
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editors/openoffice-devel/Makefile
View File

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

6
editors/openoffice-devel/distinfo
View File

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

3
editors/openoffice-devel/files/patch-connectivity_source_parse_sqlbison.y
View File

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

11
editors/openoffice-devel/files/patch-gmake43
View File

@ -1,11 +0,0 @@
--- solenv/gbuild/Tempfile.mk.orig 2019-09-17 22:55:21 UTC
+++ solenv/gbuild/Tempfile.mk
@@ -27,7 +27,7 @@ $(strip $(1)
$(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
$(foreach item,$(3),$(eval gb_var2file_curblock += $(item)
ifeq ($$(words $$(gb_var2file_curblock)),$(2))
- gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
+ gb_var2file_helpervar := $$(shell printf " %s" "$$(gb_var2file_curblock)" >> $(1) )
gb_var2file_curblock :=
endif
))\