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

4406 Commits

Author SHA1 Message Date
SteveGilvarry 14cf1bcae6 Clean up CMakeLists.txt, wrap lines, remove comments from initial commit, update comments. No functionality changes 2015-04-15 22:09:25 +10:00
Isaac Connor c17d156d95 Merge pull request #798 from onlyjob/PBP 
zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements.
 2015-04-13 10:19:59 -04:00
Isaac Connor e1ef19f470 Merge pull request #802 from knnniggett/deep_storage 
hide USE_DEEP_STORAGE
 2015-04-13 10:17:03 -04:00
Andrew Bauer 30765fdedf hide USE_DEEP_STORAGE 2015-04-12 12:20:20 -05:00
Andrew Bauer e4cf323949 Merge pull request #800 from Sune1337/pthread_join 
* use pthread_join instead of pthread_tryjoin_np
 2015-04-12 11:51:50 -05:00
Dmitry Smirnov afb127125d zmpkg.pl: correction for "Use of uninitialized value $command in string eq at zmpkg.pl line 62" 2015-04-11 22:41:07 +10:00
Dmitry Smirnov fa97348535 zmpkg.pl: pod2usage, tabs-to-spaces + readability 2015-04-11 22:39:32 +10:00
Dmitry Smirnov ac685fd247 zmfilter.pl: pod2usage + beautification 2015-04-11 11:18:21 +10:00
Dmitry Smirnov fba085a1c5 zmcontrol.pl: pod2usage (draft) + minor readability improvements. 
Looks like "zmcontrol.pl" was based upon "zmfilter.pl" so it inherited
 commented description of the latter.
 Therefore "zmcontrol.pl" needs a description...
 2015-04-11 11:15:56 +10:00
Isaac Connor 411b518b14 Merge pull request #774 from knnniggett/tmpfiles 
Use tmpfiles.d to manage tmpdir and sockdir
 2015-04-10 13:42:28 -04:00
Andrew Bauer 124ba1c2a8 Merge pull request #796 from ZoneMinder/zm_image_cleanups 
one small fix for a log line where the 4th parameter wasn't included.  T...
 2015-04-10 12:38:35 -05:00
Isaac Connor 05634f694a Merge pull request #781 from knnniggett/v4l_headers 
Check for libv4l1-videodev headers
 2015-04-10 13:30:15 -04:00
Isaac Connor 065a372678 one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations. 2015-04-10 13:26:17 -04:00
Isaac Connor 2db94d35f6 Merge pull request #795 from onlyjob/PBP 
zmaudit.pl, zmcamtool.pl: pod2usage, PBP/5 + readability
 2015-04-10 13:02:19 -04:00
Dmitry Smirnov 53907eeba1 zmcamtool.pl: readability 2015-04-11 00:35:40 +10:00
Dmitry Smirnov 90fa57788a zmcamtool.pl: pod2usage 2015-04-11 00:35:35 +10:00
Dmitry Smirnov 4dee542e99 zmcamtool.pl: tabs-to-spaces 2015-04-11 00:07:36 +10:00
Dmitry Smirnov 4bb8043fe5 zmaudit.pl: PBP/5 + readability 2015-04-10 20:34:17 +10:00
Dmitry Smirnov aeb3486322 zmaudit.pl: convert to pod2usage 2015-04-10 20:34:17 +10:00
Andrew Bauer ef21d08dd3 Update CMakeLists.txt 
typo
 2015-04-09 10:44:16 -05:00
Sune1337 5779b2e20f * use pthread_join instead of pthread_tryjoin_np 2015-04-08 22:15:54 +02:00
Isaac Connor c39984b228 Merge pull request #794 from onlyjob/PBP 
as discussed...
 2015-04-08 15:07:14 -04:00
Dmitry Smirnov 373b53f8f3 zmdc.pl: Usage() --> pod2usage() 2015-04-09 03:56:04 +10:00
Dmitry Smirnov 81860d99a6 zmdc.pl: PBP/5 + reformatting 2015-04-09 03:55:51 +10:00
Isaac Connor 577643ef09 Merge pull request #793 from SteveGilvarry/Leftover_Short_open 
Leftover short open tags
 2015-04-08 07:25:54 -04:00
