pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice2 Update to 2.3.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d756ea3737ac
branches:  trunk
changeset: 536393:d756ea3737ac
user:      hira <hira%pkgsrc.org@localhost>
date:      Wed Dec 12 10:07:54 2007 +0000

description:
Update to 2.3.1.
This release fixes CVE-2007-4575 (Potential arbitrary code execution
vulnerability in 3rd party module (HSQLDB)).

Changes since 2.3.0:
canvas23101             cairo canvas fixes
os105                   Fixe of issue 82625
dndthreading            Fix for DND threading apartment problems on Windows
extpatchfix
impress135              single fix cws for impress presentation
localisation26          l10n fixes for arabic
native119               New Java GUI Installer
c03v10
c17v001
ext002                  Release CWS to provide DirectX Canvas as Extension
fwk75                   Framework fixes for OOo2.3.1
native115               OOo 2.3.1 installation tasks
sw8u9bf01               Writer bug fixes for OOo2.3.1/SO8PU9
atkbridge8              Fix crash when leaving presentation mode with
                        accessibility enabled.
dr59                    Calc issues for target OOo 2.3.1
fwk76                   Framework OOo2.3.1 fixes.
hsql1808                upgrading hsqldb to latest release 1.8.0.9
jl80                    Bundle new JRE with StarOffice/OpenOffice
pdffix01                Fix regressions in PDF export of OOo 2.3.0
proxru
pythonhcheck            fix Python.h check
sw8u9bf02               Writer bugfixes for 2.3.1
thbpp9                  Misc fixes for 2.3.1
tl48                    Various fixes for OOo 2.3.1
updatedutchspellcheck   Update Dutch spell checker for 2.3.1.
dba231a                 DBA related bug fixing towards 2.3.1
impress131              impress fixes for OOo 2.3.1
javastuffor231          fix two Java issues for 2.3.1
jl81
localizationcws20071022 L10N cws for OOo 2.3.1, do not integrate into SRC680.
mav25                   Showstopper cws.
pmladek07               Do not crash when loading too big pictures.
updateptbrspellchecker  Update pt-BR spellchecker.
vcl23102                Fixes for 2.3.1
i18n38_OOG680           i18n bug fix
chart16                 chart bugfixes for OOo 2.3.1
swlayout01              fix for issue i79774 respectively internal issue
                        b6596954
ause086                 small build fixes to avoid bigger trouble - 2.3.1 only!
c05v005
c07v015
c13v001
chart18                 chart regressions in 2.3
jl78                    new cli assemblies
sb78                    ScriptFramework.jar not available to extensions
vcl23101                Issues for 2.3.1
allowcurloldies         fix ucb build with system curl 7.17.0

diffstat:

 misc/openoffice2/Makefile         |   9 +++++----
 misc/openoffice2/distinfo         |  28 ++++++++++++++--------------
 misc/openoffice2/patches/patch-cx |  15 ++++++++++++---
 3 files changed, 31 insertions(+), 21 deletions(-)

diffs (116 lines):

diff -r 59419b33537a -r d756ea3737ac misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Wed Dec 12 09:53:46 2007 +0000
+++ b/misc/openoffice2/Makefile Wed Dec 12 10:07:54 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2007/11/17 16:28:09 hira Exp $
+# $NetBSD: Makefile,v 1.30 2007/12/12 10:07:54 hira Exp $
 #
 
-OO_VER=                        2.3.0
+OO_VER=                        2.3.1
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
-PKGREVISION=           2
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=           ${DISTNAME}
@@ -28,7 +27,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/OOG680_m5
+WRKSRC=                        ${WRKDIR}/OOG680_m9
 CONFIGURE_DIRS=                config_office
 
 # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -70,6 +69,7 @@
 CONFIGURE_ARGS+=       --enable-cairo
 CONFIGURE_ARGS+=       --disable-ldap
 CONFIGURE_ARGS+=       --with-system-stdlibs
+CONFIGURE_ARGS+=       --with-system-curl
 CONFIGURE_ARGS+=       --with-system-db
 CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --with-system-freetype
@@ -180,6 +180,7 @@
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff -r 59419b33537a -r d756ea3737ac misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Wed Dec 12 09:53:46 2007 +0000
+++ b/misc/openoffice2/distinfo Wed Dec 12 10:07:54 2007 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.29 2007/11/17 16:28:09 hira Exp $
+$NetBSD: distinfo,v 1.30 2007/12/12 10:07:55 hira Exp $
 
