Add fix for regcomp-crasher on PPC, see bug #162217

Package-Manager: portage-2.1.2-r4

6 files changed, 71 insertions, 10 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 215d207459a5..88f8fe4a6712 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.300 2007/01/25 08:24:51 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.301 2007/01/25 08:57:54 suka Exp $
+
+  25 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.1.0/disable-regcomp-java.diff,
+  +files/2.1.0/disable-regcomp-python.diff, +files/2.1.0/regcompapply.diff,
+  openoffice-2.1.0.ebuild:
+  Add fix for regcomp-crasher on PPC, see bug #162217
 
   25 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 92f72d7a4c4c..ba57c55ff845 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -14,6 +14,14 @@ AUX 2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752
 MD5 cb8c7bad3c931b6b7990cffd484a4cae files/2.0.4/regcompapply.diff 319
 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 files/2.0.4/regcompapply.diff 319
 SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd files/2.0.4/regcompapply.diff 319
+AUX 2.1.0/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
+MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.1.0/disable-regcomp-java.diff 965
+RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.1.0/disable-regcomp-java.diff 965
+SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19 files/2.1.0/disable-regcomp-java.diff 965
+AUX 2.1.0/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
+MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.1.0/disable-regcomp-python.diff 934
+RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.1.0/disable-regcomp-python.diff 934
+SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.1.0/disable-regcomp-python.diff 934
 AUX 2.1.0/gentoo-2.1.0.diff 181 RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae SHA1 d88a87f0e53d84ccb7102a4beb2d5fba8fba2a2a SHA256 c0bcfd92976525c66f9e77a728c1dc71c8f09712177af9454d286082ba6e3d8d
 MD5 0ac100c746d44b8f92d7034cf41db54b files/2.1.0/gentoo-2.1.0.diff 181
 RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae files/2.1.0/gentoo-2.1.0.diff 181
@@ -22,6 +30,10 @@ AUX 2.1.0/ooo-wrapper.in 2650 RMD160 081f34f44be85f13224b59c7199fa27265563760 SH
 MD5 3998f6afdb1e322b138d3d1c65449866 files/2.1.0/ooo-wrapper.in 2650
 RMD160 081f34f44be85f13224b59c7199fa27265563760 files/2.1.0/ooo-wrapper.in 2650
 SHA256 ec974e0323c7cf89bea75f56ccc6db2fd90b2be45e676851ea62d7130defcdce files/2.1.0/ooo-wrapper.in 2650
+AUX 2.1.0/regcompapply.diff 306 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d SHA1 33bd9823afb40f3477c277c49441546dd5fe4ed4 SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae
+MD5 df1c2b425e5eb0c3f710997078dbab71 files/2.1.0/regcompapply.diff 306
+RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d files/2.1.0/regcompapply.diff 306
+SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae files/2.1.0/regcompapply.diff 306
 AUX 2.1.0/wrapper-readd.diff 12211 RMD160 1014399ec5ae7d5c036f93725dfac6d7337df0d9 SHA1 0e5183e5f23653d7895f9255e12df3c173c7d59e SHA256 807f857d509b9c3817d46255bc243c56305eab4f36c581645787f4576cf4818b
 MD5 586494b3dae1789214b572a9c10ee8db files/2.1.0/wrapper-readd.diff 12211
 RMD160 1014399ec5ae7d5c036f93725dfac6d7337df0d9 files/2.1.0/wrapper-readd.diff 12211
@@ -46,14 +58,14 @@ EBUILD openoffice-2.0.4.ebuild 9982 RMD160 fe84e166003512e52dd38bb7eff5b9e32460e
 MD5 6aaf7f5d2d7a9225aa07a2e76c2834e7 openoffice-2.0.4.ebuild 9982
 RMD160 fe84e166003512e52dd38bb7eff5b9e32460e699 openoffice-2.0.4.ebuild 9982
 SHA256 a77b3db85f2cccb31eec1e732ea02262aa47d3d441e46ec033fe544dea42c6da openoffice-2.0.4.ebuild 9982
