From c37afbe0d720e7b62e92b7fc10f50a44344a3789 Mon Sep 17 00:00:00 2001
From: Alistair Bush <ali_bush@gentoo.org>
Date: Wed, 14 Jul 2010 11:28:24 +0000
Subject: [PATCH] Version Bump to solve #320947. Package-Manager:
 portage-2.1.8.3/cvs/Linux x86_64

---
 dev-dotnet/mysql-connector-net/ChangeLog      |  11 ++-
 dev-dotnet/mysql-connector-net/Manifest       |   7 +-
 .../files/02mysql-connector-net.pc.in         |   8 ++
 .../mysql-connector-net/files/gentoo.snk      | Bin 0 -> 596 bytes
 .../files/mysql-connector-net-6.2.3.patch     |  34 ++++++++
 .../mysql-connector-net-6.2.3.ebuild          |  78 ++++++++++++++++++
 6 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 dev-dotnet/mysql-connector-net/files/02mysql-connector-net.pc.in
 create mode 100644 dev-dotnet/mysql-connector-net/files/gentoo.snk
 create mode 100644 dev-dotnet/mysql-connector-net/files/mysql-connector-net-6.2.3.patch
 create mode 100644 dev-dotnet/mysql-connector-net/mysql-connector-net-6.2.3.ebuild

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/Manifest b/dev-dotnet/mysql-connector-net/Manifest
index 510b0b0b10c9..77af81ef1688 100644
--- a/dev-dotnet/mysql-connector-net/Manifest
+++ b/dev-dotnet/mysql-connector-net/Manifest
@@ -1,10 +1,15 @@
+AUX 02mysql-connector-net.pc.in 281 RMD160 b48f96a6c974b79ac34aaf4e3fbf890e780de06b SHA1 8ce1bdf19298bcfc616e4766ac312daf5804f525 SHA256 54485480a5815d1ffb6974211fb811839b48e3512d80b430faf2b7576256a34c
+AUX gentoo.snk 596 RMD160 002845242bc061507aaa61a2eb2054cb087df60b SHA1 b382fd6e424fea0159907ea559dcbcc4d88b81df SHA256 b5b023ccb1bbf7901aedeeba98e4dc5a6a07247fe6503cf95b5f179b2c4506ea
 AUX mysql-connector-net-1.0.4-assembly.patch 422 RMD160 00263503c479c120291258aab369fda851488e52 SHA1 d9d8fecb9ba91239252f79d5d5bef3dda2b64c7a SHA256 0aa04328463f73be02519a771afd17aeeba42111afef1dca308464d3b359142f
 AUX mysql-connector-net-1.0.4-fixes.patch 4713 RMD160 ac3099ea0771a0bada6c5b1c102cc7b947c8efb5 SHA1 805d9b0fdffeca77965860c4dbbdafdeddd456c7 SHA256 376afa6b54dc21341b25d3f3881f2b195617b3bde1720e11e64d525b76c92be2
 AUX mysql-connector-net-1.0.9.patch 2229 RMD160 005292d7a88f85a3056fdbe22de655737556d4cb SHA1 e892139475a10fbee776d8b47f339fe1d5d98ece SHA256 ca33a4923954de39f6ba79fe2a1aed0f528bcdd7ac9eb84d7d5fbca503e5409b
+AUX mysql-connector-net-6.2.3.patch 2481 RMD160 9113e44a632dc159133caadb004c336ebb6e8166 SHA1 89c1f11155a4a28f1c9d232fbed631c208dafbe4 SHA256 9c437775f9753fffd237e4244ae8104176c3e60dfa13592c6c440b338cbf4d07
 AUX mysql-connector-net.pc.in 229 RMD160 e43865e861163be5d1c2f6a3a09155f1f4757169 SHA1 3a4f268a20be991dcf67c654ef44dee034804fe0 SHA256 c3e205e4dc4ec645f542a1703c0f1088696a868a27ff77a6c04a8796451ae959
 DIST mysql-connector-net-1.0.4-noinstall.zip 707521 RMD160 3c78abb591c49f48e84be3315d181ff1be6bfeb4 SHA1 30424baa9324cc0f5d9a9d87f7b413360c8d400c SHA256 1006e865773ce463caf216f59e0129000d83da60070592d8b083d15d265428d0
 DIST mysql-connector-net-1.0.9-noinstall.zip 1297921 RMD160 011e330b8824276f0649a62b5c731abc63af0667 SHA1 95da5660cbdeda8d7cd966e24caff8c0ced056a0 SHA256 cbd08fdc17bcffc493a453ea2df2875023f9d2b13df169db189cddba2d39ad75
