Commit Graph

1241 Commits

Author SHA1 Message Date
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 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
Isaac Connor 5c1135b2a7 Merge branch 'master' into no_decode 2020-12-10 15:15:32 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor 7ef34bce7b Include new fonts dir in install 2020-12-03 13:30:51 -05:00
Isaac Connor 1c45019eeb Bump version to 1.35.15 2020-12-03 13:16:42 -05:00
Isaac Connor bbc2c2a607 Crud has more than 1 friend 2020-11-12 13:27:10 -05:00
Isaac Connor df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor 7faf774cd0 Use FriendsOfCake crud 3.2.0 2020-11-12 09:15:02 -05:00
Isaac Connor a3a6d94b6f bump version to 1.15.14 2020-11-06 14:16:34 -05:00
Isaac Connor 3e5f87cb41 Bump version to 1.35.13 2020-11-04 14:42:01 -05:00
Isaac Connor 9a9f80c15c show which user we are updating permissions for 2020-10-28 14:07:29 -04:00
Isaac Connor 86bf491fe1 Add Locking to filters, bump db to 1.35.12. 2020-10-28 12:55:32 -04:00
Isaac Connor 4c92c99ba1 bump version for 1.35.11 db updates 2020-10-28 12:39:50 -04:00
Isaac Connor 59884375fa Add references permission so that our zmupdate can add foreign keys 2020-10-28 09:23:46 -04:00
Isaac Connor 2eda49333f Merge branch 'master' into zma_to_thread 2020-10-20 16:20:29 -04:00
Isaac Connor 8227de8642 bump version to 1.35.10 to pick up Filter AutoUnarchive column 2020-10-12 11:04:16 -04:00
Isaac Connor faade3ea15 Enable dependencies for vnc monitor type in buster/focal and newer 2020-10-07 10:52:59 -04:00
Isaac Connor 7261a7b1dd Merge branch 'sessions_in_db' 2020-10-02 15:57:11 -04:00
Isaac Connor a58e5e96d7 bump version 2020-10-02 15:57:05 -04:00
Isaac Connor fb0fae7b20 buster only has libjpeg62-turbo-dev 2020-10-02 15:22:43 -04:00
Isaac Connor 4b10d22ea8 correct the version on libjpeg-turbo 2020-10-02 12:55:44 -04:00
Isaac Connor d139dc010b prefer libjpegturbo to libjpeg8 or 9 2020-10-01 13:47:39 -04:00
Isaac Connor 63e42ca651 Still need libjpeg 2020-10-01 12:57:46 -04:00
Isaac Connor 3eae356ed7 Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status. 2020-09-30 09:39:31 -04:00
Isaac Connor 02d4785e71 Split out user creation/updating into it's own function 2020-09-29 17:26:55 -04:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Isaac Connor 37b0fc4bbd bump version to pickup geolocation updates 2020-09-28 09:34:08 -04:00
Isaac Connor f7ec83323d Fix conditional 2020-09-23 16:16:30 -04:00
Isaac Connor ab513689f4 Don't auto-start zoneminder. DEBHELPER appears to add lines that already do it and they conflict. 2020-09-23 16:12:21 -04:00
Isaac Connor a68c95ba73 fix logic on systemd and mysql/mariadb existence 2020-09-23 16:07:46 -04:00
Isaac Connor 5410fcf18c Detect systemd and fall back to sysV. We do this for beowulf and WSL 2020-09-23 14:41:26 -04:00
Isaac Connor 04aab54044 Detect systemd and use sysV style commands if it isn't 2020-09-23 11:31:16 -04:00
Isaac Connor 45cc4dd531 put back sysV init script for beowulf/wsl 2020-09-23 11:30:40 -04:00
Andrew Bauer f7cbc2f5e0 remove uneeded setconfig options in redhat specfil 2020-09-19 09:10:16 -05:00
Andrew Bauer b3c5a985ed use BindsTo in redhat systemd service file 2020-09-17 09:16:28 -05:00
Isaac Connor b4fbe84f6b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-26 13:31:36 -04:00
Isaac Connor abebc74e1e sphinx-build is in python3-sphinx 2020-08-26 13:31:32 -04:00
Andrew Bauer f003dd7782 remove zoneinder-upload folder from cmakelists 2020-08-25 16:57:06 -05:00
Isaac Connor 3d3dde22c4 Use zm_session_start 2020-08-25 11:31:06 -04:00
Andrew Bauer 41c1774e4a remove ftp upload folder from specfile 2020-08-24 12:33:22 -05:00
Isaac Connor e111edbb72 bump version to 1.35.6 to pick a db fix from 1.34.20 2020-08-23 11:53:43 -04:00
Andrew Bauer e189e99353
Update zoneminder.spec 2020-08-18 15:37:37 -05:00
Isaac Connor 87175ccd49 Use ZM_DB_HOST when altering user permissions 2020-08-17 09:55:09 -04:00
Isaac Connor f0fbf77726 Change TMP back to /var/tmp. This is used mostly for exports so it needs to not be ram-based. 2020-08-17 09:51:23 -04:00
Isaac Connor c2dfaa1b65 create a distro build dir for devuan beowulf 2020-08-10 17:30:59 -04:00
Isaac Connor c0ab8bf90d Merge branch 'master' into zma_to_thread 2020-08-07 17:53:32 -04:00
Isaac Connor 5fb56c9f57 Merge branch 'master' into zma_to_thread 2020-08-07 17:52:43 -04:00
Andrew Bauer f43003a98b
need epel-rpm-macros on rhel for new cmake macros 2020-08-07 13:44:20 -05:00
Andrew Bauer 10a4929f75
disable LTO on redhat builds 2020-08-06 14:36:54 -05:00
Isaac Connor cc9413b44b replace python=sphinx with sphinx-doc in depends for ubuntu 2004 2020-08-05 20:00:25 -04:00
Andrew Bauer 9e03827fea
rpm specfile - use new cmake macros for f33 compat 2020-08-04 09:38:52 -05:00
Isaac Connor 869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread 2020-07-21 17:38:32 -04:00
Isaac Connor a747cd70d4 Use /run/zm instead of /var/run/zm 2020-07-11 10:44:28 -04:00
Isaac Connor 973450425d Use /run/zm instead of /var/run/zm 2020-07-11 10:44:06 -04:00
Andrew Bauer d0eb00474c fix typo in rpm specfile 2020-07-07 07:39:44 -05:00
Andrew Bauer 5e4c189a3d
Update zoneminder.spec
Account for new zmonvif-zmtrigger.pl in rpm specfile
2020-07-06 12:34:10 -05:00
Isaac Connor 1b9402239a Add libvncclient0 as an option for jessie 2020-06-15 14:59:33 -04:00
Isaac Connor 65d7c9e51d bump version 1.35.5 2020-06-05 17:51:06 -04:00
Isaac Connor c75cd1ecc9 bump version to pick up new ONVIF fields 2020-05-12 18:45:14 -04:00
Isaac Connor 75082064fd Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-09 16:40:17 -04:00
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -04:00
Isaac Connor 0412f04592 Merge branch 'release-1.34' 2020-05-08 17:25:14 -04:00
Isaac Connor f101e58480 Split db user creation and permission granting into two commands, as needed by newer mysql. Also auto-install apache rewrite module for api. 2020-05-08 17:20:41 -04:00
Isaac Connor 00c9624868 Update postinst for mysql8. Can't set permissions and create user in one line. 2020-05-08 17:17:36 -04:00
Isaac Connor 05ccdb9bed libswresample is at version 3. libavresample is 4. 2020-05-08 10:36:07 -04:00
Isaac Connor d281d2243c bump version so that Frames.Id update runs 2020-05-05 18:05:23 -04:00
Isaac Connor 4ff341a0f5 Merge branch 'master' into zma_to_thread 2020-05-02 18:03:42 -04:00
Isaac Connor 6e38a820bd Bump version to 10.34.10 for release 2020-04-23 18:28:26 -04:00
Isaac Connor 8e06a5698f Add new cleaned up rules for focal and buster 2020-04-23 15:02:22 -04:00
Isaac Connor 38f559b34b deprecate ubuntu trusty and precise 2020-04-23 15:00:28 -04:00
Isaac Connor 28e21fb0b1 Bump version to 1.34.9 2020-04-04 12:13:07 -04:00
Isaac Connor 593ea24cc6 add libvnc dependencies for VNC monitor type 2020-03-30 12:42:27 -04:00
Isaac Connor dd9c578be6 bumpv ersion to 1.35.2 2020-03-27 14:48:20 -04:00
Isaac Connor a555e09cad Bump version to 1.34.8. Please note that the lack of zm-update-1.34.8.sql is intentional. It is not needed as there are no db updates 2020-03-27 13:15:11 -04:00
Isaac Connor c880793fdc bump version to 1.34.7 2020-03-26 15:34:36 -04:00
Isaac Connor 6d787fd77e Bump version for 1.34.6 2020-03-06 14:52:38 -05:00
Isaac Connor 8300b94382 bump version to 1.35.1 2020-03-05 15:50:02 -05:00
Isaac Connor 52cb2441f0 Bump version to 1.34.5 for release 2020-02-25 20:46:59 -05:00
Isaac Connor e630550d0f bump version for release 1.34.4 2020-02-24 14:44:19 -05:00
Isaac Connor 17eca9f495 bump version to 1.35.0 for db upgrade 2020-02-19 14:50:16 -05:00
Isaac Connor ea2eba4110 bump version to 1.34.3 2020-02-19 13:50:27 -05:00
Andrew Bauer 4d82a5485a rpm specfile
I have to use my contact info for rpmfusion
2020-02-08 10:46:54 -06:00
Isaac Connor b7ad7ab1fc release 1.34.2 2020-02-04 16:47:39 -05:00
Andrew Bauer 9a71ca9a2f
update specfile changelog 2020-01-31 19:25:35 -06:00
Isaac Connor fb5111ffe4 bump version to 1.34.1 for release 2020-01-24 17:01:47 -05:00
Andrew Bauer 0992928089 merge rpm changelog from RPMFusion 2020-01-18 11:00:00 -06:00
Isaac Connor d4bc0bf72b bump version for release to 1.34.0 2020-01-15 17:31:06 -05:00
Isaac Connor 8dfe7460f3 revert bogus change 2020-01-11 10:21:29 -05:00
Isaac Connor 80c95d5afe Merge branch 'master' into wip_axisv2 2020-01-10 17:20:32 -05:00