Commit Graph

1330 Commits (de5b8bd8935837e59422b622d732ac3ebe0c92a1)

Author SHA1 Message Date
Isaac Connor ea83e8c3b1 Add libjwt-dev as a build dependency. libjwt-gnutls-dev doesn't exist in bionic anymore. 2021-08-09 10:23:02 -04:00
Isaac Connor 6373ef9be7 move db update script so it gets used. Bump version to 1.37.1 for db update 2021-07-05 09:32:39 -04:00
Isaac Connor ef92f1ea16 Bump version to 1.36.5 2021-06-22 14:35:13 -04:00
Andrew Bauer b95cf72dc8 comment to rpm changelog regarding cmake 2021-06-18 15:30:19 -05:00
Andrew Bauer 172a0555ed only refer to cmake3 when building on el7 2021-06-18 15:30:10 -05:00
Andrew Bauer a423f2620e Allow cakephp cache engine to be set during build 2021-06-18 15:29:54 -05:00
Andrew Bauer 0edc91ffca comment to rpm changelog regarding cmake 2021-06-18 15:27:24 -05:00
Andrew Bauer ec861c5e2b only refer to cmake3 when building on el7 2021-06-18 15:25:17 -05:00
Andrew Bauer db7c5df8c1
Update zoneminder.spec 2021-06-18 13:08:17 -05:00
Andrew Bauer b59e911c43 Allow cakephp cache engine to be set during build 2021-06-18 12:12:01 -05:00
Isaac Connor c3fb84bf88 Add an age component of 7d to /var/tmp/zm so that exports and other files go away 2021-06-15 10:44:02 -04:00
Isaac Connor 786d0c553e We require sudo 2021-06-12 12:22:15 -04:00
Isaac Connor 46c730e27b Bump version for 1.36.4 2021-06-08 16:59:03 -04:00
Isaac Connor 97d077d623 Bump version to 1.36.3 for release 2021-06-08 16:57:20 -04:00
Isaac Connor dbb8019852 Bump version for 1.36.2 2021-06-08 16:55:13 -04:00
Isaac Connor b634338398 Bump version for 1.36.4 2021-06-08 16:00:20 -04:00
Steve Gilvarry b29a785a7c Update symlink to new file location 2021-06-06 17:22:13 +10:00
Peter Keresztes Schmidt 73351f4387 Drop Ubuntu Xenial support 2021-06-05 17:16:22 +02:00
Peter Keresztes Schmidt 5c96eedac8 Build: Remove dependency on libavdevice
We currently don't use the library so don't depend on it.
2021-06-05 15:08:38 +02:00
Peter Keresztes Schmidt 7d501a6585 Remove libavresample support
libavresample hasn't been maintained for a long time by FFmpeg since libswresample superseded it.
In 2018 it was officially deprecated [1].

Let's remove the support for it since there is no need to maintain this option further.

