[packages/zoneminder] - up to 1.27.0
arekm
arekm at pld-linux.org
Mon Jun 23 20:19:50 CEST 2014
commit da26edb7c347c9666398ff460e51f3033268d114
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Jun 23 20:19:46 2014 +0200
- up to 1.27.0
am.patch | 11 -----
ffmpeg-2.0.patch | 64 ------------------------------
ffmpeg10.patch | 82 --------------------------------------
format-security.patch | 11 -----
zm-fedora.patch | 67 -------------------------------
zoneminder-1.25.0-gcc47.patch | 33 ---------------
zoneminder-1.25.0-gcrypt.patch | 86 ----------------------------------------
zoneminder-1.25.0-kernel35.patch | 21 ----------
zoneminder.spec | 59 ++++++++++++---------------
9 files changed, 26 insertions(+), 408 deletions(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index 3146d33..349446f 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,12 +8,12 @@
Summary: Zone Minder is a software motion detector with nice WWW GUI
Summary(pl.UTF-8): Zone Minder - programowy wykrywacz ruchu z miłym GUI przez WWW
Name: zoneminder
-Version: 1.25.0
-Release: 8
+Version: 1.27.0
+Release: 1
License: GPL v2
Group: Applications/Graphics
-Source0: http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
-# Source0-md5: eaefa14befd482154970541252aa1a39
+Source0: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
+# Source0-md5: 9ff149baa1a0d04931fbafcdb3200fab
Source1: zm-init
Source2: zm.conf
Source3: zm-logrotate_d
@@ -21,40 +21,43 @@ Source4: http://dig.hopto.org/xlib_shm/xlib_shm-0.6.3.tar.bz2
# Source4-md5: 469a65bdf658e68e23445f5cc6f07f07
# http://mootools.net/download
Source5: mootools.js
-Patch0: zm-fedora.patch
+Source6: %{name}-tmpfiles.conf
Patch1: %{name}-xlib_shm.patch
Patch2: %{name}-build.patch
Patch3: %{name}-init.patch
-Patch4: %{name}-1.25.0-gcc47.patch
-Patch5: %{name}-1.25.0-gcrypt.patch
-Patch6: %{name}-1.25.0-kernel35.patch
-Patch7: ffmpeg10.patch
-Patch8: format-security.patch
-Patch9: am.patch
-Patch10: ffmpeg-2.0.patch
URL: http://www.zoneminder.com/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
+BuildRequires: curl-devel
BuildRequires: ffmpeg-devel >= 0.4.9-4.20090225
BuildRequires: gnutls-devel
BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel
+BuildRequires: libx264-devel
BuildRequires: mysql-devel
BuildRequires: pcre-devel
-BuildRequires: perl-devel
BuildRequires: perl-DBD-mysql
BuildRequires: perl-DBI
BuildRequires: perl-Date-Manip
-BuildRequires: perl-libwww
+BuildRequires: perl-Device-SerialPort
+BuildRequires: perl-Expect
+BuildRequires: perl-Net-SFTP
BuildRequires: perl-PHP-Serialization
BuildRequires: perl-Sys-Mmap
+BuildRequires: perl-devel
+BuildRequires: perl-libwww
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: vlc-devel
BuildRequires: xorg-lib-libXv-devel
+BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
Requires: perl-DBD-mysql
Requires: perl-Date-Manip
+Requires: perl-Device-SerialPort
+Requires: perl-Expect
Requires: perl-MIME-tools
+Requires: perl-Net-SFTP
Requires: perl-PHP-Serialization
Requires: perl-Sys-Mmap
Requires: php(mysql)
@@ -66,8 +69,8 @@ Suggests: cambozola
Suggests: perl-MIME-Lite
Obsoletes: zm
Obsoletes: zm-X10
-Obsoletes: zoneminder-X10
Obsoletes: zm-control
+Obsoletes: zoneminder-X10
Obsoletes: zoneminder-control
Conflicts: apache-base < 2.4.0-1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -98,19 +101,11 @@ różnymi kamerami USB i sieciowymi kamerami IP.
%setup -q -n ZoneMinder-%{version} -a4
%undos scripts/zm.in
-%patch0 -p1
cd xlib_shm-*
%patch1 -p1
cd ..
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
sed -i -e 's#-frepo##g' src/Makefile.am
sed -i -e 's#chown#true#g' -e 's#chmod#true#g' *.am */*.am */*/*.am
@@ -123,16 +118,14 @@ GRANT SELECT,INSERT,UPDATE,DELETE ON zm.* TO 'zmuser'@localhost IDENTIFIED BY 'z
EOF
%build
+%{__autoheader}
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
+ ZM_RUNDIR=%{_var}/run/zoneminder \
+ ZM_LOGDIR=%{_var}/log/zoneminder \
--with-libarch=%{_lib} \
-%ifarch %{ix86} %{x8664}
- --enable-crashtrace \
-%else
- --disable-crashtrace \
-%endif
--enable-mmap=yes \
--disable-debug \
--with-mysql=%{_prefix} \
@@ -153,7 +146,7 @@ EOF
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_localstatedir}/{run,log/zoneminder},/etc/logrotate.d} \
- $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+ $RPM_BUILD_ROOT{%{_webapps}/%{_webapp},%{_sysconfdir}/tmpfiles.d}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -177,6 +170,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT%{_appdir}/www
install zm_xlib_shm $RPM_BUILD_ROOT%{_bindir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -205,13 +199,13 @@ exit 0
%files
%defattr(644,root,root,755)
-%doc AUTHORS README
+%doc AUTHORS BUGS ChangeLog README.md
%dir %attr(750,root,http) %{_webapps}/%{_webapp}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
%config(noreplace) %attr(640,root,http) %{_sysconfdir}/zm.conf
%config(noreplace) /etc/logrotate.d/%{name}
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
%attr(754,root,root) /etc/rc.d/init.d/zoneminder
-%attr(4755,root,root) %{_bindir}/zmfix
%attr(755,root,root) %{_bindir}/zma
%attr(755,root,root) %{_bindir}/zmaudit.pl
%attr(755,root,root) %{_bindir}/zmcontrol.pl
@@ -228,9 +222,8 @@ exit 0
%attr(755,root,root) %{_bindir}/zmvideo.pl
%attr(755,root,root) %{_bindir}/zmwatch.pl
%attr(755,root,root) %{_bindir}/zm_xlib_shm
-%dir %{_datadir}/ZoneMinder
-%{_datadir}/ZoneMinder/db
%dir %{_appdir}
+%{_appdir}/db
%dir %{_appdir}/www
%{_appdir}/www/*.*
%{_appdir}/www/ajax
diff --git a/am.patch b/am.patch
deleted file mode 100644
index cbfe210..0000000
--- a/am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ZoneMinder-1.25.0/configure.ac~ 2013-05-18 18:30:09.051564761 +0200
-+++ ZoneMinder-1.25.0/configure.ac 2013-05-18 18:32:20.381563810 +0200
-@@ -2,7 +2,7 @@
- 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)
-+AC_CONFIG_HEADERS(config.h)
-
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
diff --git a/ffmpeg-2.0.patch b/ffmpeg-2.0.patch
deleted file mode 100644
index e43e078..0000000
--- a/ffmpeg-2.0.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- ZoneMinder-1.25.0/configure.ac~ 2013-07-15 14:26:39.321337932 +0800
-+++ ZoneMinder-1.25.0/configure.ac 2013-07-15 14:27:06.812123235 +0800
-@@ -276,7 +276,7 @@
- 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_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+AC_CHECK_LIB(avcodec,avcodec_open2,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
- AC_CHECK_LIB(avformat,avformat_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)
---- ZoneMinder-1.25.0/src/zm_mpeg.cpp~ 2013-07-15 14:27:59.593630969 +0800
-+++ ZoneMinder-1.25.0/src/zm_mpeg.cpp 2013-07-15 14:31:49.580200474 +0800
-@@ -215,7 +215,7 @@
- }
-
- /* open the codec */
-- if ( avcodec_open(c, codec) < 0 )
-+ if ( avcodec_open2(c, codec, NULL) < 0 )
- {
- Panic( "Could not open codec" );
- }
---- ZoneMinder-1.25.0/src/zm_remote_camera_rtsp.cpp~ 2013-07-15 14:27:59.543629539 +0800
-+++ ZoneMinder-1.25.0/src/zm_remote_camera_rtsp.cpp 2013-07-15 14:32:19.011041121 +0800
-@@ -183,7 +183,7 @@
- Panic( "Unable to locate codec %d decoder", mCodecContext->codec_id );
-
- // Open codec
-- if ( avcodec_open( codecContext, codec ) < 0 )
-+ if ( avcodec_open2( codecContext, codec, NULL ) < 0 )
- Panic( "Can't open codec" );
-
- // Allocate space for the native video frame
---- ZoneMinder-1.25.0/src/zm_sdp.h~ 2011-05-16 04:39:06.000000000 +0800
-+++ ZoneMinder-1.25.0/src/zm_sdp.h 2013-07-15 14:32:39.311620995 +0800
-@@ -41,7 +41,7 @@
- int payloadType;
- const char payloadName[6];
- enum AVMediaType codecType;
-- enum CodecID codecId;
-+ enum AVCodecID codecId;
- int clockRate;
- int autoChannels;
- };
-@@ -50,7 +50,7 @@
- {
- const char payloadName[32];
- enum AVMediaType codecType;
-- enum CodecID codecId;
-+ enum AVCodecID codecId;
- //int clockRate;
- //int autoChannels;
- };
---- ZoneMinder-1.25.0/src/zm_ffmpeg_camera.cpp~ 2013-08-29 18:09:12.227817417 +0200
-+++ ZoneMinder-1.25.0/src/zm_ffmpeg_camera.cpp 2013-08-29 18:11:09.392520063 +0200
-@@ -122,7 +122,7 @@
- Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
-
- // Open the codec
-- if ( avcodec_open( mCodecContext, mCodec ) < 0 )
-+ if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
- Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
-
- // Allocate space for the native video frame
diff --git a/ffmpeg10.patch b/ffmpeg10.patch
deleted file mode 100644
index 03928c2..0000000
--- a/ffmpeg10.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- ZoneMinder-1.25.0/configure.ac~ 2012-11-13 18:16:48.389092179 +0100
-+++ ZoneMinder-1.25.0/configure.ac 2012-11-13 18:21:17.022416030 +0100
-@@ -273,8 +273,8 @@
- 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(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+AC_CHECK_LIB(avformat,avformat_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)
- AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
---- ZoneMinder-1.25.0/src/zm_ffmpeg_camera.cpp~ 2011-06-21 09:40:13.000000000 +0200
-+++ ZoneMinder-1.25.0/src/zm_ffmpeg_camera.cpp 2012-11-13 18:24:16.935743023 +0100
-@@ -91,7 +91,7 @@
- Info( "Priming capture from %s", mPath.c_str() );
-
- // Open the input, not necessarily a file
-- if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
-+ if ( avformat_open_input(&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
- Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
-
- // Locate stream info from input
---- ZoneMinder-1.25.0/src/zm_mpeg.cpp~ 2011-05-15 22:39:06.000000000 +0200
-+++ ZoneMinder-1.25.0/src/zm_mpeg.cpp 2012-11-13 18:28:26.225734227 +0100
-@@ -126,17 +126,6 @@
- }
- }
-
--void VideoStream::SetParameters()
--{
-- /* set the output parameters (must be done even if no
-- parameters). */
-- if ( av_set_parameters(ofc, NULL) < 0 )
-- {
-- Panic( "Invalid output format parameters" );
-- }
-- //dump_format(ofc, 0, filename, 1);
--}
--
- const char *VideoStream::MimeType() const
- {
- for ( int i = 0; i < sizeof(mime_data)/sizeof(*mime_data); i++ )
-@@ -210,7 +210,9 @@
- /* open the output file, if needed */
- if ( !(of->flags & AVFMT_NOFILE) )
- {
--#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,73,100)
-+ if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
-+#elif LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
- if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
- #else
- if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
-@@ -241,7 +230,7 @@
- }
-
- /* write the stream header, if any */
-- av_write_header(ofc);
-+ avformat_write_header(ofc, NULL);
- }
-
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height )
-@@ -253,7 +242,6 @@
-
- SetupFormat( filename, format );
- SetupCodec( colours, width, height, bitrate, frame_rate );
-- SetParameters();
- }
-
- VideoStream::~VideoStream()
---- ZoneMinder-1.25.0/src/zm_mpeg.h~ 2009-05-28 10:20:59.000000000 +0200
-+++ ZoneMinder-1.25.0/src/zm_mpeg.h 2012-11-13 18:28:39.735733749 +0100
-@@ -55,7 +55,6 @@
-
- void SetupFormat( const char *p_filename, const char *format );
- void SetupCodec( int colours, int width, int height, int bitrate, double frame_rate );
-- void SetParameters();
-
- public:
- VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height );
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 3377e71..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ZoneMinder-1.25.0/src/zm_signal.cpp~ 2011-06-21 11:19:11.000000000 +0200
-+++ ZoneMinder-1.25.0/src/zm_signal.cpp 2012-11-13 18:33:27.135723612 +0100
-@@ -110,7 +110,7 @@
- char **messages = backtrace_symbols( trace, trace_size );
- if ( size_t offset = strcspn( messages[trace_size-1], " " ) )
- {
-- snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), messages[trace_size-1] );
-+ snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), "%s", messages[trace_size-1] );
- cmd_ptr += offset;
- }
- else
diff --git a/zm-fedora.patch b/zm-fedora.patch
deleted file mode 100644
index b525cc6..0000000
--- a/zm-fedora.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ur ZoneMinder-1.25.0.orig//configure.ac ZoneMinder-1.25.0/configure.ac
---- ZoneMinder-1.25.0.orig//configure.ac 2011-08-23 15:10:32.000000000 +0000
-+++ ZoneMinder-1.25.0/configure.ac 2011-12-14 13:55:39.783022708 +0000
-@@ -4,8 +4,6 @@
- AC_CONFIG_SRCDIR(src/zm.h)
- AM_CONFIG_HEADER(config.h)
-
--PATH_BUILD=`pwd`
--AC_SUBST(PATH_BUILD)
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
-
-@@ -358,6 +356,8 @@
-
- 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 -ur ZoneMinder-1.25.0.orig//db/Makefile.am ZoneMinder-1.25.0/db/Makefile.am
---- ZoneMinder-1.25.0.orig//db/Makefile.am 2011-06-21 07:40:11.000000000 +0000
-+++ ZoneMinder-1.25.0/db/Makefile.am 2011-12-14 13:55:26.783165035 +0000
-@@ -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 -ur ZoneMinder-1.25.0.orig//scripts/zmupdate.pl.in ZoneMinder-1.25.0/scripts/zmupdate.pl.in
---- ZoneMinder-1.25.0.orig//scripts/zmupdate.pl.in 2011-08-26 07:51:37.000000000 +0000
-+++ ZoneMinder-1.25.0/scripts/zmupdate.pl.in 2011-12-14 13:55:26.784133435 +0000
-@@ -424,7 +424,7 @@
- }
- else
- {
-- $command .= ZM_PATH_BUILD."/db";
-+ $command .= ZM_PATH_DATA."/db";
- }
- $command .= "/zm_update-".$version.".sql";
-
-diff -ur ZoneMinder-1.25.0.orig//zm.conf.in ZoneMinder-1.25.0/zm.conf.in
---- ZoneMinder-1.25.0.orig//zm.conf.in 2008-07-25 09:48:17.000000000 +0000
-+++ ZoneMinder-1.25.0/zm.conf.in 2011-12-14 13:55:26.784133435 +0000
-@@ -12,8 +12,8 @@
- # Current version of ZoneMinder
- 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
deleted file mode 100644
index a083c6d..0000000
--- a/zoneminder-1.25.0-gcc47.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 21f197e..0000000
--- a/zoneminder-1.25.0-gcrypt.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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-kernel35.patch b/zoneminder-1.25.0-kernel35.patch
deleted file mode 100644
index 51bc128..0000000
--- a/zoneminder-1.25.0-kernel35.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
---- ./src/zm_local_camera.cpp.kernel35 2012-07-16 15:01:22.182614878 -0500
-+++ ./src/zm_local_camera.cpp 2012-07-16 15:02:16.491941730 -0500
-@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
- {
- Debug( 3, "Terminating video stream" );
- //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-- enum v4l2_buf_type type = v4l2_data.fmt.type;
-+ enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
- if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
- Error( "Failed to stop capture stream: %s", strerror(errno) );
-
-@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
-
- Debug( 3, "Starting video stream" );
- //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-- enum v4l2_buf_type type = v4l2_data.fmt.type;
-+ enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
- if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
- Fatal( "Failed to start capture stream: %s", strerror(errno) );
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zoneminder.git/commitdiff/da26edb7c347c9666398ff460e51f3033268d114
More information about the pld-cvs-commit
mailing list