Fix Connections leaking in Mono.Webserver.FastCgi, bug #432750 by gentoo at pasichnyk dot net. Drop old.

Package-Manager: portage-2.1.11.17/cvs/Linux x86_64

4 files changed, 66 insertions, 15 deletions

diff --git a/dev-dotnet/xsp/ChangeLog b/dev-dotnet/xsp/ChangeLog
index 0e7ab9763cfd..8092cf7927c3 100644
--- a/dev-dotnet/xsp/ChangeLog
+++ b/dev-dotnet/xsp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/xsp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.106 2012/08/18 12:27:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.107 2012/09/15 12:46:53 pacho Exp $
+
+*xsp-2.10.2-r2 (15 Sep 2012)
+
+  15 Sep 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/xsp-2.10.2-endrequest.patch, +xsp-2.10.2-r2.ebuild, -xsp-2.10.2.ebuild:
+  Fix Connections leaking in Mono.Webserver.FastCgi, bug #432750 by gentoo at
+  pasichnyk dot net. Drop old.
 
   18 Aug 2012; Michael Weber <xmw@gentoo.org> xsp-2.10.2-r1.ebuild:
   ppc stable (bug 407701)
diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest
index 3fdf8f1f41e5..42182ba932c7 100644
--- a/dev-dotnet/xsp/Manifest
+++ b/dev-dotnet/xsp/Manifest
@@ -6,15 +6,16 @@ AUX 2.2/mod-mono-server.confd 1284 SHA256 afece05a71e3a13127ecc40c0f6948dd19adf7
 AUX 2.2/mod-mono-server.initd 1975 SHA256 b9d34b7c3adf2b2bc72ceb0ae736c11ef0bfe0c8d8fead0ba5fc32df2249f038 SHA512 58470b29472ad1e8e380e62bafa0cd639e5e57c3e6910a49d276fee4c8f8745db07d4e6f4a22b069895840598a640be5f74dd62511dc396dd6c3bc866eb8e1ca WHIRLPOOL 95c7fec372b29076e295f697ec64e3930d7727b40aa54877f0795d1f4ac1ec0b056e05cf0eff0d82ed0fc2a69cd720ab900c7cf4350a692576dba568df70b00a
 AUX 2.2/xsp.confd 364 SHA256 002d95fea743bbf18bbff3fb4af5397cf775519afaf1493384b28125c0efdc38 SHA512 00f7c6149a5def1e0afbabdf11c641d3570f0f10517e03ec582e737d43d473e7fec2e728b30e9be71f9e7b42d49b91cc55d575251691f046da9e6061b26a3e17 WHIRLPOOL d431178d742df19bb6ed4b135f73a65404d788d2d4b1c43837721b0632cb7454f87d7ff718f185dc2f4436a9625816a447a7af0bb23c9f07ea7e73aff2f81f34
 AUX 2.2/xsp.initd 853 SHA256 8957b8c23d369effa5b15936e9a6728cbbe2db81e03329b67df7c44c7b81f8fd SHA512 5286dc332e891a0e6af96e58d986a41fdf4d46af406854986b835e6b73dd23503556e1ef4b1511c4ee54aba5405fe6bd61ddc19ca40a0269cdf96448c3731b50 WHIRLPOOL 664d8baac144fdd371872adca473fb3a0acf6034e1c74e52edf3ef6984beac9320c8c19128ffb58b53af7db0ef58bd32c868e5aae9c9a178683ca8e135c92c26
