Merge lp://qastaging/~noskcaj/ubuntu/vivid/sagan/liblognorm-transition into lp://qastaging/ubuntu/vivid/sagan
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/sagan/liblognorm-transition |
| Merge into: | lp://qastaging/ubuntu/vivid/sagan |
| Diff against target: |
39802 lines (+21113/-12473) 125 files modified
.pc/01-do-not-include-lognorm-private-header.patch/src/sagan-config.c (+0/-532) .pc/01-do-not-include-lognorm-private-header.patch/src/sagan-signal.c (+0/-160) .pc/01-do-not-include-lognorm-private-header.patch/src/sagan.c (+0/-1322) .pc/applied-patches (+0/-1) AUTHORS (+0/-1) FAQ (+1/-4) INSTALL (+12/-7) Makefile (+805/-0) Makefile.am (+2/-2) Makefile.in (+252/-164) NEWS (+1/-2) README (+9/-6) aclocal.m4 (+703/-254) autogen.sh (+5/-0) config.guess (+206/-161) config.h (+335/-0) config.h.in (+53/-12) config.status (+1290/-0) config.sub (+157/-121) configure (+2040/-899) configure.ac (+300/-0) configure.in (+0/-325) debian/changelog (+8/-0) debian/control (+3/-1) debian/patches/01-do-not-include-lognorm-private-header.patch (+0/-36) debian/patches/series (+0/-1) depcomp (+347/-186) doc/sagan_freebsd.howto.md (+393/-0) etc/sagan.8 (+4/-1) etc/sagan.conf (+252/-63) extra/README (+2/-1) extra/barnyard2/barnyard2.cli.conf (+6/-0) extra/barnyard2/barnyard2.snorby.conf (+15/-0) extra/pulledpork/fetchcarl.sh (+187/-0) extra/pulledpork/pulledpork.sagan.conf (+19/-0) extra/rc.d-freebsd/sagan (+39/-0) extra/rsyslog/sagan.conf (+6/-0) install-sh (+21/-14) missing (+159/-320) src/Makefile (+0/-673) src/Makefile.am (+20/-5) src/Makefile.in (+844/-254) src/output-plugins/sagan-alert.c (+30/-18) src/output-plugins/sagan-alert.h (+26/-0) src/output-plugins/sagan-esmtp.c (+210/-157) src/output-plugins/sagan-esmtp.h (+8/-0) src/output-plugins/sagan-external.c (+114/-90) src/output-plugins/sagan-external.h (+25/-0) src/output-plugins/sagan-prelude.c (+0/-456) src/output-plugins/sagan-prelude.h (+0/-39) src/output-plugins/sagan-snort.c (+0/-597) src/output-plugins/sagan-snort.h (+0/-57) src/output-plugins/sagan-snortsam.c (+644/-579) src/output-plugins/sagan-snortsam.h (+199/-202) src/output-plugins/sagan-twofish.c (+574/-513) src/output-plugins/sagan-twofish.h (+54/-51) src/output-plugins/sagan-unified2.c (+439/-424) src/output-plugins/sagan-unified2.h (+3/-3) src/parsers/parse-ip.c (+106/-56) src/parsers/parse-port.c (+140/-115) src/parsers/parse-proto.c (+93/-0) src/parsers/parsers.h (+30/-0) src/processors/sagan-blacklist.c (+327/-0) src/processors/sagan-blacklist.h (+42/-0) src/processors/sagan-engine.c (+952/-0) src/processors/sagan-engine.h (+31/-0) src/processors/sagan-perfmon.c (+254/-0) src/processors/sagan-perfmon.h (+24/-0) src/processors/sagan-search.c (+281/-0) src/processors/sagan-search.h (+44/-0) src/processors/sagan-track-clients.c (+209/-0) src/processors/sagan-track-clients.h (+49/-0) src/processors/sagan-websense.c (+14/-0) src/sagan-alert-time.c (+195/-0) src/sagan-alert-time.h (+27/-0) src/sagan-classifications.c (+74/-62) src/sagan-classifications.h (+38/-0) src/sagan-config.c (+845/-442) src/sagan-config.h (+192/-0) src/sagan-credits.c (+72/-0) src/sagan-credits.h (+26/-0) src/sagan-defs.h (+56/-17) src/sagan-flowbit.c (+681/-0) src/sagan-flowbit.h (+50/-0) src/sagan-gen-msg.c (+116/-0) src/sagan-gen-msg.h (+37/-0) src/sagan-geoip.c (+136/-0) src/sagan-geoip.h (+35/-0) src/sagan-ignore-list.c (+84/-0) src/sagan-ignore-list.h (+34/-0) src/sagan-key.c (+21/-14) src/sagan-key.h (+25/-0) src/sagan-liblognorm.c (+193/-0) src/sagan-liblognorm.h (+60/-0) src/sagan-lockfile.c (+80/-58) src/sagan-lockfile.h (+27/-0) src/sagan-meta-content.c (+147/-0) src/sagan-meta-content.h (+26/-0) src/sagan-output.c (+65/-51) src/sagan-output.h (+26/-0) src/sagan-plog.c (+160/-144) src/sagan-plog.h (+36/-0) src/sagan-processor.c (+148/-16) src/sagan-processor.h (+26/-0) src/sagan-protocol-map.c (+115/-0) src/sagan-protocol-map.h (+48/-0) src/sagan-references.c (+129/-99) src/sagan-references.h (+37/-0) src/sagan-rules.c (+1113/-535) src/sagan-rules.h (+129/-0) src/sagan-send-alert.c (+91/-0) src/sagan-send-alert.h (+26/-0) src/sagan-signal.c (+191/-100) src/sagan-signal.h (+39/-0) src/sagan-stats.c (+159/-50) src/sagan-stats.h (+25/-0) src/sagan-strlcat.c (+27/-25) src/sagan-strlcpy.c (+26/-23) src/sagan-usage.c (+60/-61) src/sagan-usage.h (+25/-0) src/sagan-util.c (+516/-273) src/sagan.c (+988/-1241) src/sagan.h (+211/-376) src/version.h (+1/-1) stamp-h1 (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/sagan/liblognorm-transition |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
New upstream RC release. Allows the package to build, so this is preferable to our current version.
To post a comment you must log in.
Unmerged revisions
- 12. By Jackson Doak
-
Add build-dep on libee-dev.
- 11. By Jackson Doak
-
* New upstream release.
* Drop patch, no longer needed
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I don't think this works very well, can you fix? Might be an update to sagan-rules.
laney@raleigh> sagan
[E] [sagan.c, line 392] Cannot open /var/log/
laney@raleigh> sudo sagan
[*] Loading classifications
[*] 46 classifications loaded
[*] Loading references.conf file. [/etc/sagan-
[*] 6 references loaded.
[*] Loading gen-msg.map file. [/etc/sagan-
[E] [sagan-gen-msg.c, line 62] Cannot open generator file (/etc/sagan-