+ case "${usergroup_phase}" in
+ local run_cmd
+ run_cmd=run_su
+ shift
+ run_su /opt/pkg/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent PHP_VERSION_REQD=74 MYSQL_VERSION_REQD=mariadb106 PKG_APACHE=apache24 WRKLOG=/tmp/bulklog/zoneminder-1.30.5nb3/work.log
+ su pbulk -c '"$@"' make /opt/pkg/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent PHP_VERSION_REQD=74 MYSQL_VERSION_REQD=mariadb106 PKG_APACHE=apache24 WRKLOG=/tmp/bulklog/zoneminder-1.30.5nb3/work.log
=> Bootstrap dependency digest>=20211023: found digest-20220214
=> Checksum BLAKE2s OK for FriendsOfCake-crud-v3.0.10.tar.gz
=> Checksum SHA512 OK for FriendsOfCake-crud-v3.0.10.tar.gz
=> Checksum BLAKE2s OK for ZoneMinder-1.30.5.tar.gz
=> Checksum SHA512 OK for ZoneMinder-1.30.5.tar.gz
===> Installing dependencies for zoneminder-1.30.5nb3
==========================================================================
The supported build options for zoneminder are:
apache
The currently selected options are:
apache
You can select which build options to use by setting PKG_DEFAULT_OPTIONS
or the following variable. Its current value is shown:
PKG_OPTIONS.zoneminder (not defined)
==========================================================================
==========================================================================
The following variables will affect the build process of this package,
zoneminder-1.30.5nb3. Their current value is shown below:
* APACHE_GROUP = www
* APACHE_USER = www
* JPEG_DEFAULT = jpeg
* MYSQL_VERSION_DEFAULT = mariadb106
* PKG_APACHE_DEFAULT = apache24
* SSLBASE (defined)
* SSLCERTBUNDLE (not defined)
* SSLCERTS = /etc/opt/pkg/openssl/certs
* SSLDIR = /etc/opt/pkg/openssl
* SSLKEYS = /etc/opt/pkg/openssl/private
* VARBASE = /var/opt/pkg
* ZM_HTTPD_CGIBIN = libexec/zoneminder/cgi-bin
Based on these variables, the following variables have been set:
* APACHE_PKG_PREFIX = ap24
* JPEGBASE (defined, but empty)
* JPEG_TYPE = jpeg
* MYSQL_VERSION = mariadb106
* PKG_APACHE = apache24
You may want to abort the process now with CTRL-C and change the value
of variables in the first group before continuing. Be sure to run
`/opt/pkg/bin/bmake clean' after the changes.
==========================================================================
=> Tool dependency glib2-tools-[0-9]*: found glib2-tools-2.74.4
=> Tool dependency mktools-[0-9]*: found mktools-20220614
=> Tool dependency cmake>=2.8.1nb1: found cmake-3.25.1
=> Tool dependency gmake>=3.81: found gmake-4.4
=> Tool dependency perl>=5.6.0: found perl-5.36.0
=> Tool dependency pkgconf-[0-9]*: found pkgconf-1.8.0
=> Tool dependency cwrappers>=20150314: found cwrappers-20220403
=> Tool dependency checkperms>=1.1: found checkperms-1.12
=> Build dependency apache>=2.4.54nb1<2.5: found apache-2.4.54nb3
=> Full dependency p5-Archive-Zip-[0-9]*: found p5-Archive-Zip-1.68nb2
=> Full dependency p5-Date-Manip-[0-9]*: found p5-Date-Manip-6.88
=> Full dependency p5-Device-SerialPort-[0-9]*: found p5-Device-SerialPort-1.04nb14
=> Full dependency p5-DBD-mysql-[0-9]*: found p5-DBD-mysql-4.050nb5
=> Full dependency p5-MIME-Lite-[0-9]*: found p5-MIME-Lite-3.033nb1
=> Full dependency p5-MIME-tools-[0-9]*: found p5-MIME-tools-5.510
=> Full dependency p5-Net-SFTP-Foreign-[0-9]*: found p5-Net-SFTP-Foreign-1.93nb1
=> Full dependency p5-PHP-Serialization-[0-9]*: found p5-PHP-Serialization-0.34nb12
=> Full dependency p5-Sys-Mmap-[0-9]*: found p5-Sys-Mmap-0.20nb1
=> Full dependency p5-libwww-[0-9]*: found p5-libwww-6.61nb1
=> Full dependency ap24-php74-[0-9]*: found ap24-php74-7.4.33nb9
=> Full dependency php74-gd-[0-9]*: found php74-gd-7.4.33nb3
=> Full dependency php74-pdo_mysql-[0-9]*: found php74-pdo_mysql-7.4.33nb2
=> Full dependency php74-sockets-[0-9]*: found php74-sockets-7.4.33
=> Full dependency ffmpeg2>=2.8.20nb1: found ffmpeg2-2.8.20nb6
=> Full dependency bzip2>=1.0.3: found bzip2-1.0.8
=> Full dependency zlib>=1.2.3: found zlib-1.2.13
=> Full dependency jpeg>=9: found jpeg-9e
=> Full dependency mariadb-client>=10.6.8nb1<10.7.0: found mariadb-client-10.6.11
=> Full dependency openssl>=1.1.1pnb1: found openssl-1.1.1s
=> Full dependency glib2>=2.70.2: found glib2-2.74.4
=> Full dependency pcre>=8.30nb1: found pcre-8.45
=> Full dependency curl>=7.86.0nb1: found curl-7.87.0
===> Overriding tools for zoneminder-1.30.5nb3
===> Extracting for zoneminder-1.30.5nb3
/bin/cp /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/files/zoneminder.conf /home/pbulk/build/security/zoneminder/work/zoneminder-1.30.5/zoneminder.conf
/usr/bin/mv /home/pbulk/build/security/zoneminder/work/zoneminder-1.30.5/version /home/pbulk/build/security/zoneminder/work/zoneminder-1.30.5/version.txt
===> Patching for zoneminder-1.30.5nb3
=> Applying pkgsrc patches for zoneminder-1.30.5nb3
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-CMakeLists.txt
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-CMakeLists.txt
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-CMakeLists.txt,v 1.1 2022/09/27 01:20:39 gdt Exp $
|
|Don't have a file called "version", to avoid conflict with C++20 <version>.
|
|CMake will detect the MacOS 6-argument sendfile() support and configure
|HAVE_SENDFILE, but the code itself doesn't support this interface. So don't
|probe for HAVE_SENDFILE if we HAVE_SENDFILE6_SUPPORT.
|
|Just because librt doesn't exist does not mean that clock_gettime() doesn't
|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
--------------------------
Patching file CMakeLists.txt using Plan A...
Hunk #1 succeeded at 4.
Hunk #2 succeeded at 226.
Hunk #3 succeeded at 239.
Hunk #4 succeeded at 735.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-cmake_Modules_Pod2Man.cmake
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-cmake_Modules_Pod2Man.cmake
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-cmake_Modules_Pod2Man.cmake,v 1.1 2022/09/27 01:20:39 gdt Exp $
|
|Change man install path to pkgsrc norms.
|
|Not reported upstream until we are caught up. Then, the bug is not
|the value, but that it isn't configurable via a cmake command-line
|argument.
|
|--- cmake/Modules/Pod2Man.cmake.orig 2019-02-22 15:38:47.000000000 +0000
|+++ cmake/Modules/Pod2Man.cmake
--------------------------
Patching file cmake/Modules/Pod2Man.cmake using Plan A...
Hunk #1 succeeded at 58.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in,v 1.1 2022/09/27 01:20:39 gdt Exp $
|
|Inhibit a couple of "phone home" options that are enabled by default. These
|should be opt-in rather than opt-out.
|
|The ConfigData.pm module determines what the default setting is for new
|options during an upgrade as well as on an initial installation.
|
|--- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.orig 2022-01-23 22:09:24.000000000 +1300
|+++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2022-01-23 22:11:28.000000000 +1300
--------------------------
Patching file scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in using Plan A...
Hunk #1 succeeded at 2787.
Hunk #2 succeeded at 2805.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm,v 1.3 2022/09/27 01:20:39 gdt Exp $
|
|Perl doesn't really support "> /dev/null", so just capture into $output.
|
|% ktruss -i perl -e 'qx(does-not-exist >/dev/null 2>&1);'|egrep 'dup2.*2'
|does-not-exist: not found
|% ktruss -i perl -e 'qx(does-not-exist 2>&1);'|egrep 'dup2.*2'
| 16954 1 perl dup2(0x1, 0x2) = 2
|
|The problem is that, whilst Perl supports 2>&1 internally (and does not use
|the shell at all) if there is no other redirection, it does not support file
|redirection - it defers that (and therefore necessarily must also defer the
|stderr redirection) to the shell. If the system's shell happens to report
|"Not found" errors before redirection is processed (E.g. NetBSD shell) then
|the stderr redirection is happening too late to be captured.
|
|That leads to unintended errors reported on stderr - primarily if sudo is not
|installed on the system, or not in the $PATH.
|
|Use the -m parameter to su, as ZM_WEB_USER shouldn't require a login shell.
|
|--- scripts/ZoneMinder/lib/ZoneMinder/General.pm.orig 2019-02-22 15:38:47.000000000 +0000
|+++ scripts/ZoneMinder/lib/ZoneMinder/General.pm
--------------------------
Patching file scripts/ZoneMinder/lib/ZoneMinder/General.pm using Plan A...
Hunk #1 succeeded at 129.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm,v 1.2 2022/09/27 01:20:39 gdt Exp $
|
|Adjust for (more) modern perl.
|
|Not submitted upstream because pkgsrc is woefully out of date.
|
|--- scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm.orig 2016-02-03 18:40:30.000000000 +0000
|+++ scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
--------------------------
Patching file scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm using Plan A...
Hunk #1 succeeded at 158.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_zm_in
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_zm_in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-scripts_zm_in,v 1.5 2022/09/27 01:20:39 gdt Exp $
|
|/etc/rc.d/init.d/functions doesn't commonly exist.
|
|The LOCKFILE feature appears unused, and requires a /var/lock/subsys directory
|we don't have.
|
|--- scripts/zm.in.orig 2016-02-03 18:40:30.000000000 +0000
|+++ scripts/zm.in
--------------------------
Patching file scripts/zm.in using Plan A...
Hunk #1 succeeded at 7.
Hunk #2 succeeded at 54.
Hunk #3 succeeded at 66.
Hunk #4 succeeded at 107.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_zmpkg_pl_in
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-scripts_zmpkg_pl_in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-scripts_zmpkg_pl_in,v 1.1 2022/09/27 01:20:39 gdt Exp $
|
|The systemd check in zmpkg.pl does not work, even on systems that use systemd.
|It fails to start, eventually timing out, if there is any parent process
|between zmpkg.pl and systemd or init - such as /etc/init.d/zoneminder
|
|But everything does seem to work ok from systemd without this roundabout code
|anyway, so just inhibit it.
|
|--- scripts/zmpkg.pl.in.orig 2021-09-26 20:28:10.324733138 +1300
|+++ scripts/zmpkg.pl.in 2021-09-26 20:28:30.414613144 +1300
--------------------------
Patching file scripts/zmpkg.pl.in using Plan A...
Hunk #1 succeeded at 168.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__event.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__event.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__event.cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|zoneminder uses %ld for time_t, which is troublesome on NetBSD arm and
|presumably i386. (Note that there are multiple patch files for the
|same issue.)
|
|Not yet sent upstream -- needs update to latest release first, where
|it might be fixed, or the patch might simply need to be rebased.
|Also, this fix is expedient and probably a better fix is appropriate.
|
|Avoid sendfile code when sendfile doesn't exist.
|
|--- src/zm_event.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_event.cpp
--------------------------
Patching file src/zm_event.cpp using Plan A...
Hunk #1 succeeded at 36.
Hunk #2 succeeded at 82.
Hunk #3 succeeded at 183.
Hunk #4 succeeded at 196.
Hunk #5 succeeded at 527.
Hunk #6 succeeded at 578.
Hunk #7 succeeded at 666.
Hunk #8 succeeded at 1224.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__monitor.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__monitor.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__monitor.cpp,v 1.3 2022/09/27 01:20:39 gdt Exp $
|
|The shmat() error return is (apparently) -1 as a pointer. Some compilers
|(E.g. clang on MacOS) refuse to consider testing if a pointer is less than
|zero as legal code. Fix compilation by converting to explicit tests for
|particular values that might make sense.
|
|Avoid type error (suseconds_t is not long). To be addressed upstream once caught up.
|
|--- src/zm_monitor.cpp.orig 2019-02-23 04:38:47.000000000 +1300
|+++ src/zm_monitor.cpp 2022-01-19 21:56:47.000000000 +1300
--------------------------
Patching file src/zm_monitor.cpp using Plan A...
Hunk #1 succeeded at 160.
Hunk #2 succeeded at 194.
Hunk #3 succeeded at 3175.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__rtp__ctrl.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__rtp__ctrl.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__rtp__ctrl.h,v 1.2 2022/09/27 01:20:39 gdt Exp $
|
|Work around:
| zm_rtp_ctrl.h:128:31: error: flexible array member 'RtpCtrlThread::RtcpPacket::<unnamed union>::Bye::srcN' in an otherwise empty 'struct RtpCtrlThread::RtcpPacket::<unnamed union>::Bye'
|
|Not reported upstream because pkgsrc is out of date; to be done if this is not resolved by updating.
|
|--- src/zm_rtp_ctrl.h.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_rtp_ctrl.h
--------------------------
Patching file src/zm_rtp_ctrl.h using Plan A...
Hunk #1 succeeded at 125.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__rtp__source.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__rtp__source.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__rtp__source.cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|Fix type issue with tv_sec; see earlier patches.
|
|--- src/zm_rtp_source.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_rtp_source.cpp
--------------------------
Patching file src/zm_rtp_source.cpp using Plan A...
Hunk #1 succeeded at 197.
Hunk #2 succeeded at 207.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__thread.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__thread.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__thread.h,v 1.6 2022/09/27 01:20:39 gdt Exp $
|
|Fix build with Clang.
|
|pthread_t is opaque, and under NetBSD is a pointer. It's being abused here,
|but the value is only used for logging, and casting pthread_self() is more
|portable than syscall(SYS_gettid).
|
|\todo Fix correctly upstream.
|
|--- src/zm_thread.h.orig 2019-02-23 04:38:47.000000000 +1300
|+++ src/zm_thread.h 2022-01-18 00:14:30.000000000 +1300
--------------------------
Patching file src/zm_thread.h using Plan A...
Hunk #1 succeeded at 22.
Hunk #2 succeeded at 56.
Hunk #3 succeeded at 219.
Hunk #4 succeeded at 232.
Hunk #5 succeeded at 271.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__timer.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__timer.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__timer.h,v 1.5 2022/09/27 01:20:39 gdt Exp $
|
|Fix build with Clang.
|
|pthread_t is opaque, and under NetBSD is a pointer. It's being abused here,
|but the value is only used for logging, and casting pthread_self() is more
|portable than syscall(SYS_gettid).
|
|--- src/zm_timer.h.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_timer.h
--------------------------
Patching file src/zm_timer.h using Plan A...
Hunk #1 succeeded at 33.
Hunk #2 succeeded at 53.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__utils.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__utils.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__utils.cpp,v 1.3 2022/09/27 01:20:39 gdt Exp $
|
|\todo Explain
|
|--- src/zm_utils.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_utils.cpp
--------------------------
Patching file src/zm_utils.cpp using Plan A...
Hunk #1 succeeded at 76.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__utils.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm__utils.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm__utils.h,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|\todo Explain
|
|--- src/zm_utils.h.orig 2015-04-01 17:20:39.840273017 +1300
|+++ src/zm_utils.h 2015-04-01 17:28:57.376293647 +1300
--------------------------
Patching file src/zm_utils.h using Plan A...
Hunk #1 succeeded at 33.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_comms_cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_comms_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm_comms_cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|Don't attempt to include headers that don't exist.
|
|--- src/zm_comms.cpp.orig 2016-02-03 18:40:30.000000000 +0000
|+++ src/zm_comms.cpp
--------------------------
Patching file src/zm_comms.cpp using Plan A...
Hunk #1 succeeded at 28.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_comms_h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_comms_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm_comms_h,v 1.5 2022/01/12 11:53:26 dsainty Exp $
|
|extern "C" system headers.
|
|Include missing system headers for NetBSD.
|
|To fix Linux readv/writev, back-port:
|https://github.com/ZoneMinder/zoneminder/commit/417421b1d869d1b71c8ec1a1e3b082fcede6ce58#diff-484f666f58ec13f38fa402143f2f6ad8e63a013909d3941ffbb3d66745b20c8d
|
|--- src/zm_comms.h.orig 2016-02-03 18:40:30.000000000 +0000
|+++ src/zm_comms.h
--------------------------
Patching file src/zm_comms.h using Plan A...
Hunk #1 succeeded at 22.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_logger_cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_logger_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm_logger_cpp,v 1.7 2022/09/27 01:20:39 gdt Exp $
|
|Use libgen.h for basename.
|
|Kludge around const for basename.
|
|If the system has syscall() but not SYS_gettid [E.g. NetBSD], don't attempt
|to use SYS_gettid.
|
|Fix time types (sizes).
|
|--- src/zm_logger.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_logger.cpp
--------------------------
Patching file src/zm_logger.cpp using Plan A...
Hunk #1 succeeded at 33.
Hunk #2 succeeded at 517.
Hunk #3 succeeded at 534.
Hunk #4 succeeded at 618.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_remote_camera_h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_remote_camera_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm_remote_camera_h,v 1.4 2015/04/05 08:51:08 dsainty Exp $
|
|Declare sockaddr_in.
|
|--- src/zm_remote_camera.h.orig 2015-02-05 15:52:37.000000000 +1300
|+++ src/zm_remote_camera.h 2015-04-01 17:56:10.736361360 +1300
--------------------------
Patching file src/zm_remote_camera.h using Plan A...
Hunk #1 succeeded at 23.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_signal_cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_signal_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm_signal_cpp,v 1.3 2022/09/27 01:20:39 gdt Exp $
|
|Don't assume machine-dependent IP register details are available for any
|platform except Linux. Only Linux is sure to have this style of mcontext_t.
|
|Resolves build on systems that have ucontext_t but an mcontext_t that
|doesn't look like Linux.
|
|--- src/zm_signal.cpp.orig 2019-02-23 04:38:47.000000000 +1300
|+++ src/zm_signal.cpp 2022-01-18 00:42:50.000000000 +1300
--------------------------
Patching file src/zm_signal.cpp using Plan A...
Hunk #1 succeeded at 66.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_thread_cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zm_thread_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zm_thread_cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|pthread_mutex_timedlock() is not available on NetBSD 5.0, and not required
|in ZoneMinder.
|
|Work around varying notion of an undefined mpid on pthread/not.
|
|--- src/zm_thread.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zm_thread.cpp
--------------------------
Patching file src/zm_thread.cpp using Plan A...
Hunk #1 succeeded at 72.
Hunk #2 succeeded at 86.
Hunk #3 succeeded at 234.
Hunk #4 succeeded at 315.
Hunk #5 succeeded at 344.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zmc_cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zmc_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zmc_cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|Use a more appropriate initialisation for a long, and use the definition out
|of <limits.h>, for portability.
|
|--- src/zmc.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zmc.cpp
--------------------------
Patching file src/zmc.cpp using Plan A...
Hunk #1 succeeded at 55.
Hunk #2 succeeded at 280.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zmf.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zmf.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zmf.cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|\todo Explain
|
|--- src/zmf.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zmf.cpp
--------------------------
Patching file src/zmf.cpp using Plan A...
Hunk #1 succeeded at 331.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zmu.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-src_zmu.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_zmu.cpp,v 1.4 2022/09/27 01:20:39 gdt Exp $
|
|time types
|
|--- src/zmu.cpp.orig 2019-02-22 15:38:47.000000000 +0000
|+++ src/zmu.cpp
--------------------------
Patching file src/zmu.cpp using Plan A...
Hunk #1 succeeded at 519.
Hunk #2 succeeded at 792.
Hunk #3 succeeded at 809.
done
=> Verifying /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-web_ajax_stream_php
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-upstream-trunk/security/zoneminder/patches/patch-web_ajax_stream_php
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-web_ajax_stream_php,v 1.2 2013/03/24 16:47:47 joerg Exp $
|
|http://www.zoneminder.com/forums/viewtopic.php?t=13322
|
|--- web/ajax/stream.php.orig 2011-06-27 11:14:00.000000000 +0000
|+++ web/ajax/stream.php
--------------------------
Patching file web/ajax/stream.php using Plan A...
Hunk #1 succeeded at 64 (offset 4 lines).
done
===> Creating toolchain wrappers for zoneminder-1.30.5nb3
/usr/bin/mkdir -p /home/pbulk/build/security/zoneminder/work/.buildlink/bin && /usr/bin/ln -fs ../sbin/apxs /home/pbulk/build/security/zoneminder/work/.buildlink/bin/apxs
/usr/bin/mkdir -p /home/pbulk/build/security/zoneminder/work/.buildlink/bin && /usr/bin/ln -fs apr-1-config /home/pbulk/build/security/zoneminder/work/.buildlink/bin/apr-config
/usr/bin/mkdir -p /home/pbulk/build/security/zoneminder/work/.buildlink/bin && /usr/bin/ln -fs apu-1-config /home/pbulk/build/security/zoneminder/work/.buildlink/bin/apu-config
===> Configuring for zoneminder-1.30.5nb3
=> Adjusting default paths in configuration.
=> Fixing ZoneMinder configuration file for Apache.
=> Adjusting paths in scripts.
=> Adjusting systemd pkexec perl.
/usr/bin/find /home/pbulk/build/security/zoneminder/work/zoneminder-1.30.5 -name "*.pm*.orig" -type f | /usr/bin/xargs /usr/bin/rm -f
=> Replacing Perl interpreter in scripts/zmaudit.pl.in scripts/zmcamtool.pl.in scripts/zmcontrol.pl.in scripts/zmdc.pl.in scripts/zmfilter.pl.in scripts/zmpkg.pl.in scripts/zmtelemetry.pl.in scripts/zmtrack.pl.in scripts/zmtrigger.pl.in scripts/zmupdate.pl.in scripts/zmvideo.pl.in scripts/zmwatch.pl.in scripts/zmx10.pl.in onvif/scripts/zmonvif-probe.pl zmconfgen.pl.in.
=> Fixing CMAKE_MODULE_PATH in CMakeLists.txt
=> Checking for portability problems in extracted files
CMake Deprecation Warning at CMakeLists.txt:5 (cmake_minimum_required):
Compatibility with CMake < 2.8.12 will be removed from a future version of
CMake.
Update the VERSION argument <min> value or use a ...<max> suffix to tell
CMake that the project does not need compatibility with older versions.
-- The C compiler identification is GNU 12.2.0
-- The CXX compiler identification is GNU 12.2.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /home/pbulk/build/security/zoneminder/work/.cwrapper/bin/gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /home/pbulk/build/security/zoneminder/work/.cwrapper/bin/g++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Performing Test HAVE_SENDFILE4_SUPPORT
-- Performing Test HAVE_SENDFILE4_SUPPORT - Failed
-- Performing Test HAVE_SENDFILE7_SUPPORT
-- Performing Test HAVE_SENDFILE7_SUPPORT - Failed
-- Performing Test HAVE_SENDFILE6_SUPPORT
-- Performing Test HAVE_SENDFILE6_SUPPORT - Failed
-- Looking for libv4l1-videodev.h
-- Looking for libv4l1-videodev.h - not found
-- Looking for linux/videodev.h
-- Looking for linux/videodev.h - not found
-- Looking for linux/videodev2.h
-- Looking for linux/videodev2.h - not found
-- Looking for execinfo.h
-- Looking for execinfo.h - found
-- Looking for backtrace
-- Looking for backtrace - found
-- Looking for backtrace_symbols
-- Looking for backtrace_symbols - found
-- Looking for ucontext.h
-- Looking for ucontext.h - found
-- Looking for sys/sendfile.h
-- Looking for sys/sendfile.h - found
-- Looking for sys/syscall.h
-- Looking for sys/syscall.h - found
-- Looking for syscall
-- Looking for syscall - found
-- Looking for sendfile
-- Looking for sendfile - not found
-- Looking for posix_memalign
-- Looking for posix_memalign - found
-- Looking for sys/types.h
-- Looking for sys/types.h - found
-- Looking for stdint.h
-- Looking for stdint.h - found
-- Looking for stddef.h
-- Looking for stddef.h - found
-- Check size of siginfo_t
-- Check size of siginfo_t - done
-- Check size of ucontext_t
-- Check size of ucontext_t - failed
-- Looking for clock_gettime in rt
-- Looking for clock_gettime in rt - found
-- Found ZLIB: /opt/pkg/lib/libz.so (found version "1.2.13")
-- Looking for zlib.h
-- Looking for zlib.h - found
-- Found CURL: /opt/pkg/lib/libcurl.so (found version "7.87.0")
-- Looking for curl/curl.h
-- Looking for curl/curl.h - found
-- Found JPEG: /opt/pkg/lib/libjpeg.so (found version "90")
-- Looking for include files stdio.h, jpeglib.h
-- Looking for include files stdio.h, jpeglib.h - found
-- Found OpenSSL: /opt/pkg/lib/libcrypto.so (found version "1.1.1s")
-- Looking for openssl/md5.h
-- Looking for openssl/md5.h - found
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Looking for pcre.h
-- Looking for pcre.h - found
-- Looking for mysql/mysql.h
-- Looking for mysql/mysql.h - found
-- Looking for libavformat/avformat.h
-- Looking for libavformat/avformat.h - found
-- Looking for libavcodec/avcodec.h
-- Looking for libavcodec/avcodec.h - found
-- Looking for libavdevice/avdevice.h
-- Looking for libavdevice/avdevice.h - found
-- Looking for libavutil/avutil.h
-- Looking for libavutil/avutil.h - found
-- Looking for libavutil/mathematics.h
-- Looking for libavutil/mathematics.h - found
-- Looking for libswscale/swscale.h
-- Looking for libswscale/swscale.h - found
CMake Warning (dev) at CMakeLists.txt:553 (message):
Video 4 Linux headers weren't found - Analog and USB camera support will
not be available
This warning is for project developers. Use -Wno-dev to suppress it.
-- Checking prototype MD5 for HAVE_MD5_OPENSSL - True
-- Found Perl: /home/pbulk/build/security/zoneminder/work/.tools/bin/perl (found version "5.36.0")
-- Checking for perl module Sys::Syslog
-- Checking for perl module Sys::Syslog - found at /opt/pkg/lib/perl5/5.36.0/x86_64-solaris-thread-multi-64/Sys/Syslog.pm
-- Checking for perl module DBI
-- Checking for perl module DBI - found at /opt/pkg/lib/perl5/vendor_perl/5.36.0/x86_64-solaris-thread-multi-64/DBI.pm
-- Checking for perl module DBD::mysql
-- Checking for perl module DBD::mysql - found at /opt/pkg/lib/perl5/vendor_perl/5.36.0/x86_64-solaris-thread-multi-64/DBD/mysql.pm
-- Checking for perl module Getopt::Long
-- Checking for perl module Getopt::Long - found at /opt/pkg/lib/perl5/5.36.0/Getopt/Long.pm
-- Checking for perl module Time::HiRes
-- Checking for perl module Time::HiRes - found at /opt/pkg/lib/perl5/5.36.0/x86_64-solaris-thread-multi-64/Time/HiRes.pm
-- Checking for perl module Date::Manip
-- Checking for perl module Date::Manip - found at /opt/pkg/lib/perl5/vendor_perl/5.36.0/Date/Manip.pm
-- Checking for perl module LWP::UserAgent
-- Checking for perl module LWP::UserAgent - found at /opt/pkg/lib/perl5/vendor_perl/5.36.0/LWP/UserAgent.pm
-- Checking for perl module ExtUtils::MakeMaker
-- Checking for perl module ExtUtils::MakeMaker - found at /opt/pkg/lib/perl5/5.36.0/ExtUtils/MakeMaker.pm
-- Checking for perl module Sys::Mmap
-- Checking for perl module Sys::Mmap - found at /opt/pkg/lib/perl5/vendor_perl/5.36.0/x86_64-solaris-thread-multi-64/Sys/Mmap.pm
-- Found PerlModules: TRUE
-- Using web user: www
-- Using web group: www
-- Found PkgConfig: /home/pbulk/build/security/zoneminder/work/.tools/bin/pkg-config (found version "1.8.0")
-- Checking for one of the modules 'polkit-gobject-1;polkit'
-- Checking for module 'glib-2.0'
-- Found glib-2.0, version 2.74.4
-- Found GLIB2: /opt/pkg/lib/libglib-2.0.so
-- Found Polkit: /home/pbulk/build/security/zoneminder/work/zoneminder-1.30.5/
-- Using mootools core file: mootools-core-1.4.5-compat.js
-- Using mootools more file: mootools-more-1.5.1.js
-- Optional libraries found: zlib cURL OpenSSL PCRE AVFormat AVCodec AVDevice AVUtil SWScale
-- Optional libraries not found: GCrypt GnuTLS libVLC
-- Running ZoneMinder configuration generator
Generating 'src/zm_config_defines.h'
Updating 'db/zm_create.sql'
-- ZoneMinder configuration generator completed successfully
-- Configuring done
-- Generating done
-- Build files have been written to: /home/pbulk/build/security/zoneminder/work/zoneminder-1.30.5
=> Rewrite cmake Dependencies files