www-misc/zoneminder: Various fixes, work in progress

Package-Manager: Portage-2.3.5, Repoman-2.3.2

3 files changed, 35 insertions, 3 deletions

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf-r1 b/www-misc/zoneminder/files/10_zoneminder.conf-r1
new file mode 100644
index 000000000000..441c793d1890
--- /dev/null
+++ b/www-misc/zoneminder/files/10_zoneminder.conf-r1
@@ -0,0 +1,17 @@
+ScriptAlias /zm/cgi-bin/ "/usr/libexec/zoneminder/cgi-bin/"
+
+<Directory "/usr/libexec/zoneminder/cgi-bin">
+  AllowOverride All
+  Options ExecCGI
+  Order allow,deny
+  Allow from all
+</Directory> 
+
+Alias /zoneminder "%ZM_WEBDIR%"
+
+<Directory "%ZM_WEBDIR%">
+  Options -Indexes MultiViews FollowSymLinks
+  AllowOverride All
+  Order allow,deny
+  Allow from all
+</Directory> 
diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
index 2ada7c7d0a45..07995214d1cf 100644
--- a/www-misc/zoneminder/files/README.gentoo
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -14,14 +14,14 @@
    for an example configuration snippet.
 
 4. Enable PHP in your webserver configuration,
-   enable short_open_tags in php.ini,
+   enable short_open_tags in php.ini (likely on by default now)
    set the time zone in php.ini,
    and restart/reload the webserver.
 
 5. Start the zoneminder daemon:
      /etc/init.d/zoneminder start
 
-6. Finally point your browser to http://your.webserver/zoneminder
+6. Finally point your browser to http://your.webserver/zm
 
 If you are upgrading, you will need to run the zmupdate.pl script:
-      /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]
+   /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch b/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
new file mode 100644
index 000000000000..fee5b783c356
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
@@ -0,0 +1,15 @@
+https://forums.zoneminder.com/viewtopic.php?t=24534
+& personal message by simon@rustyspoon.co_m
+
+diff -ruN ZoneMinder-1.30.2.orig/web/includes/functions.php ZoneMinder-1.30.2/web/includes/functions.php
+--- ZoneMinder-1.30.2.orig/web/includes/functions.php	2017-03-30 20:43:06.000000000 +0200
++++ ZoneMinder-1.30.2/web/includes/functions.php	2017-04-16 21:13:43.841371345 +0200
+@@ -1442,7 +1442,7 @@
+   return( $load[0] );
+ }
+ 
+-function getDiskPercent($path = ZM_DIR_EVENTS) {
++function getDiskPercent($path = ZM_PATH_WEB.'/'.ZM_DIR_EVENTS) {
+   $total = disk_total_space($path);
+   if ( $total === false ) {
+     Error("disk_total_space returned false. Verify the web account user has access to " . $path );