pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2008Q1]: pkgsrc/misc/openoffice2 pullup ticket #2342 - request...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b6488262356d
branches: pkgsrc-2008Q1
changeset: 540290:b6488262356d
user: rtr <rtr%pkgsrc.org@localhost>
date: Sat Apr 26 04:29:13 2008 +0000
description:
pullup ticket #2342 - requested by hira
fixes security vulnerabilities
Revisions pulled up:
- pkgsrc/misc/openoffice2/Makefile 1.41
- pkgsrc/misc/openoffice2/distinfo 1.36,1.37,1.38
- pkgsrc/misc/openoffice2/options.mk 1.18
- pkgsrc/misc/openoffice2/patches/patch-aa r0
- pkgsrc/misc/openoffice2/patches/patch-ae r0
- pkgsrc/misc/openoffice2/patches/patch-aj r0
- pkgsrc/misc/openoffice2/patches/patch-ak 1.7,1.8
- pkgsrc/misc/openoffice2/patches/patch-ba 1.11,1.12
- pkgsrc/misc/openoffice2/patches/patch-bg 1.4
- pkgsrc/misc/openoffice2/patches/patch-bs 1.3
- pkgsrc/misc/openoffice2/patches/patch-cp 1.2
- pkgsrc/misc/openoffice2/patches/patch-cr 1.2
- pkgsrc/misc/openoffice2/patches/patch-ct 1.2
- pkgsrc/misc/openoffice2/patches/patch-cw 1.2
- pkgsrc/misc/openoffice2/patches/patch-cz r0
- pkgsrc/misc/openoffice2/patches/patch-db r0
- pkgsrc/misc/openoffice2/patches/patch-dc 1.1,1.2
- pkgsrc/misc/openoffice2/patches/patch-dd 1.1
Module Name: pkgsrc
Committed By: hira
Date: Mon Apr 7 16:24:51 UTC 2008
Modified Files:
pkgsrc/misc/openoffice2: Makefile distinfo options.mk
pkgsrc/misc/openoffice2/patches: patch-ak patch-ba patch-bg patch-cp
patch-cr patch-ct patch-cw
Added Files:
pkgsrc/misc/openoffice2/patches: patch-dc
Removed Files:
pkgsrc/misc/openoffice2/patches: patch-aa patch-ae patch-aj patch-cz
patch-db
Log Message:
Update to 2.4.0.
<snip>
----------------------------------------------------------------------
Module Name: pkgsrc
Committed By: hira
Date: Sun Apr 13 20:32:43 UTC 2008
Modified Files:
pkgsrc/misc/openoffice2: distinfo
pkgsrc/misc/openoffice2/patches: patch-ak patch-bs
Log Message:
Fix build with firefox. Problem reported by abs@.
----------------------------------------------------------------------
Module Name: pkgsrc
Committed By: joerg
Date: Thu Apr 17 08:43:31 UTC 2008
Modified Files:
pkgsrc/misc/openoffice2: distinfo
pkgsrc/misc/openoffice2/patches: patch-dc
Added Files:
pkgsrc/misc/openoffice2/patches: patch-dd
Log Message:
Repeat after me: Never use sys/errno.h, just use errno.h. Fix build on
AMD64.
----------------------------------------------------------------------
Module Name: pkgsrc
Committed By: hira
Date: Wed Apr 9 09:03:59 UTC 2008
Modified Files:
pkgsrc/misc/openoffice2: distinfo
pkgsrc/misc/openoffice2/patches: patch-ba
Log Message:
Fix `test =='. Pointed out by wiz@.
----------------------------------------------------------------------
diffstat:
misc/openoffice2/Makefile | 9 +-
misc/openoffice2/distinfo | 49 +-
misc/openoffice2/options.mk | 12 +-
misc/openoffice2/patches/patch-aa | 585 -----------------------
misc/openoffice2/patches/patch-ae | 17 -
misc/openoffice2/patches/patch-aj | 60 --
misc/openoffice2/patches/patch-ak | 78 +-
misc/openoffice2/patches/patch-ba | 52 +-
misc/openoffice2/patches/patch-bg | 12 +-
misc/openoffice2/patches/patch-bs | 20 +-
misc/openoffice2/patches/patch-cp | 14 +-
misc/openoffice2/patches/patch-cr | 17 +-
misc/openoffice2/patches/patch-ct | 16 +-
misc/openoffice2/patches/patch-cw | 12 +-
misc/openoffice2/patches/patch-cz | 30 -
misc/openoffice2/patches/patch-db | 948 --------------------------------------
misc/openoffice2/patches/patch-dc | 13 +
misc/openoffice2/patches/patch-dd | 13 +
18 files changed, 190 insertions(+), 1767 deletions(-)
diffs (truncated from 2292 to 300 lines):
diff -r 7f1a9267f2e1 -r b6488262356d misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Fri Apr 25 01:09:44 2008 +0000
+++ b/misc/openoffice2/Makefile Sat Apr 26 04:29:13 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2008/03/21 09:20:55 hira Exp $
+# $NetBSD: Makefile,v 1.40.2.1 2008/04/26 04:29:13 rtr Exp $
#
-OO_VER= 2.3.1
-PKGREVISION= 5
+OO_VER= 2.4.0
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
CATEGORIES= misc
@@ -30,7 +29,7 @@
.include "../../mk/bsd.prefs.mk"
-WRKSRC= ${WRKDIR}/OOG680_m9
+WRKSRC= ${WRKDIR}/OOH680_m12
CONFIGURE_DIRS= config_office
# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -113,7 +112,7 @@
MESSAGE_SUBST+= OO_RELEASE=${OO_RELEASE}
INSTALLATION_DIRS= bin ${OO_RELEASE}
-OO_UNXNAME= openoffice.org2.3
+OO_UNXNAME= openoffice.org2.4
OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
OO_PKGROOT= /opt/${OO_UNXNAME}
OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg
diff -r 7f1a9267f2e1 -r b6488262356d misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Fri Apr 25 01:09:44 2008 +0000
+++ b/misc/openoffice2/distinfo Sat Apr 26 04:29:13 2008 +0000
@@ -1,26 +1,23 @@
-$NetBSD: distinfo,v 1.35 2008/03/21 09:20:56 hira Exp $
+$NetBSD: distinfo,v 1.35.2.1 2008/04/26 04:29:13 rtr Exp $
-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 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1
+Size (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120 bytes
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 1f775a0f2b755ad1c4cb7d14df93d86948424e7f
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = f8be874225a4f8a90bf20d563db175f3381e224e
+Size (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 153590855 bytes
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = a52ed9e7a7511ad12cf6cef98e64a3ef384dd383
+Size (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 81193819 bytes
+SHA1 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = cbefb4655987fb70b929b6922c2b27beb1e5db18
+RMD160 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = ad25cb334f59154db36da8346c47805013f0f6fe
+Size (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = 44072779 bytes
SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
-SHA1 (patch-ae) = 6fb03e29c5368f26e7187516354858df127d388b
SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-aj) = f0a38928938ba18d32b1e9007dbb8e36e54381bc
-SHA1 (patch-ak) = 23c202e81b47a415a0762aa5f30e8ed4e64017ad
+SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -29,12 +26,12 @@
SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = e1cc1c4dd80c3151c9f43d1030d89404f0537b47
+SHA1 (patch-ba) = 0134e4055ebe01134029881c3f4d961f7efe8db6
SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
-SHA1 (patch-bg) = c050b8fa384a187fbf846f78c884c98840046a86
+SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
@@ -46,7 +43,7 @@
SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
-SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12
+SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
@@ -56,16 +53,16 @@
SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-cp) = 7c6007d18cc4f1b5d1c8e16c9170ec0e8211a040
+SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
-SHA1 (patch-cr) = 9cf96627d480714d62109bb3a7d67777a1a2b796
+SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
SHA1 (patch-cs) = 76c55cd6150076022d9b773486232417ed069643
-SHA1 (patch-ct) = f895442c141fb7cc172adca4903bbf784dbe3594
+SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
-SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
+SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
-SHA1 (patch-cz) = e9850759fccff68914b104f4075e79c61b1010eb
SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
-SHA1 (patch-db) = 2760f1dd5a19afb7e329796318beedfc6972f039
+SHA1 (patch-dc) = 125ae2e943946cb96c6f7513dccced0c9d8797af
+SHA1 (patch-dd) = 6f791b6be13e37a59b3115ab338587489079b89d
diff -r 7f1a9267f2e1 -r b6488262356d misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk Fri Apr 25 01:09:44 2008 +0000
+++ b/misc/openoffice2/options.mk Sat Apr 26 04:29:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2007/12/18 22:24:29 hira Exp $
+# $NetBSD: options.mk,v 1.17.4.1 2008/04/26 04:29:13 rtr Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2
PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd
@@ -8,11 +8,11 @@
OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
cs cy da de dz el en-GB en-US en-ZA eo es et \
eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka km kn-IN ko ku lo lt lv mk ms ml-IN mr-IN \
- ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru \
- rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx \
- te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve \
- vi xh zh-CN zh-TW zu
+ ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
+ nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
+ rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
+ ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
+ zh-TW zu
.for l in ${OO_SUPPORTED_LANGUAGES}
PKG_SUPPORTED_OPTIONS+= lang-${l}
.endfor
diff -r 7f1a9267f2e1 -r b6488262356d misc/openoffice2/patches/patch-aa
--- a/misc/openoffice2/patches/patch-aa Fri Apr 25 01:09:44 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,585 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/10/06 20:02:22 hira Exp $
-
---- sal/util/sal_netbsd.map.orig 2007-09-27 06:14:49.000000000 +0900
-+++ sal/util/sal_netbsd.map 2007-09-27 08:16:30.000000000 +0900
-@@ -0,0 +1,580 @@
-+UDK_3_0_0 {
-+ global:
-+ GetVersionInfo;
-+ osl_acceptConnectionOnSocket;
-+ osl_acceptPipe;
-+ osl_acquireSocket;
-+ osl_acquirePipe;
-+ osl_acquireMutex;
-+ osl_acquireSemaphore;
-+ osl_addSignalHandler;
-+ osl_addToSocketSet;
-+ osl_assertFailedLine;
-+ osl_bindAddrToSocket;
-+ osl_breakDebug;
-+ osl_checkCondition;
-+ osl_clearSocketSet;
-+ osl_closeDirectory;
-+ osl_closePipe;
-+ osl_closeProfile;
-+ osl_connectSocketTo;
-+ osl_copyHostAddr;
-+ osl_copySocketAddr;
-+ osl_createCondition;
-+ osl_createEmptySocketAddr;
-+ osl_createHostAddr;
-+ osl_createHostAddrByAddr;
-+ osl_createHostAddrByName;
-+ osl_createInetSocketAddr;
-+ osl_createMutex;
-+ osl_createPipe;
-+ osl_createSemaphore;
-+ osl_createSocket;
-+ osl_createSocketSet;
-+ osl_createSuspendedThread;
-+ osl_createThread;
-+ osl_createThreadKey;
-+ osl_decrementInterlockedCount;
-+ osl_demultiplexSocketEvents;
-+ osl_destroyCondition;
-+ osl_destroyHostAddr;
-+ osl_destroyMutex;
-+ osl_destroySemaphore;
-+ osl_destroySocketAddr;
-+ osl_destroySocketSet;
-+ osl_destroyThread;
-+ osl_destroyThreadKey;
-+ osl_enableNonBlockingMode;
-+ osl_executeProcess;
-+ osl_executeProcess_WithRedirectedIO;
-+ osl_flushProfile;
-+ osl_freeProcessHandle;
-+ osl_freeSecurityHandle;
-+ osl_getAddrOfSocketAddr;
-+ osl_getCommandArg;
-+ osl_getCommandArgCount;
-+ osl_getConfigDir;
-+ osl_getCurrentSecurity;
-+ osl_getDirectoryItem;
-+ osl_getDottedInetAddrOfSocketAddr;
-+ osl_getEnvironment;
-+ osl_getEthernetAddress;
-+ osl_getExecutableFile;
-+ osl_getFamilyOfSocketAddr;
-+ osl_getFileStatus;
-+ osl_getFileURLFromSystemPath;
-+ osl_getGlobalMutex;
-+ osl_getHomeDir;
-+ osl_getHostnameOfHostAddr;
-+ osl_getHostnameOfSocketAddr;
-+ osl_getInetPortOfSocketAddr;
-+ osl_getLastPipeError;
-+ osl_getLastSocketError;
-+ osl_getLastSocketErrorDescription;
-+ osl_getLocalAddrOfSocket;
-+ osl_getLocalHostname;
-+ osl_getModuleURLFromAddress;
-+ osl_getNextDirectoryItem;
-+ osl_getPeerAddrOfSocket;
-+ osl_getProcess;
-+ osl_getProcessInfo;
-+ osl_getProcessWorkingDir;
-+ osl_getProfileSectionEntries;
-+ osl_getProfileSections;
-+ osl_getServicePort;
-+ osl_getSocketAddrOfHostAddr;
-+ osl_getSocketOption;
-+ osl_getSocketType;
-+ osl_getSymbol;
-+ osl_getSystemPathFromFileURL;
-+ osl_getSystemTime;
-+ osl_getThreadIdentifier;
-+ osl_getThreadKeyData;
-+ osl_getThreadPriority;
-+ osl_getThreadTextEncoding;
-+ osl_getUserIdent;
-+ osl_getUserName;
-+ osl_getVolumeInformation;
-+ osl_incrementInterlockedCount;
-+ osl_isAdministrator;
-+ osl_isEndOfFile;
-+ osl_isEqualSocketAddr;
-+ osl_isExceptionPending;
-+ osl_isInSocketSet;
-+ osl_isNonBlockingMode;
-+ osl_isReceiveReady;
-+ osl_isSendReady;
-+ osl_isThreadRunning;
-+ osl_joinProcess;
-+ osl_joinWithThread;
-+ osl_listenOnSocket;
-+ osl_loadModule;
-+ osl_loginUser;
-+ osl_loginUserOnFileServer;
-+ osl_openDirectory;
-+ osl_openProfile;
-+ osl_raiseSignal;
-+ osl_readProfileBool;
-+ osl_readProfileIdent;
-+ osl_readProfileString;
-+ osl_readPipe;
-+ osl_readSocket;
-+ osl_receiveFromSocket;
-+ osl_receivePipe;
-+ osl_receiveSocket;
-+ osl_releaseDirectoryItem;
-+ osl_releaseMutex;
-+ osl_releasePipe;
-+ osl_releaseSemaphore;
-+ osl_releaseSocket;
-+ osl_removeFromSocketSet;
-+ osl_removeProfileEntry;
-+ osl_removeSignalHandler;
-+ osl_reportError;
-+ osl_resetCondition;
-+ osl_resolveHostname;
-+ osl_resumeThread;
-+ osl_scheduleThread;
-+ osl_searchFileURL;
-+ osl_sendPipe;
-+ osl_sendSocket;
-+ osl_sendToSocket;
-+ osl_setCondition;
Home |
Main Index |
Thread Index |
Old Index