SteveGilvarry 98d91ded90 Found some introduced short tags 2015-04-08 20:13:27 +10:00
SteveGilvarry 45fd7f1eca Found some old open tags left over 2015-04-08 20:11:26 +10:00
Andrew Bauer 8e5ba94ff8 Merge pull request #791 from onlyjob/783 
#783 - related corrections
 2015-04-06 07:05:40 -05:00
Dmitry Smirnov 904f2989ed Improving ZM_USE_DEEP_STORAGE description (#783): 
Removed "If you are upgrading from a previous version of ZoneMinder" from
 description. From data loss prospective it is irrelevant whether database
 is upgraded or not as fresh install is just as vulnerable.
 Changed "enable" to "change" to emphasize the above.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-04-06 18:39:13 +10:00
Dmitry Smirnov 078c5aa14b Briefly document "--migrate-events" option in zmupdate.pl (#783). 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-04-06 18:38:14 +10:00
Andrew Bauer 3e8c894a3e Update ConfigData.pm.in 2015-04-04 09:20:21 -05:00
Andrew Bauer d25f7ed362 Merge pull request #782 from onlyjob/export 
skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes: #506).
 2015-04-04 08:37:06 -05:00
Dmitry Smirnov d1f00f02c2 skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes: #506). 
Use mygetEventPath() to get valid path.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-04-04 20:39:06 +11:00
Andrew Bauer 549d7fd426 include libv4l1-videodev headers 2015-04-03 18:24:51 -05:00
Andrew Bauer 2331d731d1 cmake - update v4l header file check 2015-04-03 18:21:28 -05:00
Andrew Bauer a3637b9eed Add libv4l-devel as a build req for el7, f20, & f21 2015-04-03 17:41:46 -05:00
Andrew Bauer 0a010a69bd autotools - update v4l header file check 2015-04-03 17:36:09 -05:00
Andrew Bauer c0af30bdf1 fix permissions on config file 2015-03-31 20:45:12 -05:00
Andrew Bauer 7802089b82 Use tmpfiles.d to manage tmpdir and sockdir 2015-03-31 20:30:27 -05:00
Isaac Connor 2671e71e33 Merge pull request #763 from onlyjob/podhelp 
POD: zmupdate.pl converted to "pod2usage"
 2015-03-30 13:29:03 -04:00
Dmitry Smirnov 5f6c559476 POD: zmupdate.pl converted to "pod2usage" 
Best practice for POD documentation is to (re-)use it for displaying usage
 info. Now `perldoc zmupdate.pl` shows expected information and we can even
 generate man page automatically with `pod2man zmupdate.pl`.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-31 02:47:16 +11:00
Isaac Connor 07d1846458 Merge pull request #761 from onlyjob/build 
build: fix FTBFS with format-hardening (please review)
 2015-03-30 08:48:53 -04:00
Andrew Bauer 01c8ef748f Merge pull request #759 from onlyjob/pod 
fixing POD errors
 2015-03-30 07:27:03 -05:00
Dmitry Smirnov 6bbe42c5eb build: fix FTBFS with format-hardening 
~~~~
x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I..  -I/usr/include -I/usr/include -I/usr/include -D__STDC_CONSTANT_MACROS -Wall -finline-functions -fomit-frame-pointer -I/usr/include -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_mpeg.o -MD -MP -MF .deps/zm_mpeg.Tpo -c -o zm_mpeg.o zm_mpeg.cpp
zm_mpeg.cpp: In member function ‘void VideoStream::SetupFormat()’:
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
snprintf( s->filename, sizeof(s->filename), filename );
                                                     ^
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
~~~~

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-30 15:27:37 +11:00
Dmitry Smirnov b0faa138bd POD: added missing NAME sections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-30 15:07:03 +11:00
Dmitry Smirnov 11f7af3b03 fixing POD errors 
manpage-has-errors-from-pod2man (forgotten '=back' before '=head2')

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-30 14:41:01 +11:00
Isaac Connor 6aed8e5475 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-03-26 09:10:17 -04:00
Isaac Connor c816e79d65 Merge pull request #737 from knnniggett/netpbm 
remove NETPBM dependency from autotools
 2015-03-24 14:28:11 -04:00
Isaac Connor bc4d397534 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-03-23 13:13:26 -04:00
Isaac Connor cf40e20190 Merge pull request #746 from manupap1/fix_gitignore 
Ignore autogenerated files in git
 2015-03-17 08:33:28 -04:00