[1] https://patchwork.ffmpeg.org/project/ffmpeg/patch/20171225175335.18183-1-atomnuker@gmail.com/
2021-06-04 23:46:58 +02:00
Peter Keresztes Schmidt e724a93395 Build: Remove in-tree version of CheckPrototypeDefinition
We currently don't use the module and all supported CMake versions ship this module if needed.
2021-06-01 08:41:44 +02:00
Isaac Connor 0e598f67c9 Bump version to 1.36.3 for release 2021-05-30 18:49:09 -04:00
Isaac Connor 4f2945bd57
Merge pull request #3267 from Carbenium/crypto-hashing
Crypto: Implement a generic hashing API
2021-05-30 18:07:58 -04:00
Isaac Connor dab2792077
Merge pull request #3262 from Carbenium/selectable-crypto-backend
Build: Make crypto and JWT backends selectable
2021-05-30 17:06:22 -04:00
Peter Keresztes Schmidt 8129600a37 Build: Cleanup gnutls/openssl defines
We only need HAVE_LIBGNUTLS and HAVE_LIBOPENSSL to compile the right crypto backend.
2021-05-30 22:56:21 +02:00
Isaac Connor 1219bd8d1e the filename is incorrect so the tmpfiles.d configuration is not being included 2021-05-30 10:54:59 -04:00
Isaac Connor 28a6a3e41e the filename is incorrect so the tmpfiles.d configuration is not being included 2021-05-30 10:54:23 -04:00
Peter Keresztes Schmidt b81689aa3f Remove libgcrypt as dependency
GnuTLS used gcrypt as backend but switched in ~2011 to nettle.
Thus we don't need to/shouldn't depend on it.
2021-05-29 21:37:30 +02:00
Isaac Connor cd16f3f8e4 Bump version for 1.36.2 2021-05-28 14:00:36 -04:00
Andrew Bauer 800a8ecc2e sync rpm specfile changelog with rpmfusion 2021-05-22 07:00:07 -05:00
Isaac Connor 2afeaefec4 Set version to 1.36.1 for release 2021-05-21 10:46:56 -04:00
Isaac Connor e18f9676cd Bump version to new 1.37 dev version 2021-05-16 13:55:01 -04:00
Isaac Connor b17edf3153 Bump version to 1.36.0 2021-05-13 19:28:32 -04:00
Isaac Connor 8aacdb37cc Bump to 1.35.28 2021-05-05 15:03:51 -04:00
Peter Keresztes Schmidt 3bbec92d40 utils/packpack: Update RtspServer 2021-05-01 00:39:22 +02:00
Isaac Connor c74778f949 Revert "add new dependency libarray-util-perl"
This reverts commit 9e5ca7832a.
2021-04-29 19:00:36 -04:00
Isaac Connor 9e5ca7832a add new dependency libarray-util-perl 2021-04-29 14:49:54 -04:00
Isaac Connor 33ed35c1f6 Use new zmupdate -s param touse system maintenance use to perform updates 2021-04-28 10:05:21 -04:00
Isaac Connor d1687df6af Bump version to 1.35.27 for ModetDuringPTZ changes 2021-04-23 14:52:29 -04:00
Andrew Bauer 6d90fd7bd6
update specfile to use latest rtspserver commit 2021-04-23 11:53:38 -05:00
Isaac Connor 484ff7dbaa Fail postinst if zmupdate fails 2021-04-19 11:51:35 -04:00
Isaac Connor 285c06ca23 Bump version to 1.35.26 2021-04-12 15:59:31 -04:00
Isaac Connor 053406bade Bump to version 1.35.25 2021-04-11 12:59:18 -04:00
Peter Keresztes Schmidt 3b705c15fe build: Store all generated sources in CMAKE_BINARY_DIR
config.h is already generated there so move zm_config_data.h and zm_config_define.h
there as well. Also limit the scope of CMAKE_BINARY_DIR as include directory to the zm target.
All in all this makes zm_config_data and zm_config_define available when building the tests target.
2021-04-11 01:28:23 +02:00
Isaac Connor 08d9ca453a Bump version to 1.35.24 2021-04-09 19:45:23 -04:00
Andrew Bauer 3be21d0457 add rpm support for RtspServer submodule 2021-04-07 09:23:36 -05:00
Isaac Connor 198d205188 bump version for 1.35.23 2021-03-30 18:33:46 -04:00
Isaac Connor 3d13daaf25 Bump version for 1.35.22 2021-03-26 17:03:27 -04:00
Isaac Connor 531850c57e require libjwt-gnutls0. Our built in jwt-cpp doesn't seem to work 2021-03-23 13:52:05 -04:00
Isaac Connor 527defc0c8 Bump version to 1.35.21 for Snapshots 2021-03-12 09:28:47 -05:00
Isaac Connor 93e4691b08 remove liblivemedia as a dependency. We have gone another way 2021-03-10 16:17:26 -05:00
Isaac Connor fda0656f84 Bump version to 1.35.20 to pick up SecondPath db change 2021-03-03 12:07:33 -05:00
Peter Keresztes Schmidt 1a6b26f2ab build: Add fmt as a required dependency 2021-03-01 22:43:02 +01:00
Isaac Connor 0dc748acb5 drop back to compat 12 for buster 2021-02-17 14:13:42 -05:00
Isaac Connor 99568b8046 remove debian vcs 2021-02-17 13:41:52 -05:00
Isaac Connor 1f2c7d3f98 allow debhelper >13 2021-02-17 13:17:30 -05:00
Isaac Connor d2777d2fe4 Remove ffmpeg from recommends. We depend on it 2021-02-17 12:53:30 -05:00
Isaac Connor 0edbb3d9c4 debug is optional, not extra 2021-02-17 12:52:06 -05:00
Isaac Connor 0d0be59b6b Need to require debhelper 13 2021-02-17 12:51:44 -05:00
Isaac Connor a3ed986343 Fix filename 2021-02-17 12:40:41 -05:00
Isaac Connor 4a1efe56ff remove --parallel which isn't needed anymore 2021-02-17 12:40:27 -05:00
Isaac Connor 8c85ffd904 Remove apache2.2 auth lines 2021-02-17 12:40:14 -05:00
Isaac Connor 8a3ea42528 Remove Uploaders. Update mysql packages to be default- 2021-02-17 12:39:56 -05:00
Isaac Connor b4c594b15c Use apache2_invoke instead of enmod 2021-02-17 12:32:06 -05:00
Isaac Connor 8e4922665f Add icons to installed files 2021-02-17 11:56:43 -05:00
Isaac Connor 6007914344 we don't build libzoneminder-perl at this time, so don't try to instal it's man pages 2021-02-17 11:49:59 -05:00
Isaac Connor a60d683f73 Don't build man pages. They will be built by dh 2021-02-17 11:07:33 -05:00
Isaac Connor 66efc3ba59 .tmpfile is deprecated. Use .tmpfiles 2021-02-17 10:29:21 -05:00
Isaac Connor 233b666595 maybe fix docs building 2021-02-16 17:19:13 -05:00
Isaac Connor e7f3bc357d More syncup with official debian build 2021-02-16 17:03:17 -05:00
Isaac Connor 36c7d17111 Remove dh-systemd update standards-version and homepage 2021-02-16 16:32:19 -05:00
Isaac Connor b0f9b210a8 Update for debhelper > 12 2021-02-16 16:22:29 -05:00
Isaac Connor f08979aae9 Bump compat to 13 2021-02-16 14:13:42 -05:00
Isaac Connor cc09f68426 We use our own jquery. Debian can do it's own thing 2021-02-10 17:07:18 -05:00
Andrew Bauer 2a440685eb remove zma binary from rpm specfile 2021-02-09 20:55:52 -06:00
Peter Keresztes Schmidt bccadba1f6 Distros/Ubuntu2004: Remove an extra newline from the control file
This breaks the build with following message:
  dpkg-buildpackage: error: syntax error in debian/control at line 41: block lacks the 'Package' field
