Merge branch 'MTres19-ubuntu_bionic_v2'

CMakeLists.txt

@@ -482,24 +482,24 @@ if(MP4V2_LIBRARIES)
 	if(MP4V2_INCLUDE_DIR)
 		include_directories("${MP4V2_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
-	endif(MP4V2_INCLUDE_DIR)
 		check_include_file("mp4v2/mp4v2.h" HAVE_MP4V2_MP4V2_H)
+	endif(MP4V2_INCLUDE_DIR)
 
         # mp4v2.h
 	find_path(MP4V2_INCLUDE_DIR mp4v2.h)
 	if(MP4V2_INCLUDE_DIR)
 		include_directories("${MP4V2_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
-	endif(MP4V2_INCLUDE_DIR)
 		check_include_file("mp4v2.h" HAVE_MP4V2_H)
+	endif(MP4V2_INCLUDE_DIR)
 
 	# mp4.h
 	find_path(MP4V2_INCLUDE_DIR mp4.h)
 	if(MP4V2_INCLUDE_DIR)
 		include_directories("${MP4V2_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
-	endif(MP4V2_INCLUDE_DIR)
 		check_include_file("mp4.h" HAVE_MP4_H)
+	endif(MP4V2_INCLUDE_DIR)
 
 	mark_as_advanced(FORCE MP4V2_LIBRARIES MP4V2_INCLUDE_DIR)
 	set(optlibsfound "${optlibsfound} mp4v2")

distros/ubuntu1604/README.Debian

@@ -23,8 +23,7 @@ configuration file:
 Upgrading database
 ------------------
 
-Prior to 1.28.1 database upgrade was performed automatically.
+The database is updated automatically on installation. You should not need to take this step.
-"zoneminder" service will refuse to start with outdated database.
 
 Assuming that database is on "localhost" then the following command can be
 used to upgrade "zm" database:
@@ -45,17 +44,11 @@ The following command prints the current version of zoneminder database:
 Enabling service
 ----------------
 
-By default Zoneminder service is not starting automatically and need to be
+By default Zoneminder service is not automatically started and needs to be
-manually activated once database is configured:
+manually enabled once database is configured:
-
-On systemd:
 
     sudo systemctl enable zoneminder.service
 
-On SysV:
-
-    sudo update-rc.d zoneminder enable
-
 
 Web server set-up
 -----------------
@@ -82,10 +75,10 @@ Common configuration steps for Apache2:
 
 ## nginx / fcgiwrap
 
-Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
+Nginx needs "php-fpm" package to support PHP and "fcgiwrap" package
 for binary "cgi-bin" applications:
 
-    sudo apt-get install php5-fpm fcgiwrap
+    sudo apt-get install php-fpm fcgiwrap
 
 To enable a URL alias that makes Zoneminder available from
 
@@ -119,32 +112,9 @@ site configuration.
 Changing the location for images and events
 -------------------------------------------
 
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
+ZoneMinder is now able to be configured to use an alternative location for storing
-package modifies that by changing /usr/share/zoneminder/images and
+events and images at compile time. This package makes use of that, so symlinks in
-/usr/share/zoneminder/events to symlinks to directories under
+/usr/share/zoneminder/www are no longer necessary.
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-(thanks to vagrant@freegeek.org):
-
-These lines in fstab could allow you to bind-mount an alternate location
-
-         /dev/sdX1 /otherdrive ext3 defaults 0 2
-         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
-         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
 
 Access to /dev/video*
 ---------------------

distros/ubuntu1604/control

@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libcurl4-gnutls-dev
               ,libgnutls-openssl-dev
               ,libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
-              ,default-libmysqlclient-dev | libmysqlclient-dev
+              ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
               ,libpcre3-dev
               ,libpolkit-gobject-1-dev
               ,libv4l-dev (>= 0.8.3) [!hurd-any]
@@ -39,7 +39,7 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libmp4v2-2, libx264-142|libx264-148, libswscale-ffmpeg3|libswscale4|libswscale3
+        ,libmp4v2-2, libx264-142|libx264-148|libx264-152, libswscale-ffmpeg3|libswscale4|libswscale3
         ,ffmpeg | libav-tools
         ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
@@ -61,7 +61,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libdigest-sha-perl
         ,libsys-cpu-perl, libsys-meminfo-perl
         ,libdata-uuid-perl
-        ,mysql-client | virtual-mysql-client
+        ,mysql-client | mariadb-client | virtual-mysql-client
         ,perl-modules
         ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc
         ,policykit-1
@@ -70,7 +70,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libpcre3
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm
-           ,mysql-server | virtual-mysql-server
+           ,mysql-server | mariadb-server | virtual-mysql-server
            ,zoneminder-doc (>= ${source:Version})
            ,ffmpeg
 Suggests: fcgiwrap, logrotate

distros/ubuntu1604/rules

@@ -66,9 +66,6 @@ override_dh_fixperms:
 	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
-override_dh_installinit:
-	dh_installinit --no-start
-
 override_dh_systemd_start:
 	dh_systemd_start --no-start
 

distros/ubuntu1604/zoneminder.init

@@ -1,91 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          zoneminder
-# Required-Start:    $network $remote_fs $syslog
-# Required-Stop:     $network $remote_fs $syslog
-# Should-Start:      mysql
-# Should-Stop:       mysql
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description:  Control ZoneMinder as a Service
-# Description: ZoneMinder CCTV recording and surveillance system
-### END INIT INFO
-# chkconfig: 2345 20 20
-
-# Source function library.
-. /lib/lsb/init-functions
-
-prog=ZoneMinder
-ZM_PATH_BIN="/usr/bin"
-RUNDIR="/var/run/zm"
-TMPDIR="/tmp/zm"
-command="$ZM_PATH_BIN/zmpkg.pl"
-
-start() {
-	echo -n "Starting $prog: "
-	export TZ=:/etc/localtime
-	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
-	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"
-	$command start
-	RETVAL=$?
-	[ $RETVAL = 0 ] && echo success
-	[ $RETVAL != 0 ] && echo failure
-	echo
-	[ $RETVAL = 0 ] && touch /var/lock/zm
-	return $RETVAL
-}
-stop() {
-	echo -n "Stopping $prog: "
-	#
-	# Why is this status check being done?
-	# as $command stop returns 1 if zoneminder
-	# is stopped, which will result in
-	# this returning 1, which will stuff
-	# dpkg when it tries to stop zoneminder before
-	# uninstalling . . .
-	#
-	result=`$command status`
-	if [ ! "$result" = "running" ]; then
-		echo "Zoneminder already stopped"
-		echo
-		RETVAL=0
-	else
-		$command stop
-		RETVAL=$?
-		[ $RETVAL = 0 ] && echo success
-		[ $RETVAL != 0 ] && echo failure
-		echo
-		[ $RETVAL = 0 ] && rm -f /var/lock/zm
-	fi
-}
-status() {
-	result=`$command status`
-	if [ "$result" = "running" ]; then
-		echo "ZoneMinder is running"
-		RETVAL=0
-	else
-		echo "ZoneMinder is stopped"
-		RETVAL=1
-	fi
-}
-
-case "$1" in
-'start')
-	start
-	;;
-'stop')
-	stop
-	;;
-'restart' | 'force-reload')
-	stop
-	start
-	;;
-'status')
-	status
-	;;
-*)
-	echo "Usage: $0 { start | stop | restart | status }"
-	RETVAL=1
-	;;
-esac
-exit $RETVAL

