Sun Sep 13 03:54:14 2009 UTC ()
Update to 2.4.3.  This is bug fix release.  It fixes the following
security vulnerabilities.

 * CVE-2009-0200/CVE-2009-0201: Manipulated Microsoft Word files can
   lead to heap overflows and arbitrary code execution
 * CVE-2009-2414/CVE-2009-2416: Manipulated XML documents can lead to
   arbitrary code execution

Release notes: http://development.openoffice.org/releases/2.4.3.html

 - Fix getline() problem (patches from misc/openoffice3/patches).
 - Use internal neon (9 patches are required to use external neon).
 - Use internal openssl for internal neon.
 - Disable VBA extension (enabling this causes build error).


(hira)
diff -r1.73 -r1.74 pkgsrc/misc/openoffice2/Makefile
diff -r1.54 -r1.55 pkgsrc/misc/openoffice2/distinfo
diff -r0 -r1.1 pkgsrc/misc/openoffice2/patches/patch-ga
diff -r0 -r1.1 pkgsrc/misc/openoffice2/patches/patch-gb
diff -r0 -r1.1 pkgsrc/misc/openoffice2/patches/patch-gc
cvs diff -r1.73 -r1.74 pkgsrc/misc/openoffice2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/Makefile 2009/09/10 00:27:08 1.73
+++ pkgsrc/misc/openoffice2/Attic/Makefile 2009/09/13 03:54:13 1.74
@@ -1,46 +1,45 @@ @@ -1,46 +1,45 @@
1# $NetBSD: Makefile,v 1.73 2009/09/10 00:27:08 tnn Exp $ 1# $NetBSD: Makefile,v 1.74 2009/09/13 03:54:13 hira Exp $
2# 2#
3 3
4OO_VER= 2.4.2 4OO_VER= 2.4.3
5DISTNAME= openoffice-${OO_VER} 5DISTNAME= openoffice-${OO_VER}
6PKGNAME= openoffice2-${OO_VER} 6PKGNAME= openoffice2-${OO_VER}
7PKGREVISION= 12 
8CATEGORIES= misc 7CATEGORIES= misc
9MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} 8MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
10DIST_SUBDIR= ${DISTNAME} 9DIST_SUBDIR= ${DISTNAME}
11 10
12DISTFILES= OOo_${OO_VER}_src_core.tar.bz2 11DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
13DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2 12DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
14DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2 13DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2
15#DISTFILES+= OOo_${OO_VER}_src_sdk.tar.bz2 14#DISTFILES+= OOo_${OO_VER}_src_sdk.tar.bz2
16DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2 15DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2
17 16
18MAINTAINER= hira@NetBSD.org 17MAINTAINER= hira@NetBSD.org
19HOMEPAGE= http://www.openoffice.org/ 18HOMEPAGE= http://www.openoffice.org/
20COMMENT= Integrated office productivity suite (version 2) 19COMMENT= Integrated office productivity suite (version 2)
21 20
22PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
23 22
24BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison 23BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
25BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip 24BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
26BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip 25BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
27BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip 26BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
28 27
29DEPENDS+= libpaper-[0-9]*:../../print/libpaper 28DEPENDS+= libpaper-[0-9]*:../../print/libpaper
30 29
31.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
32 31
33WRKSRC= ${WRKDIR}/OOH680_m18 32WRKSRC= ${WRKDIR}/OOH680_m21
34CONFIGURE_DIRS= config_office 33CONFIGURE_DIRS= config_office
35 34
36# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879). 35# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
37GCC_REQD+= 3.4 36GCC_REQD+= 3.4
38USE_LANGUAGES+= c c++ 37USE_LANGUAGES+= c c++
39 38
40USE_TOOLS+= bash gmake imake perl pkg-config tar 39USE_TOOLS+= bash gmake imake perl pkg-config tar
41PTHREAD_OPTS+= require 40PTHREAD_OPTS+= require
42PTHREAD_AUTO_VARS= yes 41PTHREAD_AUTO_VARS= yes
43 42
44CONFLICTS+= staroffice-[0-9]* 43CONFLICTS+= staroffice-[0-9]*
45CONFLICTS+= openoffice-[0-9]* 44CONFLICTS+= openoffice-[0-9]*
46CONFLICTS+= openoffice3-[0-9]* 45CONFLICTS+= openoffice3-[0-9]*
@@ -79,43 +78,41 @@ SUBST_SED.lib+= -e 's|@OO_LIBDIR@|${OO_ @@ -79,43 +78,41 @@ SUBST_SED.lib+= -e 's|@OO_LIBDIR@|${OO_
79LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib 78LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib
80LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib 79LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
81SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g' 80SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
82LIBS+= ${LIB.${pkg}} 81LIBS+= ${LIB.${pkg}}
83.endfor 82.endfor
84 83
85CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q} 84CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q}
86CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q} 85CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q}
87CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4} 86CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
88CONFIGURE_ENV+= BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas} 87CONFIGURE_ENV+= BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
89CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk 88CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk
90CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode 89CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode
91CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn 90CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn
92CONFIGURE_ENV+= USE_BUILTIN_openssl=${USE_BUILTIN.openssl} 
93 91
94CONFIGURE_ARGS+= --with-use-shell=bash 92CONFIGURE_ARGS+= --with-use-shell=bash
95CONFIGURE_ARGS+= --enable-binfilter 93CONFIGURE_ARGS+= --enable-binfilter
96CONFIGURE_ARGS+= --enable-cairo 94CONFIGURE_ARGS+= --enable-cairo
97CONFIGURE_ARGS+= --disable-ldap 95CONFIGURE_ARGS+= --disable-ldap
 96CONFIGURE_ARGS+= --disable-vba
