[zoneminder] Forgot to add the new patches; doh.
Jason Tibbitts
tibbs at fedoraproject.org
Thu Jan 19 20:19:47 UTC 2012
commit a6f1399eaefa4ccd5f1ed0f6bc55aea7f712e923
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date: Thu Jan 19 14:19:27 2012 -0600
Forgot to add the new patches; doh.
zoneminder-1.25.0-dbinstall.patch | 58 +++++++++++++++++++++++++
zoneminder-1.25.0-gcc47.patch | 33 ++++++++++++++
zoneminder-1.25.0-gcrypt.patch | 86 +++++++++++++++++++++++++++++++++++++
zoneminder-1.25.0-noffmpeg.patch | 23 ++++++++++
4 files changed, 200 insertions(+), 0 deletions(-)
---
diff --git a/zoneminder-1.25.0-dbinstall.patch b/zoneminder-1.25.0-dbinstall.patch
new file mode 100644
index 0000000..8aba378
--- /dev/null
+++ b/zoneminder-1.25.0-dbinstall.patch
@@ -0,0 +1,58 @@
+diff -up ./configure.ac.dbinstall ./configure.ac
+--- ./configure.ac.dbinstall 2011-08-23 10:10:32.000000000 -0500
++++ ./configure.ac 2012-01-19 12:52:29.201006160 -0600
+@@ -1,10 +1,10 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AM_CONFIG_HEADER(config.h)
+
+-PATH_BUILD=`pwd`
++PATH_BUILD=/usr/share/zoneminder
+ AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+@@ -358,6 +358,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
++AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
++AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+ AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall 2011-06-21 02:40:11.000000000 -0500
++++ ./db/Makefile.am 2012-01-19 12:15:03.871582792 -0600
+@@ -1,7 +1,16 @@
+ AUTOMAKE_OPTIONS = gnu
+
++zmdbdatadir = $(pkgdatadir)/db
++
+ EXTRA_DIST = \
+ zm_create.sql.in \
++ $(dbupgrade_scripts)
++
++dist_zmdbdata_DATA = \
++ zm_create.sql \
++ $(dbupgrade_scripts)
++
++dbupgrade_scripts = \
+ zm_update-0.0.1.sql \
+ zm_update-0.9.7.sql \
+ zm_update-0.9.8.sql \
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall 2008-07-25 04:48:17.000000000 -0500
++++ ./zm.conf.in 2012-01-19 12:15:03.872582761 -0600
+@@ -15,6 +15,9 @@ ZM_VERSION=@VERSION@
+ # Path to build directory, used mostly for finding DB upgrade scripts
+ ZM_PATH_BUILD=@PATH_BUILD@
+
++# Path to installed data directory, used mostly for finding DB upgrade scripts
++ZM_PATH_DATA=@PKGDATADIR@
++
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
+
diff --git a/zoneminder-1.25.0-gcc47.patch b/zoneminder-1.25.0-gcc47.patch
new file mode 100644
index 0000000..a083c6d
--- /dev/null
+++ b/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.gcc47 2011-06-21 04:19:10.000000000 -0500
++++ ./src/zm_local_camera.cpp 2012-01-19 13:43:49.142440717 -0600
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
+--- ./src/zm_logger.cpp.gcc47 2011-06-28 06:07:35.000000000 -0500
++++ ./src/zm_logger.cpp 2012-01-19 13:43:49.142440717 -0600
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
+--- ./src/zm_thread.h.gcc47 2012-01-19 13:44:43.082766722 -0600
++++ ./src/zm_thread.h 2012-01-19 13:44:56.966335869 -0600
+@@ -21,6 +21,7 @@
+ #define ZM_THREAD_H
+
+ #include <pthread.h>
++#include <unistd.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+
diff --git a/zoneminder-1.25.0-gcrypt.patch b/zoneminder-1.25.0-gcrypt.patch
new file mode 100644
index 0000000..21f197e
--- /dev/null
+++ b/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt 2012-01-19 12:58:20.647123209 -0600
++++ ./configure.ac 2012-01-19 13:12:34.186669577 -0600
+@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+- AC_SUBST(ZM_SSL_LIB,gnutls)
++ AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+--- ./src/zm_user.cpp.gcrypt 2011-08-03 06:31:06.000000000 -0500
++++ ./src/zm_user.cpp 2012-01-19 12:58:20.654122992 -0600
+@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username,
+ return( user );
+ }
+
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++ unsigned char *md)
++{
++ gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++ return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt 2010-11-11 06:11:07.000000000 -0600
++++ ./src/zm_user.h 2012-01-19 13:14:11.200654694 -0600
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H
+ #define ZM_USER_H
+
+-#if HAVE_LIBGNUTLS_OPENSSL
+-#include <gnutls/openssl.h>
+ #if HAVE_GCRYPT_H
+ #include <gcrypt.h>
+-#endif // HAVE_GCRYPT_H
+ #elif HAVE_LIBCRYPTO
+ #include <openssl/md5.h>
+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+
+ class User
+ {
diff --git a/zoneminder-1.25.0-noffmpeg.patch b/zoneminder-1.25.0-noffmpeg.patch
new file mode 100644
index 0000000..032222d
--- /dev/null
+++ b/zoneminder-1.25.0-noffmpeg.patch
@@ -0,0 +1,23 @@
+diff -up ./configure.ac.noffmpeg ./configure.ac
+--- ./configure.ac.noffmpeg 2012-01-19 12:53:04.000000000 -0600
++++ ./configure.ac 2012-01-19 12:54:29.575278231 -0600
+@@ -273,13 +273,13 @@ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
++dnl AC_CHECK_LIB(avcore,av_image_copy,,)
++dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+ AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ AC_CHECK_LIB(z,compress,,)
+
More information about the scm-commits
mailing list