+DIST mysql-connector-net-6.2.3-src.zip 915380 RMD160 61c3edbba60b7553974c980a0fbb78ac88a8a393 SHA1 46343bd7c2778beb1d4be865044ba212a0ca7dfb SHA256 6970c4f6ded8cbacf1db252f337614e3c4c21402de86d1d7b611a7176f5bf834
 EBUILD mysql-connector-net-1.0.4.ebuild 1825 RMD160 ac7717a3c1779eb57b0d63b783f843fa100e85c3 SHA1 b3a4d84d86603c1bccb47bdf7eaca83d54567369 SHA256 84eb5f1318a0d6d02f30912405b4e4c6c0a994751118a45a1a2c09bdd39b4d02
 EBUILD mysql-connector-net-1.0.9.ebuild 1833 RMD160 7bc1ba8ea9c51cf710feb0142444b329249d92cf SHA1 ccd225641e4fd91b2c0c39ce93a0ffd99e6e05f9 SHA256 c146da31a89770bb41c366431b26a26d3b98a04999c85092d3331d526650638c
-MISC ChangeLog 1968 RMD160 db7998b8bfc2c494b2b6fea04607d0ead3fea92b SHA1 bc523c5554278d65ce9d3a4f3ef63f9f66ac1430 SHA256 cedc8c90278bbb6114a3ee49d1a2d9f668269674f704df7b421c4d42823d20df
+EBUILD mysql-connector-net-6.2.3.ebuild 2363 RMD160 87e43bfef43fae24065538286cece47fa333d909 SHA1 649fd6a98aeede399cf9f8bb64fbb8b7745a4502 SHA256 bff22377797182e3415e75ac6f616230872390b3f0381d997bf52e98abd6f965
+MISC ChangeLog 2257 RMD160 4eeffcae1d45ce1b970821f1c318e0fdcef7f65a SHA1 77de6a3d4c81a2fcf77cd57de4eb35757a81d605 SHA256 3f1df071bdbd57f5c792cb334af2c11b7f405114f9f47c81305581711a0eb44e
 MISC metadata.xml 696 RMD160 a574d31b2aa1ffe0268d22dcca75d10534a03a76 SHA1 01d8887d9ee5bd5f0fb2639cdae664582a44560e SHA256 8898737e2ad59031263bce78c4fa842db86bc5431726f267849d4bee50d9da16
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 0000000000000000000000000000000000000000..24d65f17c39a1b49d03076897a3e589b3823192e
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONaL000293C&26SWh;tDlLt}t&R5wyWH=#Ah1@D
z9j#o1<r1lkF*aVw_vNLR7HBu)OL<ueuK-stE?p-s0!r+vw*GO3A#aFhQc_0`3#y)Q
zR2Hb+{h@RH!73Zt-mS5QrF{7A8S<rK(Ra3J0n%&j@=@|g$4ZdH<~k(WdY<oyS$(3_
zft47^Vj<vhKF_hasX+t$_MwsKFllOex;OW2Dsv(U>^?*DUcdSex0uJlU=nv%jGE8%
znw;<;+P5x5#ID0<85pC-VwToHXd&dj8K}s$JyfspdBQNj>KNcETeL0O+q?MU))%lJ
z6Q?F2;7_YUx~5Ed@JSEeY0v%PRg=_BpF(QQA)P0}g6~wNK<?CLHq!KI;}(HG4<ya(
zlUXG~Ad)(8J>^IH{g3JdsLv3wJfP7BC^#eNP|>u)LY{v80x%P<8hcfqW_-Y5U8*M8
zoxU>QmCF>53?bgvC<dz;R#GgJWSRCq0&eC5z++H=tRg4y!52+O-;mN)Mgkf5H!1BW
zaJk{K(QgOS)<T&6c=g7vd_@bs5($0G%-YX1LH86I0FM78Bdv6hK!{PnZI8RaIi6BQ
zITmmE;XQki<jRmO(LIM{nG807!-CU1$g#ITVn1eT&Bz04_;~Z+mCwD&Y6^sBu2|@_
z_{0bzvmMVp&0?c_!qoq$oBiZ_>c-d%96A(MkN<B#;Vu3nq`hxC)WfMxom_6YR<io@
iw|&oYIr^;)5NDUC*g4pZZrWw!qBy@@{EZUI)v|I9qAQC4

literal 0
HcmV?d00001

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}/\""
+}
-- 
2.26.2