Bumped EAPI=5, added patch to compile against apache-2.4. Closes bug #411299

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x748B2C601F6F0683

5 files changed, 183 insertions, 58 deletions

diff --git a/www-apache/mod_fastcgi/ChangeLog b/www-apache/mod_fastcgi/ChangeLog
index 8b2a156ea550..d796c2a9713d 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fastcgi/ChangeLog,v 1.16 2012/11/27 20:23:56 neurogeek Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fastcgi/ChangeLog,v 1.17 2013/07/10 02:45:54 neurogeek Exp $
+
+*mod_fastcgi-2.4.7_pre0910052141-r1 (10 Jul 2013)
+
+  10 Jul 2013; <neurogeek@gentoo.org>
+  +files/mod_fastcgi-compile-against-apache2.4.patch,
+  -files/2.4.6-graceful.patch, +mod_fastcgi-2.4.7_pre0910052141-r1.ebuild:
+  Bumped EAPI=5, added patch to compile against apache-2.4. Closes bug #411299
 
   27 Nov 2012; Jesus Rivero <neurogeek@gentoo.org> metadata.xml:
   Added myself as maintainer
diff --git a/www-apache/mod_fastcgi/Manifest b/www-apache/mod_fastcgi/Manifest
index 10756275a598..a8908b9af260 100644
--- a/www-apache/mod_fastcgi/Manifest
+++ b/www-apache/mod_fastcgi/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 2.4.6-graceful.patch 1323 SHA256 c83df12ca18fb81c51031e20afa2954f1da22c1f308989752d445668fbf7339d SHA512 5e8e6779ff7b06578c7ab9ac8e37f6383ffba0dde46038e2e40f76c850feaf434edb6c47f9377735da434a6934202709171b9fb3b0e602d22ac41531991979c5 WHIRLPOOL 2b580490129140d3c59b1e44c9742f607cab50f615c9e78afa6598b069839d79799ddbc46a54c213b3cdb4425506454e8eda5d8809bd9f1afdaa41c2546ae90b
 AUX 20_mod_fastcgi.conf 148 SHA256 f966884ad8c3aba759ef25b47356529f97a5caf9b111b53f334dcb55512c193e SHA512 478d1a64ec786ead4eb4ec5a51ae177619e8c8ab35a7656d1532f255d7107348d87453ff8df8fe29e0ff379ae403c711000e5576bba9167f0549bcae4ae9df3f WHIRLPOOL 8f4a90bce196d61c2d6305ff8dbee49b79153790ff361abcf745cee3205d06c915f2ac25fc98094e02c48d8055304443ac82fba1a082046c7c1800afda26d073
+AUX mod_fastcgi-compile-against-apache2.4.patch 6882 SHA256 e405f365fac2d80c181a7ddefc9c6332cac7766cb9c67c464c272d595cde1800 SHA512 f297d429d5fb44003d7e08844bcd5e689af4958334ce49c122b35489f0536db4d0e6e129478a44da19ff17a69736ef3059a6bf5f6a12da135eaf3ea9ef187549 WHIRLPOOL c07869777293eaf59ee1390bb487df6cd3e0c255d5121f6f51caebc06c180103d4651118b6bc475c61c64ea014a6b8cf52b70bd89a68ec2c26c2c9662f1537d1
 DIST mod_fastcgi-SNAP-0910052141.tar.gz 103255 SHA256 e6564ae206284806c781834e9e89aa4b0a4dd647b45c6da5cc389c65a984bdc7 SHA512 4ab909bb26104542d44490a30f2a77f71c7f4345902f00e06424f03bbf81858a72a713580ee6081088e6d5154f702a155d25b675111371c087c122ef6d181d95 WHIRLPOOL d576eda007ce0ae598501877abbe34e407d2335d3feedd096b930a8cd7da65107efb906bd5fa75cafc30d9c2bb7bbe7a09bfaa27d40d6812b4db02514276dfd0
+EBUILD mod_fastcgi-2.4.7_pre0910052141-r1.ebuild 850 SHA256 a6172dc01d30be04aea9e182ac692df308bff7b1f7285eb3eae0c9b4be8e536b SHA512 3f7d7f9d5c5c2e2ad1fbfa59888b5ab09ef2c498402c2a2b4099061782762d0ac47a21c6b5da67feac561268b9f21b3b2cbb468db348549bbf14fe0511a22168 WHIRLPOOL 5ca7f0510275473b19f0236d009544492bb2beebd37914f28abf169620c35e822f5795c86ae94a88717991abca5b87ec747fc693b2304a8eaf961fce6b7b00fe
 EBUILD mod_fastcgi-2.4.7_pre0910052141.ebuild 751 SHA256 6b421168a27c57bc0ebe4bf348d16ba07d873126f36860e00fd6099557bad0d2 SHA512 e5d14f00d33da6597a3721c62310870dab723c6757e0ff61e7eca037dc080823b4df6f70b1c09ea43bcde11edc974ed2c5971f532277189f9d0dff6e88e0e8ae WHIRLPOOL 9f47b6be1deb45bb10e40e3fd6f204f951b10a9848a1f76c066b218d2ec0284c31cc9984dc59919e9313bebe74f3466b4f5bb04c87099f74d46bc400a1393d1f
