dev-lang/mono-1.2.6-r1: added patch fixing bug #202358

Package-Manager: portage-2.1.3.19

5 files changed, 190 insertions, 10 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index ee99821d94d4..ca1b8561776b 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mono
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.132 2007/12/14 19:59:25 jurek Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.133 2008/01/02 06:13:22 jurek Exp $
+
+*mono-1.2.6-r1 (02 Jan 2008)
+
+  02 Jan 2008; Jurek Bartuszek <jurek@gentoo.org>
+  +files/mono-1.2.6-threads-types-private-prototypes.patch,
+  +mono-1.2.6-r1.ebuild:
+  Added patch fixing bug #202358
 
 *mono-1.2.6 (14 Dec 2007)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index f5a884eca89f..7556f295690e 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -21,6 +21,10 @@ AUX mono-1.2.5-remoting.patch 1798 RMD160 17f42b6d663ee80d86e71e3facc9630f36f4d4
 MD5 3db452318f1b27327e739ed9dd36f9d9 files/mono-1.2.5-remoting.patch 1798
 RMD160 17f42b6d663ee80d86e71e3facc9630f36f4d4c6 files/mono-1.2.5-remoting.patch 1798
 SHA256 42d29fa86fe92edb8cc24f4dc62f77d5f20075ecf97c211fc63a02ed91f5da8c files/mono-1.2.5-remoting.patch 1798
+AUX mono-1.2.6-threads-types-private-prototypes.patch 1341 RMD160 a0febde503971203d1ebf7f1274e42f95a5ed3b6 SHA1 b61bf000d7064cb76787954941696c17fa55c8d1 SHA256 0f5ac74f73817749de78c0d9435294bf148c11faef8c67729ce409493a7ee0ff
+MD5 8153012334ae944ba47d479a953df50d files/mono-1.2.6-threads-types-private-prototypes.patch 1341
+RMD160 a0febde503971203d1ebf7f1274e42f95a5ed3b6 files/mono-1.2.6-threads-types-private-prototypes.patch 1341
+SHA256 0f5ac74f73817749de78c0d9435294bf148c11faef8c67729ce409493a7ee0ff files/mono-1.2.6-threads-types-private-prototypes.patch 1341
 AUX mono-biginteger_overflow.diff 848 RMD160 1f2cb38e577102943399459e2ef0f511dcad5209 SHA1 15203be56015aed4a9b63ca3ade01d3a22f4bae3 SHA256 adc10b8a97cbcb6b4758f7de041eee757259d55e1e2cbaf84a89e5ef83e46806
 MD5 cc456e7525bdc2d2f3982bf7213181a8 files/mono-biginteger_overflow.diff 848
 RMD160 1f2cb38e577102943399459e2ef0f511dcad5209 files/mono-biginteger_overflow.diff 848
@@ -60,14 +64,18 @@ EBUILD mono-1.2.5.ebuild 3634 RMD160 a67a1b0a1708c44d2c8dfa7dc9b8a17b09725dda SH
 MD5 660a4635b834e18857988232a04721aa mono-1.2.5.ebuild 3634
 RMD160 a67a1b0a1708c44d2c8dfa7dc9b8a17b09725dda mono-1.2.5.ebuild 3634
 SHA256 ab2aa371e939d8e392193134f14994afdff7e21d5db2071f8fe961b909d54177 mono-1.2.5.ebuild 3634
+EBUILD mono-1.2.6-r1.ebuild 3720 RMD160 28a317b87f35738fc075246923ceca6dd6f9e14f SHA1 75d41791ed72f049be44a964de68cdcefa173280 SHA256 3a9cfbf979e4b322c18568540cd2bcd58a0870047f17eb2260e1f41de5c768ad
+MD5 2734804b264bc2ef54c83f8dc85d4c45 mono-1.2.6-r1.ebuild 3720
+RMD160 28a317b87f35738fc075246923ceca6dd6f9e14f mono-1.2.6-r1.ebuild 3720
+SHA256 3a9cfbf979e4b322c18568540cd2bcd58a0870047f17eb2260e1f41de5c768ad mono-1.2.6-r1.ebuild 3720
 EBUILD mono-1.2.6.ebuild 3570 RMD160 f8bb1f38515d8a48ba0a1c1498cfe9dcd0a48968 SHA1 d6983276047fc1bd6515926ed373af67b2087bd2 SHA256 362b9c4c5efeab2430086cd874d9bb99be3f37d59918f81565eaf3a0a3ba3635
 MD5 fd0f346ac39dde7d01772740d777fc95 mono-1.2.6.ebuild 3570
 RMD160 f8bb1f38515d8a48ba0a1c1498cfe9dcd0a48968 mono-1.2.6.ebuild 3570
 SHA256 362b9c4c5efeab2430086cd874d9bb99be3f37d59918f81565eaf3a0a3ba3635 mono-1.2.6.ebuild 3570
