ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,607 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

387 Commits

Author SHA1 Message Date
David Wilcox bde7fc8476 Minor corrections to README.OpenSuse 
A few typos and a correction to a web link
 2014-08-07 15:31:13 +01:00
Cosme Domínguez Díaz 786f6518fa Allow use webservers other than apache. 2014-08-04 00:23:47 +02:00
Andrew Bauer cd35eb52d8 Add ONVIF files to rpm spec files 2014-08-03 10:48:56 -05:00
Isaac Connor f0437c6ce4 sync to ubuntu version 2014-08-01 13:53:59 -04:00
Isaac Connor f48f2dbf30 update to same as ubuntu 2014-08-01 13:28:04 -04:00
Isaac Connor 2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor 6d2be734d2 add mariadb as a dependency option 2014-07-24 11:24:57 -04:00
Isaac Connor 864f68197d change mysql-server to Recommends 2014-07-15 14:06:32 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor f33b127e7e add curl dependencies 2014-07-11 10:51:12 -04:00
whopperg 4a070f93bb Update rules 
There was a missing tab-indent. So dpkg-buildpackage under debian didnt work:

Error:
debian/rules:77: *** missing separator.  Stop.
 2014-07-06 11:48:41 +02:00
Isaac Connor e2987067f4 add avtools instead of ffmpg 2014-06-26 13:09:52 -04:00
Isaac Connor 0f4e9eb3e4 add these dependencies, apparently they are required for sftp upload 2014-06-17 10:54:42 -04:00
Isaac Connor a73e367d5e add libav-tools as an option instead of ffmpeg 2014-06-04 11:21:43 -04:00
Kfir Itzhak 7aef6e9389 Merge pull request #387 from PX03AFK/patch-4 
Update zoneminder.cmake.OS13.spec - minor corrections
 2014-04-25 11:06:35 +03:00
Kfir Itzhak c64b1318db Merge pull request #389 from PX03AFK/patch-6 
Update README.OpenSuse
 2014-04-25 11:05:37 +03:00
David Wilcox ca2b6f36f5 Update README.OpenSuse 
Additional info on amending database if using version which has /tmp as work space
 2014-04-17 15:44:44 -04:00
David Wilcox 103dc0c00d Update CMakeLists.txt 
Adds named variables to ease change in the future
 2014-04-17 15:42:37 -04:00
David Wilcox ee7fe5bfaa Update zoneminder.cmake.OS13.spec 
Correct requires for cpanm and make as they should be post
change cpanm call to be full path name
correct permissions on events, images and temp
 2014-04-17 15:41:04 -04:00
David Wilcox 5cd165e9d5 Update zoneminder.tmpfiles 
Incorrect directory
 2014-04-03 22:16:38 -04:00
Isaac Connor 3212974bdf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-03-28 10:12:39 -04:00
Andrew Bauer dda1034927 Merge pull request #362 from PX03AFK/patch-2 
Update zoneminder.cmake.OS13.spec
 2014-03-27 17:58:27 -05:00
David Wilcox c4645de0e6 Update zoneminder.cmake.OS13.spec 2014-03-26 23:06:42 -04:00
David Wilcox a7a5f5d543 Update README.OpenSuse 2014-03-26 23:05:20 -04:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
Andrew Bauer e0f8583110 Merge pull request #348 from PX03AFK/opensuse 
Initial upload for opensuse rpm
 2014-03-19 12:09:53 -05:00
root 43b259c5cd Initial upload for opensuse rpm 2014-03-18 23:31:58 -04:00
Kyle Johnson 75d390d70a Merge branch 'release-1.27' 2014-03-15 00:51:13 -04:00
Andrew Bauer f8f0ec57dc further refinement of build requirements 2014-03-14 06:56:05 -05:00
Andrew Bauer 9f616c0d2b Make httpd both an install and build requirement 2014-03-12 06:58:53 -05:00
Andrew Bauer f9fab8d487 Need to make httpd a build requirement for cmake builds so the apache user can be properly auto-detected 2014-03-11 20:38:51 -05:00
Andrew Bauer a5d1f2afb7 Create a hardened build per Fedora packaging guidelines 2014-03-11 19:01:32 -05:00
Andrew Bauer 16c59f7cb0 Update README.Fedora 
typo
 2014-03-08 14:04:40 -06:00
Andrew Bauer bc4630fddc Update local_zoneminder.te 
Changes based on forum feedback
 2014-02-22 15:39:10 -06:00
