From 969eed5ce77b9698d4d714731af27d42ab433a7e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 10 Dec 2013 13:57:22 -0500
Subject: [PATCH] add libapache2-mod-fcgid as an option instead of
 libapache2-mod-php5 add config to use it instead of modphp5

---
 distros/debian/apache.conf     | 26 +++++++++++++++++++-------
 distros/debian/control         |  2 +-
 distros/ubuntu1204/apache.conf | 26 +++++++++++++++++++-------
 distros/ubuntu1204/changelog   |  4 ++--
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/distros/debian/apache.conf b/distros/debian/apache.conf
index 92a2b6414..d834f5399 100644
--- a/distros/debian/apache.conf
+++ b/distros/debian/apache.conf
@@ -1,9 +1,21 @@
 Alias /zm /usr/share/zoneminder
 
-<Directory /usr/share/zoneminder>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
+<IfModule mod_fcgid.c>
+	<Directory /usr/share/zoneminder/>
+		Options +ExecCGI
+		AllowOverride All
+		AddHandler fcgid-script .php
+		FCGIWrapper /usr/bin/php5-cgi
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfModule>
+<IfModule mod_php5.c>
+	<Directory /usr/share/zoneminder>
+	  php_flag register_globals off
+	  Options Indexes FollowSymLinks
+	  <IfModule mod_dir.c>
+		DirectoryIndex index.php
+	  </IfModule>
+	</Directory>
+</IfModule>
diff --git a/distros/debian/control b/distros/debian/control
index d774fb45f..929fad475 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.2
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapach2-mod-fcgid, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl
 Recommends: mysql-server
 Description: A video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 
diff --git a/distros/ubuntu1204/apache.conf b/distros/ubuntu1204/apache.conf
index 92a2b6414..d834f5399 100644
--- a/distros/ubuntu1204/apache.conf
+++ b/distros/ubuntu1204/apache.conf
@@ -1,9 +1,21 @@
 Alias /zm /usr/share/zoneminder
 
-<Directory /usr/share/zoneminder>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
+<IfModule mod_fcgid.c>
+	<Directory /usr/share/zoneminder/>
+		Options +ExecCGI
+		AllowOverride All
+		AddHandler fcgid-script .php
+		FCGIWrapper /usr/bin/php5-cgi
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfModule>
+<IfModule mod_php5.c>
+	<Directory /usr/share/zoneminder>
+	  php_flag register_globals off
+	  Options Indexes FollowSymLinks
+	  <IfModule mod_dir.c>
+		DirectoryIndex index.php
+	  </IfModule>
+	</Directory>
+</IfModule>
diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog
index 7da762cd1..02bd3a5ac 100644
--- a/distros/ubuntu1204/changelog
+++ b/distros/ubuntu1204/changelog
@@ -1,8 +1,8 @@
-zoneminder (1.26.4+1-SNAPSHOT2013110302) precise; urgency=high
+zoneminder (1.26.4+1-SNAPSHOT2013120601) precise; urgency=high
 
   * Today's snapshot of master
 
- -- Isaac Connor <iconnor@connortechnology.com>  Sun, 03 Nov 2013 14:05:46 -0500
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 06 Dec 2013 14:05:46 -0500
 
 zoneminder (1.26.4-2) precise; urgency=high