zoneminder: Begin upgrade to 1.32 series

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: zoneminder: Begin upgrade to 1.32 series
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Tue, 27 Sep 2022 11:24:58 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Sep 27 07:24:58 2022 -0400
Changeset:	f2112295043fba4f9e274addb4791f0dfdaff851

Modified Files:
	zoneminder/Makefile
	zoneminder/TODO
	zoneminder/distinfo
	zoneminder/patches/patch-CMakeLists.txt
Added Files:
	zoneminder/COMMIT_MSG
Removed Files:
	zoneminder/patches/patch-src_zmf.cpp

Log Message:
zoneminder: Begin upgrade to 1.32 series

It remains to merge most patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f2112295043fba4f9e274addb4791f0dfdaff851

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/COMMIT_MSG                   | 61 +++++++++++++++++++++++++++++++++
 zoneminder/Makefile                     |  4 +--
 zoneminder/TODO                         |  7 ++++
 zoneminder/distinfo                     |  9 +++--
 zoneminder/patches/patch-CMakeLists.txt | 12 ++++---
 zoneminder/patches/patch-src_zmf.cpp    | 15 --------
 6 files changed, 80 insertions(+), 28 deletions(-)

diffs:
diff --git a/zoneminder/COMMIT_MSG b/zoneminder/COMMIT_MSG
new file mode 100644
index 0000000000..6e3048323a
--- /dev/null
+++ b/zoneminder/COMMIT_MSG
@@ -0,0 +1,61 @@
+security/zoneminder: Update to 1.32.3
+
+Welcome to 2018.
+
+Packaging changes:
+  zmf removed upstream; drop patch
+
+
+Upstream NEWS:
+
+    A re-worked web console, compared to the previous 1.30.4 release
+
+    record to mp4 container
+
+    record audio
+
+    support for php 7.x
+
+    Arbitrary website as a non-recordable, interactive monitor.
+
+    Updated Montage Review
+
+    Options-> Paths moved into config files under conf.d folder
+
+    Multiple storage paths are supported. See Options -> Storage
+
+    The old method of bind mounting the event folder is no longer needed nor recommended
+
+    Additional system statistics on the web console
+
+    Raspberry pi OMX hardware h264 decoder support
+
+    Event thumbnails play video on mouseover
+
+    Drag and drop sorting of monitors
+
+    Scalability improvements
+
+    Support for Redhat el6 distros and clones has been removed
+
+Upstream upgrade notes:
+
+    The upgrade scripts will take longer than normal to run,
+    especially if you have many events
+
+    Your previous settings on the Options -> Paths tab have been moved
+    into the file zmcustom.conf which is typically found under
+    /etc/zm/conf.d
+
+    Consider migrating your events folder from the former bind mount
+    method to the new method under Options -> Storage
+
+    You should no longer have symbolic links in your webroot
+    folder. This resolves a long standing security issue.
+
+    The Apache config file has changed. This config file may or may
+    not update automatically. This depends on what distro you are
+    running and how you installed ZoneMinder. Please refer to the
+    documentation for your distro to learn what specific steps are
+    required.
+
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index 26e974b867..dff05988c2 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -1,8 +1,6 @@
 # $NetBSD: Makefile,v 1.42 2019/06/18 12:36:59 gdt Exp $
 
-#VERSION=	1.36.7
-VERSION=	1.30.5
-PKGREVISION=	2
+VERSION=	1.32.3
 # Sometimes the distfile unpacks to ZoneMinder and sometimes zoneminder.
 NAME_DIST=	ZoneMinder
 NAME_LOWER=	zoneminder
diff --git a/zoneminder/TODO b/zoneminder/TODO
index fa5874b68a..824bf87fca 100644
--- a/zoneminder/TODO
+++ b/zoneminder/TODO
@@ -7,3 +7,10 @@
   push to pkgsrc
 
 2) evaluate patches and push upstream
+
+3) 1.32 notes:
+
+  https://github.com/ZoneMinder/zoneminder/releases/tag/1.32.0
+  https://github.com/ZoneMinder/zoneminder/issues/2078#issuecomment-395094624
+
+  new deps: pecl-apcu, file-slurp, format-human-bytes
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index dd136142cc..d7bd85f98d 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -3,10 +3,10 @@ $NetBSD: distinfo,v 1.12 2018/07/14 15:03:57 gdt Exp $
 BLAKE2s (FriendsOfCake-crud-v3.0.10.tar.gz) = e04238f274c6ce5b27f4a106630ef224fe6cb61a8172d32474e8660af7adea81
 SHA512 (FriendsOfCake-crud-v3.0.10.tar.gz) = 2f60557f2c783bb448e06c1ca40b536a1d7d5f3caf0626fa6716a28f808492d4799e238f16c022571be96921105b074b6763920fd7b9cc77b76d17ceadae2040
 Size (FriendsOfCake-crud-v3.0.10.tar.gz) = 72960 bytes