-MISC ChangeLog 29390 RMD160 425484c6869a7b0b3ed38886743618b6d77cd9d7 SHA1 20184da69a94e6def1526e04a2605c3111ab65d5 SHA256 0852a986623e4bccb68c22c0063543363e136e9405cadf4c8364cbbd2c271bb3
-MD5 56a57825c3f1579d2a308475a2acdc99 ChangeLog 29390
-RMD160 425484c6869a7b0b3ed38886743618b6d77cd9d7 ChangeLog 29390
-SHA256 0852a986623e4bccb68c22c0063543363e136e9405cadf4c8364cbbd2c271bb3 ChangeLog 29390
+MISC ChangeLog 29589 RMD160 68d5213a4e9d0c6bf102fd0b1b2306f8c0e0ad02 SHA1 c83a0c207d06dac8c9e5340e34992efb7b3681b4 SHA256 9d08a6b8e89c7efddaccecf493b3158d90498206ada1bdf7de4ca0d2e97acead
+MD5 59eb50fca36fdac4a2be63f091624df3 ChangeLog 29589
+RMD160 68d5213a4e9d0c6bf102fd0b1b2306f8c0e0ad02 ChangeLog 29589
+SHA256 9d08a6b8e89c7efddaccecf493b3158d90498206ada1bdf7de4ca0d2e97acead ChangeLog 29589
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 metadata.xml 159
@@ -96,10 +104,13 @@ SHA256 49716b35259e4053b6d2f2bbe02e300154c9ca84b61ae5b7c9886194cc55ef39 files/di
 MD5 ba5268173a432ef2412055cdfba23002 files/digest-mono-1.2.6 241
 RMD160 b33b110e8a1e9d04988f8173c40a4cfae9b0cc3c files/digest-mono-1.2.6 241
 SHA256 7da6122dc6f13961b1fe360fa87ee29a0d9bb62b8605c82028fdfcc1130e7bb3 files/digest-mono-1.2.6 241
