pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/security/zoneminder



Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jan  5 16:02:45 UTC 2026

Modified Files:
        pkgsrc/security/zoneminder: Makefile PLIST distinfo
        pkgsrc/security/zoneminder/files: README-pkgsrc.md
        pkgsrc/security/zoneminder/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/security/zoneminder/files: upstream-PR-3914
        pkgsrc/security/zoneminder/patches:
            patch-scripts_ZoneMinder_lib_ZoneMinder_Database.pm

Log Message:
security/zoneminder: Update to 1.36.37.7

This is really the release-1.36 branch, 7 commits after 1.36.37.
Upstream has cherry-picked MariaDB fixes, and the pkgsrc default is
now MariaDB, which should just work.

GC cherry-picking of PR 3914, because those are on the upstream stable
branch now.

Rototill/gc/update README-pkgsrc.txt to catch up with years of zm changes.

Drop ZM_DIR_IMAGES as no longer used.

Clean up and improve comments in Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/security/zoneminder/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/zoneminder/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/zoneminder/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/zoneminder/files/README-pkgsrc.md
cvs rdiff -u -r1.1 -r0 pkgsrc/security/zoneminder/files/upstream-PR-3914
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/security/zoneminder/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_Database.pm

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

Modified files:

Index: pkgsrc/security/zoneminder/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.96 pkgsrc/security/zoneminder/Makefile:1.97
--- pkgsrc/security/zoneminder/Makefile:1.96    Sun Jan  4 23:29:54 2026
+++ pkgsrc/security/zoneminder/Makefile Mon Jan  5 16:02:44 2026
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.96 2026/01/04 23:29:54 gdt Exp $
+# $NetBSD: Makefile,v 1.97 2026/01/05 16:02:44 gdt Exp $
 
-VERSION=       1.36.37
+# (1st-parent) commits past 1.36.37 on release-1.36
+VERSION=       1.36.37.7
 # Distfile is ZoneMinder but package and tarball contents are zoneminder.
 NAME_DIST=     ZoneMinder
 NAME_LOWER=    zoneminder
 
 PKGNAME=       ${DISTNAME:S/${NAME_DIST}-/${NAME_LOWER}-/}
-PKGREVISION=   3
+#PKGREVISION=  0
 DISTNAME=      ${NAME_DIST}-${VERSION}
-WRKSRC=                ${WRKDIR}/${NAME_LOWER}-${VERSION}
+#WRKSRC=               ${WRKDIR}/${NAME_LOWER}-${VERSION}
+WRKSRC=                ${WRKDIR}/${NAME_LOWER}-${GITHUB_TAG}
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=${NAME_DIST}/}
 GITHUB_PROJECT=        ${NAME_DIST}
 GITHUB_TYPE=   tag
-GITHUB_TAG=    ${PKGVERSION_NOREV}
+#GITHUB_TAG=   ${PKGVERSION_NOREV}
+GITHUB_TAG=    02e750c7b395f701ea68bb05b7b94520805c59ef
 
 ## Submodules (from ZoneMinder's .gitmodules file)
 # We use a specific commit on each branch, to avoid distfile versioning woes
@@ -44,7 +47,7 @@ PKG_SUGGESTED_OPTIONS=                apache
 # for MariaDB.
 PKG_OPTIONS_REQUIRED_GROUPS+=  database
 PKG_OPTIONS_GROUP.database=    mysql mariadb
-PKG_SUGGESTED_OPTIONS+=                mysql
+PKG_SUGGESTED_OPTIONS+=                mariadb
 
 .include "../../mk/bsd.options.mk"
 
@@ -132,9 +135,6 @@ CMAKE_CONFIGURE_ARGS+=      -DZM_CONTENTDIR=$
 OWN_DIRS_PERMS+=       ${ZM_CONTENT} ${REAL_ROOT_USER} ${APACHE_GROUP} 775
 CMAKE_CONFIGURE_ARGS+= -DZM_DIR_EVENTS=${ZM_CONTENT}/events
 OWN_DIRS_PERMS+=       ${ZM_CONTENT}/events ${APACHE_USER} ${APACHE_GROUP} 775
-# \todo Understanda ZM_DIR_IMAGES.
-CMAKE_CONFIGURE_ARGS+= -DZM_DIR_IMAGES=${ZM_CONTENT}/images
-OWN_DIRS_PERMS+=       ${ZM_CONTENT}/images ${APACHE_USER} ${APACHE_GROUP} 775
 
 ## Dependencies other than perl and php.
 