Andrew Bauer 4f2b09a36d remove noreplace flag on zm.conf in spec file 2014-02-01 19:30:23 -06:00
Andrew Bauer d87682e5aa Edit vlc requirements in spec files 2014-02-01 17:49:04 -06:00
Andrew Bauer 647cf5b180 update Fedora & CentOS README's 2014-02-01 16:39:33 -06:00
Andrew Bauer 4088f9bc00 Add libcurl requirement to rpm spec files 2014-02-01 15:01:36 -06:00
Andrew Bauer 22b54dd046 Bump spec files revision to 1.27 2014-02-01 12:24:30 -06:00
Andrew Bauer 23144606dc Merge pull request #318 from ZoneMinder/zmcamtool 
zmcamtool.pl - import and export ptz camera controls & camera presets
 2014-01-29 07:34:40 -08:00
Andrew Bauer 52794e4dad Add vlc-devel to rpm build requirements 2014-01-26 14:02:06 -06:00
Andrew Bauer f00e72be1e Initial commit for new zmcamtool.pl script 2014-01-21 16:22:30 -06:00
Kyle Johnson 6534aa546c Fixed readme.debian fstab bind examples 
After receiving a bug report that the examples did not work, I tried them myself.  They did not work, so I updated them to something that does work.
 2014-01-02 08:24:58 -05:00
Andrew Bauer ab06878b7b Update zoneminder.cmake.f19.spec 
Add BuildRequires perl(Sys::Syslog) to successfully build with mock
 2014-01-01 15:03:12 -06:00
Dmitry Katsubo e745bbf14e No need to redefine RUNDIR and ZM_RUNDIR, as they already depend on DESTDIR. 2013-12-30 15:32:06 +01:00
Dmitry Katsubo 7bf0bcf4ef Updated package version (otherwise build process stops). 2013-12-30 15:31:50 +01:00
Andrew Bauer dbd2ee348e define variables to toggle x10 & ffmpeg support 2013-12-23 19:41:00 -06:00
Andrew Bauer c4d22672ac Specfile changes related to zmfix 2013-12-23 17:06:31 -06:00
nkwood f4d6d99ab2 Update zoneminder.f19.spec 2013-12-23 15:09:12 -06:00
nkwood 4a89c8d5e9 Update zoneminder.el6.spec 2013-12-23 15:08:19 -06:00
nkwood f12dd88e5d Update zoneminder.cmake.f19.spec 2013-12-23 15:06:38 -06:00
nkwood 8e7d89024f Update zoneminder.cmake.el6.spec 2013-12-23 15:05:11 -06:00
nkwood 942b9c65da Update init.d 2013-12-23 15:01:21 -06:00
nkwood 922385d761 Update init.d 2013-12-23 14:55:56 -06:00
Andrew Bauer 45385526d7 Update README.CentOS 
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
 2013-12-21 09:45:40 -06:00
Andrew Bauer db2398d1ba Update README.Fedora 
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
 2013-12-21 09:45:21 -06:00
Isaac Connor 7064141161 check for mysql existence first. 2013-12-17 13:13:45 -05:00
Andrew Bauer 43b8990d73 Update zoneminder.el6.spec 
Bump revision and changelog
 2013-12-16 14:46:28 -06:00
Andrew Bauer 2ca23bf07a Update zoneminder.cmake.el6.spec 
Bump revision and changelog
 2013-12-16 14:45:50 -06:00
Andrew Bauer 0f14db811d Update zoneminder.f19.spec 
Bump revision and changelog
 2013-12-16 14:45:11 -06:00
Andrew Bauer 3ce3df8645 Update zoneminder.cmake.f19.spec 
Bump revision and changelog
 2013-12-16 14:44:22 -06:00
Andrew Bauer 570606f01f Update zoneminder.cmake.f19.spec 
Bugfix. Perl path had x86_64 hardcoded.  Use macro instead.
 2013-12-16 14:43:33 -06:00
Andrew Bauer 49e4d1089a Update zoneminder.cmake.el6.spec 
Bugfix. Perl path was hardcoded to x86_64. Use macro instead.
 2013-12-16 14:42:22 -06:00
Andrew Bauer 8d2dac67b3 Update zoneminder.in 2013-12-14 09:14:44 -06:00
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05:00
Andrew Bauer d0debfa450 Update zoneminder.in 
The freshen database feature does not appear to be necessary and may even corrupt the dB under certain conditions. Commenting out.
 2013-11-26 15:21:28 -06:00
Isaac Connor 4555a8bf92 Merge pull request #240 from ZoneMinder/postinstcleanup 
remove extra stuff that I don't think we need because we are the source.
 2013-11-19 08:29:51 -08:00