+MD5 ba5268173a432ef2412055cdfba23002 files/digest-mono-1.2.6-r1 241
+RMD160 b33b110e8a1e9d04988f8173c40a4cfae9b0cc3c files/digest-mono-1.2.6-r1 241
+SHA256 7da6122dc6f13961b1fe360fa87ee29a0d9bb62b8605c82028fdfcc1130e7bb3 files/digest-mono-1.2.6-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHYuCjyvXkcyXx2ogRAg29AKCASH3tfsh8PGmN7ncULPb0sX1OkgCfW3ta
-dMp9pg1fEX8+20z+2/U40as=
-=JreV
+iD8DBQFHeyuKyOePD61SuWIRAvS6AKCMwUPhdZd+Wkfmi23nv06X7i9kiwCbB2Rd
+HvOfimhxqu09SVTlFC8devE=
+=tpek
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/digest-mono-1.2.6-r1 b/dev-lang/mono/files/digest-mono-1.2.6-r1
new file mode 100644
index 000000000000..614eb182a555
--- /dev/null
+++ b/dev-lang/mono/files/digest-mono-1.2.6-r1
@@ -0,0 +1,3 @@
+MD5 391f85b4f962269e044ceac2b5235310 mono-1.2.6.tar.bz2 18163130
+RMD160 c6536b008cb73845943956c9ab365589a28c013c mono-1.2.6.tar.bz2 18163130
+SHA256 24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f mono-1.2.6.tar.bz2 18163130
diff --git a/dev-lang/mono/files/mono-1.2.6-threads-types-private-prototypes.patch b/dev-lang/mono/files/mono-1.2.6-threads-types-private-prototypes.patch
new file mode 100644
index 000000000000..eec421241a42
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.2.6-threads-types-private-prototypes.patch
@@ -0,0 +1,32 @@
+--- mono/metadata/threads.h	2007/12/20 00:38:27	1.1
++++ mono/metadata/threads.h	2007/12/20 00:38:46
+@@ -14,7 +14,6 @@
+ #include <mono/utils/mono-membar.h>
+ #include <mono/metadata/object.h>
+ #include <mono/metadata/appdomain.h>
+-#include <mono/metadata/threads-types.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -67,10 +66,6 @@ extern void mono_thread_interruption_che
+ extern void mono_thread_force_interruption_checkpoint (void);
+ extern gint32* mono_thread_interruption_request_flag (void);
+ 
+-extern void mono_thread_set_state (MonoThread *thread, MonoThreadState state);
+-extern void mono_thread_clr_state (MonoThread *thread, MonoThreadState state);
+-extern gboolean mono_thread_test_state (MonoThread *thread, MonoThreadState test);
+-
+ G_END_DECLS
+ 
+ #endif /* _MONO_METADATA_THREADS_H_ */
+--- mono/metadata/threads-types.h	2007/12/20 00:38:32	1.1
++++ mono/metadata/threads-types.h	2007/12/20 00:40:55
+@@ -157,4 +157,8 @@ extern MonoThreadHazardPointers* mono_ha
+ 		(hp)->hazard_pointers [(i)] = NULL; \
+ 	} while (0)
+ 
++extern void mono_thread_set_state (MonoThread *thread, MonoThreadState state) MONO_INTERNAL;
++extern void mono_thread_clr_state (MonoThread *thread, MonoThreadState state) MONO_INTERNAL;
++extern gboolean mono_thread_test_state (MonoThread *thread, MonoThreadState test) MONO_INTERNAL;
++
+ #endif /* _MONO_METADATA_THREADS_TYPES_H_ */
diff --git a/dev-lang/mono/mono-1.2.6-r1.ebuild b/dev-lang/mono/mono-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..1a0be5959a62
--- /dev/null
+++ b/dev-lang/mono/mono-1.2.6-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.6-r1.ebuild,v 1.1 2008/01/02 06:13:22 jurek Exp $
+
+inherit eutils flag-o-matic multilib autotools
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.go-mono.com"
+SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 X11 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="X nptl"
+
+RDEPEND="!<dev-dotnet/pnet-0.6.12
+		 >=dev-libs/glib-2.6
+		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
+		 ppc?	(
+					>=sys-devel/gcc-3.2.3-r4
+					>=sys-libs/glibc-2.3.3_pre20040420
+				)
+		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
+DEPEND="${RDEPEND}
+		  sys-devel/bc
+		>=dev-util/pkgconfig-0.19"
+PDEPEND="dev-dotnet/pe-format"
+
+# Parallel build unfriendly
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RESTRICT="test"
+
+function get-memory-total() {
+	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix the install path, install into $(libdir)
+	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
+		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
+		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
+		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in            \
+	|| die "sed failed"
+
+	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
+		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
+		"${S}"/{scripts,}/*.pc.in                                               \
+	|| die "sed failed"
+
+	# Remove dummy ltconfig and let libtool handle it
+	rm -f "${S}"/libgc/ltconfig
+
+	epatch "${FILESDIR}"/mono-biginteger_overflow.diff
+
+	# Fixes bug #202358, see
+	# https://bugzilla.novell.com/show_bug.cgi?id=349952
+	epatch "${FILESDIR}"/${P}-threads-types-private-prototypes.patch
+
+	einfo "Regenerating the build files, this will take some time..."
+	eautoreconf
+}
+
+src_compile() {
+	# mono's build system is finiky, strip the flags
+	strip-flags
+
+	# Enable the 2.0 FX, use the system glib and the gc
+	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
+
+	# Threading support
+	if use amd64 || use nptl ; then
+		# force __thread on amd64 (bug #83770)
+		myconf="${myconf} --with-tls=__thread"
+	else
+		myconf="${myconf} --with-tls=pthread"
+	fi
+
+	# Enable large heaps if memory is more than >=3GB
+	if [[ $(get-memory-total) -ge 3145728 ]] ; then
+		myconf="${myconf} --with-large-heap=yes"
+	fi
+
+	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
+	touch "${S}"/mcs/build/deps/use-monolite
+
+	econf ${myconf} || die "configure failed"
+	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
+
+	if [[ "$?" -ne "0" ]]; then
+		ewarn "If you are using any hardening features such as"
+		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
+		ewarn "why build has failed. In this case turn any active security"
+		ewarn "enhancements off and try emerging the package again"
+		die
+	fi
+}
+
+src_test() {
+	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	mkdir -p "${T}/home/mono" || die "mkdir home failed"
+
+	export HOME="${T}/home/mono"
+	export XDG_CONFIG_HOME="${T}/home/mono"
+	export XDG_DATA_HOME="${T}/home/mono"
+
+	if ! LC_ALL=C emake -j1 check; then
+		hasq test $FEATURES && die "Make check failed. See above for details."
+		hasq test $FEATURES || eerror "Make check failed. See above for details."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	docinto docs
+	dodoc docs/*
+
+	docinto libgc
+	dodoc libgc/ChangeLog
+}