Commit Graph

21 Commits

Author SHA1 Message Date
Zakir Durumeric 42650bf402 Merge branch 'master' of github.com:zmap/zmap 2013-08-30 01:15:45 -04:00
Zakir Durumeric be62665bb5 working MakeFile 2013-08-30 01:15:25 -04:00
Zakir Durumeric 65d19a8199 resolve merge conflicts and move timestamp to system field. 2013-08-29 23:05:53 -04:00
Eric 2aeb368f37 remove old man if it is there 2013-08-29 18:05:41 -04:00
Zakir Durumeric 161ba170d9 merging in master 2013-08-29 15:03:23 -04:00
Eric 851cdb05d6 Merge branch 'master' of github.com:jimcheetham/zmap into jimcheetham-master 2013-08-29 01:49:04 -04:00
Zakir Durumeric 67aa6f0ab0 adding generic csv output module 2013-08-27 12:03:24 -04:00
Christopher Meng 4ec783f748 $(EXTRA_CFLAGS) FOR RPM %{optflags}
We RPM packaging system need to use optflags for secure building, and of course will override the flags you've defined.

However the current one is not good, we should leave it to the end of the flags queue.

[rpmaker@fab SPECS]$ rpm -E %{optflags}
-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
2013-08-22 13:40:19 +08:00
Jim Cheetham c6fc67288a Install man files under $(PREFIX) 2013-08-20 21:53:37 -04:00
Eric 853524c2ae remove redundant -Ws from Makefile 2013-08-20 19:24:18 -04:00
Alex Halderman 5e4143973d Undefine _FORTIFY_SOURCE before defining it, in case it's set by the distro.
Fixes Issue #7.
2013-08-20 13:05:47 -04:00
Alex Halderman 9200992976 Remove Redis objects on make clean
Resolves Issue #33.
2013-08-20 12:23:12 -04:00
Alex Halderman f34343a887 Clean up Makefile success output 2013-08-20 12:20:53 -04:00
Alex Halderman b588a7dbaf Clean up GCC flags
Remove some redundant or repeated flags, as noted by ppannuto in Issue #23.
2013-08-20 12:11:48 -04:00
Alex Halderman 81f25a1848 Fix unrecognized option errors when building with older versions of GCC (Issue #23).
This approach suggested by ppannuto.
2013-08-20 12:01:01 -04:00
Zakir Durumeric 1ae210f330 Merge branch 'master' into probe-v2 2013-08-20 00:34:27 -04:00
Zakir Durumeric aa090e63eb Fixing issue #24; accidentally clobbering LDFLAGS and CFLAGS previously. 2013-08-19 21:02:27 -04:00
Zakir Durumeric 952f6cefa1 building fieldset and probe modules 2013-08-19 04:42:25 -04:00
HD Moore 9d31ee1a62 Add json_file output format (uses json-c) 2013-08-17 14:02:23 -05:00
Eric 597a0c252e remove ssldb and fix redis callback 2013-08-17 02:35:27 -04:00
Zakir Durumeric 490054d239 inital public release 2013-08-16 11:12:47 -04:00