Another patch from debian. Respect LDFLAGS, bug #335153, thank Diego E. 'Flameeyes' Pettenò for report. Drop old.

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

6 files changed, 117 insertions, 27 deletions

diff --git a/dev-perl/SpeedyCGI/ChangeLog b/dev-perl/SpeedyCGI/ChangeLog
index 728c291a0db4..382cd7dd6149 100644
--- a/dev-perl/SpeedyCGI/ChangeLog
+++ b/dev-perl/SpeedyCGI/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/SpeedyCGI
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/ChangeLog,v 1.9 2010/03/29 14:59:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/ChangeLog,v 1.10 2010/09/15 14:21:11 pva Exp $
+
+*SpeedyCGI-2.22-r2 (15 Sep 2010)
+
+  15 Sep 2010; Peter Volkov <pva@gentoo.org> -SpeedyCGI-2.22.ebuild,
+  +SpeedyCGI-2.22-r2.ebuild, +files/SpeedyCGI-2.22-big-socket-buffers.patch,
+  +files/SpeedyCGI-2.22-ldflags.patch:
+  Another patch from debian. Respect LDFLAGS, bug #335153, thank Diego E.
+  'Flameeyes' Pettenò for report. Drop old.
 
 *SpeedyCGI-2.22-r1 (29 Mar 2010)
 
diff --git a/dev-perl/SpeedyCGI/Manifest b/dev-perl/SpeedyCGI/Manifest
index b1c5b0567aa9..747b6d3e2883 100644
--- a/dev-perl/SpeedyCGI/Manifest
+++ b/dev-perl/SpeedyCGI/Manifest
@@ -1,6 +1,8 @@
 AUX SpeedyCGI-2.22-apache-docs.patch 647 RMD160 c4307e549242f4aeffc0bdb0d27cf6a241fe16ef SHA1 df95d9544bc48893a95fb81843a8105139755421 SHA256 b71fda634673120f2491d707e3e76f185817b5ca0dee71401df0e1071e15e95f
 AUX SpeedyCGI-2.22-apache2.2.patch 1870 RMD160 a2dbdbd1999bf4878f94033a8a1c3599d4c462af SHA1 244607138a607b05ddf91123fdf676c8f53c405c SHA256 e3075cd6841433619a8cee661a7e1db977a0b05275081b8fa960bfdbc7a20884
+AUX SpeedyCGI-2.22-big-socket-buffers.patch 1378 RMD160 47c747d8d5f6739a702afda582bd1dcf1f4833b6 SHA1 6a1a301d47d354d66ae89efb82851ee854955613 SHA256 6fd5676ed0de398fc55cd09316bdbaa4ac49360cd6e7a95838e84e8c4d75eda3
 AUX SpeedyCGI-2.22-empty-param.patch 1050 RMD160 fe508be28ba343d224a403136feccd7969bcdfc5 SHA1 e4df486a37fcf7cb517a8fe0baed05da5c07bfba SHA256 461c9656edd2581a9a9295e2e15e794d781b51234d68ab7c6ee6c0a03ccc55f3
+AUX SpeedyCGI-2.22-ldflags.patch 390 RMD160 9cd401a876ea0d890a777b71c3419b65e232b8f7 SHA1 1631828269781406ce4b3af478c318393d550e17 SHA256 9f49e4a484cb179ecb589bb4fb9e16ea26f0348d8c60e38ad6e526d8d13f9293
 AUX SpeedyCGI-2.22-makefile-manpage.patch 652 RMD160 34b42da8b98fc7add4e55e77bc01e6fbb9b0f2c6 SHA1 0ad31aca3a85d2cba5748665fdfbaabe390f32b3 SHA256 9e965b895a478c1d0779c1bfb92af141d859cc82e39a4ef18a46a0bfe388be91
 AUX SpeedyCGI-2.22-perl5.10.patch 738 RMD160 096bcd5ba5395c6bd08259f6ea467334ac5ebe3d SHA1 530883df01aa9b8a926eb2d3ae76cc3402bc0acc SHA256 7e4124d9a21f9cff079e970d2b1fae9836cca1bc8f0b70a03463c9c6538607af
 AUX SpeedyCGI-2.22-perl_sys_init.patch 750 RMD160 5f30e53a28765b829d67ef66954fd9c7ff7cc5cd SHA1 baa47c0e4a5484a3eca4e1638cdf028d0fe10987 SHA256 c7a4a6276ae134a8e3e6bb12348544b52ca3f25378c30ef353d8fdc986054ffe