Isaac Connor c840f1b622 suggest mysql-server 2013-11-08 12:08:06 -05:00
Isaac Connor 6d6503c006 suggest mysql-server 2013-11-08 12:07:45 -05:00
Isaac Connor 2cd0d0b405 repeat the dbh package lines for debian as well 2013-11-08 11:25:06 -05:00
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO 
Conflicts:
	zm.conf.in
 2013-11-08 11:22:09 -05:00
Isaac Connor e9c0509399 add rules for a dbg package 2013-11-08 11:09:23 -05:00
Will Scales 82a3f4622f Update zoneminder.service 
Added "After=" rule to [unit] section to prevent Zoneminder from starting before mysqld.
 2013-11-06 06:30:43 -06:00
Isaac Connor a1cb1e6de2 bump version # for snapshot 2013-11-04 09:56:20 -05:00
Isaac Connor 6c6da67427 Merge branch 'master' into mysql2PDO 2013-11-03 15:57:45 -05:00
Isaac Connor 7b585d182a remove extra stuff that I don't think we need because we are the source. 
Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing.
We don't need to be doing that work in a postinst bash script.
 2013-11-03 15:49:37 -05:00
Kfir Itzhak a341778ca2 Merge branch 'cmakefixes' 
Conflicts:
	distros/fedora/zoneminder.cmake.f19.spec
	distros/redhat/zoneminder.cmake.el6.spec
 2013-10-21 16:58:04 +03:00
Andrew Bauer c25a7ffc99 Update zoneminder.cmake.f19.spec 
We need to strip the prefix from perl_vendorlib before passing it to cmake
 2013-10-20 12:59:31 -05:00
Andrew Bauer 183ce4b422 Update zoneminder.cmake.el6.spec 
We need to strip the prefix from perl_vendorlib macro before passing it to cmake.
 2013-10-20 12:44:09 -05:00
Kfir Itzhak cdd2920767 Merge pull request #217 from knnniggett/cmake_redhat 
cmake support files for redhat/centos distros
 2013-10-19 13:03:16 -07:00
Andrew Bauer d544a92ccb change chkconfig default 2013-10-19 13:54:25 -05:00
Andrew Bauer 60962566a5 cmake support files for redhat/centos distros 2013-10-19 13:50:59 -05:00
Andrew Bauer 72973ff7e7 Add new zoneminder cmake specfile 2013-10-19 12:14:43 -05:00
Andy Bauer b1c76ad0b6 Cmake support files for fedora distro 2013-10-19 08:49:47 -05:00
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
Andrew Bauer 62dbb6e5fb Update README.Fedora 
typo
 2013-10-14 06:47:29 -05:00
Andy Bauer 32cf3663f3 Update README.Fedora 
add "sudo"
 2013-10-13 08:22:16 -05:00
Andy Bauer a3dc2b50d3 Update README.CentOS 2013-10-11 06:47:32 -05:00
Andy Bauer b7e69f0104 Update zoneminder.cmake.f19.spec 
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
 2013-10-10 13:30:38 -05:00
Andy Bauer e16c2502d6 Update zoneminder.f19.spec 2013-10-10 13:29:46 -05:00
Andy Bauer 1e756a1529 Update zoneminder.cmake.el6.spec 
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
 2013-10-10 13:29:15 -05:00
Andy Bauer 8f512729f3 Update zoneminder.el6.spec 
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
 2013-10-10 13:28:42 -05:00
Andy Bauer 6f313ad866 Update zoneminder.f19.spec 
fix typo
 2013-10-10 06:32:45 -05:00
Andy Bauer 4218ef0113 Update README.Fedora 2013-10-09 18:37:48 -05:00
Andy Bauer 78effbab45 Update README.Fedora 2013-10-09 18:36:59 -05:00
Andy Bauer 33f7673656 Update README.Fedora 2013-10-09 18:35:39 -05:00
Andy Bauer 5c7674ca09 Update zoneminder.f19.spec 2013-10-09 18:34:07 -05:00
Andy Bauer 4336b6cdb4 Update zoneminder.f19.spec 2013-10-09 18:23:46 -05:00
Andy Bauer c0878c5e76 Update README.Fedora 
Remove mariadb from instructions per the Fedora team.
 2013-10-09 17:41:20 -05:00
Andy Bauer dbbf1d9f37 Create zoneminder-1.26.0-defaults.patch 2013-10-09 12:06:14 -05:00
Andy Bauer de16858590 Update zoneminder.f19.spec 
Remove -msse2 flag from builds other than x86_64
 2013-10-08 19:25:47 -05:00