+AUX xsp-2.10.2-endrequest.patch 1132 SHA256 59ab59447b2f41f50d891cc27cc25851b9f4f4fd9d66f5068d2127e45f81a386 SHA512 36a1ec8f2b934ececbadc79917b0c7e239797f0dd9a409132acaf79e95ab4fa2c22c525f01d681f74b38113d7d01ee46a53cceb342a5e97bc5fbdd3937a7f43a WHIRLPOOL 122dea34c8f87ae3f778080c18d0e8382231389a92cb71fefe403498ad2ed4d3996f3e9ea4fae84447c943fb0e479e33be815c1b2cc6e6940ecc8d46b3457d2d
 DIST xsp-2.10.2.tar.bz2 284801 SHA256 f4657f724167244d9baedf94e1d5747b8f1f53c339c7a11897154c1eb1289d4e SHA512 9b49e3a712e062b9a272e72609eda3cb8139127bc9780d6374a3567f51f15f38233f92252c2e4c22778b1841de66855dfe6a8cf81c97c6ebbf84f71dda0d43dd WHIRLPOOL fce613fedf164f7cd4cf0bae622884a4f7b6747e249d965c4ea23997586371b6a588ad96d66bcc5c6e74f98b76de3f374cd676de164ba1f3a889e4b00b8b6dcc
 EBUILD xsp-2.10.2-r1.ebuild 1037 SHA256 03ea027f5fb2d1220dc9da3755ab549a7480832ea3020625e865edede46ecff4 SHA512 d2cf9c65f05e5baf89bc1a8eb756065df45f87f12fb3b8e65f733ffa02e42edf1895365ac811110bd5f72c2230cab716990e79efa4dd375132f7f76db1016bc2 WHIRLPOOL 1bedbd4ea7366bad491dd88531e25341a3ab609747263bf4ee6009ac19609425906473781edc3e360483eeafb43b695bc01b8449130a2a95b378a72ba4f5cd33
-EBUILD xsp-2.10.2.ebuild 1032 SHA256 9fc43a10e905ccf100a9bc64adb7a7cd0462f8d96688e065b643855b4d8931de SHA512 4645077c39a5a9ccf52d66a6994ff85b38b2540b09effb16ee7ad1488aff6f139c27a981f45ad07304fc139f62919b3f0c54ce44353c1bc515f4e8f87f97dcba WHIRLPOOL 4859bc08ce77dd2be28855a2775190ede6ce1d1733bafc7992eedf3db84e4d52b0fb93da37a909b7a3dbda9d70e19965f88599358ad3ba057d0356574a0ad9bd
-MISC ChangeLog 17384 SHA256 96ac80c741a061ff0a29d8ebf73b972d116ea6d0841035863e5a0f40fc71db11 SHA512 cc696da5706be3d798f96b85814199975c2c10e9a4cda2b0d2ce59f45bfbd6d7e38d216ad65886011312a7b27aa5e3464d6ab336424a14e272588e39e0acd8c4 WHIRLPOOL c0c35e3714f6f5eddcf9efee4400360652473c483fe6464ead5c42e13975d590d55073ffee4de1d2ae8f60e6e9dfa6ee7238a459186027e2347b9f298ef633cf
+EBUILD xsp-2.10.2-r2.ebuild 1185 SHA256 42a6b49c8cdd7ed58bb8572f3930e41eae972c1530854c7b085aa545000c0882 SHA512 0caf6c6493e5c3b4e9a90f3923f11e5408761ba49ce5c78fa75c7563f336beda2ac80058270038c2bd2bd0f2f899445f9b33d49429b870eb30cf05d371e6ce57 WHIRLPOOL d97cdf2f49e1ca08cebe199b09b083fe526c1c769ef7bffe101736185f28367a4396ca361925ffcbb1e59ea5a309881d3b4a568652cfdc607879b67ae19ac19c
+MISC ChangeLog 17653 SHA256 5b46202f6185eaa6c80db3a3a1e2eac93f344e591f335df8ccb6b4914ade7a99 SHA512 06bc04e9fea1e1d6c854bd32c49ad48bc904b74aa894f549d16fbe5a96876a71b1e400f7752e8964cb905f7705cbfd19190be280667bc8c5f72a65dbc6d1d36b WHIRLPOOL 63217c150461c4775a2d85824c605ac3022a5f69dccb2670ee0a33022fc2d953ecf80222f57112b4a59408a26fbbab83c7677059ca4be814cf3d78426daf4d97
 MISC metadata.xml 309 SHA256 1a04b4ee014e693577e1a05accf4670bf3d4461e5b5ded22dfe285fa929e0369 SHA512 35c4a860a64742157608ef403569f79c8383d9d89b04bf6793071a5d68080d8d15be2aacc897c6cb1c9eb5179a7654746a57ad0682eef1d7ad93a598cbad7de7 WHIRLPOOL 2ede1cd166f1c4f91490bdd1409423d9286101fac1b4ea7b487e35636bc3caceea46c8fc93d395c883604232bff81aa9b9ee901bbb2520af1ea199c05e3e12ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAvijMACgkQknrdDGLu8JCMYAD/Q36KkAiZG4GE8VCex2I+t1th