@@ -12,6 +14,6 @@ AUX SpeedyCGI-2.22-uninit-crash.patch 500 RMD160 063adcbdbd4c64943391a36a3b557ad
 DIST CGI-SpeedyCGI-2.22.tar.gz 151946 RMD160 90bc10281f4380d6d9e3b376ce385567fb3d165d SHA1 155437a83eedc2cb1ae2b9f93a731a0cfb7ce7f2 SHA256 9021a5c6d8ed205422f091209addf7d1be27222adbcbd17bc52fbc527bcc6f98
 DIST speedy-error.patch 3087 RMD160 4890f30070a4c1393f762307a3ecf47716a77cfa SHA1 1a3f624d5eb70367e12984a49e50000ee800a326 SHA256 9da44c9c7c5068c214e52076e011d5485f077e26080ddabd1ab1eda854605c6d
 EBUILD SpeedyCGI-2.22-r1.ebuild 1105 RMD160 e64801b51154c35ded54b2cc0e6e7a5bdcb7bef5 SHA1 f1544afe0069e0433ae425c023c16a266c076a99 SHA256 4d32ad9539838121d7356faa34f14cbb60dc019ba5f99f16a324d28743267825
-EBUILD SpeedyCGI-2.22.ebuild 678 RMD160 11c9aebc252ab1b5cefe568f121dd00e684c5974 SHA1 4f57c05b5d9117f6843bea8818a47195fbc7429e SHA256 b6fc51db9f6a2dec994bd2f42ece44fb8dccd69fe167d064bccae548c62232d7
-MISC ChangeLog 1666 RMD160 3f0445a58ae93e7520e6844cffca3191d56ab73c SHA1 78d6f775373486584b53b28296754b82bf623f16 SHA256 691a377d7768eb9a30021284d22831c14ec514b35ff100efa126a0a91db0061d
+EBUILD SpeedyCGI-2.22-r2.ebuild 1278 RMD160 00d0d67311a4e6ced9ebabeb90a5f4dbdc29f751 SHA1 31d2d6a2b40bd9a1a793df68b32abde41fccf0b7 SHA256 73ed08a27b026956ae10abe4d1438020754195a0448ab0c2a343359ace476e82
+MISC ChangeLog 2006 RMD160 06526e0fd31c310486646cffac09b8e3441e453a SHA1 1e3f882b430c264080d7c6266bd135e1b615edf7 SHA256 d89cad1dec36776953b0eac10583eea6937c333c8be43340aa15a8a3ad5e4c86
 MISC metadata.xml 253 RMD160 200dfba0bf6af511668b0793f97e03e6cbe389f5 SHA1 329dca67f808221ee9442dab7d889ee187984594 SHA256 e90841b00ef0dbd6a62c94af879a69d09dc674725347380b839a445fa543edbf
