Update to 1.34.3

PR:		243795
Submitted by:	bsd@abinet.ru (maintainer)

multimedia/zoneminder/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneminder
-PORTVERSION=	1.32.3
+PORTVERSION=	1.34.3
-PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	bsd@abinet.ru
@@ -10,7 +9,7 @@ COMMENT=	Complete security camera solution, fully web based with image analysis
 
 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 @@ LIB_DEPENDS=	libx264.so:multimedia/libx264 \
 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,9 +43,7 @@ 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
+USE_PHP=	json pdo_mysql session gd sockets ctype opcache openssl hash
-
-CONFLICTS_INSTALL=	zoneminder-h264
 
 OPTIONS_DEFINE=	NLS V4L DOCS
 OPTIONS_SUB=	yes
@@ -69,9 +68,10 @@ SHEBANG_FILES=	scripts/zmaudit.pl.in \
 		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 @@ CMAKE_ARGS+=	-DZM_PERL_MM_PARMS=INSTALLDIRS=site \
 
 .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 @@ post-extract:
 	${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

multimedia/zoneminder/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1544308211
+TIMESTAMP = 1582458454
-SHA256 (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 9a7e61c529a6269ff0344403369b160b8c8da48615c4172377c465da0b0074b1
+SHA256 (zoneminder-zoneminder-1.34.3_GH0.tar.gz) = cc98dacc94847b1727aeaa7fb324387277133c881c789920706c661713544091
-SIZE (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 10656921
+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

multimedia/zoneminder/files/README.FreeBSD

@@ -175,16 +175,10 @@ Upgrades
 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,
 
 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.

multimedia/zoneminder/files/extra-patch-CMakeLists.txt

@@ -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)

multimedia/zoneminder/files/patch-CMakeLists.txt

@@ -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"))

multimedia/zoneminder/files/patch-cmake_Modules_Pod2Man.cmake

@@ -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)
- 

multimedia/zoneminder/files/patch-scripts_CMakeLists.txt

@@ -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

multimedia/zoneminder/files/patch-src_CMakeLists.txt

@@ -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)

multimedia/zoneminder/files/patch-src_zm__video.cpp

@@ -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) ) {