Revision bump, fixing mod_fcgid w/ apache-2.2.4; as we stopped installing /usr/$(get_libdir)/apache2/logs with 2.2.4, the module fails to put its socket into the "default" place (definded in mod_fcgid.c as DEFAULT_SOCKET_PREFIX and DEFAULT_SHM_PATH). Thanks to Victor Roman Archidona <daijo at daijo.org> in #178407.

(Portage version: 2.1.2.7)

4 files changed, 33 insertions, 3 deletions

diff --git a/www-apache/mod_fcgid/ChangeLog b/www-apache/mod_fcgid/ChangeLog
index ce6130ea5fc8..84708f9a7ab5 100644
--- a/www-apache/mod_fcgid/ChangeLog
+++ b/www-apache/mod_fcgid/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-apache/mod_fcgid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.27 2007/03/14 19:17:40 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.28 2007/05/23 20:12:11 phreak Exp $
+
+*mod_fcgid-2.1-r1 (23 May 2007)
+
+  23 May 2007; Christian Heim <phreak@gentoo.org>
+  +files/20_mod_fcgid-2.1.conf, -mod_fcgid-2.1.ebuild,
+  +mod_fcgid-2.1-r1.ebuild:
+  Revision bump, fixing mod_fcgid w/ apache-2.2.4; as we stopped installing
+  /usr/$(get_libdir)/apache2/logs with 2.2.4, the module fails to put its
+  socket into the "default" place (definded in mod_fcgid.c as
+  DEFAULT_SOCKET_PREFIX and DEFAULT_SHM_PATH). Thanks to Victor Roman
+  Archidona <daijo at daijo.org> in #178407.
 
   14 Mar 2007; Christian Heim <phreak@gentoo.org>
   +files/mod_fcgid-2.1-apr_shm_remove.patch, mod_fcgid-2.1.ebuild:
diff --git a/www-apache/mod_fcgid/files/20_mod_fcgid-2.1.conf b/www-apache/mod_fcgid/files/20_mod_fcgid-2.1.conf
new file mode 100644
index 000000000000..9a31e5fdee08
--- /dev/null
+++ b/www-apache/mod_fcgid/files/20_mod_fcgid-2.1.conf
@@ -0,0 +1,10 @@
+<IfDefine FCGID>
+	<IfModule !mod_fcgid.c>
+		LoadModule fcgid_module modules/mod_fcgid.so
+	</IfModule>
+	<IfModule mod_fcgid.c>
+		AddHandler fcgid-script .fcg
+		SocketPath /var/run/fcgid.sock
+		SharememPath /var/run/fcgid_shm
+	</IfModule>
+</IfDefine>
diff --git a/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1 b/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1-r1
index c74843686e7b..c74843686e7b 100644
--- a/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1
+++ b/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1-r1
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild
index 8bcc017df64c..bcf9dcbffe33 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.1.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1.ebuild,v 1.3 2007/03/14 19:17:40 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1-r1.ebuild,v 1.1 2007/05/23 20:12:11 phreak Exp $
 
 inherit apache-module eutils
 
@@ -15,7 +15,7 @@ IUSE=""
 
 S="${WORKDIR}/${PN}.${PV}"
 
-APACHE2_MOD_CONF="20_${PN}"
+#APACHE2_MOD_CONF="20_${PN}"
 APACHE2_MOD_DEFINE="FCGID"
 
 APXS2_ARGS="-I ${S} -c ${PN}.c fcgid_bridge.c \
@@ -36,3 +36,12 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-apr_shm_remove.patch
 }
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed!"
+
+	# Once APACHE2_MOD_CONF is able to use newconfd (probably never), this line
+	# should go.
+	insinto ${APACHE2_MODULES_CONFDIR}
+	newins "${FILESDIR}"/20_mod_fcgid-${PV}.conf 20_mod_fcgid.conf
+}