diff --git a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild b/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild
new file mode 100644
index 000000000000..cc88866692c3
--- /dev/null
+++ b/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild,v 1.1 2010/09/15 14:21:11 pva Exp $
+
+EAPI="2"
+inherit perl-module
+
+DESCRIPTION="Speed up perl scripts by running them persistently"
+HOMEPAGE="http://daemoninc.com/SpeedyCGI/"
+SRC_URI="http://daemoninc.com/SpeedyCGI/CGI-${P}.tar.gz
+	http://oss.oetiker.ch/smokeping/pub/speedy-error.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/CGI-${P}
+
+PATCHES=( "${DISTDIR}/speedy-error.patch"
+"${FILESDIR}/${P}-makefile-manpage.patch"
+"${FILESDIR}/${P}-empty-param.patch"
+"${FILESDIR}/${P}-strerror.patch"
+"${FILESDIR}/${P}-apache-docs.patch"
+"${FILESDIR}/${P}-apache2.2.patch"
+"${FILESDIR}/${P}-strip-backend-libs.patch"
+"${FILESDIR}/${P}-test-timeout.patch"
+"${FILESDIR}/${P}-speedy_unsafe_putenv.patch"
+"${FILESDIR}/${P}-perl5.10.patch"
+"${FILESDIR}/${P}-perl_sys_init.patch"
+"${FILESDIR}/${P}-uninit-crash.patch"
+"${FILESDIR}/${P}-big-socket-buffers.patch"
+"${FILESDIR}/${P}-ldflags.patch"
+)
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+#src_configure() {
+#	export myconf="OPTIMIZE=\"${LDFLAGS}\""
+#	perl-module_src_configure
+#}
diff --git a/dev-perl/SpeedyCGI/SpeedyCGI-2.22.ebuild b/dev-perl/SpeedyCGI/SpeedyCGI-2.22.ebuild
deleted file mode 100644
index ee2d41d75f75..000000000000
--- a/dev-perl/SpeedyCGI/SpeedyCGI-2.22.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/SpeedyCGI-2.22.ebuild,v 1.5 2009/11/26 12:36:42 flameeyes Exp $
-
-inherit perl-module
-
-DESCRIPTION="Speed up perl scripts by running them persistently"
-HOMEPAGE="http://daemoninc.com/SpeedyCGI/"
-SRC_URI="http://daemoninc.com/SpeedyCGI/CGI-${P}.tar.gz
-	http://oss.oetiker.ch/smokeping/pub/speedy-error.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/CGI-${P}
-
-PATCHES=( "${DISTDIR}/speedy-error.patch" )
-
-MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-big-socket-buffers.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-big-socket-buffers.patch
new file mode 100644
index 000000000000..a67d9b6954b3
--- /dev/null
+++ b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-big-socket-buffers.patch
@@ -0,0 +1,47 @@
+Author: Niko Tyni <ntyni@debian.org>
+Description: fix the detach test on systems with a large socket buffer size (#584344)
+--- speedy-cgi-perl.orig/speedy/t/detach.t
++++ speedy-cgi-perl/speedy/t/detach.t
+@@ -6,9 +6,22 @@
+ 
+ use strict;
+ use IO::File;
++use Socket;
+ 
+ my $smbuf	=   8 * 1024;
+-my $lgbuf	= 512 * 1024;
++my $lgbuf;
++
++# find out the size of the socket write buffer
++# see http://bugs.debian.org/584344
++my $s;
++if (socket($s, AF_UNIX, SOCK_STREAM, 0) &&
++    (my $packed_size = getsockopt($s, SOL_SOCKET, SO_SNDBUF))) {
++    $lgbuf = $smbuf + 2 * unpack("I", $packed_size);
++} else {
++    warn("socket() or getsockopt() failed: $!");
++}
++
++$lgbuf = 512 * 1024 if $lgbuf < 512 * 1024;
+ my $scr		= 't/scripts/detach';
+ 
+ use vars qw(@open_files @pids %children);
+@@ -23,7 +36,7 @@
+     $| = 1; print ""; $| = 0;
+     my $child;
+     if (($child = open($fh, "-|")) == 0) {
+-	open(F, "$ENV{SPEEDY} -- -B$sz $scr |");
++	open(F, "$ENV{SPEEDY} -- -B$sz $scr $lgbuf |");
+ 	print scalar <F>;
+ 	close(STDOUT);
+ 	sleep 60;	# Simulate slow drain of output
+--- speedy-cgi-perl.orig/speedy/t/scripts/detach
++++ speedy-cgi-perl/speedy/t/scripts/detach
+@@ -1,3 +1,6 @@
+ $| = 1;
++# the data should not fit in the socket write buffer
++# see http://bugs.debian.org/584344
++my $size = shift || (512 * 1024);
+ print "$$\n";
+-print 'x' x (500*1024);
++print 'x' x int(500 / 512 * $size);
diff --git a/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-ldflags.patch b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-ldflags.patch
new file mode 100644
index 000000000000..7eb8c9171fc1
--- /dev/null
+++ b/dev-perl/SpeedyCGI/files/SpeedyCGI-2.22-ldflags.patch
@@ -0,0 +1,13 @@
+=== modified file 'src/SpeedyMake.pl'
+--- src/SpeedyMake.pl	2010-08-30 20:08:42 +0000
++++ src/SpeedyMake.pl	2010-08-30 20:09:18 +0000
+@@ -328,7 +328,7 @@
+ sub remove_libs { undef }
+ 
+ sub get_ldopts {
+-    $_ = "$LD_OPTS " . &ExtUtils::Embed::ldopts('-std');
++    $_ = "$LD_OPTS " . &ExtUtils::Embed::ldopts('-std') . " " . $ENV{LDFLAGS};
+     $EFENCE && s/$/ $EFENCE/;
+     return $_;
+ }
+