2021-02-07 19:36:05 +01:00
Isaac Connor 5fac0903b1 We include jquery ourselves 2021-02-06 20:11:38 -05:00
Isaac Connor 3d20183020 Remove mp4v2 2021-02-04 17:32:53 -05:00
Isaac Connor 8f9637f21a
Merge pull request #3129 from Carbenium/cmake-reformat
Build: Reindent the CMakeLists
2021-02-04 17:20:34 -05:00
Peter Keresztes Schmidt 6c9983155c Build: Reindent the CMakeLists
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
Peter Keresztes Schmidt dd527f0888 Consolidate __STDC_FORMAT_MACROS and __STDC_CONSTANT_MACROS definition
Move the definitions to zm_define.h and include the header at the appropriate locations.
These macros have not been adopted by the C++11 standard.
However glibc 2.17 (CentOS 7) still depends on them to provide the macros which are guarded by these defines.
2021-02-04 19:58:29 +01:00
Isaac Connor 3fd98ee9c1 Bump version to add RTSPServer column to Monitors 2021-02-03 08:33:10 -05:00
Andrew Bauer fdbab5adc3 rpmspecfile README - update zmuser creation on newer sql's 2021-02-02 15:18:54 -06:00
Andrew Bauer c55b80beab rpmspecfile - generate ssl cert for both apache and nginx 2021-01-31 16:14:39 -06:00
Isaac Connor be95bd2fa7 deprecate python-sphinx in favour of python3-sphinx. Remove mp4v2 and libx264 2021-01-28 16:17:15 -05:00
Isaac Connor be99d09772 Accept liblivemedia64 for buster 2021-01-26 22:05:13 -05:00
Isaac Connor 9beaf613bf Add liblivemedia as a dependency to build rtsp_server 2021-03-02 09:05:58 -05:00
Isaac Connor 243d028118 Add liblivemedia dependencies to build rtsp server 2021-03-02 09:05:58 -05:00
Isaac Connor 836ef731c1 Don't use libjquery-js 2021-03-01 16:47:18 -05:00
Isaac Connor 01c74fdac3 Add RTSPStreamName to Monitors table. Bump version to 1.35.19 2021-03-01 16:46:48 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Isaac Connor 671d58f0d0 bump version and put back ZM_MIN_RTSP_PORT setting 2021-01-26 12:35:17 -05:00
Andrew Bauer 0b35a6f09a remove mootools from debian packaging 2021-01-18 07:59:54 -06:00
Andrew Bauer b9c0823774 don't install tools folder 2021-01-18 07:41:08 -06:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Andrew Bauer 24d558b31a
spelling 2020-12-19 12:14:56 -06:00
Andrew Bauer 96ade2f9d0 update rpm nginx readme 2020-12-19 10:09:12 -06:00
Andrew Bauer 80afbbd9ce fixup rpmspecfile cert generation 2020-12-19 08:11:20 -06:00
Isaac Connor 2936d64b91 Always take ownership of dirs in /var/cache/zoneminder. The previous behaviour would have only done it on a new install. Fixes #3096 2020-12-18 10:54:08 -05:00
Isaac Connor 0702b64cc4 Merge branch 'master' into zma_to_thread 2020-12-15 10:51:40 -05:00