Commit Graph

4606 Commits

Author SHA1 Message Date
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
Isaac Connor 64d7a53cf6 remove lines I used for debugging. 2015-04-01 12:53:06 -04:00
Isaac Connor 2591e946af old versions ignore other efforts to include our own m4 directory, so spceify it on the command line 2015-04-01 12:19:27 -04:00
Isaac Connor 5592f52cf8 add -I to aclocal command line since it is ignoring all other include directives 2015-04-01 12:18:45 -04:00
Isaac Connor 1b8554fad2 cleanup. 2015-04-01 12:17:23 -04:00
Isaac Connor fd62b1a71c show directory listing to see what's in the build dir. cat aclocal.m4 after it has actually been created. 2015-04-01 11:26:23 -04:00
Isaac Connor 59fbb4d0b5 ahem: only cat aclocal.m4 if using autotools 2015-04-01 11:16:05 -04:00
Isaac Connor b0e6ed1d4a check cwd and cat out the resulting aclocal.m4 in order to debug the lack of including our ac_check_sendfile macros. Also be more verbose from libtoolize 2015-04-01 11:05:11 -04:00
Isaac Connor c2c130df37 try out the new AC_CONFIG_MACRO_DIRS feature. 2015-04-01 10:14:02 -04:00
Isaac Connor bf3efa7a7a allow AC_CHECK_SENDFILE because travis is complaining 2015-03-31 23:31:05 -04:00
Isaac Connor 648a05a406 have to include the m4 dir apparently 2015-03-31 23:20:39 -04:00
Isaac Connor 199c94e7db Add Sendfile checks for cmake 2015-03-31 23:07:19 -04: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
balr0g e4e2160bf6 Don't trigger linked cameras on new events 2015-03-31 13:22:02 -04:00
Isaac Connor 21915eb92c Merge branch 'master' into freebsd_fixes 2015-03-31 11:06:53 -04:00
Isaac Connor 0669b24165 this was moved to m4 2015-03-31 11:06:14 -04:00
Emmanuel Papin 039cf09da9 Fix bad translations (first checking before tests) 2015-03-30 21:16:33 +02:00
Emmanuel Papin c0b41ed6a8 Readd translations from Jypy 2015-03-30 20:50:42 +02:00
Emmanuel Papin ca041a3ce5 Revert "Update fr_fr.php"
This reverts commit 3b9c3f0776.
2015-03-30 20:06:59 +02: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 ed28eebba4 This is already included in zm_signal.h 2015-03-27 15:16:15 -04:00
Isaac Connor ef340255d3 move the macro for AC_SENDFILE into the m4 directory 2015-03-27 15:15:55 -04:00
Isaac Connor 6114acdadf tell configure to look in m4 for additional macros 2015-03-27 15:15:12 -04: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
Emmanuel Papin a4985fb00d Ignore Makefile.old 2015-03-15 16:46:48 +01:00
Emmanuel Papin 0f10e2b24d Add config.h.in~ to the list of files to ignore 2015-03-14 23:23:21 +01:00
Emmanuel Papin 8a1d00dfd6 Ignore file added at compile time 2015-03-14 23:15:56 +01:00
Emmanuel Papin e219b5c86a Ignore files modified at compile time 2015-03-14 23:14:27 +01:00
Emmanuel Papin c68a325e8e Untrack files modified at compile time 2015-03-14 23:09:36 +01:00
Emmanuel Papin 56b724e161 Fix text formatting in event's note 2015-03-08 14:33:55 +01:00
Emmanuel Papin 63158ebe7d Improve management of plugin options 2015-03-08 13:13:49 +01:00
Emmanuel Papin 7fd2f367c6 Fix plugin output to event note 2015-03-07 21:46:01 +01:00