-BLAKE2s (ZoneMinder-1.30.5.tar.gz) = eae68bdd260feaf529154de3173805dd318c7bc22ca0a76341f330d04d06bf1b
-SHA512 (ZoneMinder-1.30.5.tar.gz) = f423b79726357c277814c9346445b695fc1b0f9cff61847003d6286bc36f92aab8ab35689e1a3552fb60394793c478fefb4c8fa3861a1dd06a2655b018c6a52a
-Size (ZoneMinder-1.30.5.tar.gz) = 9936584 bytes
-SHA1 (patch-CMakeLists.txt) = 4cf38ed2818c2000863c4b6587c5b5f64b0c1127
+BLAKE2s (ZoneMinder-1.32.3.tar.gz) = 7b82f17c3584afc882f0dbfc6ccdbaa9f5659cbd6aa0e4cf90f03f3a94a23ec7
+SHA512 (ZoneMinder-1.32.3.tar.gz) = 1226127a1352ebc6e80ba0cbdb3ecbae27cf64a75b7652abc651e1440b709456f71f5a7f700e37575a8f4c8cd2a0904e5be7721f61ae040365b60ed05447a9c8
+Size (ZoneMinder-1.32.3.tar.gz) = 10656921 bytes
+SHA1 (patch-CMakeLists.txt) = cfc565e597d48c6b3c54e1aba53e5f1b4e19f34a
 SHA1 (patch-cmake_Modules_Pod2Man.cmake) = f0a1462037fc63fa9f35d0595f4f50946f5518e7
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in) = b8f508abcd5451da73092070a302b99d1fd59def
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = bded373e318cd074b92853165d5ca38d23bdea5f
@@ -28,6 +28,5 @@ SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
 SHA1 (patch-src_zm_signal_cpp) = 6863c33f22d40fd9dabdab7ba7056d56fae9d418
 SHA1 (patch-src_zm_thread_cpp) = 3d59ce545ee5ce16417b635e4b963867f4e15741
 SHA1 (patch-src_zmc_cpp) = 925a6fa9ab28b54b5ba0bc5fd657a16c1e59d46e
-SHA1 (patch-src_zmf.cpp) = 73affd763e7f37109e607cc6474fb8e87f783bdf
 SHA1 (patch-src_zmu.cpp) = a238a58cf383e847b69031ec06c929c960cafc6e
 SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6
diff --git a/zoneminder/patches/patch-CMakeLists.txt b/zoneminder/patches/patch-CMakeLists.txt
index 4909ab0993..e8bed1eadc 100644
--- a/zoneminder/patches/patch-CMakeLists.txt
+++ b/zoneminder/patches/patch-CMakeLists.txt
@@ -12,8 +12,8 @@ exist, so don't insist on librt being present.  Fixes the build on MacOS.
 Let Pkgsrc be responsible for zm.conf into examples, rather than overwriting
 the existing configuration file.
 
---- CMakeLists.txt.orig	2019-02-23 04:38:47.000000000 +1300
-+++ CMakeLists.txt	2022-01-19 22:51:36.000000000 +1300
+--- CMakeLists.txt.orig	2018-12-08 14:22:36.000000000 +0000
++++ CMakeLists.txt
 @@ -4,7 +4,7 @@
  #
  cmake_minimum_required (VERSION 2.8.7)
@@ -23,7 +23,7 @@ the existing configuration file.
  # make API version a minor of ZM version
  set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
  
-@@ -226,7 +226,9 @@
+@@ -282,7 +282,9 @@ check_include_file("ucontext.h" HAVE_UCO
  check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
  check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
  check_function_exists("syscall" HAVE_SYSCALL)
@@ -33,7 +33,7 @@ the existing configuration file.
  check_function_exists("posix_memalign" HAVE_POSIX_MEMALIGN)
  check_type_size("siginfo_t" HAVE_SIGINFO_T)
  check_type_size("ucontext_t" HAVE_UCONTEXT_T)
-@@ -237,7 +239,7 @@
+@@ -293,7 +295,7 @@ if (UNIX)
      include (CheckLibraryExists)
      CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
      if(NOT HAVE_CLOCK_GETTIME)
@@ -42,12 +42,14 @@ the existing configuration file.
      else(NOT HAVE_CLOCK_GETTIME)
          list(APPEND ZM_BIN_LIBS "-lrt")
      endif(NOT HAVE_CLOCK_GETTIME)
-@@ -733,7 +735,7 @@
+@@ -891,8 +893,8 @@ else(zmconfgen_result EQUAL 0)
  endif(zmconfgen_result EQUAL 0)
  
  # Install zm.conf
 -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
+-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/conf.d/" DESTINATION "${ZM_CONFIG_SUBDIR}" PATTERN "*.in" EXCLUDE)
 +#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
++#install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/conf.d/" DESTINATION "${ZM_CONFIG_SUBDIR}" PATTERN "*.in" EXCLUDE)
  
  # Uninstall target
  configure_file(
diff --git a/zoneminder/patches/patch-src_zmf.cpp b/zoneminder/patches/patch-src_zmf.cpp
deleted file mode 100644
index 2ebefa7b56..0000000000
--- a/zoneminder/patches/patch-src_zmf.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_zmf.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $
-
-\todo Explain
-
---- src/zmf.cpp.orig	2019-02-22 15:38:47.000000000 +0000
-+++ src/zmf.cpp
-@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
-     Debug( 1, "Got image, writing to %s", path );
- 
-     FILE *fd = 0;
--    if ( (fd = fopen( path, "w" )) < 0 )
-+    if ( (fd = fopen( path, "w" )) == 0 )
-     {
-       Error( "Can't fopen '%s': %s", path, strerror(errno) );
-       exit( -1 );
Prev by Date: innernet: import version 1.5.5
Next by Date: zoneminder: Update progress
Previous by Thread: innernet: import version 1.5.5
Next by Thread: zoneminder: Update progress
Indexes:
Home | Main Index | Thread Index | Old Index