head 1.2; access; symbols pkgsrc-2020Q2:1.1.0.42 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.22 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.44 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.40 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.38 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.36 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.34 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.32 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.30 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.28 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.26 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.24 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.20 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.18 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.16 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.14 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.12 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.10 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.8 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.6 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.4 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.2; locks; strict; comment @# @; 1.2 date 2020.08.25.16.42.21; author gdt; state dead; branches; next 1.1; commitid AWi8aZUk2bUCTslC; 1.1 date 2015.04.10.02.58.49; author dsainty; state Exp; branches 1.1.2.1; next ; commitid C84nmgWLupt2uZgy; 1.1.2.1 date 2015.04.10.02.58.49; author hiramatsu; state dead; branches; next 1.1.2.2; commitid f73vVLbCJTHyoRiy; 1.1.2.2 date 2015.04.24.16.07.10; author hiramatsu; state Exp; branches; next ; commitid f73vVLbCJTHyoRiy; desc @@ 1.2 log @security/zoneminder: Update to 1.29.0 This is the last version that supports autoconf, and this update is only because it's a reasonable benefit/cost tradeoff as an intermediaate step. Tested on netbsd-9/earmv7hf-el. Upstream chanages: many bug fixes and improvements zoneminder API Multiserver limted ONVIF support See more at https://github.com/ZoneMinder/zoneminder/releases/tag/v1.29.0-rc2 and before and after. Note that when updating, one must run zmupdate to modify the db schema. @ text @$NetBSD: patch-src_zm_ffmpeg_camera_cpp,v 1.1 2015/04/10 02:58:49 dsainty Exp $ Replace the non-portable pthread_tryjoin_np() with pthread_join(), assessed as a reasonable patch by the original author. https://github.com/ZoneMinder/ZoneMinder/commit/7534557533a7347f4901a139c2b698e76aaf164d --- src/zm_ffmpeg_camera.cpp.orig 2015-04-09 12:31:49.987117639 +1200 +++ src/zm_ffmpeg_camera.cpp 2015-04-09 14:40:54.059009480 +1200 @@@@ -120,7 +120,7 @@@@ void *retval = 0; int ret; - ret = pthread_tryjoin_np(mReopenThread, &retval); + ret = pthread_join(mReopenThread, &retval); if (ret != 0){ Error("Could not join reopen thread."); } @ 1.1 log @Patch up some Linux-specific assumptions in the code. Fixes build under NetBSD. Bump PKGREVISION for switch to ffmpeg2, and some portability changes that aren't expected to affect functionality. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-src_zm_ffmpeg_camera_cpp was added on branch pkgsrc-2015Q1 on 2015-04-24 16:07:10 +0000 @ text @d1 18 @ 1.1.2.2 log @Pullup ticket #4654 - requested by dsainty security/zoneminder: security update Revisions pulled up: - security/zoneminder/Makefile 1.18 - security/zoneminder/distinfo 1.7 - security/zoneminder/MESSAGE 1.3 - security/zoneminder/PLIST 1.4 - security/zoneminder/patches/patch-Makefile_am 1.3 - security/zoneminder/patches/patch-configure_ac 1.4 - security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm 1.2 - security/zoneminder/patches/patch-scripts_zm_in 1.3 - security/zoneminder/patches/patch-src_Makefile_am 1.3 - security/zoneminder/patches/patch-src_zm__thread.h 1.4 - security/zoneminder/patches/patch-src_zm__timer.h 1.3 - security/zoneminder/patches/patch-src_zm__utils.h 1.2 - security/zoneminder/patches/patch-src_zm_ffmpeg_camera_cpp 1.1 - security/zoneminder/patches/patch-src_zm_remote_camera_h 1.4 - security/zoneminder/patches/patch-src_zm_signal_cpp 1.1 - security/zoneminder/patches/patch-src_zm_signal_h deleted - security/zoneminder/patches/patch-src_zmf_cpp deleted --- Module Name: pkgsrc Committed By: dsainty Date: Sun Apr 5 08:51:08 UTC 2015 Modified Files: pkgsrc/security/zoneminder: MESSAGE Makefile PLIST distinfo pkgsrc/security/zoneminder/patches: patch-Makefile_am patch-configure_ac patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm patch-scripts_zm_in patch-src_Makefile_am patch-src_zm__thread.h patch-src_zm__timer.h patch-src_zm__utils.h patch-src_zm_remote_camera_h Removed Files: pkgsrc/security/zoneminder/patches: patch-src_zm_signal_h patch-src_zmf_cpp Log Message: Update ZoneMinder from 1.25.0 to 1.28.1. Numerous changes, documented at: https://github.com/ZoneMinder/ZoneMinder/releases Addresses two security advisories: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.28.0 http://secunia.com/advisories/62918/ Pkgsrc changes: patch-src_zm_signal_h is no longer necessary because zm_signal.h uses HAVE_EXECINFO_H. patch-src_zmf_cpp appears to be applied upstream. patch-configure_ac no longer needs to set PATH_BUILD to PREFIX/share/zoneminder, so that zmupdate.pl can locate the database build scripts as installed files. Upstream has now implemented this via the ZM_PATH_DATA entry in zm.conf, and adds a ZM_PATH_DATA/db subdirectory. src/Makefile.am no longer setuid's zmfix, as zmfix was removed from ZoneMinder 1.26.6. The code now uses clock_gettime(), which on some systems (like Linux), calls for -lrt. Since the build system isn't aware of this, but Pkgsrc is, just set PTHREAD_AUTO_VARS=yes. The PHP code now uses PDO for DB access, but it looks like there are some straggling dependencies on the raw MySQL driver, so both are pulled in. --- Module Name: pkgsrc Committed By: dsainty Date: Tue Apr 7 12:32:59 UTC 2015 Modified Files: pkgsrc/security/zoneminder: Makefile Log Message: NetBSD's tar (6.1) does an exit(1) on the source archive, complaining: Invalid header, starting valid header search. As a workaround: EXTRACT_USING=gtar --- Module Name: pkgsrc Committed By: dsainty Date: Tue Apr 7 12:54:36 UTC 2015 Modified Files: pkgsrc/security/zoneminder: distinfo pkgsrc/security/zoneminder/patches: patch-configure_ac Log Message: Recognise lower-case "netbsd" as BSD. NB: This doesn't fix the threads portability issues yet for NetBSD, but gets through configuration. --- Module Name: pkgsrc Committed By: dsainty Date: Fri Apr 10 02:53:20 UTC 2015 Modified Files: pkgsrc/security/zoneminder: Makefile Log Message: New ZoneMinder supports the newer ffmpeg APIs, so switch the ffmpeg dependency from ffmpeg010 to ffmpeg2. --- Module Name: pkgsrc Committed By: dsainty Date: Fri Apr 10 02:58:49 UTC 2015 Modified Files: pkgsrc/security/zoneminder: Makefile distinfo pkgsrc/security/zoneminder/patches: patch-src_zm__thread.h patch-src_zm__timer.h Added Files: pkgsrc/security/zoneminder/patches: patch-src_zm_ffmpeg_camera_cpp patch-src_zm_signal_cpp Log Message: Patch up some Linux-specific assumptions in the code. Fixes build under NetBSD. Bump PKGREVISION for switch to ffmpeg2, and some portability changes that aren't expected to affect functionality. --- Module Name: pkgsrc Committed By: dsainty Date: Wed Apr 22 15:13:44 UTC 2015 Modified Files: pkgsrc/security/zoneminder: Makefile Log Message: Fix paths in two missed installed scripts. The intention of zmsystemctl.pl is to use bin/pkexec to allow the apache user to start and stop the ZoneMinder services on operating systems using systemd and newer versions of Polkit than Pkgsrc currently has. If the base OS doesn't use systemd (E.g. anything not Linux), this file shouldn't be used anyway. In Pkgsrc we ignore the potentially absent pkexec interpreter in this file. If the base OS uses systemd, it probably also has pkexec in its base installation. Bump PKGREVISION. @ text @a0 18 $NetBSD: patch-src_zm_ffmpeg_camera_cpp,v 1.1 2015/04/10 02:58:49 dsainty Exp $ Replace the non-portable pthread_tryjoin_np() with pthread_join(), assessed as a reasonable patch by the original author. https://github.com/ZoneMinder/ZoneMinder/commit/7534557533a7347f4901a139c2b698e76aaf164d --- src/zm_ffmpeg_camera.cpp.orig 2015-04-09 12:31:49.987117639 +1200 +++ src/zm_ffmpeg_camera.cpp 2015-04-09 14:40:54.059009480 +1200 @@@@ -120,7 +120,7 @@@@ void *retval = 0; int ret; - ret = pthread_tryjoin_np(mReopenThread, &retval); + ret = pthread_join(mReopenThread, &retval); if (ret != 0){ Error("Could not join reopen thread."); } @