Date: Sat, 8 Dec 2018 22:28:06 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486990 - in head/multimedia/zoneminder: . files Message-ID: <201812082228.wB8MS6Om006814@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sat Dec 8 22:28:06 2018 New Revision: 486990 URL: https://svnweb.freebsd.org/changeset/ports/486990 Log: multimedia/zoneminder: update 1.30.4 -> 1.32.2 PR: 233289 Submitted by: Ivan <bsd@abinet.ru> (maintainer) Reviewed by: lme Relnotes: http://www.zoneminder.com/blog/2018/10/13/tuesdays-gone-release.html https://github.com/ZoneMinder/zoneminder/releases/tag/1.32.0 Added: head/multimedia/zoneminder/files/patch-cmake_Modules_Pod2Man.cmake (contents, props changed) head/multimedia/zoneminder/files/patch-src_CMakeLists.txt (contents, props changed) Deleted: head/multimedia/zoneminder/files/patch-ffmpeg4 head/multimedia/zoneminder/files/patch-misc_CMakeLists.txt head/multimedia/zoneminder/files/patch-src_zm__image.cpp head/multimedia/zoneminder/files/patch-src_zm__logger.cpp head/multimedia/zoneminder/files/patch-src_zm__signal.cpp head/multimedia/zoneminder/files/patch-src_zmf.cpp Modified: head/multimedia/zoneminder/Makefile head/multimedia/zoneminder/distinfo head/multimedia/zoneminder/files/README.FreeBSD head/multimedia/zoneminder/files/patch-CMakeLists.txt head/multimedia/zoneminder/files/patch-scripts_CMakeLists.txt head/multimedia/zoneminder/files/patch-src_zm__monitor.cpp head/multimedia/zoneminder/files/patch-src_zm__stream.cpp head/multimedia/zoneminder/pkg-descr head/multimedia/zoneminder/pkg-plist Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/Makefile Sat Dec 8 22:28:06 2018 (r486990) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= zoneminder -PORTVERSION= 1.30.4 -PORTREVISION= 6 +PORTVERSION= 1.32.2 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -10,7 +9,7 @@ COMMENT= Complete security camera solution, fully web LICENSE= GPLv2 -CONFLICTS_INSTALL= zoneminder-h264 +ONLY_FOR_ARCHS= amd64 i386 ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>=0:databases/p5-DBD-mysql \ @@ -24,22 +23,27 @@ ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ p5-SOAP-WSDL>=0:devel/p5-SOAP-WSDL \ p5-Data-UUID>=0:devel/p5-Data-UUID \ p5-IO-Socket-Multicast>=0:net/p5-IO-Socket-Multicast \ + p5-Number-Bytes-Human>=0:devel/p5-Number-Bytes-Human \ + p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \ ffmpeg:multimedia/ffmpeg BUILD_DEPENDS= ${ZM_DEPENDS} +LIB_DEPENDS= libx264.so:multimedia/libx264 \ + libmp4v2.so:multimedia/mp4v2 \ + libgcrypt.so:security/libgcrypt RUN_DEPENDS= ${ZM_DEPENDS} \ sudo:security/sudo \ p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \ zip:archivers/zip -USE_GITHUB= yes -GH_PROJECT= ZoneMinder -GH_TUPLE= FriendsOfCake:crud:c3976f1:crud - USES= cmake:noninja jpeg mysql perl5 php shebangfix ssl +USE_GITHUB= yes +GH_PROJECT= zoneminder +GH_TUPLE= zoneminder:crud:0bd63fb:crud \ + zoneminder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin USE_RC_SUBR= zoneminder USE_PHP= json pdo_mysql session gd sockets ctype opcache -ONLY_FOR_ARCHS= amd64 i386 +CONFLICTS_INSTALL= zoneminder-h264 OPTIONS_DEFINE= NLS V4L DOCS OPTIONS_SUB= yes @@ -56,6 +60,7 @@ SHEBANG_FILES= scripts/zmaudit.pl.in \ scripts/zmdc.pl.in \ scripts/zmfilter.pl.in \ scripts/zmpkg.pl.in \ + scripts/zmstats.pl.in \ scripts/zmtelemetry.pl.in \ scripts/zmtrack.pl.in \ scripts/zmtrigger.pl.in \ @@ -63,49 +68,52 @@ SHEBANG_FILES= scripts/zmaudit.pl.in \ scripts/zmvideo.pl.in \ scripts/zmwatch.pl.in \ scripts/zmx10.pl.in \ - onvif/scripts/zmonvif-probe.pl + scripts/zmonvif-probe.pl.in PORTDOCS= AUTHORS BUGS ChangeLog INSTALL NEWS README.FreeBSD TODO CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ -DZM_CONFIG_DIR=${PREFIX}/etc \ + -DZM_CONFIG_SUBDIR=${PREFIX}/etc/zoneminder \ -DZM_WEBDIR=${WWWDIR} \ -DZM_CGIDIR=${WWWDIR}/cgi-bin \ - -DZM_CONTENTDIR=${WWWDIR} \ + -DZM_CONTENTDIR=/var/db/zoneminder \ + -DZM_MANPAGE_DEST_PREFIX=${PREFIX}/man \ -DHAVE_SENDFILE=0 \ -DZM_NO_CURL=ON \ -DZM_NO_LIBVLC=ON \ -DPCRE_LIBRARIES=0 \ + -DZM_PATH_MAP=/tmp \ -DGNUTLS_LIBRARIES=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" .include <bsd.port.pre.mk> -.if ${PHP_VER} >= 70 -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} +.if ${PHP_VER} >= 71 +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} .else -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4@${PHP_FLAVOR} +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4@${PHP_FLAVOR} .endif PKGMESSAGE= ${WRKDIR}/pkg-message post-extract: ${CP} -R ${WRKSRC_crud}/* ${WRKSRC}/web/api/app/Plugin/Crud + ${CP} -R ${WRKSRC_crud_plugin}/* ${WRKSRC}/web/api/app/Plugin/CakePHP-Enum-Behavior ${CP} ${FILESDIR}/README.FreeBSD ${WRKSRC} ${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE} ${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in - ${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php +# ${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php pre-install: - ${MKDIR} ${STAGEDIR}${WWWDIR}/images - ${MKDIR} ${STAGEDIR}${WWWDIR}/events ${MKDIR} ${STAGEDIR}${WWWDIR}/temp ${MKDIR} ${STAGEDIR}${WWWDIR}/api/app/tmp + ${MKDIR} ${STAGEDIR}/var/cache/zoneminder + ${MKDIR} ${STAGEDIR}/var/cache/zoneminder/events + ${MKDIR} ${STAGEDIR}/var/cache/zoneminder/images + ${MKDIR} ${STAGEDIR}/var/db/zoneminder ${MKDIR} ${STAGEDIR}/var/run/zm ${MKDIR} ${STAGEDIR}/var/tmp/zm - -post-install: - ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/zm.conf ${STAGEDIR}${PREFIX}/etc/zm.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/multimedia/zoneminder/distinfo ============================================================================== --- head/multimedia/zoneminder/distinfo Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/distinfo Sat Dec 8 22:28:06 2018 (r486990) @@ -1,5 +1,7 @@ -TIMESTAMP = 1496073899 -SHA256 (zoneminder-ZoneMinder-1.30.4_GH0.tar.gz) = 5461350caa9d8ec58deb1ef08e2e1641084e694f2a9f9e17b3b678b1a43203c7 -SIZE (zoneminder-ZoneMinder-1.30.4_GH0.tar.gz) = 9937142 -SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce -SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961 +TIMESTAMP = 1541609433 +SHA256 (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = cf72cbd45d91ef0232c123dac5f908993f8941a62b9ae96975c4e6043bd4b9a9 +SIZE (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = 10639207 +SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579 +SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129 +SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1 +SIZE (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3500 Modified: head/multimedia/zoneminder/files/README.FreeBSD ============================================================================== --- head/multimedia/zoneminder/files/README.FreeBSD Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/files/README.FreeBSD Sat Dec 8 22:28:06 2018 (r486990) @@ -14,13 +14,9 @@ the same server. 1. Preliminary steps -1.1 Install databases/mysql56-server or newer +1.1 Install databases/mysql57-server or newer You may choose your favourite method - ports or packages here. - FreeBSD default setting use STRICT_TRANS_TABLES sql_mode. It's mandatory to disable it. Edit your my.cnf accordingly - The following SQL mode should be compatible with ZM: - sql_mode= NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - ZoneMinder use very simple queries, however it tends to write to the database quite a lot depending on your capture mode and number of cameras. So tweak your MySQL instance accordantly @@ -33,42 +29,62 @@ the same server. We provide an example for an HTTP install, however, you should use HTTPS if you plan to expose your installation to the public. There are plenty guides how to do it and security/letsencrypt.sh is a - good way to get a valid SSL certificate. + good way to get a valid SSL certificate. Probably, your installation + will be behind reverse proxy, so this example should work for you. + Please, notive the following issues with ZM: + + - web interface has several hardcoded /zm in url generation, so it is + mandatory to serve your installtion from /zm subfolder + - if behind reverse proxy, HTTP_X_FORWARDED_PROTO must be supplied or link + generation will use http:// + Your server block should include the following: - server { - root /usr/local/www/zoneminder; - try_files $uri $uri/ /index.php$is_args$args; - index index.php; + server { + listen 80; - location = /cgi-bin/nph-zms { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass unix:/var/run/fcgiwrap/fcgiwrap.sock; - } + root /usr/local/www/zoneminder; + index index.php + gzip off; - location ~ \.php$ { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass unix:/var/run/php-fpm.sock; - } + location /cgi-bin/nph-zms { - location /api { - rewrite ^/api/(.+)$ /api/index.php?p=$1 last; - } + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_pass unix:/var/run/fcgiwrap/fcgiwrap.sock; } -1.2.1 ZoneMinder has it's own authentication system, however it's recommend to use NGINX basic - auth over HTTPS if you don't need fine grain control to ZoneMinder components. + location /zm/cache { -1.2.2 If you choose ZoneMinder authentication, it's recommended to prohibit access to - image and events folder as it's possible to guess file names inside it. + alias /var/cache/zoneminder; + } - location ~ ^/(?:images|events)/ { - deny all; - } - + location /zm { + + alias /usr/local/www/zoneminder; + + location ~ \.php$ { + + if (!-f $request_filename) { return 404; } + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_index index.php; + fastcgi_pass unix:/var/run/php-fpm.sock; + } + + location ~ \.(jpg|jpeg|gif|png|ico)$ { + access_log off; + expires 33d; + } + + location /zm/api/ { + alias /usr/local/www/zoneminder; + rewrite ^/zm/api(.+)$ /zm/api/app/webroot/index.php?p=$1 last; + } + } + } + Enable and start NGINX sysrc nginx_enable="YES" service nginx start @@ -158,3 +174,17 @@ Upgrades 3. Start ZoneMinder service zoneminder start + +Upgrading from www/zoneminder 1.30.x or www/zoneminder-h264 +===================================================== + +Before proceeding to upgrade sequence listed above, + +1. Connect to mysql server with root and issue + set global log_bin_trust_function_creators=1; + +2. Add write access to www user to /usr/local/etc/zoneminder/zmcustom.conf + +3. Take notice, that default monitor files are not under ${WWWDIR} anymore. + Old setup will work, but as security concideration it is recommended to + move them to /var/db/zoneminder (default) or to any place not under www root. Modified: head/multimedia/zoneminder/files/patch-CMakeLists.txt ============================================================================== --- head/multimedia/zoneminder/files/patch-CMakeLists.txt Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/files/patch-CMakeLists.txt Sat Dec 8 22:28:06 2018 (r486990) @@ -1,32 +1,23 @@ ---- CMakeLists.txt.orig 2016-06-01 00:41:17 UTC +--- CMakeLists.txt.orig 2018-10-13 18:36:15 UTC +++ CMakeLists.txt -@@ -385,13 +385,13 @@ find_library(MYSQLCLIENT_LIBRARIES mysql - if(MYSQLCLIENT_LIBRARIES) - set(HAVE_LIBMYSQLCLIENT 1) - list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}") -- find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h) -+ find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/mysql) - if(MYSQLCLIENT_INCLUDE_DIR) - include_directories("${MYSQLCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}") - endif(MYSQLCLIENT_INCLUDE_DIR) - mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR) -- check_include_file("mysql/mysql.h" HAVE_MYSQL_H) -+ check_include_file("mysql.h" HAVE_MYSQL_H) - if(NOT HAVE_MYSQL_H) - message(FATAL_ERROR - "ZoneMinder requires MySQL headers - check that MySQL development packages are installed") -@@ -658,13 +658,6 @@ endif(NOT ZM_WEB_GROUP) - message(STATUS "Using web user: ${ZM_WEB_USER}") - message(STATUS "Using web group: ${ZM_WEB_GROUP}") +@@ -127,7 +127,8 @@ mark_as_advanced( + ZM_PATH_ARP + ZM_CONFIG_DIR + ZM_CONFIG_SUBDIR +- ZM_SYSTEMD) ++ ZM_SYSTEMD ++ ZM_MANPAGE_DEST_PREFIX) --# Check for polkit --find_package(Polkit) --if(NOT POLKIT_FOUND) -- message(FATAL_ERROR -- "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.") --endif(NOT POLKIT_FOUND) -- - # Some variables that zm expects - set(ZM_PID "${ZM_RUNDIR}/zm.pid") - set(ZM_CONFIG "${ZM_CONFIG_DIR}/zm.conf") + set(ZM_RUNDIR "/var/run/zm" CACHE PATH + "Location of transient process files, default: /var/run/zm") +@@ -210,6 +211,10 @@ set(ZM_TARGET_DISTRO "" CACHE STRING + "Build ZoneMinder for a specific distribution. Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD") + set(ZM_SYSTEMD "OFF" CACHE BOOL + "Set to ON to force building ZM with systemd support. default: OFF") ++set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH ++ "Relative path used to install ZoneMinder's Man pages into a ++ non-standard folder. Most Linux users will not need to change this. ++ BSD users may need to set this.") + + # Reassign some variables if a target distro has been specified + if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc")) Added: head/multimedia/zoneminder/files/patch-cmake_Modules_Pod2Man.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/zoneminder/files/patch-cmake_Modules_Pod2Man.cmake Sat Dec 8 22:28:06 2018 (r486990) @@ -0,0 +1,20 @@ +--- cmake/Modules/Pod2Man.cmake.orig 2018-10-13 18:36:15 UTC ++++ cmake/Modules/Pod2Man.cmake +@@ -21,7 +21,7 @@ + # To use it, include this file in CMakeLists.txt and + # invoke POD2MAN(<podfile> <manfile> <section>) + +-MACRO(POD2MAN PODFILE MANFILE SECTION) ++MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX) + FIND_PROGRAM(POD2MAN pod2man) + FIND_PROGRAM(GZIP gzip) + +@@ -58,7 +58,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION) + + INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz +- DESTINATION share/man/man${SECTION} ++ DESTINATION ${MANPAGE_DEST_PREFIX}/man${SECTION} + ) + ENDMACRO(POD2MAN PODFILE MANFILE SECTION) + Modified: head/multimedia/zoneminder/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/multimedia/zoneminder/files/patch-scripts_CMakeLists.txt Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/files/patch-scripts_CMakeLists.txt Sat Dec 8 22:28:06 2018 (r486990) @@ -1,11 +1,11 @@ ---- scripts/CMakeLists.txt.orig 2016-06-01 00:41:17 UTC +--- scripts/CMakeLists.txt.orig 2018-10-13 18:36:15 UTC +++ scripts/CMakeLists.txt -@@ -32,7 +32,7 @@ FOREACH(PERLSCRIPT ${perlscripts}) +@@ -31,7 +31,7 @@ configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" + file(GLOB perlscripts "*.pl") + FOREACH(PERLSCRIPT ${perlscripts}) + get_filename_component(PERLSCRIPTNAME ${PERLSCRIPT} NAME) +- POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8) ++ POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX}) ENDFOREACH(PERLSCRIPT ${perlscripts}) # Install the perl scripts --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - if(NOT ZM_NO_X10) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif(NOT ZM_NO_X10) Added: head/multimedia/zoneminder/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/zoneminder/files/patch-src_CMakeLists.txt Sat Dec 8 22:28:06 2018 (r486990) @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2018-10-13 18:36:15 UTC ++++ src/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN + + # Generate man files for the binaries destined for the bin folder + FOREACH(CBINARY zma zmc zmu) +- POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8) ++ POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8 ${ZM_MANPAGE_DEST_PREFIX}) + ENDFOREACH(CBINARY zma zmc zmu) + + install(TARGETS zmc zma zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) Modified: head/multimedia/zoneminder/files/patch-src_zm__monitor.cpp ============================================================================== --- head/multimedia/zoneminder/files/patch-src_zm__monitor.cpp Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/files/patch-src_zm__monitor.cpp Sat Dec 8 22:28:06 2018 (r486990) @@ -1,29 +1,20 @@ ---- src/zm_monitor.cpp.orig 2016-07-28 01:45:26 UTC +--- src/zm_monitor.cpp.orig 2018-10-13 18:36:15 UTC +++ src/zm_monitor.cpp -@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect() - return( false ); - } - mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 ); -- if ( mem_ptr < 0 ) -+ if ( mem_ptr < (void *)0 ) - { - Debug( 3, "Can't shmat link memory: %s", strerror(errno) ); - connected = false; -@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect() - connected = false; +@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone + Camera *camera = 0; + if ( type == "Local" ) { - #if ZM_MEM_MAPPED -- if ( mem_ptr > 0 ) -+ if ( mem_ptr > (void *)0 ) - { - msync( mem_ptr, mem_size, MS_ASYNC ); - munmap( mem_ptr, mem_size ); -@@ -558,7 +558,7 @@ bool Monitor::connect() { - exit( -1 ); - } - mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 ); -- if ( mem_ptr < 0 ) -+ if ( mem_ptr < (void *)0 ) - { - Error( "Can't shmat: %s", strerror(errno)); - exit( -1 ); ++#if ZM_HAS_V4L + int extras = (deinterlacing>>24)&0xff; + + camera = new LocalCamera( +@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone + record_audio, + extras + ); ++#else ++ Fatal("ZoneMinder not built with Local Camera support"); ++#endif + } else if ( type == "Remote" ) { + if ( protocol == "http" ) { + camera = new RemoteCameraHttp( Modified: head/multimedia/zoneminder/files/patch-src_zm__stream.cpp ============================================================================== --- head/multimedia/zoneminder/files/patch-src_zm__stream.cpp Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/files/patch-src_zm__stream.cpp Sat Dec 8 22:28:06 2018 (r486990) @@ -1,11 +1,11 @@ ---- src/zm_stream.cpp.orig 2017-05-09 14:54:48 UTC +--- src/zm_stream.cpp.orig 2018-11-07 16:33:47 UTC +++ src/zm_stream.cpp -@@ -332,7 +332,7 @@ void StreamBase::openComms() - - strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) ); +@@ -325,7 +325,7 @@ void StreamBase::openComms() { + strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path)); loc_addr.sun_family = AF_UNIX; -- if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 ) -+ if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 ) - { - Fatal( "Can't bind: %s", strerror(errno) ); + Debug(3, "Binding to %s", loc_sock_path); +- if ( bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) { ++ if ( ::bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) { + Fatal("Can't bind: %s", strerror(errno)); } + Modified: head/multimedia/zoneminder/pkg-descr ============================================================================== --- head/multimedia/zoneminder/pkg-descr Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/pkg-descr Sat Dec 8 22:28:06 2018 (r486990) @@ -1,4 +1,4 @@ Zoneminder is an all-in-one GPL'd security and surveillance camera solution. Fully web-based system for viewing and analyzing security camera feeds. -WWW: http://www.zoneminder.com/ +WWW: https://www.zoneminder.com/ Modified: head/multimedia/zoneminder/pkg-plist ============================================================================== --- head/multimedia/zoneminder/pkg-plist Sat Dec 8 22:13:30 2018 (r486989) +++ head/multimedia/zoneminder/pkg-plist Sat Dec 8 22:28:06 2018 (r486990) @@ -4,10 +4,10 @@ bin/zmc bin/zmcamtool.pl bin/zmcontrol.pl bin/zmdc.pl -bin/zmf bin/zmfilter.pl bin/zmonvif-probe.pl bin/zmpkg.pl +bin/zmstats.pl bin/zmtelemetry.pl bin/zmtrack.pl bin/zmtrigger.pl @@ -16,7 +16,10 @@ bin/zmupdate.pl bin/zmvideo.pl bin/zmwatch.pl bin/zmx10.pl -@sample etc/zm.conf.sample +etc/zm.conf +%%ETCDIR%%/01-system-paths.conf +%%ETCDIR%%/02-multiserver.conf +%%ETCDIR%%/README %%SITE_PERL%%/ONVIF/Analytics/Attributes/actor.pm %%SITE_PERL%%/ONVIF/Analytics/Attributes/contentType.pm %%SITE_PERL%%/ONVIF/Analytics/Attributes/encodingStyle.pm @@ -2978,26 +2981,34 @@ bin/zmx10.pl %%SITE_PERL%%/ZoneMinder/Control.pm %%SITE_PERL%%/ZoneMinder/Control/3S.pm %%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm +%%SITE_PERL%%/ZoneMinder/Control/DCS3415.pm +%%SITE_PERL%%/ZoneMinder/Control/Dahua.pm +%%SITE_PERL%%/ZoneMinder/Control/DericamP2.pm %%SITE_PERL%%/ZoneMinder/Control/FI8608W_Y2k.pm %%SITE_PERL%%/ZoneMinder/Control/FI8620_Y2k.pm %%SITE_PERL%%/ZoneMinder/Control/FI8908W.pm %%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm %%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm %%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm +%%SITE_PERL%%/ZoneMinder/Control/Floureon.pm %%SITE_PERL%%/ZoneMinder/Control/HikVision.pm +%%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm %%SITE_PERL%%/ZoneMinder/Control/IPCC7210W.pm %%SITE_PERL%%/ZoneMinder/Control/Keekoon.pm %%SITE_PERL%%/ZoneMinder/Control/LoftekSentinel.pm %%SITE_PERL%%/ZoneMinder/Control/M8640.pm +%%SITE_PERL%%/ZoneMinder/Control/MaginonIPC.pm %%SITE_PERL%%/ZoneMinder/Control/Ncs370.pm %%SITE_PERL%%/ZoneMinder/Control/Netcat.pm +%%SITE_PERL%%/ZoneMinder/Control/PSIA.pm %%SITE_PERL%%/ZoneMinder/Control/PanasonicIP.pm %%SITE_PERL%%/ZoneMinder/Control/PelcoD.pm %%SITE_PERL%%/ZoneMinder/Control/PelcoP.pm +%%SITE_PERL%%/ZoneMinder/Control/Reolink.pm %%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm %%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm -%%SITE_PERL%%/ZoneMinder/Control/TVIP862.pm %%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm +%%SITE_PERL%%/ZoneMinder/Control/Trendnet.pm %%SITE_PERL%%/ZoneMinder/Control/Visca.pm %%SITE_PERL%%/ZoneMinder/Control/Vivotek_ePTZ.pm %%SITE_PERL%%/ZoneMinder/Control/Wanscam.pm @@ -3012,7 +3023,11 @@ bin/zmx10.pl %%SITE_PERL%%/ZoneMinder/Memory.pm %%SITE_PERL%%/ZoneMinder/Memory/Mapped.pm %%SITE_PERL%%/ZoneMinder/Memory/Shared.pm +%%SITE_PERL%%/ZoneMinder/Monitor.pm +%%SITE_PERL%%/ZoneMinder/ONVIF.pm +%%SITE_PERL%%/ZoneMinder/Object.pm %%SITE_PERL%%/ZoneMinder/Server.pm +%%SITE_PERL%%/ZoneMinder/Storage.pm %%SITE_PERL%%/ZoneMinder/Trigger/Channel.pm %%SITE_PERL%%/ZoneMinder/Trigger/Channel/File.pm %%SITE_PERL%%/ZoneMinder/Trigger/Channel/Handle.pm @@ -5974,22 +5989,27 @@ bin/zmx10.pl %%PERL5_MAN3%%/ZoneMinder::Control.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz +%%PERL5_MAN3%%/ZoneMinder::Control::DCS3415.3.gz +%%PERL5_MAN3%%/ZoneMinder::Control::Dahua.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::FI8608W_Y2k.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::FI8620_Y2k.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::FI8908W.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::FI8918W.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::FI9821W_Y2k.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::FI9831W.3.gz +%%PERL5_MAN3%%/ZoneMinder::Control::Floureon.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz +%%PERL5_MAN3%%/ZoneMinder::Control::MaginonIPC.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::Ncs370.3.gz +%%PERL5_MAN3%%/ZoneMinder::Control::PSIA.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::PanasonicIP.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::PelcoD.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::PelcoP.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::SPP1802SWPTZ.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::SkyIPCam7xx.3.gz -%%PERL5_MAN3%%/ZoneMinder::Control::TVIP862.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::Toshiba_IK_WB11A.3.gz +%%PERL5_MAN3%%/ZoneMinder::Control::Trendnet.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::Visca.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::Vivotek_ePTZ.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::Wanscam.3.gz @@ -6001,7 +6021,11 @@ bin/zmx10.pl %%PERL5_MAN3%%/ZoneMinder::General.3.gz %%PERL5_MAN3%%/ZoneMinder::Logger.3.gz %%PERL5_MAN3%%/ZoneMinder::Memory.3.gz +%%PERL5_MAN3%%/ZoneMinder::Monitor.3.gz +%%PERL5_MAN3%%/ZoneMinder::ONVIF.3.gz +%%PERL5_MAN3%%/ZoneMinder::Object.3.gz %%PERL5_MAN3%%/ZoneMinder::Server.3.gz +%%PERL5_MAN3%%/ZoneMinder::Storage.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Channel.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::File.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Handle.3.gz @@ -6011,24 +6035,27 @@ bin/zmx10.pl %%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz -share/man/man8/zoneminder-zma.8.gz -share/man/man8/zoneminder-zmaudit.pl.8.gz -share/man/man8/zoneminder-zmc.8.gz -share/man/man8/zoneminder-zmcamtool.pl.8.gz -share/man/man8/zoneminder-zmcontrol.pl.8.gz -share/man/man8/zoneminder-zmdc.pl.8.gz -share/man/man8/zoneminder-zmf.8.gz -share/man/man8/zoneminder-zmfilter.pl.8.gz -share/man/man8/zoneminder-zmpkg.pl.8.gz -share/man/man8/zoneminder-zmsystemctl.pl.8.gz -share/man/man8/zoneminder-zmtelemetry.pl.8.gz -share/man/man8/zoneminder-zmtrack.pl.8.gz -share/man/man8/zoneminder-zmtrigger.pl.8.gz -share/man/man8/zoneminder-zmu.8.gz -share/man/man8/zoneminder-zmupdate.pl.8.gz -share/man/man8/zoneminder-zmvideo.pl.8.gz -share/man/man8/zoneminder-zmwatch.pl.8.gz -share/man/man8/zoneminder-zmx10.pl.8.gz +share/applications/zoneminder.desktop +man/man8/zoneminder-zma.8.gz +man/man8/zoneminder-zmaudit.pl.8.gz +man/man8/zoneminder-zmc.8.gz +man/man8/zoneminder-zmcamtool.pl.8.gz +man/man8/zoneminder-zmcontrol.pl.8.gz +man/man8/zoneminder-zmdc.pl.8.gz +man/man8/zoneminder-zmfilter.pl.8.gz +man/man8/zoneminder-zmonvif-probe.pl.8.gz +man/man8/zoneminder-zmpkg.pl.8.gz +man/man8/zoneminder-zmstats.pl.8.gz +man/man8/zoneminder-zmsystemctl.pl.8.gz +man/man8/zoneminder-zmtelemetry.pl.8.gz +man/man8/zoneminder-zmtrack.pl.8.gz +man/man8/zoneminder-zmtrigger.pl.8.gz +man/man8/zoneminder-zmu.8.gz +man/man8/zoneminder-zmupdate.pl.8.gz +man/man8/zoneminder-zmvideo.pl.8.gz +man/man8/zoneminder-zmwatch.pl.8.gz +man/man8/zoneminder-zmx10.pl.8.gz +%%DATADIR%%/db/triggers.sql %%DATADIR%%/db/zm_create.sql %%DATADIR%%/db/zm_update-0.0.1.sql %%DATADIR%%/db/zm_update-0.9.10.sql @@ -6092,13 +6119,66 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%DATADIR%%/db/zm_update-1.28.110.sql %%DATADIR%%/db/zm_update-1.28.99.sql %%DATADIR%%/db/zm_update-1.29.0.sql -%%DATADIR%%/db/zm_update-1.29.1.sql %%DATADIR%%/db/zm_update-1.30.0.sql %%DATADIR%%/db/zm_update-1.30.1.sql %%DATADIR%%/db/zm_update-1.30.2.sql %%DATADIR%%/db/zm_update-1.30.3.sql %%DATADIR%%/db/zm_update-1.30.4.sql +%%DATADIR%%/db/zm_update-1.31.0.sql +%%DATADIR%%/db/zm_update-1.31.1.sql +%%DATADIR%%/db/zm_update-1.31.10.sql +%%DATADIR%%/db/zm_update-1.31.11.sql +%%DATADIR%%/db/zm_update-1.31.12.sql +%%DATADIR%%/db/zm_update-1.31.13.sql +%%DATADIR%%/db/zm_update-1.31.14.sql +%%DATADIR%%/db/zm_update-1.31.15.sql +%%DATADIR%%/db/zm_update-1.31.16.sql +%%DATADIR%%/db/zm_update-1.31.17.sql +%%DATADIR%%/db/zm_update-1.31.18.sql +%%DATADIR%%/db/zm_update-1.31.19.sql +%%DATADIR%%/db/zm_update-1.31.2.sql +%%DATADIR%%/db/zm_update-1.31.20.sql +%%DATADIR%%/db/zm_update-1.31.21.sql +%%DATADIR%%/db/zm_update-1.31.22.sql +%%DATADIR%%/db/zm_update-1.31.23.sql +%%DATADIR%%/db/zm_update-1.31.24.sql +%%DATADIR%%/db/zm_update-1.31.25.sql +%%DATADIR%%/db/zm_update-1.31.26.sql +%%DATADIR%%/db/zm_update-1.31.27.sql +%%DATADIR%%/db/zm_update-1.31.28.sql +%%DATADIR%%/db/zm_update-1.31.29.sql +%%DATADIR%%/db/zm_update-1.31.3.sql +%%DATADIR%%/db/zm_update-1.31.30.sql +%%DATADIR%%/db/zm_update-1.31.31.sql +%%DATADIR%%/db/zm_update-1.31.32.sql +%%DATADIR%%/db/zm_update-1.31.33.sql +%%DATADIR%%/db/zm_update-1.31.34.sql +%%DATADIR%%/db/zm_update-1.31.35.sql +%%DATADIR%%/db/zm_update-1.31.36.sql +%%DATADIR%%/db/zm_update-1.31.37.sql +%%DATADIR%%/db/zm_update-1.31.38.sql +%%DATADIR%%/db/zm_update-1.31.39.sql +%%DATADIR%%/db/zm_update-1.31.4.sql +%%DATADIR%%/db/zm_update-1.31.40.sql +%%DATADIR%%/db/zm_update-1.31.41.sql +%%DATADIR%%/db/zm_update-1.31.42.sql +%%DATADIR%%/db/zm_update-1.31.43.sql +%%DATADIR%%/db/zm_update-1.31.44.sql +%%DATADIR%%/db/zm_update-1.31.45.sql +%%DATADIR%%/db/zm_update-1.31.46.sql +%%DATADIR%%/db/zm_update-1.31.47.sql +%%DATADIR%%/db/zm_update-1.31.5.sql +%%DATADIR%%/db/zm_update-1.31.6.sql +%%DATADIR%%/db/zm_update-1.31.7.sql +%%DATADIR%%/db/zm_update-1.31.8.sql +%%DATADIR%%/db/zm_update-1.31.9.sql +%%DATADIR%%/db/zm_update-1.32.0.sql +%%DATADIR%%/db/zm_update-1.32.1.sql +%%DATADIR%%/db/zm_update-1.32.2.sql +%%DATADIR%%/icons/16x16/icon.xpm +%%WWWDIR%%/ajax/add_monitors.php %%WWWDIR%%/ajax/alarm.php +%%WWWDIR%%/ajax/console.php %%WWWDIR%%/ajax/control.php %%WWWDIR%%/ajax/event.php %%WWWDIR%%/ajax/log.php @@ -6106,12 +6186,8 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/ajax/stream.php %%WWWDIR%%/ajax/zone.php %%WWWDIR%%/api/.editorconfig -%%WWWDIR%%/api/.gitattributes -%%WWWDIR%%/api/.gitignore -%%WWWDIR%%/api/.htaccess %%WWWDIR%%/api/CONTRIBUTING.md %%WWWDIR%%/api/README.md -%%WWWDIR%%/api/app/.htaccess %%WWWDIR%%/api/app/Config/Schema/db_acl.php %%WWWDIR%%/api/app/Config/Schema/db_acl.sql %%WWWDIR%%/api/app/Config/Schema/i18n.php @@ -6140,12 +6216,15 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/app/Controller/ControlsController.php %%WWWDIR%%/api/app/Controller/EventsController.php %%WWWDIR%%/api/app/Controller/FramesController.php +%%WWWDIR%%/api/app/Controller/GroupsController.php %%WWWDIR%%/api/app/Controller/HostController.php %%WWWDIR%%/api/app/Controller/LogsController.php %%WWWDIR%%/api/app/Controller/MonitorsController.php %%WWWDIR%%/api/app/Controller/PagesController.php %%WWWDIR%%/api/app/Controller/ServersController.php %%WWWDIR%%/api/app/Controller/StatesController.php +%%WWWDIR%%/api/app/Controller/StorageController.php +%%WWWDIR%%/api/app/Controller/UsersController.php %%WWWDIR%%/api/app/Controller/ZonePresetsController.php %%WWWDIR%%/api/app/Controller/ZonesController.php %%WWWDIR%%/api/app/Model/AppModel.php @@ -6153,14 +6232,19 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/app/Model/Control.php %%WWWDIR%%/api/app/Model/Event.php %%WWWDIR%%/api/app/Model/Frame.php +%%WWWDIR%%/api/app/Model/Group.php %%WWWDIR%%/api/app/Model/Host.php %%WWWDIR%%/api/app/Model/Log.php %%WWWDIR%%/api/app/Model/Monitor.php %%WWWDIR%%/api/app/Model/Server.php %%WWWDIR%%/api/app/Model/State.php +%%WWWDIR%%/api/app/Model/Storage.php %%WWWDIR%%/api/app/Model/User.php %%WWWDIR%%/api/app/Model/Zone.php %%WWWDIR%%/api/app/Model/ZonePreset.php +%%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/Model/Behavior/EnumBehavior.php +%%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/composer.json +%%WWWDIR%%/api/app/Plugin/CakePHP-Enum-Behavior/readme.md %%WWWDIR%%/api/app/Plugin/Crud/CONTRIBUTING.md %%WWWDIR%%/api/app/Plugin/Crud/Console/Command/TranslationsShell.php %%WWWDIR%%/api/app/Plugin/Crud/Controller/Component/CrudComponent.php @@ -6236,6 +6320,12 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/app/View/Events/json/view.ctp %%WWWDIR%%/api/app/View/Events/xml/index.ctp %%WWWDIR%%/api/app/View/Events/xml/view.ctp +%%WWWDIR%%/api/app/View/Groups/json/edit.ctp +%%WWWDIR%%/api/app/View/Groups/json/index.ctp +%%WWWDIR%%/api/app/View/Groups/json/view.ctp +%%WWWDIR%%/api/app/View/Groups/xml/edit.ctp +%%WWWDIR%%/api/app/View/Groups/xml/index.ctp +%%WWWDIR%%/api/app/View/Groups/xml/view.ctp %%WWWDIR%%/api/app/View/Helper/AppHelper.php %%WWWDIR%%/api/app/View/Layouts/Emails/html/default.ctp %%WWWDIR%%/api/app/View/Layouts/Emails/text/default.ctp @@ -6251,9 +6341,11 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/app/View/Logs/index.ctp %%WWWDIR%%/api/app/View/Logs/json/index.ctp %%WWWDIR%%/api/app/View/Logs/view.ctp +%%WWWDIR%%/api/app/View/Monitors/json/add.ctp %%WWWDIR%%/api/app/View/Monitors/json/edit.ctp %%WWWDIR%%/api/app/View/Monitors/json/index.ctp %%WWWDIR%%/api/app/View/Monitors/json/view.ctp +%%WWWDIR%%/api/app/View/Monitors/xml/add.ctp %%WWWDIR%%/api/app/View/Monitors/xml/edit.ctp %%WWWDIR%%/api/app/View/Monitors/xml/index.ctp %%WWWDIR%%/api/app/View/Monitors/xml/view.ctp @@ -6264,6 +6356,12 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/app/View/Servers/xml/edit.ctp %%WWWDIR%%/api/app/View/Servers/xml/index.ctp %%WWWDIR%%/api/app/View/Servers/xml/view.ctp +%%WWWDIR%%/api/app/View/Users/add.ctp +%%WWWDIR%%/api/app/View/Users/json/index.ctp +%%WWWDIR%%/api/app/View/Users/json/view.ctp +%%WWWDIR%%/api/app/View/Users/login.ctp +%%WWWDIR%%/api/app/View/Users/xml/index.ctp +%%WWWDIR%%/api/app/View/Users/xml/view.ctp %%WWWDIR%%/api/app/View/View/Configs/json/edit.ctp %%WWWDIR%%/api/app/View/View/Configs/json/index.ctp %%WWWDIR%%/api/app/View/View/Configs/json/view.ctp @@ -6383,7 +6481,6 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/app/vendor/composer/installers/tests/Composer/Installers/Test/PiwikInstallerTest.php %%WWWDIR%%/api/app/vendor/composer/installers/tests/Composer/Installers/Test/TestCase.php %%WWWDIR%%/api/app/vendor/composer/installers/tests/bootstrap.php -%%WWWDIR%%/api/app/webroot/.htaccess %%WWWDIR%%/api/app/webroot/css/cake.generic.css %%WWWDIR%%/api/app/webroot/favicon.ico %%WWWDIR%%/api/app/webroot/img/cake.icon.png @@ -6477,7 +6574,6 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/form.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/index.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/default/views/view.ctp -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/.htaccess %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php @@ -6492,13 +6588,26 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/email.php.default %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/routes.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Templates/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.bat %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/AppController.php +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/Component/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Lib/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/AppModel.php +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Plugin/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Vendor/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp @@ -6515,10 +6624,17 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/index.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/.htaccess +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/cache/models/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/cache/persistent/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/cache/views/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/logs/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/sessions/empty +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/tmp/tests/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/favicon.ico +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/files/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.icon.png %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-error-icon.png @@ -6526,6 +6642,7 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-pass-icon.png %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-skip-icon.png %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/index.php +%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/js/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/test.php %%WWWDIR%%/api/lib/Cake/Console/cake %%WWWDIR%%/api/lib/Cake/Console/cake.bat @@ -6561,6 +6678,7 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Controller/Controller.php %%WWWDIR%%/api/lib/Cake/Controller/Scaffold.php %%WWWDIR%%/api/lib/Cake/Core/App.php +%%WWWDIR%%/api/lib/Cake/Core/CakeObject.php %%WWWDIR%%/api/lib/Cake/Core/CakePlugin.php %%WWWDIR%%/api/lib/Cake/Core/Configure.php %%WWWDIR%%/api/lib/Cake/Core/Object.php @@ -6718,9 +6836,9 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/Case/Controller/PagesControllerTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Core/AppTest.php +%%WWWDIR%%/api/lib/Cake/Test/Case/Core/CakeObjectTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Core/CakePluginTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Core/ConfigureTest.php -%%WWWDIR%%/api/lib/Cake/Test/Case/Core/ObjectTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php @@ -6802,7 +6920,6 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SanitizeTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SecurityTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Utility/SetTest.php -%%WWWDIR%%/api/lib/Cake/Test/Case/Utility/StringTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Utility/ValidationTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/Utility/XmlTest.php %%WWWDIR%%/api/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php @@ -6953,11 +7070,18 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/Fixture/UnsignedFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UserFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidNativeFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidNativeTagFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidNativeTreeFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidTagFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidTreeFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeitemFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php +%%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/UuidportfolioFixture.php %%WWWDIR%%/api/lib/Cake/Test/Fixture/rss.xml %%WWWDIR%%/api/lib/Cake/Test/Fixture/sample.xml @@ -6984,9 +7108,11 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test2.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/SampleShell.php +%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/Task/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/classes/test_object.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/views/admin_edit.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/AppController.php +%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/Component/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/PagesController.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestAppsErrorController.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestConfigsController.php @@ -7100,9 +7226,11 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php +%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php +%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginEmailComponent.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php @@ -7157,7 +7285,9 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php +%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php +%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/View/Layouts/Emails/text/default.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/Utility/TestAppEngine.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Vendor/Test/MyTest.php @@ -7241,6 +7371,7 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/xml/index.ctp +%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Scaffolds/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/index.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/json/index.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Elements/test_element.ctp @@ -7261,6 +7392,7 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/theme.js %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/pdfs/theme_test.pdf %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/space image.text +%%WWWDIR%%/api/lib/Cake/Test/test_app/tmp/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/img/cake.power.gif %%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/theme_webroot.css %%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/webroot_test.css @@ -7360,23 +7492,34 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/cgi-bin/nph-zms %%WWWDIR%%/cgi-bin/zms %%WWWDIR%%/css/bootstrap.min.css +%%WWWDIR%%/css/bootstrap.min.css.map %%WWWDIR%%/css/overlay.css %%WWWDIR%%/css/reset.css %%WWWDIR%%/css/spinner.css +%%WWWDIR%%/fonts/MaterialIcons-Regular.eot +%%WWWDIR%%/fonts/MaterialIcons-Regular.ttf +%%WWWDIR%%/fonts/MaterialIcons-Regular.woff +%%WWWDIR%%/fonts/MaterialIcons-Regular.woff2 %%WWWDIR%%/fonts/glyphicons-halflings-regular.eot %%WWWDIR%%/fonts/glyphicons-halflings-regular.svg %%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf %%WWWDIR%%/fonts/glyphicons-halflings-regular.woff %%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2 +%%WWWDIR%%/fonts/license.md %%WWWDIR%%/graphics/favicon.ico -%%WWWDIR%%/graphics/spinner.gif -%%WWWDIR%%/graphics/transparent.gif +%%WWWDIR%%/graphics/spinner.png +%%WWWDIR%%/graphics/transparent.png +%%WWWDIR%%/includes/Control.php %%WWWDIR%%/includes/Event.php +%%WWWDIR%%/includes/Filter.php %%WWWDIR%%/includes/Frame.php +%%WWWDIR%%/includes/Group.php %%WWWDIR%%/includes/Monitor.php +%%WWWDIR%%/includes/MontageLayout.php %%WWWDIR%%/includes/Server.php %%WWWDIR%%/includes/Storage.php %%WWWDIR%%/includes/actions.php +%%WWWDIR%%/includes/auth.php %%WWWDIR%%/includes/config.php %%WWWDIR%%/includes/control_functions.php %%WWWDIR%%/includes/csrf/LICENSE.txt @@ -7392,10 +7535,12 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/js/logger.js %%WWWDIR%%/js/mootools.ext.js %%WWWDIR%%/js/overlay.js +%%WWWDIR%%/js/videojs.zoomrotate.js %%WWWDIR%%/lang/big5_big5.php %%WWWDIR%%/lang/cn_zh.php %%WWWDIR%%/lang/cs_cz.php %%WWWDIR%%/lang/de_de.php +%%WWWDIR%%/lang/default.php %%WWWDIR%%/lang/dk_dk.php %%WWWDIR%%/lang/en_gb.php %%WWWDIR%%/lang/en_us.php @@ -7414,13 +7559,52 @@ share/man/man8/zoneminder-zmx10.pl.8.gz %%WWWDIR%%/lang/ru_ru.php %%WWWDIR%%/lang/se_se.php %%WWWDIR%%/lang/updateLangs.php -%%WWWDIR%%/skins/classic/css/classic/control.css +%%WWWDIR%%/robots.txt +%%WWWDIR%%/skins/classic/css/base/export.css +%%WWWDIR%%/skins/classic/css/base/jquery-ui-theme.css +%%WWWDIR%%/skins/classic/css/base/skin.css *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812082228.wB8MS6Om006814>