@@ -227,22 +227,6 @@ ZM_PERL_PATH+=     scripts/zmx10.pl.in
 DEPENDS+=                      p5-DBD-MariaDB-[0-9]*:../../databases/p5-DBD-MariaDB
 MYSQL_VERSIONS_ACCEPTED=       mariadb118 mariadb114 mariadb1011 mariadb106 mariadb105
 CMAKE_CONFIGURE_ARGS+=         -DZM_DB_TYPE=MariaDB
-
-# Once you cross into p5-DBD-mysql 5, more changes are needed.
-# \todo Pull these into the package as patches or wait for upstream.
-#    https://github.com/ZoneMinder/zoneminder/pull/3914/
-
-# in Database.pm, comment out mysql_auto_reconnect because MariaDB doesn't have that.
-#$dbh->{mysql_auto_reconnect} = 1;
-#Fatal('Can\'t set mysql_auto_reconnect on in database connection')
-#  unless $dbh->{mysql_auto_reconnect};
-
-# add to includes/database.php: There is no pdo_MariaDB; use pdo_mysql instead.
-# $dsn = ZM_DB_TYPE;
-# if ( $dsn == 'MariaDB' ) {
-#   $dsn = 'mysql';
-# }
-
 .endif
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=                      p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql

Index: pkgsrc/security/zoneminder/PLIST
diff -u pkgsrc/security/zoneminder/PLIST:1.11 pkgsrc/security/zoneminder/PLIST:1.12
--- pkgsrc/security/zoneminder/PLIST:1.11       Sat Jan  3 19:49:04 2026
+++ pkgsrc/security/zoneminder/PLIST    Mon Jan  5 16:02:44 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2026/01/03 19:49:04 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2026/01/05 16:02:44 gdt Exp $
 bin/zm_rtsp_server
 bin/zmaudit.pl
 bin/zmc
@@ -6378,7 +6378,7 @@ share/zoneminder/db/zm_update-1.35.9.sql
 share/zoneminder/db/zm_update-1.36.16.sql
 share/zoneminder/db/zm_update-1.36.18.sql
 share/zoneminder/db/zm_update-1.36.34.sql
-share/zoneminder/db/zm_update-${PKGVERSION}.sql
+share/zoneminder/db/zm_update-1.36.37.sql
 share/zoneminder/db/zm_update-1.36.6.sql
 share/zoneminder/db/zm_update-1.36.9.sql
 share/zoneminder/fonts/default.zmfnt

Index: pkgsrc/security/zoneminder/distinfo
diff -u pkgsrc/security/zoneminder/distinfo:1.25 pkgsrc/security/zoneminder/distinfo:1.26
--- pkgsrc/security/zoneminder/distinfo:1.25    Sun Jan  4 23:29:54 2026
+++ pkgsrc/security/zoneminder/distinfo Mon Jan  5 16:02:44 2026
@@ -1,24 +1,23 @@
-$NetBSD: distinfo,v 1.25 2026/01/04 23:29:54 gdt Exp $
+$NetBSD: distinfo,v 1.26 2026/01/05 16:02:44 gdt Exp $
 
 BLAKE2s (FriendsOfCake-crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz) = 8877bf6718ecfe3cba2515629418fe5addc60cf8ce4650526b39db6a234922ad
 SHA512 (FriendsOfCake-crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz) = 
da58528686baf05385ad08079f965bce10eba6d599133ab773e9ab1f9e4b7d82cf5431b4b773317b90effb16e0b026a029bdfabe08a9ef1a5e9b94e7a1c2ea9e
 Size (FriendsOfCake-crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz) = 73086 bytes
-BLAKE2s (ZoneMinder-1.36.37.tar.gz) = db39b3312d2043091075be5fb5ce801feca2e6cbb6ba9c3621935a4d343219ac
-SHA512 (ZoneMinder-1.36.37.tar.gz) = 0ee1b3ae63e9c70cf81cc6de8f307cd65a17d2c4118d98a5967b0a12e61c4c2dd15a1f0b5b0469107738fe32ab4cb0614c1f6e8937deea7bb7e4707bb4092989
-Size (ZoneMinder-1.36.37.tar.gz) = 13971532 bytes
+BLAKE2s (ZoneMinder-1.36.37.7-02e750c7b395f701ea68bb05b7b94520805c59ef.tar.gz) = 03f1d0d287f06cac877d39fd20a827656fe775acd3f5a26c376c9a153ab60796
+SHA512 (ZoneMinder-1.36.37.7-02e750c7b395f701ea68bb05b7b94520805c59ef.tar.gz) = 
556ebb4e25e2b76e3729d72cb652d6c9b253c3f5ca43809f2a8709e286420522f05e855b74bf50eff0c0f560f8ae1f215a06f20f2da203737deed2d6fea11ed7
+Size (ZoneMinder-1.36.37.7-02e750c7b395f701ea68bb05b7b94520805c59ef.tar.gz) = 13974395 bytes
 BLAKE2s (ZoneMinder-CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz) = 4639184438becb1c33450a00e213fca9d11e92b7f2545fb701f40a664c716764
 SHA512 (ZoneMinder-CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz) = 