-SHA1 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = a45b356092fc61aba68d0b7536bb3f723cd62937
-RMD160 (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 441a43c2a2d5418c9d3b55a89790f31598000bde
-Size (openoffice-2.3.0/OOo_2.3.0_src_binfilter.tar.bz2) = 6477306 bytes
-SHA1 (openoffice-2.3.0/OOo_2.3.0_src_core.tar.bz2) = 339453f169e63f531e24f3d5774e6a5da65b26c1
-RMD160 (openoffice-2.3.0/OOo_2.3.0_src_core.tar.bz2) = 67c7a97aac4652f8a9cfb3019b9649689977b076
-Size (openoffice-2.3.0/OOo_2.3.0_src_core.tar.bz2) = 145104450 bytes
-SHA1 (openoffice-2.3.0/OOo_2.3.0_src_l10n.tar.bz2) = ca7dcd4d19d1f5df21fb931fe31cdd779128f49c
-RMD160 (openoffice-2.3.0/OOo_2.3.0_src_l10n.tar.bz2) = a84678c0bf786869464814b0fa21137acb3250a9
-Size (openoffice-2.3.0/OOo_2.3.0_src_l10n.tar.bz2) = 78634672 bytes
-SHA1 (openoffice-2.3.0/OOo_2.3.0_src_system.tar.bz2) = a6c2af424f7ac26adf75b384572fe19975ef355d
-RMD160 (openoffice-2.3.0/OOo_2.3.0_src_system.tar.bz2) = 5b557b49eec915127515c76ad921eea3580a893c
-Size (openoffice-2.3.0/OOo_2.3.0_src_system.tar.bz2) = 36640242 bytes
+SHA1 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 0643c52da3850a164928342e7651897b7a76ca1f
+RMD160 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 497aec1de49ea941ab8305331a9fc9e8e04a5162
+Size (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 6476673 bytes
+SHA1 (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = de189e03a329cdd334823a52b800fad0c033ab4d
+RMD160 (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = ab75c022d00ed6269eb9437f9c022e44181c6d3a
+Size (openoffice-2.3.1/OOo_2.3.1_src_core.tar.bz2) = 144156134 bytes
+SHA1 (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = 004defae1496cf4b953a233abb20fd4c7e162423
+RMD160 (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = bc10b1e05574aced79532fbef316e66dcb810fbf
+Size (openoffice-2.3.1/OOo_2.3.1_src_l10n.tar.bz2) = 79077332 bytes
+SHA1 (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = ebc835f9c00ef60b9d8da1004a8f31f8a88aef6f
+RMD160 (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = f93b0fc523a39d29e73466be4d592d5a9fcde68e
+Size (openoffice-2.3.1/OOo_2.3.1_src_system.tar.bz2) = 36879908 bytes
 SHA1 (patch-aa) = bbbd684c158cddb8aabf9c232257a997950f6119
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
@@ -64,4 +64,4 @@
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
-SHA1 (patch-cx) = 4babf4ff88831db1967192ae33e6694410ea304c
+SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
diff -r 59419b33537a -r d756ea3737ac misc/openoffice2/patches/patch-cx
--- a/misc/openoffice2/patches/patch-cx Wed Dec 12 09:53:46 2007 +0000
+++ b/misc/openoffice2/patches/patch-cx Wed Dec 12 10:07:54 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-cx,v 1.2 2007/11/17 16:28:09 hira Exp $
+$NetBSD: patch-cx,v 1.3 2007/12/12 10:07:55 hira Exp $
 
 --- solenv/inc/libs.mk.orig    2007-07-31 22:06:06.000000000 +0900
-+++ solenv/inc/libs.mk 2007-11-13 10:33:35.000000000 +0900
++++ solenv/inc/libs.mk 2007-12-12 17:04:33.000000000 +0900
 @@ -187,14 +187,14 @@
  LINGULIB=$(HM2LIBST)
  LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
@@ -29,7 +29,7 @@
  .ENDIF
  .ELSE
  JPEG3RDLIB=-ljpeglib
-@@ -221,8 +221,8 @@
+@@ -221,13 +221,17 @@
  CURLLIB=-lcurl-3
  .ELSE                 # "$(GUI)$(COM)"=="WNTGCC"
  .IF "$(SYSTEM_DB)" == "YES"
@@ -40,3 +40,12 @@
  .ELSE
  BERKELEYLIB=-ldb-4.2
  BERKELEYCPPLIB=-ldb_cxx-4.2
+ .ENDIF
++.IF "$(SYSTEM_CURL)" == "YES"
++CURLLIB=$(CURL_LIBS)
++.ELSE
+ CURLLIB=-lcurl
++.ENDIF
+ .ENDIF                        # "$(GUI)$(COM)"=="WNTGCC"
+ SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
+ SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)



Home | Main Index | Thread Index | Old Index