Andy Bauer 8d331452f5 Update zoneminder.el6.spec 
Remove -msse2 flag from builds other than x86_64
 2013-10-08 19:24:33 -05:00
Andy Bauer 85bca8de6d Update zoneminder.el6.spec 2013-10-07 19:01:08 -05:00
Andy Bauer 545275c4c0 Update zoneminder.f19.spec 2013-10-07 19:00:18 -05:00
Andy Bauer 667d7559df Create zoneminder.cmake.f19.spec 2013-10-07 18:57:00 -05:00
Andy Bauer 1d7660934f Create zoneminder.cmake.el6.spec 2013-10-07 18:31:59 -05:00
Andy Bauer 0cbb818d63 Update README.CentOS 
minor text formatting changes
 2013-10-07 15:51:35 -05:00
Andy Bauer 02f33cc884 Rename zoneminder.1.26.el6.spec to zoneminder.el6.spec 2013-10-06 12:24:19 -05:00
Andy Bauer 2393f6ae77 Update zoneminder.1.26.el6.spec 2013-10-06 12:23:44 -05:00
Andy Bauer b8f3124f1c Update README.Fedora 2013-10-05 19:45:07 -05:00
Andy Bauer 665638cabb Update README.CentOS 2013-10-05 19:44:32 -05:00
Andy Bauer 95a0480216 Update README.Fedora 2013-10-05 19:41:28 -05:00
Andy Bauer a09d690a1c Update zoneminder.f19.spec 2013-10-05 19:33:38 -05:00
Andy Bauer c2c8d18a9e Update zoneminder.f19.spec 2013-10-05 19:14:04 -05:00
Andy Bauer d853e53c5e Create zoneminder-1.26.4-dbinstall.patch 2013-10-05 19:11:14 -05:00
Andy Bauer 5fe50152ff Update README.Fedora 2013-10-05 17:21:30 -05:00
Andy Bauer 2d1d0a3ad3 Rename zoneminder.tmpfiles.d to zoneminder.tmpfiles 2013-10-05 17:05:33 -05:00
Andy Bauer 2bdc1a3fae Create zoneminder.tmpfiles.d 2013-10-05 16:56:42 -05:00
Andy Bauer 50fea88690 Rename redalart.wav to redalert.wav 
fix typo
 2013-10-05 15:49:28 -05:00
Andy Bauer 1afa52637e Update zoneminder.f19.spec 
gcc4.7/4/8 patch no longer needed
 2013-10-04 06:39:44 -05:00
Isaac Connor 21caddf97b This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise 2013-10-03 13:53:37 -04:00
Isaac Connor 80d97c7bdf Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master 
Conflicts:
	distros/debian/changelog
 2013-10-03 11:36:26 -04:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
Andy Bauer b505472be2 Update README.CentOS 
update documentation to add alter permission to zmuser
 2013-10-03 08:31:59 -05:00
Andy Bauer ea5c610fb1 Update README.Fedora 
added alter permission to zmuser
 2013-10-03 08:30:31 -05:00
Andy Bauer ead696e5a7 Create zoneminder.f19.spec 2013-09-29 11:26:32 -05:00
Andy Bauer 38963520f4 Update README.Fedora 
Updated documentation to reflect current issues/workarounds when running zoneminder on Fedora 19
 2013-09-28 15:18:45 -05:00
Jan Dennis Bungart b428272f42 fixing debian docs file (README -> README.md) 2013-09-22 10:34:11 +08:00
Jan Dennis Bungart 7172930994 Fixing debian control file (libjpeg-turbo8 -> libjpeg8) 2013-09-22 10:21:20 +08:00
Jan Dennis Bungart a3519feffc Fixing postinst script and changelog needed for successful debian build 2013-09-22 10:01:30 +08:00
Knniggett b4da026bdf Add fedora files to zoneminder source tree 2013-09-21 16:36:00 -05:00
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta 
Conflicts:
	scripts/zmupdate.pl.in
 2013-09-18 13:03:54 -04:00
Isaac Connor eba8b0dde0 move this into the distros dir 2013-09-18 12:51:10 -04:00
Andy Bauer 7d5e0d3ba2 Update README.Fedora 
Update README.Fedora installation instructions. Fixes issue #145.
 2013-09-16 08:21:37 -05:00
abauer efc729110a Move redhat folder to a subfolder called distros 2013-09-15 16:33:09 -05:00