Merge branch 'develop'

Author: kylejohnson

manifests/install/zoneminder.pp

@@ -1,11 +1,15 @@
 class zoneminder::install::zoneminder {
 
   exec { "clone-zoneminder":
-    command => "svn co $zoneminder::params::zoneminder_source zoneminder << EOF
-p
-EOF",
+    command => "git clone $zoneminder::params::zoneminder_source zoneminder",
     cwd => "/usr/local/src",
     creates => "/usr/local/src/zoneminder",
+    before => Exec["checkout-release-1.26"]
+  }
+
+  exec { "checkout-release-1.26":
+    command => "git checkout release-1.26",
+    cwd => "/usr/local/src/zoneminder",
     before => File["/usr/local/src/zoneminder/configure.sh"]
   }
 

manifests/params.pp

@@ -5,7 +5,7 @@
 
   $prerequisites = ['apache2', 'mysql-server', 'php5', 'php5-mysql', 'build-essential', 'libmysqlclient-dev', 'libssl-dev', 'libbz2-dev', 'libpcre3-dev', 'libdbi-perl', 'libarchive-zip-perl', 'libdate-manip-perl', 'libdevice-serialport-perl', 'libmime-perl', 'libpcre3', 'libwww-perl', 'libdbd-mysql-perl', 'libsys-mmap-perl', 'yasm', 'subversion', 'automake', 'autoconf', 'libjpeg-turbo8-dev', 'libjpeg-turbo8', 'apache2-mpm-prefork', 'libapache2-mod-php5', 'php5-cli']
 
-  $zoneminder_source = 'https://svn.unixmedia.net/public/zum/trunk/zum/'
+  $zoneminder_source = 'https://github.com/ZoneMinder/ZoneMinder.git'
 
   $ffmpeg_source = 'git://source.ffmpeg.org/ffmpeg.git'
   $ffmpeg_configure_options = '--enable-shared --enable-swscale --enable-gpl'

templates/configure.sh.erb

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+libtoolize --force
+aclocal
+autoheader
+automake --force-missing --add-missing
+autoconf
+
 export LD_LIBRARY_PATH="/usr/local/lib:/opt/libjpeg-turbo/lib:$LD_LIBRARY_PATH"
 
 DEB_HOST_GNU_TYPE=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -8,5 +14,3 @@ DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 CXXFLAGS=" -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO  -msse2 -I/usr/local/include"
 
 CXXFLAGS="$CXXFLAGS" ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr  --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
-
-aclocal