98CONFIGURE_ARGS+= --with-system-stdlibs 97CONFIGURE_ARGS+= --with-system-stdlibs
99CONFIGURE_ARGS+= --with-system-curl 98CONFIGURE_ARGS+= --with-system-curl
100CONFIGURE_ARGS+= --with-system-db 99CONFIGURE_ARGS+= --with-system-db
101CONFIGURE_ARGS+= --with-system-expat 100CONFIGURE_ARGS+= --with-system-expat
102CONFIGURE_ARGS+= --with-system-freetype 101CONFIGURE_ARGS+= --with-system-freetype
103CONFIGURE_ARGS+= --with-system-icu 102CONFIGURE_ARGS+= --with-system-icu
104CONFIGURE_ARGS+= --with-system-jpeg 103CONFIGURE_ARGS+= --with-system-jpeg
105CONFIGURE_ARGS+= --with-system-libxml2 104CONFIGURE_ARGS+= --with-system-libxml2
106CONFIGURE_ARGS+= --with-system-libxslt 105CONFIGURE_ARGS+= --with-system-libxslt
107CONFIGURE_ARGS+= --with-system-neon 
108CONFIGURE_ARGS+= --with-system-openssl 
109CONFIGURE_ARGS+= --with-system-python 106CONFIGURE_ARGS+= --with-system-python
110CONFIGURE_ARGS+= --with-system-zlib 107CONFIGURE_ARGS+= --with-system-zlib
111CONFIGURE_ARGS+= --with-dynamic-xinerama 108CONFIGURE_ARGS+= --with-dynamic-xinerama
112 109
113# `portable' supports all platforms. 110# `portable' supports all platforms.
114CONFIGURE_ARGS+= --enable-epm --with-package-format=portable 111CONFIGURE_ARGS+= --enable-epm --with-package-format=portable
115 112
116# XXX: Error in OOo internal libsndfile. 113# XXX: Error in OOo internal libsndfile.
117CONFIGURE_ARGS+= --disable-pasf 114CONFIGURE_ARGS+= --disable-pasf
118 115
119# Disable Java. 116# Disable Java.
120CONFIGURE_ARGS+= --without-java --disable-odk --disable-gcjaot 117CONFIGURE_ARGS+= --without-java --disable-odk --disable-gcjaot
121 118
@@ -185,32 +182,30 @@ post-install: @@ -185,32 +182,30 @@ post-install:
185 182
186.include "../../mk/compiler.mk" 183.include "../../mk/compiler.mk"
187 184
188.include "../../databases/db4/buildlink3.mk" 185.include "../../databases/db4/buildlink3.mk"
189.include "../../databases/shared-mime-info/mimedb.mk" 186.include "../../databases/shared-mime-info/mimedb.mk"
190.include "../../devel/zlib/buildlink3.mk" 187.include "../../devel/zlib/buildlink3.mk"
191.include "../../fonts/fontconfig/buildlink3.mk" 188.include "../../fonts/fontconfig/buildlink3.mk"
192.include "../../graphics/MesaLib/buildlink3.mk" 189.include "../../graphics/MesaLib/buildlink3.mk"
193.include "../../graphics/cairo/buildlink3.mk" 190.include "../../graphics/cairo/buildlink3.mk"
194.include "../../graphics/freetype2/buildlink3.mk" 191.include "../../graphics/freetype2/buildlink3.mk"
195.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 192.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
196.include "../../graphics/jpeg/buildlink3.mk" 193.include "../../graphics/jpeg/buildlink3.mk"
197.include "../../lang/python/application.mk" 194.include "../../lang/python/application.mk"
198.include "../../security/openssl/buildlink3.mk" 
199.include "../../textproc/expat/buildlink3.mk" 195.include "../../textproc/expat/buildlink3.mk"
200.include "../../textproc/icu/buildlink3.mk" 196.include "../../textproc/icu/buildlink3.mk"
201.include "../../textproc/libxml2/buildlink3.mk" 197.include "../../textproc/libxml2/buildlink3.mk"
202.include "../../textproc/libxslt/buildlink3.mk" 198.include "../../textproc/libxslt/buildlink3.mk"
203.include "../../www/curl/buildlink3.mk" 199.include "../../www/curl/buildlink3.mk"
204.include "../../www/neon/buildlink3.mk" 
205.include "../../x11/libX11/buildlink3.mk" 200.include "../../x11/libX11/buildlink3.mk"
206.include "../../x11/libXaw/buildlink3.mk" 201.include "../../x11/libXaw/buildlink3.mk"
207.include "../../x11/libXcursor/buildlink3.mk" 202.include "../../x11/libXcursor/buildlink3.mk"
208.include "../../x11/libXext/buildlink3.mk" 203.include "../../x11/libXext/buildlink3.mk"
209.include "../../x11/libXfixes/buildlink3.mk" 204.include "../../x11/libXfixes/buildlink3.mk"
210.include "../../x11/libXi/buildlink3.mk" 205.include "../../x11/libXi/buildlink3.mk"
211.include "../../x11/libXinerama/buildlink3.mk" 206.include "../../x11/libXinerama/buildlink3.mk"
212.include "../../x11/libXrandr/buildlink3.mk" 207.include "../../x11/libXrandr/buildlink3.mk"
213.include "../../x11/libXrender/buildlink3.mk" 208.include "../../x11/libXrender/buildlink3.mk"
214.include "../../x11/libXt/buildlink3.mk" 209.include "../../x11/libXt/buildlink3.mk"
215.include "../../mk/pthread.buildlink3.mk" 210.include "../../mk/pthread.buildlink3.mk"
216.include "../../mk/bsd.pkg.mk" 211.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.55 pkgsrc/misc/openoffice2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/distinfo 2009/09/10 00:27:08 1.54
+++ pkgsrc/misc/openoffice2/Attic/distinfo 2009/09/13 03:54:13 1.55
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.54 2009/09/10 00:27:08 tnn Exp $ 1$NetBSD: distinfo,v 1.55 2009/09/13 03:54:13 hira Exp $
2 2
3SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99 3SHA1 (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = 8c5175b933df18fa88adec59d366e5b191555d22
4RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5 4RMD160 (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = be6e0215d00ff78ecfd35ba51c86b37e9c2ba899
5Size (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 6674731 bytes 5Size (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = 6738021 bytes
6SHA1 (openoffice-2.4.2/OOo_2.4.2_src_core.tar.bz2) = f84782887062011f34c5c8f0279c40d159051a34 6SHA1 (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 40193da67ec5f76d7528e03c94599f4db8e61dfb
7RMD160 (openoffice-2.4.2/OOo_2.4.2_src_core.tar.bz2) = d29ed7d23a7616b05d855c172e6f148aeb0f4b69 7RMD160 (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 44fde99dbd4991c893dd18816f8e98e54fb0aacd
8Size (openoffice-2.4.2/OOo_2.4.2_src_core.tar.bz2) = 153673147 bytes 8Size (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 152311420 bytes
9SHA1 (openoffice-2.4.2/OOo_2.4.2_src_l10n.tar.bz2) = c59fefaf9f7e3372fbeb2a1e468270613b7b1fa6 9SHA1 (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 89c3420231808b0492dc07c83f5dc0421a3c5836
10RMD160 (openoffice-2.4.2/OOo_2.4.2_src_l10n.tar.bz2) = 7a2bf7cbe404b7fe8cb61c670717f54046e1cab9 10RMD160 (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 540dd0fdae81b1f434db73882691b5d62cd0c75d
11Size (openoffice-2.4.2/OOo_2.4.2_src_l10n.tar.bz2) = 81193726 bytes 11Size (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 81490942 bytes
12SHA1 (openoffice-2.4.2/OOo_2.4.2_src_system.tar.bz2) = 67dd2af4c25a311c2e83a7dcd3a8229378ee1625 12SHA1 (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = a250d4327bb4bcf8e025fbe7c706121044cfc949
13RMD160 (openoffice-2.4.2/OOo_2.4.2_src_system.tar.bz2) = 172fcde006f5e81f3be526ab50dbb10a67d277b3 13RMD160 (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = 01441eeaa0785b8988f1d464974119b54572f009
14Size (openoffice-2.4.2/OOo_2.4.2_src_system.tar.bz2) = 44071903 bytes 14Size (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = 41621781 bytes
15SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d 15SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
16SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98 16SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
17SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 17SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
18SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012 18SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
19SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1 19SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
20SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10 20SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
21SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5 21SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
22SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6 22SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
23SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c 23SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
24SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431 24SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431
25SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5 25SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
26SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 26SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
27SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec 27SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
@@ -64,13 +64,16 @@ SHA1 (patch-cx) = b718aa55917eaf42d4d486 @@ -64,13 +64,16 @@ SHA1 (patch-cx) = b718aa55917eaf42d4d486
64SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee 64SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
65SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67 65SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
66SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176 66SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
67SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573 67SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
68SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067 68SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067
69SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858 69SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
70SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405 70SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
71SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f 71SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
72SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a 72SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a
73SHA1 (patch-eg) = 0c6119bd2a91c91ab71348558b8c75224ffa90dc 73SHA1 (patch-eg) = 0c6119bd2a91c91ab71348558b8c75224ffa90dc
74SHA1 (patch-eh) = bb09b068066309ccdc1dc707b8d97e2dd9bf64e5 74SHA1 (patch-eh) = bb09b068066309ccdc1dc707b8d97e2dd9bf64e5
75SHA1 (patch-ei) = b8b0ca35c15cff58cc53a937f8f3a127e4cd0d03 75SHA1 (patch-ei) = b8b0ca35c15cff58cc53a937f8f3a127e4cd0d03
76SHA1 (patch-ej) = 1300efe96fb675b89df2c345cc68f1fc79a8bd69 76SHA1 (patch-ej) = 1300efe96fb675b89df2c345cc68f1fc79a8bd69
 77SHA1 (patch-ga) = ba2ecca04fa39f37180080338fe9107f854ceb95
 78SHA1 (patch-gb) = adabfee3d06e31741b462f5f9ab6dab26a243688
 79SHA1 (patch-gc) = 91865d8bd5cdb0499f4b63d626b6ef22ef0c37b2
File Added: pkgsrc/misc/openoffice2/patches/Attic/patch-ga
$NetBSD: patch-ga,v 1.1 2009/09/13 03:54:13 hira Exp $

Fix build with getline() in libc.
From http://bugs.gentoo.org/show_bug.cgi?id=270263

--- soltools/mkdepend/def.h.orig	2007-07-19 00:01:07.000000000 +0900
+++ soltools/mkdepend/def.h	2009-09-12 20:56:00.000000000 +0900
@@ -151,7 +151,7 @@
 
 char			*copy();
 char			*base_name();
-char			*getline();
+char			*ooo_getline();
 struct symtab		*slookup();
 struct symtab		*isdefined();
 struct symtab		*fdefined();
File Added: pkgsrc/misc/openoffice2/patches/Attic/patch-gb
$NetBSD: patch-gb,v 1.1 2009/09/13 03:54:14 hira Exp $

Fix build with getline() in libc.
From http://bugs.gentoo.org/show_bug.cgi?id=270263

--- soltools/mkdepend/main.c.orig	2007-10-15 23:29:29.000000000 +0900
+++ soltools/mkdepend/main.c	2009-09-12 20:53:46.000000000 +0900
@@ -543,7 +543,7 @@
  * Get the next line.  We only return lines beginning with '#' since that
  * is all this program is ever interested in.
  */
-char *getline(filep)
+char *ooo_getline(filep)
 	register struct filepointer	*filep;
 {
 	register char	*p,	/* walking pointer */
File Added: pkgsrc/misc/openoffice2/patches/Attic/patch-gc
$NetBSD: patch-gc,v 1.1 2009/09/13 03:54:14 hira Exp $

Fix build with getline() in libc.
From http://bugs.gentoo.org/show_bug.cgi?id=270263

--- soltools/mkdepend/parse.c.orig	2006-09-22 17:57:33.000000000 +0900
+++ soltools/mkdepend/parse.c	2009-09-12 20:56:36.000000000 +0900
@@ -45,7 +45,7 @@
 	register int	type;
 	boolean recfailOK;
 
-	while ((line = getline(filep))) {
+	while ((line = ooo_getline(filep))) {
 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
 		case IF:
 		doif:
@@ -167,7 +167,7 @@
 	register char	*line;
 	register int	type;
 
-	while ((line = getline(filep))) {
+	while ((line = ooo_getline(filep))) {
 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
 		case IF:
 		case IFFALSE: