Version Bump to solve #320947.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 129 insertions, 2 deletions

diff --git a/dev-dotnet/mysql-connector-net/ChangeLog b/dev-dotnet/mysql-connector-net/ChangeLog
index 31916413d8d6..66a1cc1b9a30 100644
--- a/dev-dotnet/mysql-connector-net/ChangeLog
+++ b/dev-dotnet/mysql-connector-net/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/mysql-connector-net
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/ChangeLog,v 1.11 2008/05/06 20:46:27 ramereth Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/ChangeLog,v 1.12 2010/07/14 11:28:23 ali_bush Exp $
+
+*mysql-connector-net-6.2.3 (14 Jul 2010)
+
+  14 Jul 2010; Alistair Bush <ali_bush@gentoo.org>
+  +files/02mysql-connector-net.pc.in, +mysql-connector-net-6.2.3.ebuild,
+  +files/mysql-connector-net-6.2.3.patch, +files/gentoo.snk:
+  Version Bump to latest versio to fix security bug #320947.
 
   06 May 2008; Lance Albertson <ramereth@gentoo.org> metadata.xml:
   Moving maintainer-ship over to jurek@gentoo.org
diff --git a/dev-dotnet/mysql-connector-net/files/02mysql-connector-net.pc.in b/dev-dotnet/mysql-connector-net/files/02mysql-connector-net.pc.in
new file mode 100644
index 000000000000..4c1578aa4b76
--- /dev/null
+++ b/dev-dotnet/mysql-connector-net/files/02mysql-connector-net.pc.in
@@ -0,0 +1,8 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIBDIR@
+
+Name: mysql-connector-net
+Description: mysql-connector-net - MySql ADO.NET connector
+Version: @VERSION@
+Libs: -r:${libdir}/mono/mysql-connector-net/MySql.Data.dll -r:${libdir}/mono/mysql-connector-net/MySql.Web.dll
diff --git a/dev-dotnet/mysql-connector-net/files/gentoo.snk b/dev-dotnet/mysql-connector-net/files/gentoo.snk
new file mode 100644
index 000000000000..24d65f17c39a
--- /dev/null
+++ b/dev-dotnet/mysql-connector-net/files/gentoo.snk
diff --git a/dev-dotnet/mysql-connector-net/files/mysql-connector-net-6.2.3.patch b/dev-dotnet/mysql-connector-net/files/mysql-connector-net-6.2.3.patch
new file mode 100644
index 000000000000..667e4c2dd8e9
--- /dev/null
+++ b/dev-dotnet/mysql-connector-net/files/mysql-connector-net-6.2.3.patch
@@ -0,0 +1,34 @@
+--- MySQLClient.sln.bak	2010-07-15 10:24:05.000000000 +1200
++++ MySQLClient.sln	2010-07-15 10:24:50.000000000 +1200
+@@ -7,31 +7,8 @@
+ EndProject

+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "MySql.Data\Provider\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"

+ EndProject

+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF", "MySql.Data\Provider\MySql.Data.CF.csproj", "{587A47FB-C1CC-459D-93B6-179D95E41EFB}"

+-EndProject

+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests", "MySql.Data\Tests\MySql.Data.Tests.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"

+ EndProject

+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF.Tests", "MySql.Data\Tests\MySql.Data.CF.Tests.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"

+-EndProject

+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"

+-EndProject

+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "MySql.Data.Entity\Provider\MySql.Data.Entity.csproj", "{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}"

+-EndProject

+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{77EC4E20-293A-48BA-8415-D0AD869D91FA}"

+-EndProject

+-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"

+-	ProjectSection(ProjectDependencies) = postProject

+-		{77EC4E20-293A-48BA-8415-D0AD869D91FA} = {77EC4E20-293A-48BA-8415-D0AD869D91FA}

+-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4} = {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}

+-		{710D9251-17A3-4429-9A91-63F03267F310} = {710D9251-17A3-4429-9A91-63F03267F310}