-EBUILD openoffice-2.1.0.ebuild 11380 RMD160 b552f90f909181d1ee9b0c9797fb7ff095bcbad9 SHA1 993f67169996b32b1055dcfe701dc3c803d45154 SHA256 f651528915c010fc32eecebb4c3722462014216f49b4fcdcc6e6f7fe66520e16
-MD5 6d51c0ad43c89af720cddd1d70a53192 openoffice-2.1.0.ebuild 11380
-RMD160 b552f90f909181d1ee9b0c9797fb7ff095bcbad9 openoffice-2.1.0.ebuild 11380
-SHA256 f651528915c010fc32eecebb4c3722462014216f49b4fcdcc6e6f7fe66520e16 openoffice-2.1.0.ebuild 11380
-MISC ChangeLog 62604 RMD160 ccb7a97d6e90014890c1f35e9c10869d311f61ee SHA1 5237e891415577bd41f7f93bcbc6a0739e63329b SHA256 29dbee8ac0e83871df4d8eef6aee24af12f26e6195e990cede6339dbf16489ba
-MD5 a5b525c24713f2d5ae63313f00aefcac ChangeLog 62604
-RMD160 ccb7a97d6e90014890c1f35e9c10869d311f61ee ChangeLog 62604
-SHA256 29dbee8ac0e83871df4d8eef6aee24af12f26e6195e990cede6339dbf16489ba ChangeLog 62604
+EBUILD openoffice-2.1.0.ebuild 11609 RMD160 bfa9d5a2621bd742d2d6e2f310410efa428082bc SHA1 be8937ac8cf4fbfa98b4fbd37a04954ac6713c43 SHA256 ce159bd2d5fd7e88ae2c52704aa5e2714368fb9bc28e4785a8abdf5aa2c6925b
+MD5 c13f481e90eb7b8ea616318b0c0a4cd2 openoffice-2.1.0.ebuild 11609
+RMD160 bfa9d5a2621bd742d2d6e2f310410efa428082bc openoffice-2.1.0.ebuild 11609
+SHA256 ce159bd2d5fd7e88ae2c52704aa5e2714368fb9bc28e4785a8abdf5aa2c6925b openoffice-2.1.0.ebuild 11609
+MISC ChangeLog 62857 RMD160 992806eff8e8a0a503762fbecf3af174b14f377d SHA1 23807e8fd26fdb7df5d4fccc9e3affe14a92eca6 SHA256 b7d45fc1641a67e61e5867fde00bc189554ec1e226535876bcc9b5b14e6218df
+MD5 27a8355e1fe5ae8e433ffe52c7e57931 ChangeLog 62857
+RMD160 992806eff8e8a0a503762fbecf3af174b14f377d ChangeLog 62857
+SHA256 b7d45fc1641a67e61e5867fde00bc189554ec1e226535876bcc9b5b14e6218df ChangeLog 62857
 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.1.0/disable-regcomp-java.diff b/app-office/openoffice/files/2.1.0/disable-regcomp-java.diff
new file mode 100644
index 000000000000..f9a1ff10a483
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/disable-regcomp-java.diff
@@ -0,0 +1,12 @@
+Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
+--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
+@@ -471,7 +473,7 @@
+ 	$python_error_occured = 0;
+ 
+ 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
+-	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
++	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+ 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+ 		
+ 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
diff --git a/app-office/openoffice/files/2.1.0/disable-regcomp-python.diff b/app-office/openoffice/files/2.1.0/disable-regcomp-python.diff
new file mode 100644
index 000000000000..e63a91f009eb
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/disable-regcomp-python.diff
@@ -0,0 +1,12 @@
+Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
+--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
+@@ -472,7 +472,7 @@
+ 
+ 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
+ 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+-	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
++	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+ 		
+ 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
+ 	
diff --git a/app-office/openoffice/files/2.1.0/regcompapply.diff b/app-office/openoffice/files/2.1.0/regcompapply.diff
new file mode 100644
index 000000000000..007a74949a6b
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/regcompapply.diff
@@ -0,0 +1,13 @@
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -1089,6 +1089,9 @@
+ system-db-check.diff, i#65979, hmth
+ # User ~/.ooo-2.0 as user dir
+ scp2-user-config-ooo-2.0.diff, pmladek
++#fix build on ppc
++disable-regcomp-java.diff
++disable-regcomp-python.diff
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
+
diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild
index 595073f60c44..9a4a0acc1075 100644
--- a/app-office/openoffice/openoffice-2.1.0.ebuild
+++ b/app-office/openoffice/openoffice-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.13 2007/01/25 08:24:51 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.14 2007/01/25 08:57:54 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -200,6 +200,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/wrapper-readd.diff
 	cp -f ${FILESDIR}/${PV}/ooo-wrapper.in ${S}/bin || die
 
+	if use ppc ; then
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die
+		epatch ${FILESDIR}/${PV}/regcompapply.diff
+	fi
+
 	#Use flag checks
 	if use java ; then
 		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}