distros/ubuntu1604/zoneminder.postinst

@@ -5,6 +5,9 @@ set -e
 if [ "$1" = "configure" ]; then
     
     . /etc/zm/zm.conf
+    for CONFFILE in /etc/zm/conf.d/*.conf; do
+        . "$CONFFILE"
+    done
     
     # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
     chown www-data:root /var/log/zm
@@ -12,37 +15,48 @@ if [ "$1" = "configure" ]; then
     if [ -z "$2" ]; then
         chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
     fi
-  if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ]; then
+    if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ] && [ "$(command -v a2enmod)" != "" ]; then
         echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
         a2enmod cgi
     fi
     
     # Do this every time the package is installed or upgraded
-  # Ensure zoneminder is stopped
-  deb-systemd-invoke stop zoneminder.service || exit $?
     
     # Ensure zoneminder is stopped
-  deb-systemd-invoke stop zoneminder.service || exit $?
+    deb-systemd-invoke stop zoneminder.service
     if [ "$ZM_DB_HOST" = "localhost" ]; then
-
+        if [ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ]; then
-    if [ -e "/etc/init.d/mysql" ]; then
             
             #
-      # Get mysql started if it isn't
+            # Get mysql started if it isn't running
             #
-      if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+            $(systemctl status mysql.service >/dev/null 2>&1); MYSQL_STATUS=$?
-          deb-systemd-invoke start mysql.service || exit $?
+            $(systemctl status mariadb.service >/dev/null 2>&1); MARIADB_STATUS=$?
+            
+            # 3 = inactive, 4 = nonexistant
+            if [ "$MARIADB_STATUS" != "4" ]; then
+                DBSERVICE="mariadb.service"
+            else
+                DBSERVICE="mysql.service"
             fi
             
-      if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+            if [ "$MYSQL_STATUS" != "0" ] && [ "$MARIADB_STATUS" != "0" ]; then
+                # 3 = inactive, 4 = nonexistant
+                # Due to /etc/init.d service autogeneration, mysql.service always returns the status of mariadb.service
+                # However, mariadb.service will not return the status of mysql.service.
+                deb-systemd-invoke start $DBSERVICE
+            fi
+            
+            # Make sure systemctl status exit code is 0; i.e. the DB is running
+            if systemctl status "$DBSERVICE" >/dev/null 2>&1; then
                 mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
                 # test if database if already present...
-        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                if ! $(echo quit | mysql zm > /dev/null 2> /dev/null) ; then
                     cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
                     # This creates the user.
                     echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
                 else
-            echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                    echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql mysql
                 fi
                 
                 zmupdate.pl --nointeractive
@@ -52,17 +66,17 @@ if [ "$1" = "configure" ]; then
                 zmcamtool.pl --import >/dev/null 2>&1
                 
             else
-        echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+                echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
             fi
         else
-      echo 'mysql not found, assuming remote server.'
+            echo 'MySQL/MariaDB not found; assuming remote server.'
         fi
 
     else
-    echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
+        echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
     fi
-  echo "Done Updating, starting ZoneMinder"
+    echo "Done Updating; starting ZoneMinder."
-  deb-systemd-invoke restart zoneminder.service || exit $?
+    deb-systemd-invoke restart zoneminder.service
 
 fi
 

distros/ubuntu1604/zoneminder.preinst

@@ -8,29 +8,4 @@ if [ -h "${ol}" ]; then
     [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
 fi
 
-abort=false
-if [ -h /usr/share/zoneminder/www/events ]; then
-    l=$(readlink /usr/share/zoneminder/www/events)
-    if [ "$l" != "/var/cache/zoneminder/events" -a "$l" != "/var/cache/zoneminder/events/" ]; then
-        abort=true
-    fi
-fi
-if [ -h /usr/share/zoneminder/www/images ]; then
-    l=$(readlink /usr/share/zoneminder/www/images )
-    if [ "$l" != "/var/cache/zoneminder/images"  -a "$l" != "/var/cache/zoneminder/images/" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
 #DEBHELPER#