fix graceful restart wrt #222059

Package-Manager: portage-2.1.5.2

4 files changed, 74 insertions, 13 deletions

diff --git a/www-apache/mod_fastcgi/ChangeLog b/www-apache/mod_fastcgi/ChangeLog
index 250eca9524ab..5c5b49f368bf 100644
--- a/www-apache/mod_fastcgi/ChangeLog
+++ b/www-apache/mod_fastcgi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_fastcgi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fastcgi/ChangeLog,v 1.3 2008/03/17 20:01:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fastcgi/ChangeLog,v 1.4 2008/06/01 12:19:58 hollow Exp $
+
+*mod_fastcgi-2.4.6-r1 (01 Jun 2008)
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/2.4.6-graceful.patch, -mod_fastcgi-2.4.4_pre20070916.ebuild,
+  +mod_fastcgi-2.4.6-r1.ebuild:
+  fix graceful restart wrt #222059
 
   17 Mar 2008; Markus Meier <maekke@gentoo.org> mod_fastcgi-2.4.6.ebuild:
   amd64/x86 stable, bug #213701
diff --git a/www-apache/mod_fastcgi/Manifest b/www-apache/mod_fastcgi/Manifest
index d88fdb999c24..c5a31fdb3c0f 100644
--- a/www-apache/mod_fastcgi/Manifest
+++ b/www-apache/mod_fastcgi/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.4.6-graceful.patch 1323 RMD160 83cf56d0443361fce47077b3a3b6967742a806da SHA1 6b316e00a5d38502063dc79388e71b38de0cea2c SHA256 c83df12ca18fb81c51031e20afa2954f1da22c1f308989752d445668fbf7339d
 AUX 20_mod_fastcgi.conf 148 RMD160 134e40c98e233dbc304048fe356c859300d3b0c1 SHA1 c5af515eae87e9e4b88d3980d9c4edaa71fec36a SHA256 f966884ad8c3aba759ef25b47356529f97a5caf9b111b53f334dcb55512c193e
-DIST mod_fastcgi-2.4.4_pre20070916.tar.gz 100427 RMD160 b82d0d876cee3ff3bdc4b93a7253a60c309cc733 SHA1 e4ddf75ce385852dfdab32875e49c997917fbcd9 SHA256 4352a9af2a9e38b018fd8fb644168b53a2c0e55d0d173429abab6810d2397a05
 DIST mod_fastcgi-2.4.6.tar.gz 100230 RMD160 95caee4847cb725aab6c7d8bf2db9dee49d46eec SHA1 69c56548bf97040a61903b32679fe3e3b7d3c2d4 SHA256 a5a887eecc8fe13e4cb1cab4d140188a3d2b5e6f337f8a1cce88ca441ddbe689
-EBUILD mod_fastcgi-2.4.4_pre20070916.ebuild 682 RMD160 ce76ff80c77a6530b7a7a0b1c5100817ef30b55f SHA1 8c10a87b2b6bfc0e03c6c56907db023907b8e72c SHA256 033cb848e86913932b4b509f3b637fbb98b5acba63f999ce7311e0ffd35f9bc0
+EBUILD mod_fastcgi-2.4.6-r1.ebuild 755 RMD160 b296da91780f6375d34e4eb9b470ee76064ea1b9 SHA1 15b052b788cfef7f81849b562f4736701960a18a SHA256 273d6dea94778d94c1f6eadcc89db9d62d2bfdb592bcbe645190760ede4db153
 EBUILD mod_fastcgi-2.4.6.ebuild 658 RMD160 5d1888c269d8c1411462930415df54fd4a63c991 SHA1 b60f81ae3312f32b8a39e4cd77c9a303e74f4c3c SHA256 d862e053ca48523235f20c865c0f372058529df4a9cb057e1922f827f19ac29c
