|
From: Alexander P. <ap...@us...> - 2010-01-12 01:01:50
|
- Log -----------------------------------------------------------------
commit 9993662442849cca4bd5f1ff8b059fed977d62da
Merge: 1c74529a3ebd9d21c04d69c575f4b5a66a100424 348cc39971b7b1450dbf4f1da139dcb1b202644f
Author: Alexander Prinsier <ap...@ma...>
Date: Tue Jan 12 01:33:38 2010 +0100
Merge branch 'RELENG_3_9' into RELENG_3_9_1
Conflicts:
configure.ac
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 126 ++-
Makefile.am | 4 +-
README | 26 +-
README.cssclean | 3 +-
UPGRADING | 15 +-
autogen.sh | 6 +-
configure.ac | 18 +-
contrib/README | 2 +
contrib/dspam_maintenance/README | 2 +
contrib/dspam_maintenance/dspam_maintenance.sh | 319 +++-
contrib/lotus_notes/README | 2 +
contrib/lotus_notes/libDSPAMReporting.lss | 2 +
doc/Makefile.am | 2 +-
doc/markov.txt | 2 +
doc/mysql_drv.txt | 6 +-
doc/pgsql_drv.txt | 4 +-
doc/sqlite_drv.txt | 4 +-
doc/tests.txt | 2 +
m4/Makefile.am | 3 +-
m4/libtool_hack.m4 | 33 -
m4/ncore.m4 | 43 -
m4/split_configuration.m4 | 1 +
man/Makefile.am | 68 +-
man/dspam.1 | 17 +-
man/dspam_admin.1 | 130 ++
man/dspam_clean.1 | 17 +-
man/dspam_crc.1 | 64 +
man/dspam_dump.1 | 24 +-
man/dspam_logrotate.1 | 88 +
man/dspam_merge.1 | 15 +-
man/dspam_stats.1 | 15 +-
man/dspam_train.1 | 15 +-
man/libdspam.3 | 19 +-
scripts/Makefile.am | 6 -
scripts/train.pl | 102 -
src/Makefile.am | 27 +-
src/agent_shared.c | 6 +-
src/agent_shared.h | 4 +-
src/base64.c | 6 +-
src/base64.h | 6 +-
src/bnr.c | 4 +-
src/bnr.h | 4 +-
src/buffer.c | 4 +-
src/buffer.h | 4 +-
src/client.c | 4 +-
src/client.h | 4 +-
src/config.h | 6 +-
src/config_api.c | 4 +-
src/config_api.h | 4 +-
src/config_shared.c | 65 +-
src/config_shared.h | 4 +-
src/daemon.c | 4 +-
src/daemon.h | 4 +-
src/decode.c | 9 +-
src/decode.h | 6 +-
src/diction.c | 4 +-
src/diction.h | 4 +-
src/dspam.c | 52 +-
src/dspam.conf.in | 29 +-
src/dspam.h | 4 +-
src/dspamc.c | 4 +-
src/dspamc.h | 4 +-
src/error.c | 4 +-
src/error.h | 4 +-
src/example.c | 4 +-
src/external_lookup.c | 26 +-
src/external_lookup.h | 2 +
src/hash.c | 4 +-
src/hash.h | 8 +-
src/hash_drv.c | 35 +-
src/hash_drv.h | 4 +-
src/heap.c | 4 +-
src/heap.h | 4 +-
src/language.h | 4 +-
src/libdspam.c | 29 +-
src/libdspam.h | 4 +-
src/libdspam_objects.h | 4 +-
src/list.c | 4 +-
src/list.h | 4 +-
src/mysql_drv.c | 4 +-
src/mysql_drv.h | 4 +-
src/ncore_adp.c | 7 -
src/ncore_adp.h | 7 -
src/nodetree.c | 4 +-
src/nodetree.h | 4 +-
src/pgsql_drv.c | 78 +-
src/pgsql_drv.h | 4 +-
src/pref.c | 10 +-
src/pref.h | 4 +-
src/read_config.c | 4 +-
src/read_config.h | 4 +-
src/sqlite3_drv.c | 4 +-
src/sqlite3_drv.h | 4 +-
src/sqlite_drv.c | 4 +-
src/sqlite_drv.h | 4 +-
src/storage_driver.c | 78 +-
src/storage_driver.h | 4 +-
src/tokenizer.c | 61 +-
src/tokenizer.h | 4 +-
src/tools.hash_drv/cssclean.c | 8 +-
src/tools.hash_drv/csscompress.c | 16 +-
src/tools.hash_drv/cssconvert.c | 8 +-
src/tools.hash_drv/cssstat.c | 14 +-
src/tools.mysql_drv/mysql_objects-4.1.sql | 16 +-
src/tools.mysql_drv/purge-4.1.sql | 101 +-
src/tools.mysql_drv/purge.sql | 78 +-
src/tools.pgsql_drv/dspam_pg2int8.c | 4 +-
src/tools.sqlite_drv/purge-2.sql | 1 +
src/tools/dspam_2sql.c | 5 +-
src/tools/dspam_admin.c | 5 +-
src/tools/dspam_clean.c | 5 +-
src/tools/dspam_crc.c | 4 +-
src/tools/dspam_dump.c | 5 +-
src/tools/dspam_logrotate | 4 +-
src/tools/dspam_merge.c | 5 +-
src/tools/dspam_notify.pl | 2 +
src/tools/dspam_stats.c | 15 +-
src/tools/dspam_train.in | 4 +-
src/util.c | 12 +-
src/util.h | 4 +-
txt/Makefile.am | 12 +-
webui/cgi-bin/Makefile.am | 23 +-
webui/cgi-bin/admin.cgi | 102 +-
webui/cgi-bin/admingraph.cgi | 65 +-
webui/cgi-bin/configure.pl.in | 68 +-
webui/cgi-bin/dspam.cgi | 694 +++-----
webui/cgi-bin/graph.cgi | 65 +-
webui/cgi-bin/htmlize.pl | 1948 ++++++++++++++++++++
webui/cgi-bin/subadmins | 15 +
webui/cgi-bin/templates/{ => cs}/Makefile.am | 0
webui/cgi-bin/templates/cs/nav_admin_error.html | 38 +
.../templates/cs/nav_admin_preferences.html | 128 ++
webui/cgi-bin/templates/cs/nav_admin_status.html | 143 ++
webui/cgi-bin/templates/cs/nav_admin_user.html | 59 +
webui/cgi-bin/templates/cs/nav_alerts.html | 54 +
webui/cgi-bin/templates/cs/nav_analysis.html | 52 +
webui/cgi-bin/templates/cs/nav_error.html | 41 +
.../cgi-bin/templates/{fr => cs}/nav_fragment.html | 3 +-
webui/cgi-bin/templates/cs/nav_history.html | 87 +
webui/cgi-bin/templates/cs/nav_performance.html | 110 ++
webui/cgi-bin/templates/cs/nav_preferences.html | 122 ++
webui/cgi-bin/templates/cs/nav_quarantine.html | 85 +
webui/cgi-bin/templates/cs/nav_viewmessage.html | 56 +
webui/cgi-bin/templates/cs/strings.pl | 92 +
webui/cgi-bin/templates/de/nav_admin_error.html | 13 +-
.../templates/de/nav_admin_preferences.html | 14 +-
webui/cgi-bin/templates/de/nav_admin_status.html | 19 +-
webui/cgi-bin/templates/de/nav_admin_user.html | 13 +-
webui/cgi-bin/templates/de/nav_alerts.html | 18 +-
webui/cgi-bin/templates/de/nav_analysis.html | 22 +-
webui/cgi-bin/templates/de/nav_error.html | 17 +-
webui/cgi-bin/templates/de/nav_fragment.html | 1 +
webui/cgi-bin/templates/de/nav_history.html | 28 +-
webui/cgi-bin/templates/de/nav_performance.html | 31 +-
webui/cgi-bin/templates/de/nav_preferences.html | 18 +-
webui/cgi-bin/templates/de/nav_quarantine.html | 46 +-
webui/cgi-bin/templates/de/nav_viewmessage.html | 18 +-
webui/cgi-bin/templates/de/strings.pl | 18 +-
webui/cgi-bin/templates/es-es/nav_admin_error.html | 15 +-
.../templates/es-es/nav_admin_preferences.html | 16 +-
.../cgi-bin/templates/es-es/nav_admin_status.html | 19 +-
webui/cgi-bin/templates/es-es/nav_admin_user.html | 15 +-
webui/cgi-bin/templates/es-es/nav_alerts.html | 18 +-
webui/cgi-bin/templates/es-es/nav_analysis.html | 22 +-
webui/cgi-bin/templates/es-es/nav_error.html | 19 +-
webui/cgi-bin/templates/es-es/nav_fragment.html | 1 +
webui/cgi-bin/templates/es-es/nav_history.html | 22 +-
webui/cgi-bin/templates/es-es/nav_performance.html | 19 +-
webui/cgi-bin/templates/es-es/nav_preferences.html | 18 +-
webui/cgi-bin/templates/es-es/nav_quarantine.html | 44 +-
webui/cgi-bin/templates/es-es/nav_viewmessage.html | 20 +-
webui/cgi-bin/templates/es-es/strings.pl | 12 +-
webui/cgi-bin/templates/fr/nav_admin_error.html | 15 +-
.../templates/fr/nav_admin_preferences.html | 16 +-
webui/cgi-bin/templates/fr/nav_admin_status.html | 19 +-
webui/cgi-bin/templates/fr/nav_admin_user.html | 15 +-
webui/cgi-bin/templates/fr/nav_alerts.html | 18 +-
webui/cgi-bin/templates/fr/nav_analysis.html | 22 +-
webui/cgi-bin/templates/fr/nav_error.html | 19 +-
webui/cgi-bin/templates/fr/nav_fragment.html | 1 +
webui/cgi-bin/templates/fr/nav_history.html | 22 +-
webui/cgi-bin/templates/fr/nav_performance.html | 19 +-
webui/cgi-bin/templates/fr/nav_preferences.html | 18 +-
webui/cgi-bin/templates/fr/nav_quarantine.html | 46 +-
webui/cgi-bin/templates/fr/nav_viewmessage.html | 20 +-
webui/cgi-bin/templates/fr/strings.pl | 12 +-
webui/cgi-bin/templates/he/nav_admin_error.html | 23 +-
.../templates/he/nav_admin_preferences.html | 24 +-
webui/cgi-bin/templates/he/nav_admin_status.html | 29 +-
webui/cgi-bin/templates/he/nav_admin_user.html | 25 +-
webui/cgi-bin/templates/he/nav_alerts.html | 28 +-
webui/cgi-bin/templates/he/nav_analysis.html | 32 +-
webui/cgi-bin/templates/he/nav_error.html | 27 +-
webui/cgi-bin/templates/he/nav_fragment.html | 9 +-
webui/cgi-bin/templates/he/nav_history.html | 30 +-
webui/cgi-bin/templates/he/nav_performance.html | 27 +-
webui/cgi-bin/templates/he/nav_preferences.html | 26 +-
webui/cgi-bin/templates/he/nav_quarantine.html | 36 +-
webui/cgi-bin/templates/he/nav_viewmessage.html | 28 +-
webui/cgi-bin/templates/he/strings.pl | 101 +
webui/cgi-bin/templates/nav_admin_error.html | 15 +-
webui/cgi-bin/templates/nav_admin_preferences.html | 16 +-
webui/cgi-bin/templates/nav_admin_status.html | 19 +-
webui/cgi-bin/templates/nav_admin_user.html | 15 +-
webui/cgi-bin/templates/nav_alerts.html | 18 +-
webui/cgi-bin/templates/nav_analysis.html | 23 +-
webui/cgi-bin/templates/nav_error.html | 19 +-
webui/cgi-bin/templates/nav_fragment.html | 1 +
webui/cgi-bin/templates/nav_history.html | 20 +-
webui/cgi-bin/templates/nav_performance.html | 19 +-
webui/cgi-bin/templates/nav_preferences.html | 18 +-
webui/cgi-bin/templates/nav_quarantine.html | 42 +-
webui/cgi-bin/templates/nav_viewmessage.html | 20 +-
webui/cgi-bin/templates/pt-br/nav_admin_error.html | 15 +-
.../templates/pt-br/nav_admin_preferences.html | 16 +-
.../cgi-bin/templates/pt-br/nav_admin_status.html | 19 +-
webui/cgi-bin/templates/pt-br/nav_admin_user.html | 15 +-
webui/cgi-bin/templates/pt-br/nav_alerts.html | 18 +-
webui/cgi-bin/templates/pt-br/nav_analysis.html | 22 +-
webui/cgi-bin/templates/pt-br/nav_error.html | 19 +-
webui/cgi-bin/templates/pt-br/nav_fragment.html | 1 +
webui/cgi-bin/templates/pt-br/nav_history.html | 22 +-
webui/cgi-bin/templates/pt-br/nav_performance.html | 19 +-
webui/cgi-bin/templates/pt-br/nav_preferences.html | 18 +-
webui/cgi-bin/templates/pt-br/nav_quarantine.html | 46 +-
webui/cgi-bin/templates/pt-br/nav_viewmessage.html | 20 +-
webui/cgi-bin/templates/pt-br/strings.pl | 12 +-
webui/cgi-bin/templates/ro/Makefile.am | 2 +-
webui/cgi-bin/templates/ro/nav_admin_error.html | 15 +-
.../templates/ro/nav_admin_preferences.html | 16 +-
webui/cgi-bin/templates/ro/nav_admin_status.html | 19 +-
webui/cgi-bin/templates/ro/nav_admin_user.html | 15 +-
webui/cgi-bin/templates/ro/nav_alerts.html | 20 +-
webui/cgi-bin/templates/ro/nav_analysis.html | 24 +-
webui/cgi-bin/templates/ro/nav_error.html | 19 +-
webui/cgi-bin/templates/ro/nav_fragment.html | 1 +
webui/cgi-bin/templates/ro/nav_history.html | 24 +-
webui/cgi-bin/templates/ro/nav_performance.html | 19 +-
webui/cgi-bin/templates/ro/nav_preferences.html | 18 +-
webui/cgi-bin/templates/ro/nav_quarantine.html | 48 +-
webui/cgi-bin/templates/ro/nav_viewmessage.html | 20 +-
webui/cgi-bin/templates/strings.pl | 12 +-
webui/htdocs/Makefile.am | 13 +-
webui/htdocs/base.css | 182 +-
webui/htdocs/dspam.js | 4 +-
webui/htdocs/favicon.ico | Bin 0 -> 15774 bytes
webui/htdocs/rtl.css | 50 +
247 files changed, 6253 insertions(+), 2326 deletions(-)
delete mode 100644 m4/libtool_hack.m4
delete mode 100644 m4/ncore.m4
create mode 100644 man/dspam_admin.1
create mode 100644 man/dspam_crc.1
create mode 100644 man/dspam_logrotate.1
delete mode 100644 scripts/Makefile.am
delete mode 100755 scripts/train.pl
delete mode 100644 src/ncore_adp.c
delete mode 100644 src/ncore_adp.h
create mode 100755 webui/cgi-bin/htmlize.pl
create mode 100644 webui/cgi-bin/subadmins
copy webui/cgi-bin/templates/{ => cs}/Makefile.am (100%)
create mode 100644 webui/cgi-bin/templates/cs/nav_admin_error.html
create mode 100644 webui/cgi-bin/templates/cs/nav_admin_preferences.html
create mode 100644 webui/cgi-bin/templates/cs/nav_admin_status.html
create mode 100644 webui/cgi-bin/templates/cs/nav_admin_user.html
create mode 100644 webui/cgi-bin/templates/cs/nav_alerts.html
create mode 100644 webui/cgi-bin/templates/cs/nav_analysis.html
create mode 100644 webui/cgi-bin/templates/cs/nav_error.html
copy webui/cgi-bin/templates/{fr => cs}/nav_fragment.html (77%)
create mode 100644 webui/cgi-bin/templates/cs/nav_history.html
create mode 100644 webui/cgi-bin/templates/cs/nav_performance.html
create mode 100644 webui/cgi-bin/templates/cs/nav_preferences.html
create mode 100644 webui/cgi-bin/templates/cs/nav_quarantine.html
create mode 100644 webui/cgi-bin/templates/cs/nav_viewmessage.html
create mode 100755 webui/cgi-bin/templates/cs/strings.pl
create mode 100644 webui/cgi-bin/templates/he/strings.pl
create mode 100644 webui/htdocs/favicon.ico
create mode 100644 webui/htdocs/rtl.css
hooks/post-receive
--
dspam
|
