Add a patch from upstream to combat the common regcomp / pyuno segfaults during install

Package-Manager: portage-2.1.2_rc1-r3

5 files changed, 109 insertions, 15 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index bc38f9018648..2bb2fff44b0c 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.267 2006/10/27 12:06:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.268 2006/11/03 19:12:48 suka Exp $
+
+  03 Nov 2006; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.4/pyuno-objects-allocation.diff, files/2.0.4/gentoo-2.0.4.diff,
+  openoffice-2.0.4.ebuild:
+  Add a patch from upstream to combat the common regcomp / pyuno segfaults
+  during install.
 
   27 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
   +files/2.0.4/libgcc3_uno_noexecstack.diff, files/2.0.4/gentoo-2.0.4.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 37744b6990be..763787170dfe 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,14 +2,18 @@ AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9
 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523
 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523
 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523
-AUX 2.0.4/gentoo-2.0.4.diff 840 RMD160 64cf7be5d67a0f94a41b0d8d39ca36808fec001a SHA1 0d2e17deee68d6c8075458c7e96273452c0ea790 SHA256 78ecbdb063861e37cfb537635858f4f026ad544eebc27f0533d7a246614f853c
-MD5 63fc7c7667cfa5981445720f5cfa1a9c files/2.0.4/gentoo-2.0.4.diff 840
-RMD160 64cf7be5d67a0f94a41b0d8d39ca36808fec001a files/2.0.4/gentoo-2.0.4.diff 840
-SHA256 78ecbdb063861e37cfb537635858f4f026ad544eebc27f0533d7a246614f853c files/2.0.4/gentoo-2.0.4.diff 840
+AUX 2.0.4/gentoo-2.0.4.diff 1510 RMD160 8dbb3a7713d8ee25811dfae2782f79cf316185db SHA1 3239852247b0e005ecba928799df65a64063111b SHA256 5265880249df9b3146079b7e8a9585efedf02644a8d7a3e2042bea9b28238a99
+MD5 46df795c7f74ffabdb3119970178ed11 files/2.0.4/gentoo-2.0.4.diff 1510
+RMD160 8dbb3a7713d8ee25811dfae2782f79cf316185db files/2.0.4/gentoo-2.0.4.diff 1510
+SHA256 5265880249df9b3146079b7e8a9585efedf02644a8d7a3e2042bea9b28238a99 files/2.0.4/gentoo-2.0.4.diff 1510
 AUX 2.0.4/libgcc3_uno_noexecstack.diff 497 RMD160 4990752ff5758d432fe6671cd1437ca319367fc3 SHA1 c94755a688095aa1edd0a2d3900e61116b5c875f SHA256 8cf1f1347aff8dcf6a4905f72a5922f91df0270a8463db3ceb47d9aa77f61ca3
 MD5 d10bda03b16c996cf53f90d2d5e12c3e files/2.0.4/libgcc3_uno_noexecstack.diff 497
 RMD160 4990752ff5758d432fe6671cd1437ca319367fc3 files/2.0.4/libgcc3_uno_noexecstack.diff 497
 SHA256 8cf1f1347aff8dcf6a4905f72a5922f91df0270a8463db3ceb47d9aa77f61ca3 files/2.0.4/libgcc3_uno_noexecstack.diff 497
+AUX 2.0.4/pyuno-objects-allocation.diff 2500 RMD160 cfe766f95be0f6f968bea39aa4428bf83217956c SHA1 0cce7425880a7c59170d9ae042aba3629c441033 SHA256 8ec3120e26933d3d98dcca15c959dab7c51e95f24d00b47dd5c983ea02c66559
+MD5 2a2dfe73f6fc272b86ed930a55b16f56 files/2.0.4/pyuno-objects-allocation.diff 2500
+RMD160 cfe766f95be0f6f968bea39aa4428bf83217956c files/2.0.4/pyuno-objects-allocation.diff 2500
+SHA256 8ec3120e26933d3d98dcca15c959dab7c51e95f24d00b47dd5c983ea02c66559 files/2.0.4/pyuno-objects-allocation.diff 2500
 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864
 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d
 DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8
@@ -32,14 +36,14 @@ EBUILD openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834e
 MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145
 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145
 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145
