[pkgsrc/pkgsrc-2008Q3]: pkgsrc/misc/openoffice2 Pullup ticket #2563 - request...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/misc/openoffice2 Pullup ticket #2563 - request...
From: tron <tron%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:39:48 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/8aff010eb928
branches:  pkgsrc-2008Q3
changeset: 547850:8aff010eb928
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Oct 31 21:55:54 2008 +0000

description:
Pullup ticket #2563 - request by hira
openoffice2: security update

Revisions pulled up:
- misc/openoffice2/Makefile             1.52-1.54
- misc/openoffice2/distinfo             1.45-1.47
- misc/openoffice2/patches/patch-ch     1.4
- misc/openoffice2/patches/patch-cs     1.2-1.3
---
Module Name:    pkgsrc
Committed By:   hira
Date:           Tue Oct 14 19:20:43 UTC 2008

Modified Files:
        pkgsrc/misc/openoffice2: Makefile

Log Message:
Add conflict with openoffice3.  Bump PKGREVISION.
Pointed out by wiz@.
---
Module Name:    pkgsrc
Committed By:   hira
Date:           Sat Oct 18 01:09:45 UTC 2008

Modified Files:
        pkgsrc/misc/openoffice2: Makefile distinfo
        pkgsrc/misc/openoffice2/patches: patch-cs

Log Message:
Correct CDEFS on NetBSD/amd64 (-DX86 -> -DX86_64).
Bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   hira
Date:           Sat Oct 18 01:28:22 UTC 2008

Modified Files:
        pkgsrc/misc/openoffice2: distinfo
        pkgsrc/misc/openoffice2/patches: patch-ch patch-cs

Log Message:
 - Add missing -Wl to patch-ch and patch-cs.
 - Correct flag for disabling optimizations.

Ride on previous PKGREVISION bump.
---
Module Name:    pkgsrc
Committed By:   hira
Date:           Fri Oct 31 11:00:50 UTC 2008

Modified Files:
        pkgsrc/misc/openoffice2: Makefile distinfo

Log Message:
Update to 2.4.2.  Minor update from 2.4.1.
This release fixes three security vulnerabilities.

  - CVE-2008-3282: OpenOffice.org "rtl_allocateMemory()" Truncation
                   (fixed in openoffice2-2.4.1nb1)
  - CVE-2008-2237: Manipulated WMF files can lead to heap overflows
                   and arbitrary code execution
  - CVE-2008-2238: Manipulated EMF files can lead to heap overflows
                   and arbitrary code execution

Release note: http://development.openoffice.org/releases/2.4.2.html

diffstat:

 misc/openoffice2/Makefile         |   8 ++++----
 misc/openoffice2/distinfo         |  30 +++++++++++++++---------------
 misc/openoffice2/patches/patch-ch |   8 ++++----
 misc/openoffice2/patches/patch-cs |  10 +++++-----
 4 files changed, 28 insertions(+), 28 deletions(-)

diffs (151 lines):

diff -r 4c33dbaa6d30 -r 8aff010eb928 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Fri Oct 31 12:01:12 2008 +0000
+++ b/misc/openoffice2/Makefile Fri Oct 31 21:55:54 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2008/10/02 17:57:45 joerg Exp $
+# $NetBSD: Makefile,v 1.51.2.1 2008/10/31 21:55:54 tron Exp $
 #
 
-OO_VER=                        2.4.1
-PKGREVISION=           3
+OO_VER=                        2.4.2
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
 CATEGORIES=            misc
@@ -30,7 +29,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/OOH680_m17
+WRKSRC=                        ${WRKDIR}/OOH680_m18
 CONFIGURE_DIRS=                config_office
 
 # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -44,6 +43,7 @@
 
 CONFLICTS+=            staroffice-[0-9]*
 CONFLICTS+=            openoffice-[0-9]*
+CONFLICTS+=            openoffice3-[0-9]*
 CONFLICTS+=            openoffice-bin-[0-9]*
 CONFLICTS+=            openoffice2-bin-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
diff -r 4c33dbaa6d30 -r 8aff010eb928 misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Fri Oct 31 12:01:12 2008 +0000
+++ b/misc/openoffice2/distinfo Fri Oct 31 21:55:54 2008 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.44 2008/10/03 09:09:16 hira Exp $
+$NetBSD: distinfo,v 1.44.2.1 2008/10/31 21:55:54 tron Exp $
 
-SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9
-RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417
-Size (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 6674779 bytes
-SHA1 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 170642263c32f614ee7e9439a8af30410e00d318
-RMD160 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 64f43d426005b6c5f464cf55e72df41fe833620b
-Size (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 153573457 bytes
-SHA1 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = b21f4531ea8182d87ff6f5f68809086c1c063295
-RMD160 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = d41f43b27e84ae5a4620b591e46d884e0c94a72c
-Size (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = 81193580 bytes
-SHA1 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = d42b8345b55ef6f0f2a4adb575c815bbb23ec00d
-RMD160 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = e476e4ca0804c58e4c8249b6f17f100094ad030d
-Size (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = 44069977 bytes
+SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99
+RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5
+Size (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 6674731 bytes
+SHA1 (openoffice-2.4.2/OOo_2.4.2_src_core.tar.bz2) = f84782887062011f34c5c8f0279c40d159051a34
+RMD160 (openoffice-2.4.2/OOo_2.4.2_src_core.tar.bz2) = d29ed7d23a7616b05d855c172e6f148aeb0f4b69
+Size (openoffice-2.4.2/OOo_2.4.2_src_core.tar.bz2) = 153673147 bytes
+SHA1 (openoffice-2.4.2/OOo_2.4.2_src_l10n.tar.bz2) = c59fefaf9f7e3372fbeb2a1e468270613b7b1fa6
+RMD160 (openoffice-2.4.2/OOo_2.4.2_src_l10n.tar.bz2) = 7a2bf7cbe404b7fe8cb61c670717f54046e1cab9
+Size (openoffice-2.4.2/OOo_2.4.2_src_l10n.tar.bz2) = 81193726 bytes
+SHA1 (openoffice-2.4.2/OOo_2.4.2_src_system.tar.bz2) = 67dd2af4c25a311c2e83a7dcd3a8229378ee1625
+RMD160 (openoffice-2.4.2/OOo_2.4.2_src_system.tar.bz2) = 172fcde006f5e81f3be526ab50dbb10a67d277b3
+Size (openoffice-2.4.2/OOo_2.4.2_src_system.tar.bz2) = 44071903 bytes
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
@@ -49,14 +49,14 @@
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0
+SHA1 (patch-ch) = be68bf0e05b2d80102fb098f703bf80bb4fa6abc
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
+SHA1 (patch-cs) = 55f2296e74c80f32ea548d38c4bbd9114e403fd3
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
diff -r 4c33dbaa6d30 -r 8aff010eb928 misc/openoffice2/patches/patch-ch
--- a/misc/openoffice2/patches/patch-ch Fri Oct 31 12:01:12 2008 +0000
+++ b/misc/openoffice2/patches/patch-ch Fri Oct 31 21:55:54 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.3 2007/10/06 20:02:23 hira Exp $
+$NetBSD: patch-ch,v 1.3.14.1 2008/10/31 21:55:54 tron Exp $
 
 --- solenv/inc/unxbsdi3.mk.orig        2007-10-05 10:11:25.000000000 +0900
 +++ solenv/inc/unxbsdi3.mk     2007-10-05 10:14:03.000000000 +0900
@@ -91,7 +91,7 @@
 +# reduce to -O1 to avoid optimization problems
 +CFLAGSOPT=-O1
 +# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O
++CFLAGSNOOPT=-O0
 +# Compiler flags for describing the output path
 +CFLAGSOUTOBJ=-o
 +
@@ -111,9 +111,9 @@
 +LINKC*=$(CC)
 +
 +# default linker flags
-+LINKFLAGSDEFS*=-z defs
++LINKFLAGSDEFS*=-Wl,-z,defs
 +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 +
 +# linker flags for linking applications
 +LINKFLAGSAPPGUI= -Wl,-export-dynamic 
diff -r 4c33dbaa6d30 -r 8aff010eb928 misc/openoffice2/patches/patch-cs
--- a/misc/openoffice2/patches/patch-cs Fri Oct 31 12:01:12 2008 +0000
+++ b/misc/openoffice2/patches/patch-cs Fri Oct 31 21:55:54 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cs,v 1.1 2007/10/12 15:41:43 hira Exp $
+$NetBSD: patch-cs,v 1.1.12.1 2008/10/31 21:55:54 tron Exp $
 
 --- solenv/inc/unxbsdx3.mk.orig        2007-10-13 00:24:19.000000000 +0900
 +++ solenv/inc/unxbsdx3.mk     2007-10-13 00:28:56.000000000 +0900
@@ -18,7 +18,7 @@
 +#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 +
 +# _PTHREADS is needed for the stl
-+CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++CDEFS+= -DX86_64 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
 +
 +# enable visibility define in "sal/types.h"
 +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -91,7 +91,7 @@
 +# reduce to -O1 to avoid optimization problems
 +CFLAGSOPT=-O1
 +# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O
++CFLAGSNOOPT=-O0
 +# Compiler flags for describing the output path
 +CFLAGSOUTOBJ=-o
 +
@@ -111,9 +111,9 @@
 +LINKC*=$(CC)
 +
 +# default linker flags
-+LINKFLAGSDEFS*=-z defs
++LINKFLAGSDEFS*=-Wl,-z,defs
 +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 +
 +# linker flags for linking applications
 +LINKFLAGSAPPGUI= -Wl,-export-dynamic
Prev by Date: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/doc ticket #2562
Next by Date: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/doc ticket #2566
Previous by Thread: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/doc ticket #2562
Next by Thread: [pkgsrc/pkgsrc-2008Q3]: pkgsrc/doc ticket #2566
Indexes:
Home | Main Index | Thread Index | Old Index