-MISC ChangeLog 772 RMD160 2839082683e5c47c8f5f68ddfb3fa53c20cad47f SHA1 4d855948cb20a0e23fcdc63a834f45ee122ac87e SHA256 cdce0c950da2b7fe34e9a158d948e91c2ad74cf41de7f76522f7ed59bde25ef0
+MISC ChangeLog 997 RMD160 3ee576ce44b2dfca31077fac1887e4320fe311d0 SHA1 b68f716e813fce5b4afb2010d8409fd560c3df94 SHA256 5e8f25cabdacc9a905e5d14e0e8d8d27d9cbba7ca87ee31addc0186bab61ae7e
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3s5kkKaRLQcq0GIRAp69AKCtQUl4vQXbeTuhEHecwvbBjrwVswCeNm4m
-siJIPMSv4RV+2+MufiUfCNw=
-=0h+V
+iEYEARECAAYFAkhCk/QACgkQmPFBzbX68WH0RQCfci2SoV1jUoFvsu3o8fs6nDTY
+MS8AmwSCVBTAtrr9vrRPyYPxShUg0OBV
+=0kQ1
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_fastcgi/files/2.4.6-graceful.patch b/www-apache/mod_fastcgi/files/2.4.6-graceful.patch
new file mode 100644
index 000000000000..b3d5dce179b6
--- /dev/null
+++ b/www-apache/mod_fastcgi/files/2.4.6-graceful.patch
@@ -0,0 +1,50 @@
+--- fcgi_pm.c.orig	2008-04-04 09:34:20.000000000 +0200
++++ fcgi_pm.c	2008-04-04 09:37:58.000000000 +0200
+@@ -128,8 +128,26 @@
+         int numChildren = (s->directive == APP_CLASS_DYNAMIC)
+             ? dynamicMaxClassProcs
+             : s->numProcesses;
++
++        /* Send TERM to all processes */
++        for (i = 0; i < numChildren; i++, proc++) 
++        {
++            if (proc->state == FCGI_RUNNING_STATE) 
++            {
++                fcgi_kill(proc, SIGTERM);
++            }
++        }
+         
++        s = s->next;
++    }
++ 
+ #ifndef WIN32
++    /* sleep two seconds to let the children terminate themselves */
++    sleep(2);
++    s = fcgi_servers;
++    
++    while (s) 
++    {
+         if (s->socket_path != NULL && s->directive != APP_CLASS_EXTERNAL) 
+         {
+             /* Remove the socket file */
+@@ -140,19 +158,9 @@
+                     (s->directive == APP_CLASS_DYNAMIC) ? " (dynamic)" : "", s->fs_path);
+             }
+         }
+-#endif
+-
+-        /* Send TERM to all processes */
+-        for (i = 0; i < numChildren; i++, proc++) 
+-        {
+-            if (proc->state == FCGI_RUNNING_STATE) 
+-            {
+-                fcgi_kill(proc, SIGTERM);
+-            }
+-        }
+-        
+         s = s->next;
+     }
++#endif
+ 
+ #if defined(WIN32) && (WIN32_SHUTDOWN_GRACEFUL_WAIT > 0)
+ 
diff --git a/www-apache/mod_fastcgi/mod_fastcgi-2.4.4_pre20070916.ebuild b/www-apache/mod_fastcgi/mod_fastcgi-2.4.6-r1.ebuild
index 861c485d9d6f..91c061b9e5f6 100644
--- a/www-apache/mod_fastcgi/mod_fastcgi-2.4.4_pre20070916.ebuild
+++ b/www-apache/mod_fastcgi/mod_fastcgi-2.4.6-r1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fastcgi/mod_fastcgi-2.4.4_pre20070916.ebuild,v 1.2 2008/01/27 17:31:32 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fastcgi/mod_fastcgi-2.4.6-r1.ebuild,v 1.1 2008/06/01 12:19:58 hollow Exp $
 
-inherit apache-module
+inherit apache-module eutils
 
 DESCRIPTION="FastCGI is a open extension to CGI without the limitations of server specific APIs."
 HOMEPAGE="http://fastcgi.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://www.fastcgi.com/dist/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="FastCGI"
 
-S="${WORKDIR}"/${PN}
-
 APXS2_ARGS="-c mod_fastcgi.c fcgi*.c"
 APACHE2_MOD_CONF="20_${PN}"
 APACHE2_MOD_DEFINE="FASTCGI"
@@ -21,3 +19,9 @@ APACHE2_MOD_DEFINE="FASTCGI"
 DOCFILES="CHANGES README docs/LICENSE.TERMS docs/mod_fastcgi.html"
 
 need_apache
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-graceful.patch
+}