-EBUILD openoffice-2.0.4.ebuild 9748 RMD160 430f6399c5795df99c5b7c18ba9784d4a5287559 SHA1 eca0977737bc25c4d1c4d3eb98b256adfe5205f7 SHA256 ce87bf49163459e5c31bd2760c9da1918845ad0257cb77682c395f7f61184417
-MD5 9e6f02e787464293cd2bb4dc343ac5e5 openoffice-2.0.4.ebuild 9748
-RMD160 430f6399c5795df99c5b7c18ba9784d4a5287559 openoffice-2.0.4.ebuild 9748
-SHA256 ce87bf49163459e5c31bd2760c9da1918845ad0257cb77682c395f7f61184417 openoffice-2.0.4.ebuild 9748
-MISC ChangeLog 56281 RMD160 ee85703574f55984790481a0e675e5da5ba52758 SHA1 1680ef47a8164d7f78b48728043655c42d301c3b SHA256 c2756581bd7158d93064fe43c689646712ce947a434e4f4308298eef8d1aad1d
-MD5 2d941bb527ece1af1a8fcf08f1d260c7 ChangeLog 56281
-RMD160 ee85703574f55984790481a0e675e5da5ba52758 ChangeLog 56281
-SHA256 c2756581bd7158d93064fe43c689646712ce947a434e4f4308298eef8d1aad1d ChangeLog 56281
+EBUILD openoffice-2.0.4.ebuild 9831 RMD160 6d6e0a8e6c2e7b88f0a52f5e9f3ebae7ccc806c1 SHA1 3338d003271e85064ee3fb0d185c2ab467a4dee7 SHA256 a11896220b47556c32fed5f81f9648e3b7fd424a754b0077199149b122d13a32
+MD5 46f0bba22a0049588bbbc26d00f95612 openoffice-2.0.4.ebuild 9831
+RMD160 6d6e0a8e6c2e7b88f0a52f5e9f3ebae7ccc806c1 openoffice-2.0.4.ebuild 9831
+SHA256 a11896220b47556c32fed5f81f9648e3b7fd424a754b0077199149b122d13a32 openoffice-2.0.4.ebuild 9831
+MISC ChangeLog 56532 RMD160 aca8d380926326de6fb4e56f70a796d5f3042391 SHA1 1c8e39cb55f746628bc6ca3cf7ef1ea51869e569 SHA256 3e5057c989d8aea75e548874bbcba73e75325faeac2e2e3d908bea84e1b1c4e8
+MD5 d9358c3664062e544c0efd349a1e2fdb ChangeLog 56532
+RMD160 aca8d380926326de6fb4e56f70a796d5f3042391 ChangeLog 56532
+SHA256 3e5057c989d8aea75e548874bbcba73e75325faeac2e2e3d908bea84e1b1c4e8 ChangeLog 56532
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
index 3e0756b46d0e..0e6f1c65499b 100644
--- a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
+++ b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
@@ -22,6 +22,19 @@
  
 --- patches/src680/apply 
 +++ patches/src680/apply 
+@@ -243,6 +243,12 @@
+ wizards-crasher-fix.diff, i#68079, michael
+ # update pyuno docs from www.oo.o
+ pyuno-update-docs.diff, i#63846, michael
++# replace PyMem_DEL() with PyObject_Del() on object dealloc functions to free
++# objects the right way (regcomp segfaulted on openSUSE-10.2)
++# replace PyObject_NEW with PyObject_New because the macro version most
++# probably does not preserve binary compatibility across Python versions
++# and is therefore deprecated in extension modules.
++pyuno-objects-allocation.diff, i#71078, pmladek
+ # disable font management dialog in padmin
+ padmin-nofontconfig.diff, michael
+ # Improve the web bullet export / export to png not gif.
 @@ -1069,6 +1069,8 @@
  64bit-jdk-server-paths.diff, i#65974, hmth
  # use IBM j9vm over IBM classic JVM
