diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2015-05-08 15:58:38 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2015-05-08 15:58:38 +0000 |
| commit | 75ff9b0b81bf67211df686a7ab32ee0113e0a41d (patch) | |
| tree | 507c3b5f10d3fbab30a183953896d15dcb10709c /editors/openoffice-4 | |
| parent | 866cff1adaa66f0ab3088c88602bd3065c783681 (diff) | |
| download | ports-75ff9b0b81bf67211df686a7ab32ee0113e0a41d.tar.gz ports-75ff9b0b81bf67211df686a7ab32ee0113e0a41d.zip | |
Add a patch to fix the HWP filter vulnerability documented in
CVE-2015-1774 and
<http://www.openoffice.org/security/cves/CVE-2015-1774.html>
Approved by: mat (mentor)
MFH: 2015Q2
Security: b13af778-f4fc-11e4-a95d-ac9e174be3af
Differential Revision: https://reviews.freebsd.org/D2478
Notes
Notes:
svn path=/head/; revision=385792
Diffstat (limited to 'editors/openoffice-4')
| -rw-r--r-- | editors/openoffice-4/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-4/files/patch-CVE-2015-1774 | 47 |
2 files changed, 48 insertions, 1 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 33eb28cc3ef3..d81822ac42f5 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ diff --git a/editors/openoffice-4/files/patch-CVE-2015-1774 b/editors/openoffice-4/files/patch-CVE-2015-1774 new file mode 100644 index 000000000000..df307b7904aa --- /dev/null +++ b/editors/openoffice-4/files/patch-CVE-2015-1774 @@ -0,0 +1,47 @@ +Index: scp2/source/writer/module_writer.scp +=================================================================== +--- scp2/source/writer/module_writer.scp (revision 1677189) ++++ scp2/source/writer/module_writer.scp (revision 1677190) +@@ -40,7 +40,6 @@ + Styles = (HIDDEN_ROOT); + Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel, + gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard, +- gid_File_Lib_Hwpreader, + gid_File_Lib_Swd, + gid_File_Lib_Swui, + gid_File_Lib_Msword, +Index: scp2/source/writer/file_writer.scp +=================================================================== +--- scp2/source/writer/file_writer.scp (revision 1677189) ++++ scp2/source/writer/file_writer.scp (revision 1677190) +@@ -25,8 +25,6 @@ + + STD_LIB_FILE( gid_File_Lib_Swd , swd) + +-SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp) +- + File gid_File_Exe_Swriter + BIN_FILE_BODY; + Dir = gid_Brand_Dir_Program; +Index: postprocess/packcomponents/makefile.mk +=================================================================== +--- postprocess/packcomponents/makefile.mk (revision 1677189) ++++ postprocess/packcomponents/makefile.mk (revision 1677190) +@@ -121,7 +121,6 @@ + fps_office \ + frm \ + guesslang \ +- hwp \ + i18npool \ + i18nsearch \ + lng \ +Index: postprocess/prj/build.lst +=================================================================== +--- postprocess/prj/build.lst (revision 1677189) ++++ postprocess/prj/build.lst (revision 1677190) +@@ -1,4 +1,4 @@ +-po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL ++po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL + po postprocess usr1 - all po_mkout NULL + po postprocess\checkxml nmake - all po_checkxml NULL + po postprocess\checkdeliver nmake - all po_checkdlv NULL |