Attachment 211852 Details for Bug 243795 – Proposed patch for 1.34.3

[patch] Proposed patch for 1.34.3

zoneminder-1.34.3.patch (text/plain), 21.52 KB, created by Emanuel Haupt on 2020-02-23 11:49:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emanuel Haupt

Created: 2020-02-23 11:49:32 UTC

Size: 21.52 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 526914)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zoneminder
>-PORTVERSION=	1.32.3
>-PORTREVISION=	5
>+PORTVERSION=	1.34.3
> CATEGORIES=	multimedia
> 
> MAINTAINER=	bsd@abinet.ru
>@@ -10,7 +9,7 @@
> 
> LICENSE=	GPLv2
> 
>-ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS=	aarch64 amd64 i386
> 
> ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
> 		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
>@@ -34,6 +33,8 @@
> RUN_DEPENDS=	${ZM_DEPENDS} \
> 		sudo:security/sudo \
> 		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
>+		p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
>+		p5-Data-Entropy>=0:security/p5-Data-Entropy \
> 		zip:archivers/zip
> 
> USES=		cmake:insource,noninja jpeg mysql perl5 php shebangfix ssl
>@@ -42,10 +43,8 @@
> 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
>+USE_PHP=	json pdo_mysql session gd sockets ctype opcache openssl hash
> 
>-CONFLICTS_INSTALL=	zoneminder-h264
>-
> OPTIONS_DEFINE=	NLS V4L DOCS
> OPTIONS_SUB=	yes
> NLS_USES=	gettext
>@@ -69,9 +68,10 @@
> 		scripts/zmvideo.pl.in \
> 		scripts/zmwatch.pl.in \
> 		scripts/zmx10.pl.in \
>-		scripts/zmonvif-probe.pl.in
>+		scripts/zmonvif-probe.pl.in \
>+		scripts/zmrecover.pl.in
> 
>-PORTDOCS=	AUTHORS BUGS ChangeLog INSTALL NEWS README.FreeBSD TODO
>+PORTDOCS=	README.FreeBSD
> 
> CMAKE_ARGS+=	-DZM_PERL_MM_PARMS=INSTALLDIRS=site \
> 		-DZM_CONFIG_DIR=${PREFIX}/etc \
>@@ -90,6 +90,10 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000
>+    EXTRA_PATCHES=	${PATCHDIR}/extra-patch-CMakeLists.txt
>+.endif
>+
> RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
> 
> PKGMESSAGE=	${WRKDIR}/pkg-message
>@@ -100,7 +104,6 @@
> 	${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
> 
> post-patch:
> # Avoid conflict with C++20 <version> by adding .txt suffix
>Index: distinfo
>===================================================================
>--- distinfo	(revision 526914)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1544308211
>-SHA256 (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 9a7e61c529a6269ff0344403369b160b8c8da48615c4172377c465da0b0074b1
>-SIZE (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 10656921
>+TIMESTAMP = 1582458454
>+SHA256 (zoneminder-zoneminder-1.34.3_GH0.tar.gz) = cc98dacc94847b1727aeaa7fb324387277133c881c789920706c661713544091
>+SIZE (zoneminder-zoneminder-1.34.3_GH0.tar.gz) = 10385065
> 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
>Index: files/README.FreeBSD
>===================================================================
>--- files/README.FreeBSD	(revision 526914)
>+++ files/README.FreeBSD	(working copy)
>@@ -175,7 +175,7 @@
> 3. Start ZoneMinder
> 	service zoneminder start
> 
>-Upgrading from www/zoneminder 1.30.x or www/zoneminder-h264
>+Upgrading from www/zoneminder 1.32.x
> =====================================================
> 
> Before proceeding to upgrade sequence listed above,
>@@ -182,9 +182,3 @@
> 
> 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.
>Index: files/extra-patch-CMakeLists.txt
>===================================================================
>--- files/extra-patch-CMakeLists.txt	(nonexistent)
>+++ files/extra-patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,12 @@
>+--- CMakeLists.txt.orig	2020-01-28 17:16:34.156808000 +0000
>++++ CMakeLists.txt
>+@@ -104,6 +104,9 @@
>+     ENDIF(ZM_SYSTEM_PROC MATCHES "^arm")
>+ ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
>+ 
>++# FreeBSD 12 contains own bcrypt implementation
>++add_definitions(-D__SKIP_GNU)
>++
>+ # Modules that we need:
>+ include (GNUInstallDirs)
>+ include (CheckIncludeFile)
>
>Property changes on: files/extra-patch-CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 526914)
>+++ files/patch-CMakeLists.txt	(nonexistent)
>@@ -1,23 +0,0 @@
>---- CMakeLists.txt.orig	2018-10-13 18:36:15 UTC
>-+++ CMakeLists.txt
>-@@ -127,7 +127,8 @@ mark_as_advanced( 
>-     ZM_PATH_ARP 
>-     ZM_CONFIG_DIR
>-     ZM_CONFIG_SUBDIR
>--    ZM_SYSTEMD)
>-+    ZM_SYSTEMD
>-+    ZM_MANPAGE_DEST_PREFIX)
>- 
>- 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"))
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-cmake_Modules_Pod2Man.cmake
>===================================================================
>--- files/patch-cmake_Modules_Pod2Man.cmake	(revision 526914)
>+++ files/patch-cmake_Modules_Pod2Man.cmake	(nonexistent)
>@@ -1,20 +0,0 @@
>---- 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)
>- 
>
>Property changes on: files/patch-cmake_Modules_Pod2Man.cmake
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-scripts_CMakeLists.txt
>===================================================================
>--- files/patch-scripts_CMakeLists.txt	(revision 526914)
>+++ files/patch-scripts_CMakeLists.txt	(nonexistent)
>@@ -1,11 +0,0 @@
>---- scripts/CMakeLists.txt.orig	2018-10-13 18:36:15 UTC
>-+++ scripts/CMakeLists.txt
>-@@ -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
>
>Property changes on: files/patch-scripts_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_CMakeLists.txt
>===================================================================
>--- files/patch-src_CMakeLists.txt	(revision 526914)
>+++ files/patch-src_CMakeLists.txt	(nonexistent)
>@@ -1,11 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-src_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_zm__video.cpp
>===================================================================
>--- files/patch-src_zm__video.cpp	(revision 526914)
>+++ files/patch-src_zm__video.cpp	(nonexistent)
>@@ -1,17 +0,0 @@
>---- src/zm_video.cpp.orig	2018-12-08 14:22:36 UTC
>-+++ src/zm_video.cpp
>-@@ -455,11 +455,12 @@ int X264MP4Writer::x264encodeloop(bool bFlush) {
>- 
>-       /* Write the sample */
>-       if ( !buffer.empty() ) {
>-+        unsigned int bufSize = buffer.size();
>-         if ( !MP4WriteSample(
>-               mp4h,
>-               mp4vtid,
>--              buffer.extract(buffer.size()),
>--              buffer.size(),
>-+              buffer.extract(bufSize),
>-+              bufSize,
>-               duration,
>-               offset,
>-               prevKeyframe) ) {
>
>Property changes on: files/patch-src_zm__video.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 526914)
>+++ pkg-plist	(working copy)
>@@ -7,6 +7,7 @@
> bin/zmfilter.pl
> bin/zmonvif-probe.pl
> bin/zmpkg.pl
>+bin/zmrecover.pl
> bin/zmstats.pl
> bin/zmtelemetry.pl
> bin/zmtrack.pl
>@@ -2980,6 +2981,7 @@
> %%SITE_PERL%%/ZoneMinder/ConfigData.pm.in.bak
> %%SITE_PERL%%/ZoneMinder/Control.pm
> %%SITE_PERL%%/ZoneMinder/Control/3S.pm
>+%%SITE_PERL%%/ZoneMinder/Control/Amcrest_HTTP.pm
> %%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm
> %%SITE_PERL%%/ZoneMinder/Control/DCS3415.pm
> %%SITE_PERL%%/ZoneMinder/Control/Dahua.pm
>@@ -2990,6 +2992,7 @@
> %%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm
> %%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm
> %%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm
>+%%SITE_PERL%%/ZoneMinder/Control/FOSCAMR2C.pm
> %%SITE_PERL%%/ZoneMinder/Control/Floureon.pm
> %%SITE_PERL%%/ZoneMinder/Control/HikVision.pm
> %%SITE_PERL%%/ZoneMinder/Control/IPCAMIOS.pm
>@@ -3007,6 +3010,7 @@
> %%SITE_PERL%%/ZoneMinder/Control/Reolink.pm
> %%SITE_PERL%%/ZoneMinder/Control/SPP1802SWPTZ.pm
> %%SITE_PERL%%/ZoneMinder/Control/SkyIPCam7xx.pm
>+%%SITE_PERL%%/ZoneMinder/Control/Sony.pm
> %%SITE_PERL%%/ZoneMinder/Control/Toshiba_IK_WB11A.pm
> %%SITE_PERL%%/ZoneMinder/Control/Trendnet.pm
> %%SITE_PERL%%/ZoneMinder/Control/Visca.pm
>@@ -3018,6 +3022,7 @@
> %%SITE_PERL%%/ZoneMinder/Database.pm
> %%SITE_PERL%%/ZoneMinder/Event.pm
> %%SITE_PERL%%/ZoneMinder/Filter.pm
>+%%SITE_PERL%%/ZoneMinder/Frame.pm
> %%SITE_PERL%%/ZoneMinder/General.pm
> %%SITE_PERL%%/ZoneMinder/Logger.pm
> %%SITE_PERL%%/ZoneMinder/Memory.pm
>@@ -5988,6 +5993,7 @@
> %%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz
>+%%PERL5_MAN3%%/ZoneMinder::Control::Amcrest_HTTP.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::AxisV2.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::DCS3415.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::Dahua.3.gz
>@@ -5997,6 +6003,7 @@
> %%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::FOSCAMR2C.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::Floureon.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::IPCC7210W.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::M8640.3.gz
>@@ -6008,6 +6015,7 @@
> %%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::Sony.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
>@@ -6018,6 +6026,7 @@
> %%PERL5_MAN3%%/ZoneMinder::Database.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Event.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Filter.3.gz
>+%%PERL5_MAN3%%/ZoneMinder::Frame.3.gz
> %%PERL5_MAN3%%/ZoneMinder::General.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Logger.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Memory.3.gz
>@@ -6035,7 +6044,6 @@
> %%PERL5_MAN3%%/ZoneMinder::Trigger::Channel::Unix.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Trigger::Connection::Example.3.gz
>-share/applications/zoneminder.desktop
> man/man8/zoneminder-zma.8.gz
> man/man8/zoneminder-zmaudit.pl.8.gz
> man/man8/zoneminder-zmc.8.gz
>@@ -6045,6 +6053,7 @@
> 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-zmrecover.pl.8.gz
> man/man8/zoneminder-zmstats.pl.8.gz
> man/man8/zoneminder-zmsystemctl.pl.8.gz
> man/man8/zoneminder-zmtelemetry.pl.8.gz
>@@ -6055,6 +6064,7 @@
> man/man8/zoneminder-zmvideo.pl.8.gz
> man/man8/zoneminder-zmwatch.pl.8.gz
> man/man8/zoneminder-zmx10.pl.8.gz
>+share/applications/zoneminder.desktop
> %%DATADIR%%/db/triggers.sql
> %%DATADIR%%/db/zm_create.sql
> %%DATADIR%%/db/zm_update-0.0.1.sql
>@@ -6176,6 +6186,25 @@
> %%DATADIR%%/db/zm_update-1.32.1.sql
> %%DATADIR%%/db/zm_update-1.32.2.sql
> %%DATADIR%%/db/zm_update-1.32.3.sql
>+%%DATADIR%%/db/zm_update-1.33.0.sql
>+%%DATADIR%%/db/zm_update-1.33.1.sql
>+%%DATADIR%%/db/zm_update-1.33.10.sql
>+%%DATADIR%%/db/zm_update-1.33.11.sql
>+%%DATADIR%%/db/zm_update-1.33.12.sql
>+%%DATADIR%%/db/zm_update-1.33.13.sql
>+%%DATADIR%%/db/zm_update-1.33.14.sql
>+%%DATADIR%%/db/zm_update-1.33.15.sql
>+%%DATADIR%%/db/zm_update-1.33.16.sql
>+%%DATADIR%%/db/zm_update-1.33.2.sql
>+%%DATADIR%%/db/zm_update-1.33.3.sql
>+%%DATADIR%%/db/zm_update-1.33.4.sql
>+%%DATADIR%%/db/zm_update-1.33.5.sql
>+%%DATADIR%%/db/zm_update-1.33.6.sql
>+%%DATADIR%%/db/zm_update-1.33.7.sql
>+%%DATADIR%%/db/zm_update-1.33.8.sql
>+%%DATADIR%%/db/zm_update-1.33.9.sql
>+%%DATADIR%%/db/zm_update-1.34.0.sql
>+%%DATADIR%%/db/zm_update-1.34.1.sql
> %%DATADIR%%/icons/16x16/icon.xpm
> %%WWWDIR%%/ajax/add_monitors.php
> %%WWWDIR%%/ajax/alarm.php
>@@ -6344,10 +6373,12 @@
> %%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/daemon_control.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/daemon_control.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
>@@ -7518,9 +7549,40 @@
> %%WWWDIR%%/includes/Group.php
> %%WWWDIR%%/includes/Monitor.php
> %%WWWDIR%%/includes/MontageLayout.php
>+%%WWWDIR%%/includes/Object.php
> %%WWWDIR%%/includes/Server.php
> %%WWWDIR%%/includes/Storage.php
>-%%WWWDIR%%/includes/actions.php
>+%%WWWDIR%%/includes/actions/bandwidth.php
>+%%WWWDIR%%/includes/actions/console.php
>+%%WWWDIR%%/includes/actions/control.php
>+%%WWWDIR%%/includes/actions/controlcap.php
>+%%WWWDIR%%/includes/actions/controlcaps.php
>+%%WWWDIR%%/includes/actions/device.php
>+%%WWWDIR%%/includes/actions/devices.php
>+%%WWWDIR%%/includes/actions/donate.php
>+%%WWWDIR%%/includes/actions/event.php
>+%%WWWDIR%%/includes/actions/eventdetail.php
>+%%WWWDIR%%/includes/actions/events.php
>+%%WWWDIR%%/includes/actions/filter.php
>+%%WWWDIR%%/includes/actions/function.php
>+%%WWWDIR%%/includes/actions/group.php
>+%%WWWDIR%%/includes/actions/groups.php
>+%%WWWDIR%%/includes/actions/login.php
>+%%WWWDIR%%/includes/actions/logout.php
>+%%WWWDIR%%/includes/actions/monitor.php
>+%%WWWDIR%%/includes/actions/monitors.php
>+%%WWWDIR%%/includes/actions/montage.php
>+%%WWWDIR%%/includes/actions/options.php
>+%%WWWDIR%%/includes/actions/privacy.php
>+%%WWWDIR%%/includes/actions/server.php
>+%%WWWDIR%%/includes/actions/settings.php
>+%%WWWDIR%%/includes/actions/shutdown.php
>+%%WWWDIR%%/includes/actions/state.php
>+%%WWWDIR%%/includes/actions/storage.php
>+%%WWWDIR%%/includes/actions/user.php
>+%%WWWDIR%%/includes/actions/version.php
>+%%WWWDIR%%/includes/actions/zone.php
>+%%WWWDIR%%/includes/actions/zones.php
> %%WWWDIR%%/includes/auth.php
> %%WWWDIR%%/includes/config.php
> %%WWWDIR%%/includes/control_functions.php
>@@ -7533,6 +7595,7 @@
> %%WWWDIR%%/includes/functions.php
> %%WWWDIR%%/includes/lang.php
> %%WWWDIR%%/includes/logger.php
>+%%WWWDIR%%/includes/session.php
> %%WWWDIR%%/index.php
> %%WWWDIR%%/js/Server.js
> %%WWWDIR%%/js/logger.js
>@@ -7539,8 +7602,8 @@
> %%WWWDIR%%/js/mootools.ext.js
> %%WWWDIR%%/js/overlay.js
> %%WWWDIR%%/js/videojs.zoomrotate.js
>+%%WWWDIR%%/lang/ba_ba.php
> %%WWWDIR%%/lang/big5_big5.php
>-%%WWWDIR%%/lang/ba_ba.php
> %%WWWDIR%%/lang/cn_zh.php
> %%WWWDIR%%/lang/cs_cz.php
> %%WWWDIR%%/lang/de_de.php
>@@ -7568,6 +7631,7 @@
> %%WWWDIR%%/skins/classic/css/base/skin.css
> %%WWWDIR%%/skins/classic/css/base/views/console.css
> %%WWWDIR%%/skins/classic/css/base/views/control.css
>+%%WWWDIR%%/skins/classic/css/base/views/controlcap.css
> %%WWWDIR%%/skins/classic/css/base/views/controlcaps.css
> %%WWWDIR%%/skins/classic/css/base/views/devices.css
> %%WWWDIR%%/skins/classic/css/base/views/download.css
>@@ -7713,7 +7777,7 @@
> %%WWWDIR%%/skins/classic/js/font/vjs.eot
> %%WWWDIR%%/skins/classic/js/font/vjs.ttf
> %%WWWDIR%%/skins/classic/js/font/vjs.woff
>-%%WWWDIR%%/skins/classic/js/jquery-1.11.3.js
>+%%WWWDIR%%/skins/classic/js/jquery-2.2.4.js
> %%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/AUTHORS.txt
> %%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/LICENSE.txt
> %%WWWDIR%%/skins/classic/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
>@@ -7774,7 +7838,6 @@
> %%WWWDIR%%/skins/classic/views/function.php
> %%WWWDIR%%/skins/classic/views/group.php
> %%WWWDIR%%/skins/classic/views/groups.php
>-%%WWWDIR%%/skins/classic/views/image-ffmpeg.php
> %%WWWDIR%%/skins/classic/views/js/add_monitors.js
> %%WWWDIR%%/skins/classic/views/js/console.js
> %%WWWDIR%%/skins/classic/views/js/console.js.php
>@@ -7816,7 +7879,6 @@
> %%WWWDIR%%/skins/classic/views/js/options.js.php
> %%WWWDIR%%/skins/classic/views/js/plugin.js
> %%WWWDIR%%/skins/classic/views/js/postlogin.js.php
>-%%WWWDIR%%/skins/classic/views/js/privacy.js
> %%WWWDIR%%/skins/classic/views/js/report_event_audit.js
> %%WWWDIR%%/skins/classic/views/js/server.js
> %%WWWDIR%%/skins/classic/views/js/state.js
>@@ -7854,6 +7916,7 @@
> %%WWWDIR%%/skins/classic/views/report_event_audit.php
> %%WWWDIR%%/skins/classic/views/server.php
> %%WWWDIR%%/skins/classic/views/settings.php
>+%%WWWDIR%%/skins/classic/views/shutdown.php
> %%WWWDIR%%/skins/classic/views/state.php
> %%WWWDIR%%/skins/classic/views/stats.php
> %%WWWDIR%%/skins/classic/views/status.php
>@@ -7870,6 +7933,27 @@
> %%WWWDIR%%/tools/mootools/mootools-core.js
> %%WWWDIR%%/tools/mootools/mootools-more-1.6.0.js
> %%WWWDIR%%/tools/mootools/mootools-more.js
>+%%WWWDIR%%/vendor/autoload.php
>+%%WWWDIR%%/vendor/composer/ClassLoader.php
>+%%WWWDIR%%/vendor/composer/LICENSE
>+%%WWWDIR%%/vendor/composer/autoload_classmap.php
>+%%WWWDIR%%/vendor/composer/autoload_files.php
>+%%WWWDIR%%/vendor/composer/autoload_namespaces.php
>+%%WWWDIR%%/vendor/composer/autoload_psr4.php
>+%%WWWDIR%%/vendor/composer/autoload_real.php
>+%%WWWDIR%%/vendor/composer/autoload_static.php
>+%%WWWDIR%%/vendor/composer/installed.json
>+%%WWWDIR%%/vendor/firebase/php-jwt/LICENSE
>+%%WWWDIR%%/vendor/firebase/php-jwt/README.md
>+%%WWWDIR%%/vendor/firebase/php-jwt/composer.json
>+%%WWWDIR%%/vendor/firebase/php-jwt/src/BeforeValidException.php
>+%%WWWDIR%%/vendor/firebase/php-jwt/src/ExpiredException.php
>+%%WWWDIR%%/vendor/firebase/php-jwt/src/JWT.php
>+%%WWWDIR%%/vendor/firebase/php-jwt/src/SignatureInvalidException.php
>+%%WWWDIR%%/vendor/ircmaxell/password-compat/LICENSE.md
>+%%WWWDIR%%/vendor/ircmaxell/password-compat/composer.json
>+%%WWWDIR%%/vendor/ircmaxell/password-compat/lib/password.php
>+%%WWWDIR%%/vendor/ircmaxell/password-compat/version-test.php
> %%WWWDIR%%/views/archive.php
> %%WWWDIR%%/views/image.php
> %%WWWDIR%%/views/view_video.php

Actions: View | Diff

Attachments on bug 243795: 211273 | 211274 | 211275 | 211852 | 211853