FreeBSD Bugzilla – Attachment 122096 Details for
Bug 165211
[PATCH] multimedia/zoneminder: update up to 1.25.0 release from 1.24.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
zoneminder.txt
zoneminder.txt (text/plain), 8.21 KB, created by
pg
on 2012-02-21 12:41:04 UTC
(
hide
)
Description:
zoneminder.txt
Filename:
MIME Type:
Creator:
pg
Created:
2012-02-21 12:41:04 UTC
Size:
8.21 KB
patch
obsolete
>diff -urN zoneminder.orig/Makefile zoneminder/Makefile >--- zoneminder.orig/Makefile 2012-02-17 01:04:24.033850684 +0400 >+++ zoneminder/Makefile 2012-02-21 15:34:25.600851395 +0400 >@@ -6,14 +6,14 @@ > # > > PORTNAME= zoneminder >-PORTVERSION= 1.24.4 >-PORTREVISION= 14 >+PORTVERSION= 1.25.0 >+PORTREVISION= 1 > CATEGORIES= multimedia > MASTER_SITES= http://www2.zoneminder.com/downloads/ \ > http://www.zoneminder.com/downloads/ > DISTNAME= ZoneMinder-${PORTVERSION} > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= pakhom706@gmail.com > COMMENT= Complete security camera solution, fully web based with image analysis > > LICENSE= GPLv2 >@@ -21,7 +21,7 @@ > RUN_DEPENDS= ${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo > LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ > netpbm.1:${PORTSDIR}/graphics/netpbm \ >- pcre.1:${PORTSDIR}/devel/pcre \ >+ pcre.0:${PORTSDIR}/devel/pcre \ > avutil.1:${PORTSDIR}/multimedia/ffmpeg > BUILD_DEPENDS= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5-extensions \ > ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ >@@ -86,9 +86,9 @@ > ZoneMinder::Control.3 \ > ZoneMinder::General.3 \ > ZoneMinder::Trigger::Channel::Handle.3 \ >- ZoneMinder::Debug.3 \ > ZoneMinder::ConfigAdmin.3 \ >- ZoneMinder::ConfigData.3 >+ ZoneMinder::ConfigData.3 \ >+ ZoneMinder::Logger.3 > > post-configure: > ${MV} ${WRKSRC}/zm.conf ${WRKSRC}/zm.conf.sample >diff -urN zoneminder.orig/distinfo zoneminder/distinfo >--- zoneminder.orig/distinfo 2011-06-09 14:13:37.000000000 +0400 >+++ zoneminder/distinfo 2012-02-02 15:10:44.120850000 +0400 >@@ -1,2 +1,2 @@ >-SHA256 (ZoneMinder-1.24.4.tar.gz) = af4fa2fdb1e5287dbdea05b97e14376c9ec7ccaae0f1760e754a6a92595892c0 >-SIZE (ZoneMinder-1.24.4.tar.gz) = 1061935 >+SHA256 (ZoneMinder-1.25.0.tar.gz) = ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d >+SIZE (ZoneMinder-1.25.0.tar.gz) = 1119091 >diff -urN zoneminder.orig/files/README.FreeBSD zoneminder/files/README.FreeBSD >--- zoneminder.orig/files/README.FreeBSD 2011-04-29 18:22:37.000000000 +0400 >+++ zoneminder/files/README.FreeBSD 2012-02-21 16:39:07.807849880 +0400 >@@ -210,4 +210,7 @@ > > * kern.ipc.shm_use_phys=1 > >+== Modify php.ini === >+Change in php.ini short_open_tag to On (short_open_tag = On) >+ > That's all folks! >diff -urN zoneminder.orig/files/patch-src_zm_logger.cpp zoneminder/files/patch-src_zm_logger.cpp >--- zoneminder.orig/files/patch-src_zm_logger.cpp 1970-01-01 03:00:00.000000000 +0300 >+++ zoneminder/files/patch-src_zm_logger.cpp 2012-02-14 12:08:26.154850000 +0400 >@@ -0,0 +1,24 @@ >+--- src/zm_logger.cpp.orig 2011-06-28 15:07:35.000000000 +0400 >++++ src/zm_logger.cpp 2012-02-03 01:42:44.626851425 +0400 >+@@ -33,6 +33,7 @@ >+ #include <signal.h> >+ #include <stdarg.h> >+ #include <errno.h> >++#include <sys/thr.h> >+ >+ bool Logger::smInitialised = false; >+ Logger *Logger::smInstance = 0; >+@@ -515,8 +516,12 @@ >+ #endif >+ >+ pid_t tid; >++ long lwpid; >++ thr_self(&lwpid); >++ tid = lwpid; >++ >+ #ifdef HAVE_SYSCALL >+- if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id >++ if (tid < 0 ) // Thread/Process id >+ #endif // HAVE_SYSCALL >+ tid = getpid(); // Process id >+ >diff -urN zoneminder.orig/pkg-plist zoneminder/pkg-plist >--- zoneminder.orig/pkg-plist 2011-11-13 21:33:46.000000000 +0400 >+++ zoneminder/pkg-plist 2012-02-21 12:54:05.584850611 +0400 >@@ -1,4 +1,3 @@ >-@comment file listing > bin/zma > bin/zmaudit.pl > bin/zmc >@@ -7,8 +6,8 @@ > bin/zmf > bin/zmfilter.pl > bin/zmfix >-bin/zmstreamer > bin/zmpkg.pl >+bin/zmstreamer > bin/zmtrack.pl > bin/zmtrigger.pl > bin/zmu >@@ -18,7 +17,6 @@ > bin/zmx10.pl > @unexec if cmp -s %D/etc/zm.conf.sample %D/etc/zm.conf; then rm -f %D/etc/zm.conf; fi > etc/zm.conf.sample >-@exec if [ ! -f %D/etc/zm.conf ] ; then cp -p %D/%F %B/zm.conf; fi > lib/perl5/%%PERL_VERSION%%/%%PERL_ARCH%%/perllocal.pod > %%SITE_PERL%%/ZoneMinder.pm > %%SITE_PERL%%/ZoneMinder/Base.pm >@@ -33,8 +31,8 @@ > %%SITE_PERL%%/ZoneMinder/Control/Visca.pm > %%SITE_PERL%%/ZoneMinder/Control/mjpgStreamer.pm > %%SITE_PERL%%/ZoneMinder/Database.pm >-%%SITE_PERL%%/ZoneMinder/Debug.pm > %%SITE_PERL%%/ZoneMinder/General.pm >+%%SITE_PERL%%/ZoneMinder/Logger.pm > %%SITE_PERL%%/ZoneMinder/Memory.pm > %%SITE_PERL%%/ZoneMinder/Memory/Mapped.pm > %%SITE_PERL%%/ZoneMinder/Memory/Shared.pm >@@ -61,11 +59,15 @@ > %%WWWDIR_REL%%/data/ajax/alarm.php > %%WWWDIR_REL%%/data/ajax/control.php > %%WWWDIR_REL%%/data/ajax/event.php >+%%WWWDIR_REL%%/data/ajax/log.php > %%WWWDIR_REL%%/data/ajax/status.php > %%WWWDIR_REL%%/data/ajax/stream.php > %%WWWDIR_REL%%/data/ajax/zone.php >+%%WWWDIR_REL%%/data/css/overlay.css > %%WWWDIR_REL%%/data/css/reset.css >+%%WWWDIR_REL%%/data/css/spinner.css > %%WWWDIR_REL%%/data/graphics/favicon.ico >+%%WWWDIR_REL%%/data/graphics/spinner.gif > %%WWWDIR_REL%%/data/graphics/transparent.gif > %%WWWDIR_REL%%/data/includes/actions.php > %%WWWDIR_REL%%/data/includes/config.php >@@ -73,8 +75,11 @@ > %%WWWDIR_REL%%/data/includes/database.php > %%WWWDIR_REL%%/data/includes/functions.php > %%WWWDIR_REL%%/data/includes/lang.php >+%%WWWDIR_REL%%/data/includes/logger.php > %%WWWDIR_REL%%/data/index.php >+%%WWWDIR_REL%%/data/js/logger.js > %%WWWDIR_REL%%/data/js/mootools.ext.js >+%%WWWDIR_REL%%/data/js/overlay.js > %%WWWDIR_REL%%/data/lang/big5_big5.php > %%WWWDIR_REL%%/data/lang/cn_zh.php > %%WWWDIR_REL%%/data/lang/cs_cz.php >@@ -105,6 +110,8 @@ > %%WWWDIR_REL%%/data/skins/classic/graphics/arrow-l-u.gif > %%WWWDIR_REL%%/data/skins/classic/graphics/arrow-l.gif > %%WWWDIR_REL%%/data/skins/classic/graphics/arrow-r.gif >+%%WWWDIR_REL%%/data/skins/classic/graphics/arrow-s-d.gif >+%%WWWDIR_REL%%/data/skins/classic/graphics/arrow-s-u.gif > %%WWWDIR_REL%%/data/skins/classic/graphics/arrow-u.gif > %%WWWDIR_REL%%/data/skins/classic/graphics/arrow-ul.gif > %%WWWDIR_REL%%/data/skins/classic/graphics/arrow-ur.gif >@@ -142,6 +149,7 @@ > %%WWWDIR_REL%%/data/skins/classic/views/css/frame.css > %%WWWDIR_REL%%/data/skins/classic/views/css/frames.css > %%WWWDIR_REL%%/data/skins/classic/views/css/groups.css >+%%WWWDIR_REL%%/data/skins/classic/views/css/log.css > %%WWWDIR_REL%%/data/skins/classic/views/css/monitor.css > %%WWWDIR_REL%%/data/skins/classic/views/css/montage.css > %%WWWDIR_REL%%/data/skins/classic/views/css/montage_2wide.css >@@ -193,6 +201,7 @@ > %%WWWDIR_REL%%/data/skins/classic/views/js/filter.js.php > %%WWWDIR_REL%%/data/skins/classic/views/js/group.js > %%WWWDIR_REL%%/data/skins/classic/views/js/groups.js >+%%WWWDIR_REL%%/data/skins/classic/views/js/log.js > %%WWWDIR_REL%%/data/skins/classic/views/js/login.js > %%WWWDIR_REL%%/data/skins/classic/views/js/monitor.js > %%WWWDIR_REL%%/data/skins/classic/views/js/monitor.js.php >@@ -215,6 +224,7 @@ > %%WWWDIR_REL%%/data/skins/classic/views/js/watch.js.php > %%WWWDIR_REL%%/data/skins/classic/views/js/zone.js > %%WWWDIR_REL%%/data/skins/classic/views/js/zone.js.php >+%%WWWDIR_REL%%/data/skins/classic/views/log.php > %%WWWDIR_REL%%/data/skins/classic/views/login.php > %%WWWDIR_REL%%/data/skins/classic/views/logout.php > %%WWWDIR_REL%%/data/skins/classic/views/monitor.php >@@ -265,15 +275,14 @@ > %%WWWDIR_REL%%/data/skins/xml/views/console.php > %%WWWDIR_REL%%/data/skins/xml/views/none.php > %%WWWDIR_REL%%/data/skins/xml/views/notfound.png >-%%WWWDIR_REL%%/data/tools/mootools/mootools-1.2.5-core-nc.js >-%%WWWDIR_REL%%/data/tools/mootools/mootools-1.2.5-core-yc.js >-%%WWWDIR_REL%%/data/tools/mootools/mootools-1.2.5.1-more-nc.js >-%%WWWDIR_REL%%/data/tools/mootools/mootools-1.2.5.1-more-yc.js >+%%WWWDIR_REL%%/data/tools/mootools/mootools-core-1.3.2-nc.js >+%%WWWDIR_REL%%/data/tools/mootools/mootools-core-1.3.2-yc.js > %%WWWDIR_REL%%/data/tools/mootools/mootools-core.js >+%%WWWDIR_REL%%/data/tools/mootools/mootools-more-1.3.2.1-nc.js >+%%WWWDIR_REL%%/data/tools/mootools/mootools-more-1.3.2.1-yc.js > %%WWWDIR_REL%%/data/tools/mootools/mootools-more.js > %%WWWDIR_REL%%/data/views/file.php > %%WWWDIR_REL%%/data/views/image.php >-@comment non-empty directory listing in revers order > @dirrm %%WWWDIR_REL%%/data/views > @dirrm %%WWWDIR_REL%%/data/tools/mootools > @dirrm %%WWWDIR_REL%%/data/tools >@@ -312,10 +321,8 @@ > @dirrm %%WWWDIR_REL%%/data > @dirrm %%WWWDIR_REL%%/cgi-bin > @dirrm %%WWWDIR_REL%% >-%%PORTDOCS%%@dirrm %%DOCSDIR%% >+@dirrm %%PORTDOCS%%%%DOCSDIR%% > @dirrm %%SITE_PERL%%/mach/auto/ZoneMinder >-@dirrmtry %%SITE_PERL%%/mach/auto >-@dirrmtry %%SITE_PERL%%/mach > @dirrm %%SITE_PERL%%/ZoneMinder/Trigger/Connection > @dirrm %%SITE_PERL%%/ZoneMinder/Trigger/Channel > @dirrm %%SITE_PERL%%/ZoneMinder/Trigger
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 165211
:
122093
|
122094
|
122095
| 122096 |
122097