-MISC ChangeLog 2775 SHA256 a0fe6aaeb52a4d34e97136605e5def6a83f40fecbeab3a5792394319e1ca40d8 SHA512 1d9c529feb1f1ecca85861ce4c53615632f7905fc7da3e8c22c5fe0ca38f8651cb507aea2dd8cf29472dd417c2ca728010c5da653f3c1ce8c7dd29686b626699 WHIRLPOOL 4da568d866856e1a0d8513b46b4503b9a7c70342696a8e20eed6bfa09a960f884d54ad515929e7d60ac8344620dee07b1d4828c82f443bf5517a0ecd19a653b7
+MISC ChangeLog 3073 SHA256 bc87d85788269c5de97e8c792efa5f16792ae2725d7b61fcf39404dec81d2ba4 SHA512 d02bf70e87fb3a93e1cf4f5e3e6b2ebd624c45f7b9e516e6cc6534d193aae2b6a133b736b5548c8b5533342321d6ed5baccedb1f4e48eb9fb85d55da3d9a5347 WHIRLPOOL cc29400d0cd917f521a3de1f1fb849bd14118845b8d67054774b59ecee8c02135b1c276dfcbf6b87fd72cfaa125f3aa0b8896b15f466b079056e858fb9a6dffb
 MISC metadata.xml 230 SHA256 8de1eed13d2505b1efb1c8aa4c52dc056b4e78c04be7dfcd77328d18e5f1e0cd SHA512 f90b0d0181129fa622097f68322d91e2deaf57da672de747f1d629878f873a5a7811282dcfd09a591b02a37a769ef7610bd2592ba39514f484f591a2fb164856 WHIRLPOOL 75a95775a930814d97c448430538a5b235a337afde2a90c5e99f0b6aeaa8ab478b6053e63603ae1b56438a1727b3d0d1d52cd45bb1516c0bb3b4a039ea31d4c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC02xAACgkQdIssYB9vBoPjHACeKCi/M/1+GvNcmF7Gn0dNjKbN
-+YIAnRmlcihnGGZ2c1EasVLsxt1LKVDd
-=94yy
+iEYEAREIAAYFAlHcyxEACgkQdIssYB9vBoN5FACfacVMOAlla8vxdHRkGA8nRP8D
+0mUAnjH0c0sXagLnVqa7L9qgIWWD61YJ
+=yf14
 -----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
