update docs

git-svn: trunk@4958

NEWS

@@ -1,48 +1,11 @@
-0.95rc1
--------
-
-ClamAV 0.95rc1 introduces many bugfixes, improvements and additions. To make
-the transition easier, we put various tips and upgrade notes on this page:
-https://wiki.clamav.net/Main/UpgradeNotes095
-
-The following are the key features of this release:
-
-    - New clamav-milter: The program has been redesigned and rewritten from
-      scratch. The most notable difference is that the internal mode has been
-      dropped which means that now a working clamd companion is required.
-      The milter now also has its own configuration file.
-
-    - Clamd extensions: The protocol has been extended to lighten the load
-      that clamd puts on the system, solve limitations of the old protocol,
-      and reduce latency when signature updates are received. For more
-      information about the new extensions please see the official
-      documentation and the upgrade notes.
-
-    - Improved API: The API used to program ClamAV's engine (libclamav) has
-      been redesigned to use modern object-oriented techniques and solves
-      various API/ABI compatibility issues between old and new releases.
-      You can find more information in Section 6 of clamdoc.pdf and in
-      the upgrade notes.
-
-    - ClamdTOP: This is a new program that allows system administrators to
-      monitor clamd. It provides information about the items in the clamd's
-      queue, clamd's memory usage, and the version of the signature database,
-      all in real-time and in nice curses-based interface.
-
-    - Memory Pool Allocator: Libclamav now includes its own memory pool
-      allocator based on memory mapping. This new solution replaces the
-      traditional malloc/free system for the copy of the signatures that
-      is kept in memory. As a result, clamd requires much less memory,
-      particularly when signature updates are received and the database is
-      loaded into memory.
-
-    - Unified Option Parser: Prior to version 0.95 each program in ClamAV's
-      suite of programs had its own set of runtime options. The new general
-      parser brings consistency of use and validation to these options across
-      the suite. Some command line switches of clamscan have been renamed
-      (the old ones will still be accepted but will have no effect and will
-      result in warnings), please see clamscan(1) and clamscan --help for
-      the details.
+0.95rc2
+--------
+
+This is a second release candidate for ClamAV 0.95. It fixes a number of
+problems that were found in 0.95rc1 and activates support for Google Safe
+Browsing, which can be enabled by turning on the SafeBrowsing option in
+freshclam.conf. Please see 'man 5 freshclam.conf' and
+http://safebrowsing.clamav.net for more information.
 
 --
 The ClamAV team (http://www.clamav.net/team)

README

@@ -2,6 +2,18 @@ Note: This README/NEWS file refers to the source tarball. Some things described
 here may not be available in binary packages.
 --
 
+0.95rc2
+--------
+
+This is a second release candidate for ClamAV 0.95. It fixes a number of
+problems that were found in 0.95rc1 and activates support for Google Safe
+Browsing, which can be enabled by turning on the SafeBrowsing option in
+freshclam.conf. Please see 'man 5 freshclam.conf' and
+http://safebrowsing.clamav.net for more information.
+
+--
+The ClamAV team (http://www.clamav.net/team)
+
 
 0.95rc1
 -------

etc/freshclam.conf

@@ -159,3 +159,16 @@ DatabaseMirror database.clamav.net
 # of the country of origin.
 # Default: disabled
 #DetectionStatsCountry country-code
+
+# This option enables support for Google Safe Browsing. When activated for
+# the first time, freshclam will download a new database file (safebrowsing.cvd)
+# which will be automatically loaded by clamd and clamscan during the next
+# reload, provided that the heuristic phishing detection is turned on. This
+# database includes information about websites that are phishing sites or are
+# known to be sources of malware. When using this option, it's strongly
+# recommended to run freshclam at least every 30 minutes.
+# Freshclam uses the ClamAV's mirror infrastructure to distribute the
+# database and its updates but all the contents are provided under Google's
+# terms of use. Please see http://safebrowsing.clamav.net for more information.
+# Default: disabled
+#SafeBrowsing yes

shared/optparser.c

@@ -350,7 +350,7 @@ const struct clam_option clam_options[] = {
 
     { "DetectionStatsCountry", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM, "Country of origin of malware/detection statistics (for statistical\npurposes only). The statistics collector at ClamAV.net will look up\nyour IP address to determine the geographical origin of the malware\nreported by your installation. If this installation is mainly used to\nscan data which comes from a different location, please enable this\noption and enter a two-letter code (see http://www.iana.org/domains/root/db/)\nof the country of origin.", "country-code" },
 
-    { "SafeBrowsing", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "FIXME", "yes" },
+    { "SafeBrowsing", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "This option enables support for Google Safe Browsing. When activated for\nthe first time, freshclam will download a new database file (safebrowsing.cvd)\nwhich will be automatically loaded by clamd and clamscan during the next\nreload, provided that the heuristic phishing detection is turned on. This\ndatabase includes information about websites that are phishing sites or are\nknown to be sources of malware. When using this option, it's strongly\nrecommended to run freshclam at least every 30 minutes.\nFreshclam uses the ClamAV's mirror infrastructure to distribute the\ndatabase and its updates but all the contents are provided under Google's\nterms of use. Please see http://safebrowsing.clamav.net for more information.", "yes" },
 
     /* Deprecated options */