75f2188e548b98191c8df82fb76e918f3bda9788f541449df8fa92449ad19aa0b9c13420dd91c760e08a4d31956ad51602242ab97e3bd4460f01e99f49992453
 Size (ZoneMinder-CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz) = 3504 bytes
 BLAKE2s (ZoneMinder-RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 0feba45357a746173378193be365b164061cc9f20e84210ecfe9e991ad9971e4
 SHA512 (ZoneMinder-RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 
2f3bbd449269cba5afda3135e54cca114342956da3ce8fbfb05533ec7b1c3f75767d8b5f3d9b415254ad7b39817bc343b0790c591ef3cc64d2863819ab3a7551
 Size (ZoneMinder-RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 1396623 bytes
-SHA1 (patch-CMakeLists.txt) = dd515b905c51b67112c273d20c96394010358381
+SHA1 (patch-CMakeLists.txt) = e54c1efea0b0cc99e9bbe8f493a0fe15b2c89663
 SHA1 (patch-dep_RtspServer_src_net_EventLoop.cpp) = bf1fe79c2ba1d602adf8895f29f61f7b961eece3
 SHA1 (patch-dep_RtspServer_src_net_Socket.h) = 789e90da4bfc15d6d43d942718538385cb6dfade
 SHA1 (patch-dep_RtspServer_src_net_SocketUtil.cpp) = c566652e8e7985a705682ef960118615b6777288
 SHA1 (patch-dep_RtspServer_src_xop_rtsp.h) = 20a014ce423d19549976c2158d39c46ea6892647
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in) = 3bf4e5e8276a682695db640e6608dd14c7315320
-SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Database.pm) = 2e59b1d31c2dba9f719c60540d010ebeb216f5e9
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 996670d8a659c0624587da73f8083d9349aaa1ba
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = b3de55618915fad3d9263954db71270c800ad6f1
 SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51

Index: pkgsrc/security/zoneminder/files/README-pkgsrc.md
diff -u pkgsrc/security/zoneminder/files/README-pkgsrc.md:1.3 pkgsrc/security/zoneminder/files/README-pkgsrc.md:1.4
--- pkgsrc/security/zoneminder/files/README-pkgsrc.md:1.3       Sat Jan  3 23:25:41 2026
+++ pkgsrc/security/zoneminder/files/README-pkgsrc.md   Mon Jan  5 16:02:45 2026
@@ -9,46 +9,55 @@ hand-typing SQL UPDATE statements.
 We write /var for ${VARBASE}, /usr/pkg for ${PREFIX}, and /usr/pkg/etc
 for ${PKG_SYSCONFDIR}, without loss of generality.
 
-# pkgsrc-specific notes
+# Meta
 
-## Choice of jpeg implementation
+This README is not really debugged.  If you think it might be wrong,
+speak up.
+
+See upstream instructions at
+https://zoneminder.readthedocs.io/en/stable/installationguide/ubuntu.html
+which are for Ubuntu, but seem mostly generic.
+
+# Choice of jpeg implementation
 
 ZoneMinder claims to benefit dramatically from using libjpeg-turbo.
 Because `JPEG_DEFAULT=libjpeg-turbo` is the default setting, no action
 is required.
 
-## User and Group
+# User and Group
 
 zoneminder uses `APACHE_USER` and `APACHE_GROUP`.  These are www by
 default, but people set them to fpm for use with nginx and php_fpm.
 It is important that apache, zoneminder, and any existing directories
 all agree.
 
-# MySQL configuration and initial database creation
+See "Step 6: Set permissions", and use APACHE_GROUP.
 
-(It seems that zoneminder only works with MySQL.)
+# Choice of database
 
-Condider adding `bind-address=127.0.0.1` to `etc/my.conf`, if you are
-using mysql only for zoneminder and do not want it accessible from the
-network.
+The choices are mysql and MariaDB.  While in some sense MariaDB is a
+kind of mysql, p5-DBD has decided that it's not.  Thus there is a
+package option to choose the database.  Pay attention to the example
+config which sets `ZM_DB_TYPE` accordingly, and avoid (as always)
+unintended local divergence.
 
-See upstream instructions at
-https://zoneminder.readthedocs.io/en/stable/installationguide/ubuntu.html
-which are for Ubuntu, but seem mostly generic.
+# MySQL configuration and initial database creation
+
+Add `bind-address=127.0.0.1` to `etc/my.conf` if you are using mysql
+only for zoneminder and therefore do not want it accessible from the
+network.  Or do the equivalent for MariaDB.
 
 Specifically, see "Step 5: Configure the ZoneMinder Database".
 
 The default password is "zmpass".  You should change this to something
-else, and set `ZM_DB_PASS` in
-e.g. `/usr/pkg/etc/zm/conf.d/zmcustom.conf`.
+else, and set `ZM_DB_PASS` in `/usr/pkg/etc/zm/conf.d/zmcustom.conf`.
 
-# Other setup
-
-See "Step 6: Set permissions", and use APACHE_GROUP.
+# PHP
 
 See "Step 9: Edit Timezone in PHP".  Otherwise, access to streams will
-fail.  See https://github.com/ZoneMinder/ZoneMinder/issues/1552 for
-more information.
+fail because authentication hashes will mismatch.  See
+https://github.com/ZoneMinder/ZoneMinder/issues/1552 for more
+information.
  
 # Web setup
 
@@ -62,8 +71,8 @@ and expire.  headers is default on.  Ena
 module does not make sense, but upstream maybe implies that you
 should.
 
-For now One needs to use prefork instead of event with cgid, because
-php is built without threads.
+One used to have to use prefork instead of event with cgid, because
+php was built without threads.  Now, other MPMs might work.
 
 Zoneminder installs
 /usr/pkg/share/examples/zoneminder/apache/httpd-zoneminder.conf,
@@ -87,74 +96,56 @@ file.  Likely one would use php_fpm; Mak
 In theory `zmpkg.pl start` should start everything.  In practice, the
 first `zmdc.pl start` invocation does start the daemon but then fails
 to exit, hanging the startup process.  While there is an attempt to
-avoid this in `zmpkg.pl`, it is likely necessary to kill the hanging
-start script, and thus to write a script to do so, to enable reliable
-starting.  This is likely an upstream issue, to be debugged after
-pkgsrc is up to date.
-
-# Upgrading from previous versions
-
-As always, backup everything, diff all configs from upstream before
-and minimize, save deltas, and merge to new upstreams keeping intended
-changes.  This is going to be worse than most upgrades.
+avoid this in `zmpkg.pl`, it is for now necessary to kill the hanging
+start script and thus to write a script to do so, to enable reliable
+starting.  See `start-watchdog.sh`, not yet validated.  This is likely
+an upstream issue, to be debugged after pkgsrc is up to date.
+
+# Upgrading
+
+For upgrading from previous stable versions: as always, backup
+everything, diff all configs from upstream before and minimize, save
+deltas, and merge to new upstreams keeping intended changes.  This is
+going to be worse than most upgrades.
+
+For upgrading to new micros of the same stable version, of course make
+backups but there is no particular reason to worry.
 
 ## Standard zoneminder advice
 
-Upgrade a database from an older version of ZoneMinder via:
+After installing a new zoneminder version (even a micro), upgrade a
+database via:
 
   zmupdate.pl -u root [-p <password>]
 
-NB: Zoneminder 1.32 will attempt to remove config from the database
-and place it in e.g. `/usr/pkg/etc/zm/conf.d/zmcustom.conf`.  The
-package attempts to create the directory, but make one more backup
-than you think you need.
-
-## Zoneminder path woes
-
-In theory, one wouldn't have to set paths, but it seems one does.  Go
-over the list at
-https://github.com/ZoneMinder/zoneminder/blob/release-1.32/INSTALL and
-set some.
+Beware that if you have custom config in zm.conf or in the database
+(because that used to be how it's done), zoneminder may migrate it
+to `/usr/pkg/etc/zm/conf.d/zmcustom.conf`.
 
-Probably, see (or create) conf.d/zmpaths.conf.
+As always, make one more backup than you think you need, and check the
+resulting config files.
 
-## Issues due to pkgsrc changes from 1.30 to 1.32
-
-pkgsrc changed the config dir from /usr/pkg/etc to /usr/pkg/etc/zm, so
-you should move zm.conf.
+## Zoneminder path woes
 
-When editing in conf.d, beware zmcustom.conf~ which might or might not
-also be read.
+In theory, one wouldn't have to set paths, but it seems one does.
+Find and read the docs and think about this.
 
-pkgsrc changed from /var/cache/zoneminder to /var/db/zoneminder.
-While merging configs, pay extra attention to stray /var/cache
-pathnames.
+Probably, as of 2026-01, the package mostly sets reasonable defaults
+for paths.
 
 ### Storage
 
 Zoneminder has "Storage" configured (Options, Storage), and it is
 possible that it used to be /var/cache/zoneminder/events and should
-now be /var/db/zoneminder/events.
+now be `/var/db/zoneminder/events`.
 
 ### Upload temp dir
 
 One can configure uploads and a temp dir in which to create them.
-That path is in the database as UPLOAD_LOC_DIR and can be a stray
-source of /var/cache/zoneminder.
+By default it might be `/var/db/zoneminder/upload`.
 
 # Shared memory
 
 Zoneminder tries to use a shm filesystem to store files that are then
-mmap'd.  (1.28 used SysV shm but that is no longer relevant.)
-
-On NetBSD, the compiled default might be /dev/shm but the right place
-is /var/shm.  This can be changed in zmcustom.conf via ZM_PATH_MAP.
-
-(One might need a lot of space, or to turn the buffer down to fewer
-frames; this is not about pkgsrc.)
-
-Somtimes, the shm file can get into a bad state and be zero length.
-This might be a bad error path during camera timeouts; it seems to
-happen more with bad wifi connections.  Turning up the timeouts in the
-config (e.g. wait 10s or 30s before giving up instead of 2s) probably
-also helps.  This is also not about pkgsrc.
+mmap'd.  pkgsrc sets this to /var/shm which is right for NetBSD; it is
+left for future work to set the default based on OS type.

Index: pkgsrc/security/zoneminder/patches/patch-CMakeLists.txt
diff -u pkgsrc/security/zoneminder/patches/patch-CMakeLists.txt:1.3 pkgsrc/security/zoneminder/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/security/zoneminder/patches/patch-CMakeLists.txt:1.3 Sun Jan  4 23:29:54 2026
+++ pkgsrc/security/zoneminder/patches/patch-CMakeLists.txt     Mon Jan  5 16:02:45 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2026/01/04 23:29:54 gdt Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2026/01/05 16:02:45 gdt Exp $
 
 Don't have a file called "version", to avoid conflict with C++20 <version>.
 
@@ -12,8 +12,6 @@ exist, so don't insist on librt being pr
 Let Pkgsrc be responsible for zm.conf into examples, rather than overwriting
 the existing configuration file.
 
-See ../files/upstream-PR-3914.
-
 --- CMakeLists.txt.orig        2025-12-07 16:18:50.000000000 +0000
 +++ CMakeLists.txt
 @@ -4,7 +4,7 @@
@@ -25,27 +23,6 @@ See ../files/upstream-PR-3914.
  # make API version a minor of ZM version
  set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
  
-@@ -119,14 +119,16 @@ set(ZM_CONTENTDIR "/var/lib/zoneminder" 
- set(ZM_FONTDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/fonts" CACHE PATH
-   "Location of the font files used for timestamping, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/fonts")
- 
-+set(ZM_DB_TYPE "mysql" CACHE STRING
-+  "Type of database where the ZoneMinder database located, default: mysql")
- set(ZM_DB_HOST "localhost" CACHE STRING
--  "Hostname where ZoneMinder database located, default: localhost")
-+  "Hostname where the ZoneMinder database located, default: localhost")
- set(ZM_DB_NAME "zm" CACHE STRING
--  "Name of ZoneMinder database, default: zm")
-+  "Name of the ZoneMinder database, default: zm")
- set(ZM_DB_USER "zmuser" CACHE STRING
--  "Name of ZoneMinder database user, default: zmuser")
-+  "Name of the ZoneMinder database user, default: zmuser")
- set(ZM_DB_PASS "zmpass" CACHE STRING
--  "Password of ZoneMinder database user, default: zmpass")
-+  "Password of the ZoneMinder database user, default: zmpass")
- set(ZM_WEB_USER "" CACHE STRING
-   "The user apache or the local web server runs on. Leave empty for automatic detection.
-      If that fails, you can use this variable to force")
 @@ -269,7 +271,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)
@@ -66,14 +43,6 @@ See ../files/upstream-PR-3914.
    else()
      list(APPEND ZM_BIN_LIBS "-lrt")
    endif()
-@@ -810,7 +815,6 @@ set(WEB_PREFIX "${ZM_WEBDIR}")
- set(CGI_PREFIX "${ZM_CGIDIR}")
- set(WEB_USER "${ZM_WEB_USER}")
- set(WEB_GROUP "${ZM_WEB_GROUP}")
--set(ZM_DB_TYPE "mysql")
- if(ZM_PERL_SEARCH_PATH)
-   set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
- else()
 @@ -873,8 +877,8 @@ else()
  endif()
  



Home | Main Index | Thread Index | Old Index