deleted file mode 100644
index b3d5dce179b6..000000000000
--- a/www-apache/mod_fastcgi/files/2.4.6-graceful.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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/files/mod_fastcgi-compile-against-apache2.4.patch b/www-apache/mod_fastcgi/files/mod_fastcgi-compile-against-apache2.4.patch
new file mode 100644
index 000000000000..417c03ef83b1
--- /dev/null
+++ b/www-apache/mod_fastcgi/files/mod_fastcgi-compile-against-apache2.4.patch
@@ -0,0 +1,137 @@
+Index: libapache-mod-fastcgi/fcgi.h
+===================================================================
+--- libapache-mod-fastcgi.orig/fcgi.h	2012-03-07 14:29:04.005720240 +0100
++++ libapache-mod-fastcgi/fcgi.h	2012-03-07 14:29:07.830566657 +0100
+@@ -34,6 +34,10 @@
+ #define APACHE2
+ #endif
+ 
++#ifdef AP_DECLARE_MODULE
++#define APACHE24
++#endif
++
+ #ifdef APACHE2
+ 
+ #include <sys/stat.h>
+@@ -57,10 +61,16 @@
+ #define XtOffsetOf APR_OFFSETOF
+ #define ap_select select
+ 
++#ifdef APACHE24
++#define unixd_config ap_unixd_config
++#endif
++
++#ifdef APACHE2
+ #define ap_user_id        unixd_config.user_id
+ #define ap_group_id       unixd_config.group_id
+ #define ap_user_name      unixd_config.user_name
+ #define ap_suexec_enabled unixd_config.suexec_enabled
++#endif
+ 
+ #ifndef S_ISDIR
+ #define S_ISDIR(m)      (((m)&(S_IFMT)) == (S_IFDIR))
+@@ -365,42 +375,42 @@
+ #ifdef APACHE2
+ 
+ #ifdef WIN32
+-#define FCGI_LOG_EMERG          __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ALERT          __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_CRIT           __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ERR            __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_WARN           __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_NOTICE         __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_INFO           __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_DEBUG          __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_EMERG          APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ALERT          APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_CRIT           APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ERR            APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_WARN           APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_NOTICE         APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_INFO           APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_DEBUG          APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
+ #else /* !WIN32 */
+-#define FCGI_LOG_EMERG          __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ALERT          __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_CRIT           __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ERR            __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_WARN           __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_NOTICE         __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_INFO           __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_DEBUG          __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
+-#endif
+-
+-#define FCGI_LOG_EMERG_ERRNO    __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ALERT_ERRNO    __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_CRIT_ERRNO     __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ERR_ERRNO      __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_WARN_ERRNO     __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_NOTICE_ERRNO   __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_INFO_ERRNO     __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_DEBUG_ERRNO    __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
+-
+-#define FCGI_LOG_EMERG_NOERRNO    __FILE__,__LINE__,APLOG_EMERG,0
+-#define FCGI_LOG_ALERT_NOERRNO    __FILE__,__LINE__,APLOG_ALERT,0
+-#define FCGI_LOG_CRIT_NOERRNO     __FILE__,__LINE__,APLOG_CRIT,0
+-#define FCGI_LOG_ERR_NOERRNO      __FILE__,__LINE__,APLOG_ERR,0
+-#define FCGI_LOG_WARN_NOERRNO     __FILE__,__LINE__,APLOG_WARNING,0
+-#define FCGI_LOG_NOTICE_NOERRNO   __FILE__,__LINE__,APLOG_NOTICE,0
+-#define FCGI_LOG_INFO_NOERRNO     __FILE__,__LINE__,APLOG_INFO,0
+-#define FCGI_LOG_DEBUG_NOERRNO    __FILE__,__LINE__,APLOG_DEBUG,0
++#define FCGI_LOG_EMERG          APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ALERT          APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_CRIT           APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ERR            APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_WARN           APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_NOTICE         APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_INFO           APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_DEBUG          APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
++#endif
++
++#define FCGI_LOG_EMERG_ERRNO    APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ALERT_ERRNO    APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_CRIT_ERRNO     APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_ERR_ERRNO      APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_WARN_ERRNO     APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_NOTICE_ERRNO   APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_INFO_ERRNO     APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno)
++#define FCGI_LOG_DEBUG_ERRNO    APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
++
++#define FCGI_LOG_EMERG_NOERRNO    APLOG_MARK,APLOG_EMERG,0
++#define FCGI_LOG_ALERT_NOERRNO    APLOG_MARK,APLOG_ALERT,0
++#define FCGI_LOG_CRIT_NOERRNO     APLOG_MARK,APLOG_CRIT,0
++#define FCGI_LOG_ERR_NOERRNO      APLOG_MARK,APLOG_ERR,0
++#define FCGI_LOG_WARN_NOERRNO     APLOG_MARK,APLOG_WARNING,0
++#define FCGI_LOG_NOTICE_NOERRNO   APLOG_MARK,APLOG_NOTICE,0
++#define FCGI_LOG_INFO_NOERRNO     APLOG_MARK,APLOG_INFO,0
++#define FCGI_LOG_DEBUG_NOERRNO    APLOG_MARK,APLOG_DEBUG,0
+ 
+ #else /* !APACHE2 */
+ 
+Index: libapache-mod-fastcgi/mod_fastcgi.c
+===================================================================
+--- libapache-mod-fastcgi.orig/mod_fastcgi.c	2012-03-07 14:29:04.017047773 +0100
++++ libapache-mod-fastcgi/mod_fastcgi.c	2012-03-07 14:29:07.841272721 +0100
+@@ -97,6 +97,10 @@
+ } while (0)
+ #endif
+ 
++#ifdef APACHE24
++module AP_MODULE_DECLARE_DATA fastcgi_module;
++#endif
++
+ /*
+  * Global variables
+  */
+@@ -3014,7 +3018,11 @@
+     ap_hook_fixups(fixups, NULL, NULL, APR_HOOK_MIDDLE); 
+ }
+ 
++#ifdef APACHE24
++AP_DECLARE_MODULE(fastcgi) =
++#else
+ module AP_MODULE_DECLARE_DATA fastcgi_module =
++#endif
+ {
+     STANDARD20_MODULE_STUFF,
+     fcgi_config_create_dir_config,  /* per-directory config creator */
diff --git a/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141-r1.ebuild b/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141-r1.ebuild
new file mode 100644
index 000000000000..feafd1ced217
--- /dev/null
+++ b/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 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.7_pre0910052141-r1.ebuild,v 1.1 2013/07/10 02:45:54 neurogeek Exp $
+
+EAPI="5"
+inherit apache-module eutils
+
+MY_P="${PN}-SNAP-${PV/2.4.7_pre/}"
+DESCRIPTION="FastCGI is a open extension to CGI without the limitations of server specific APIs."
+HOMEPAGE="http://fastcgi.com/"
+SRC_URI="http://www.fastcgi.com/dist/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="mod_fastcgi"
+IUSE=""
+
+APXS2_ARGS="-c mod_fastcgi.c fcgi*.c"
+APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_DEFINE="FASTCGI"
+
+DOCFILES="CHANGES README docs/LICENSE.TERMS docs/mod_fastcgi.html"
+
+S="${WORKDIR}/${MY_P}"
+
+need_apache2
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-compile-against-apache2.4.patch"
+}