-mg004SksVoowA2L5ViMA/1f2Og+O7KVW30a2D3A6poDqaocXM2EHkf54A3SxJvb/
-=Oj4q
+iEYEAREIAAYFAlBUeMIACgkQCaWpQKGI+9SXtQCfYzaZAcMvWkVJTOt5pBOYte9U
+JZEAn2foXNXNzl020ZrqyV7OsaUc6Oga
+=2Gky
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch b/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
new file mode 100644
index 000000000000..ff702d3faa59
--- /dev/null
+++ b/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
@@ -0,0 +1,35 @@
+From d2c4a279942a4575b80618719646d0767c077e96 Mon Sep 17 00:00:00 2001
+From: Guillaume Pitel <guillaume.pitel@exensa.com>
+Date: Tue, 6 Mar 2012 17:20:24 +0100
+Subject: [PATCH] Added try/catch around EndRequest Record sending (Bug 3765
+ https://bugzilla.xamarin.com/show_bug.cgi?id=3765)
+
+---
+ src/Mono.WebServer.FastCgi/Connection.cs |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/Mono.WebServer.FastCgi/Connection.cs b/src/Mono.WebServer.FastCgi/Connection.cs
+index 6c70824..0e9ef64 100644
+--- a/src/Mono.WebServer.FastCgi/Connection.cs
++++ b/src/Mono.WebServer.FastCgi/Connection.cs
+@@ -319,10 +319,13 @@ public void Run ()
+ 		{
+ 			EndRequestBody body = new EndRequestBody (appStatus,
+ 				protocolStatus);
+-			
+-			if (IsConnected)
+-				new Record (1, RecordType.EndRequest, requestID,
+-					    body.GetData ()).Send (socket);
++			try {	
++				if (IsConnected)
++					new Record (1, RecordType.EndRequest, requestID,
++						    body.GetData ()).Send (socket);
++			} catch (System.Net.Sockets.SocketException) {
++			}
++				
+ 			
+ 			int index = GetRequestIndex (requestID);
+ 			
+-- 
+1.7.10
+
diff --git a/dev-dotnet/xsp/xsp-2.10.2.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
index 31490eab3893..7990875b7e08 100644
--- a/dev-dotnet/xsp/xsp-2.10.2.ebuild
+++ b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2.ebuild,v 1.5 2012/06/04 07:12:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild,v 1.1 2012/09/15 12:46:53 pacho Exp $
 
-EAPI=2
-
-inherit go-mono mono user
+EAPI="4"
+inherit eutils go-mono mono user
 
 PATCHDIR="${FILESDIR}/2.2/"
 
@@ -13,7 +12,7 @@ HOMEPAGE="http://www.mono-project.com/ASP.NET"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
@@ -22,6 +21,15 @@ DEPEND="${RDEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_prepare() {
+	# Added try/catch around EndRequest Record sending, bug #432750
+	epatch "${FILESDIR}/${PN}-2.10.2-endrequest.patch"
+}
+
+src_configure() {
+	default
+}
+
 pkg_preinst() {
 	enewgroup aspnet
 	# Give aspnet home dir of /tmp since it must create ~/.wapi
@@ -30,10 +38,10 @@ pkg_preinst() {
 
 src_install() {
 	mv_command="cp -ar" go-mono_src_install
-	newinitd "${PATCHDIR}"/xsp.initd xsp || die
-	newinitd "${PATCHDIR}"/mod-mono-server.initd mod-mono-server || die
-	newconfd "${PATCHDIR}"/xsp.confd xsp || die
-	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server || die
+	newinitd "${PATCHDIR}"/xsp.initd xsp
+	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
+	newconfd "${PATCHDIR}"/xsp.confd xsp
+	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
 
 	keepdir /var/run/aspnet
 }