+-		{C28B1166-1380-445D-AEC1-8A18B990DD18} = {C28B1166-1380-445D-AEC1-8A18B990DD18}

+-		{DC704374-EC50-4167-93AA-8D262136502E} = {DC704374-EC50-4167-93AA-8D262136502E}

+-		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5} = {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}

+-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D} = {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}

+-		{587A47FB-C1CC-459D-93B6-179D95E41EFB} = {587A47FB-C1CC-459D-93B6-179D95E41EFB}

+-		{DC3517FF-AC26-4755-9B7A-EF658FF69593} = {DC3517FF-AC26-4755-9B7A-EF658FF69593}

+-	EndProjectSection

+-EndProject

+ Global

+ 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 		Commercial|Any CPU = Commercial|Any CPU

diff --git a/dev-dotnet/mysql-connector-net/mysql-connector-net-6.2.3.ebuild b/dev-dotnet/mysql-connector-net/mysql-connector-net-6.2.3.ebuild
new file mode 100644
index 000000000000..52815978cc9c
--- /dev/null
+++ b/dev-dotnet/mysql-connector-net/mysql-connector-net-6.2.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mysql-connector-net/mysql-connector-net-6.2.3.ebuild,v 1.1 2010/07/14 11:28:23 ali_bush Exp $
+
+EAPI="3"
+
+inherit eutils multilib mono
+
+DESCRIPTION="MySql ADO.NET connector"
+HOMEPAGE="http://www.mysql.com/products/connector/net/"
+SRC_URI="mirror://mysql/Downloads/Connector-Net/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-lang/mono-1.0"
+DEPEND="${RDEPEND}
+		app-arch/unzip
+		dev-dotnet/nant
+		>=dev-util/pkgconfig-0.20"
+
+src_unpack() {
+	mkdir -p "${S}"; cd "${S}";
+	unpack ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}.patch"
+
+	cp "${FILESDIR}/gentoo.snk" . || die
+	sed -i '/AssemblyKeyName/d' \
+		$(find MySql.Web MySql.Data MySql.Data.Entity -iname 'AssemblyInfo.cs')
+	sed -i 's/release/Release/g' \
+		$(find . -iname 'MySql.*.csproj')
+
+	local line="[assembly: AssemblyKeyFile(@\"${S}/gentoo.snk\")]"
+	echo "${line}" >> MySql.Web/Providers/Properties/AssemblyInfo.cs || die
+	echo "${line}" >> MySql.Data/Provider/Properties/AssemblyInfo.cs || die
+	echo "${line}" >> MySql.Data.Entity/Provider/Properties/AssemblyInfo.cs || die
+
+	line="[assembly: AssemblyDelaySign(false)]"
+	echo "${line}" >> MySql.Web/Providers/Properties/AssemblyInfo.cs || die
+	echo "${line}" >> MySql.Data.Entity/Provider/Properties/AssemblyInfo.cs || die
+}
+
+src_compile() {
+	xbuild MySQLClient-mono.sln || die "build failed"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)/pkgconfig
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@LIBDIR@:$(get_libdir):" \
+		"${FILESDIR}/02${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+
+	# Install dll into the GAC
+	ebegin "Installing dlls into the GAC"
+	gacutil -i MySql.Data/Provider/bin/Release/MySql.Data.dll -root "${D}/usr/$(get_libdir)" \
+		-gacdir /usr/$(get_libdir) -package ${PN} > /dev/null
+	gacutil -i MySql.Web/Providers/bin/Release/MySql.Web.dll -root "${D}/usr/$(get_libdir)" \
+		-gacdir /usr/$(get_libdir) -package ${PN} > /dev/null
+	eend
+
+	dodoc CHANGES README EXCEPTIONS
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r Samples
+	fi
+}
+
+pkg_postinst() {
+	elog "Adding the path for this connector in your mod_mono"
+	elog "configuration may be needed:"
+	elog "MonoPath \"/usr/$(get_libdir)/mono/${PN}/\""
+}