diff --git a/app-office/openoffice/files/2.0.4/pyuno-objects-allocation.diff b/app-office/openoffice/files/2.0.4/pyuno-objects-allocation.diff
new file mode 100644
index 000000000000..aa3902c1dc0e
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/pyuno-objects-allocation.diff
@@ -0,0 +1,70 @@
+diff -urN pyuno.orig/source/module/pyuno_callable.cxx pyuno/source/module/pyuno_callable.cxx
+--- pyuno.orig/source/module/pyuno_callable.cxx	2006-06-20 07:03:27.000000000 +0200
++++ pyuno/source/module/pyuno_callable.cxx	2006-11-01 15:51:33.000000000 +0100
+@@ -74,7 +74,7 @@
+   
+     me = (PyUNO_callable*) self;
+     delete me->members;
+-    PyMem_DEL (self);
++    PyObject_Del (self);
+   
+     return;
+ }
+@@ -261,7 +261,7 @@
+ {
+     PyUNO_callable* self;
+   
+-    self = PyObject_NEW (PyUNO_callable, &PyUNO_callable_Type);
++    self = PyObject_New (PyUNO_callable, &PyUNO_callable_Type);
+     if (self == NULL)
+         return NULL; //NULL == Error!
+ 
+diff -urN pyuno.orig/source/module/pyuno.cxx pyuno/source/module/pyuno.cxx
+--- pyuno.orig/source/module/pyuno.cxx	2006-06-20 07:03:05.000000000 +0200
++++ pyuno/source/module/pyuno.cxx	2006-11-01 15:51:42.000000000 +0100
+@@ -78,7 +78,7 @@
+ {
+     PyUNO* me = reinterpret_cast< PyUNO* > (self);
+     delete me->members;
+-    PyMem_DEL (self);
++    PyObject_Del (self);
+ }
+ 
+ 
+@@ -727,7 +727,7 @@
+     Sequence<Any> arguments (1);
+     Reference<XInterface> tmp_interface;
+ 
+-    self = PyObject_NEW (PyUNO, &PyUNOType);
++    self = PyObject_New (PyUNO, &PyUNOType);
+     if (self == NULL)
+         return NULL; //NULL == error
+     self->members = new PyUNOInternals();
+diff -urN pyuno.orig/source/module/pyuno_runtime.cxx pyuno/source/module/pyuno_runtime.cxx
+--- pyuno.orig/source/module/pyuno_runtime.cxx	2006-08-28 17:46:54.000000000 +0200
++++ pyuno/source/module/pyuno_runtime.cxx	2006-11-01 15:50:53.000000000 +0100
+@@ -242,13 +242,13 @@
+ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
+     throw( com::sun::star::uno::RuntimeException )
+ {
+-    RuntimeImpl *me = PyObject_NEW (RuntimeImpl, &RuntimeImpl_Type);
++    RuntimeImpl *me = PyObject_New (RuntimeImpl, &RuntimeImpl_Type);
+     if( ! me )
+         throw RuntimeException(
+             OUString( RTL_CONSTASCII_USTRINGPARAM( "cannot instantiate pyuno::RuntimeImpl" ) ),
+             Reference< XInterface > () );
+     me->cargo = 0;
+-    // must use a different struct here, as the PyObject_NEW macro
++    // must use a different struct here, as the PyObject_New
+     // makes C++ unusable
+     RuntimeCargo *c = new RuntimeCargo();
+     readLoggingConfig( &(c->logLevel) , &(c->logFile) );
+@@ -324,7 +324,7 @@
+     if( me->cargo->logFile )
+         fclose( me->cargo->logFile );
+     delete me->cargo;
+-    PyMem_DEL (self);
++    PyObject_Del (self);
+ }
+ 
+ 
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index 9bbb74d76131..536f3bb872db 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.9 2006/10/27 12:06:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.10 2006/11/03 19:12:48 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
@@ -72,7 +72,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
 	dev-libs/expat
-	>=dev-libs/boost-1.33.1
 	>=dev-libs/icu-3.4
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
 	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
@@ -93,6 +92,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-perl/Compress-Zlib
 	dev-util/pkgconfig
 	dev-util/intltool
+	>=dev-libs/boost-1.33.1
 	>=net-misc/curl-7.9.8
 	sys-libs/zlib
 	sys-apps/coreutils
@@ -176,6 +176,7 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	cp -a ${FILESDIR}/${PV}/libgcc3_uno_noexecstack.diff ${S}/patches/src680 || die
+	cp -a ${FILESDIR}/${PV}/pyuno-objects-allocation.diff ${S}/patches/src680 || die
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks