new file mode 100644

@@ -0,0 +1,45 @@

+Modified files from libbzip2 are present under libclamav/nsis.

+The original LICENSE file for bzip2 and libbzip2 is reproduced below.

+

+--------------------------------------------------------------------------

+

+This program, "bzip2", the associated library "libbzip2", and all

+documentation, are copyright (C) 1996-2006 Julian R Seward.  All

+rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+

+1. Redistributions of source code must retain the above copyright

+   notice, this list of conditions and the following disclaimer.

+

+2. The origin of this software must not be misrepresented; you must 

+   not claim that you wrote the original software.  If you use this 

+   software in a product, an acknowledgment in the product 

+   documentation would be appreciated but is not required.

+

+3. Altered source versions must be plainly marked as such, and must

+   not be misrepresented as being the original software.

+

+4. The name of the author may not be used to endorse or promote 

+   products derived from this software without specific prior written 

+   permission.

+

+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS

+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE

+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+Julian Seward, Cambridge, UK.

+jseward@bzip.org

+bzip2/libbzip2 version 1.0.4 of 20 December 2006

+

+--------------------------------------------------------------------------

new file mode 100644

@@ -0,0 +1,72 @@

+Original unmodified files from the LZMA SDK are included under libclamav/lzma.

+The original lzma.txt license file, a small portion of which is reproduced below,

+is available under libclamav/lzma/lzma.txt. 

+

+LICENSE

+-------

+

+LZMA SDK is available under any of the following licenses:

+

+1) GNU Lesser General Public License (GNU LGPL)

+2) Common Public License (CPL)

+3) Simplified license for unmodified code (read SPECIAL EXCEPTION) 

+4) Proprietary license 

+

+It means that you can select one of these four options and follow rules of that license.

+

+

+1,2) GNU LGPL and CPL licenses are pretty similar and both these

+licenses are classified as 

+ - "Free software licenses" at http://www.gnu.org/ 

+ - "OSI-approved" at http://www.opensource.org/

+

+

+3) SPECIAL EXCEPTION

+

+Igor Pavlov, as the author of this code, expressly permits you 

+to statically or dynamically link your code (or bind by name) 

+to the files from LZMA SDK without subjecting your linked 

+code to the terms of the CPL or GNU LGPL. 

+Any modifications or additions to files from LZMA SDK, however, 

+are subject to the GNU LGPL or CPL terms.

+

+SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code, 

+while you keep LZMA SDK code unmodified.

+

+

+SPECIAL EXCEPTION #2: Igor Pavlov, as the author of this code, expressly permits 

+you to use this code under the same terms and conditions contained in the License 

+Agreement you have for any previous version of LZMA SDK developed by Igor Pavlov.

+

+SPECIAL EXCEPTION #2 allows owners of proprietary licenses to use latest version 

+of LZMA SDK as update for previous versions.

+

+

+SPECIAL EXCEPTION #3: Igor Pavlov, as the author of this code, expressly permits 

+you to use code of the following files: 

+BranchTypes.h, LzmaTypes.h, LzmaTest.c, LzmaStateTest.c, LzmaAlone.cpp, 

+LzmaAlone.cs, LzmaAlone.java

+as public domain code. 

+

+

+4) Proprietary license

+

+LZMA SDK also can be available under a proprietary license which 

+can include:

+

+1) Right to modify code without subjecting modified code to the 

+terms of the CPL or GNU LGPL

+2) Technical support for code

+

+To request such proprietary license or any additional consultations,

+send email message from that page:

+http://www.7-zip.org/support.html

+

+

+You should have received a copy of the GNU Lesser General Public

+License along with this library; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+You should have received a copy of the Common Public License

+along with this library.

+

deleted file mode 100644

@@ -1,308 +0,0 @@

-********************************************************************************

-   This document contains licence details for files in libclamav/nsis. It can

-   be accessed on-line at http://nsis.sourceforge.net/License

-********************************************************************************

-

-Copyright (C) 1995-2007 Contributors 

-

-More detailed copyright information can be found in the individual source code 

-files. 

-

-Applicable licenses 

-

-* All NSIS source code, plug-ins, documentation, examples, header files and 

-  graphics, with the exception of the compression modules and where otherwise 

-  noted, are licensed under the zlib/libpng license. 

-

-* The zlib compression module for NSIS is licensed under the zlib/libpng

-  license. 

-

-* The bzip2 compression module for NSIS is licensed under the bzip2 license. 

-

-* The lzma compression module for NSIS is licensed under the Common Public

-  License version 1.0. 

-

-zlib/libpng license 

-

-This software is provided 'as-is', without any express or implied warranty. In 

-no event will the authors be held liable for any damages arising from the use

-of this software. 

-

-Permission is granted to anyone to use this software for any purpose, including 

-commercial applications, and to alter it and redistribute it freely, subject to 

-the following restrictions: 

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software in

-     a product, an acknowledgment in the product documentation would be

-     appreciated but is not required. 

-

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software. 

-

-  3. This notice may not be removed or altered from any source distribution. 

-

-bzip2 license 

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are met: 

-

-  1. Redistributions of source code must retain the above copyright notice,

-     this list of conditions and the following disclaimer.

-

-  2. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software in

-     a product, an acknowledgment in the product documentation would be

-     appreciated but is not required. 

-

-  3. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-

-  4. The name of the author may not be used to endorse or promote products

-     derived from this software without specific prior written permission. 

-

-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 

-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 

-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO

-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 

-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

-OF SUCH DAMAGE. 

-

-Julian Seward, Cambridge, UK. 

-

-jseward@acm.org 

-

-Common Public License version 1.0 

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC 

-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM 

-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 

-

-1. DEFINITIONS 

-

-"Contribution" means: 

-

-a) in the case of the initial Contributor, the initial code and documentation 

-   distributed under this Agreement, and b) in the case of each subsequent 

-   Contributor: 

-

-i) changes to the Program, and 

-

-ii) additions to the Program; 

-

-where such changes and/or additions to the Program originate from and are 

-distributed by that particular Contributor. A Contribution 'originates' from a 

-Contributor if it was added to the Program by such Contributor itself or anyone 

-acting on such Contributor's behalf. Contributions do not include additions to 

-the Program which: (i) are separate modules of software distributed in 

-conjunction with the Program under their own license agreement, and (ii) are

-not derivative works of the Program. 

-

-"Contributor" means any person or entity that distributes the Program. 

-

-"Licensed Patents " mean patent claims licensable by a Contributor which are 

-necessarily infringed by the use or sale of its Contribution alone or when 

-combined with the Program. 

-

-"Program" means the Contributions distributed in accordance with this Agreement.

-

-"Recipient" means anyone who receives the Program under this Agreement, 

-including all Contributors. 

-

-2. GRANT OF RIGHTS 

-

-a) Subject to the terms of this Agreement, each Contributor hereby grants 

-Recipient a non-exclusive, worldwide, royalty-free copyright license to 

-reproduce, prepare derivative works of, publicly display, publicly perform, 

-distribute and sublicense the Contribution of such Contributor, if any, and

-such derivative works, in source code and object code form. 

-

-b) Subject to the terms of this Agreement, each Contributor hereby grants 

-Recipient a non-exclusive, worldwide, royalty-free patent license under

-Licensed Patents to make, use, sell, offer to sell, import and otherwise

-transfer the Contribution of such Contributor, if any, in source code and

-object code form. This patent license shall apply to the combination of the

-Contribution and the Program if, at the time the Contribution is added by the

-Contributor, such addition of the Contribution causes such combination to be

-covered by the Licensed Patents. The patent license shall not apply to any

-other combinations which include the Contribution. No hardware per se is

-licensed hereunder.

-

-c) Recipient understands that although each Contributor grants the licenses to 

-its Contributions set forth herein, no assurances are provided by any 

-Contributor that the Program does not infringe the patent or other intellectual 

-property rights of any other entity. Each Contributor disclaims any liability

-to Recipient for claims brought by any other entity based on infringement of 

-intellectual property rights or otherwise. As a condition to exercising the 

-rights and licenses granted hereunder, each Recipient hereby assumes sole 

-responsibility to secure any other intellectual property rights needed, if any. 

-For example, if a third party patent license is required to allow Recipient to 

-distribute the Program, it is Recipient's responsibility to acquire that

-license before distributing the Program. 

-

-d) Each Contributor represents that to its knowledge it has sufficient

-copyright rights in its Contribution, if any, to grant the copyright license

-set forth in this Agreement. 

-

-3. REQUIREMENTS 

-

-A Contributor may choose to distribute the Program in object code form under

-its own license agreement, provided that: 

-

-a) it complies with the terms and conditions of this Agreement; and 

-

-b) its license agreement: 

-

-i) effectively disclaims on behalf of all Contributors all warranties and 

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; 

-

-ii) effectively excludes on behalf of all Contributors all liability for

-damages, including direct, indirect, special, incidental and consequential

-damages, such as lost profits; 

-

-iii) states that any provisions which differ from this Agreement are offered by 

-that Contributor alone and not by any other party; and 

-

-iv) states that source code for the Program is available from such Contributor, 

-and informs licensees how to obtain it in a reasonable manner on or through a 

-medium customarily used for software exchange. 

-

-When the Program is made available in source code form: 

-

-a) it must be made available under this Agreement; and 

-

-b) a copy of this Agreement must be included with each copy of the Program. 

-

-Contributors may not remove or alter any copyright notices contained within the 

-Program. 

-

-Each Contributor must identify itself as the originator of its Contribution, if 

-any, in a manner that reasonably allows subsequent Recipients to identify the 

-originator of the Contribution. 

-

-4. COMMERCIAL DISTRIBUTION 

-

-Commercial distributors of software may accept certain responsibilities with 

-respect to end users, business partners and the like. While this license is 

-intended to facilitate the commercial use of the Program, the Contributor who 

-includes the Program in a commercial product offering should do so in a manner 

-which does not create potential liability for other Contributors. Therefore, if 

-a Contributor includes the Program in a commercial product offering, such 

-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify 

-every other Contributor ("Indemnified Contributor") against any losses, damages 

-and costs (collectively "Losses") arising from claims, lawsuits and other legal 

-actions brought by a third party against the Indemnified Contributor to the 

-extent caused by the acts or omissions of such Commercial Contributor in 

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may

-participate in any such claim at its own expense. 

-

-For example, a Contributor might include the Program in a commercial product 

-offering, Product X. That Contributor is then a Commercial Contributor. If that 

-Commercial Contributor then makes performance claims, or offers warranties 

-related to Product X, those performance claims and warranties are such 

-Commercial Contributor's responsibility alone. Under this section, the 

-Commercial Contributor would have to defend claims against the other 

-Contributors related to those performance claims and warranties, and if a court 

-requires any other Contributor to pay any damages as a result, the Commercial 

-Contributor must pay those damages. 

-

-5. NO WARRANTY 

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON

-AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS

-OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

-Each Recipient is solely responsible for determining the appropriateness of

-using and distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement, including but not limited to the risks

-and costs of program errors, compliance with applicable laws, damage to or loss

-of data, programs or equipment, and unavailability or interruption of

-operations. 

-

-6. DISCLAIMER OF LIABILITY 

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY 

-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, 

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST 

-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 

-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY

-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS

-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 

-

-7. GENERAL 

-

-If any provision of this Agreement is invalid or unenforceable under applicable 

-law, it shall not affect the validity or enforceability of the remainder of the 

-terms of this Agreement, and without further action by the parties hereto, such 

-provision shall be reformed to the minimum extent necessary to make such 

-provision valid and enforceable. 

-

-If Recipient institutes patent litigation against a Contributor with respect to 

-a patent applicable to software (including a cross-claim or counterclaim in a 

-lawsuit), then any patent licenses granted by that Contributor to such

-Recipient under this Agreement shall terminate as of the date such litigation

-is filed. In addition, if Recipient institutes patent litigation against any

-entity (including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other software or

-hardware) infringes such Recipient's patent(s), then such Recipient's rights

-granted under Section 2(b) shall terminate as of the date such litigation is

-filed. 

-

-All Recipient's rights under this Agreement shall terminate if it fails to 

-comply with any of the material terms or conditions of this Agreement and does 

-not cure such failure in a reasonable period of time after becoming aware of 

-such noncompliance. If all Recipient's rights under this Agreement terminate, 

-Recipient agrees to cease use and distribution of the Program as soon as 

-reasonably practicable. However, Recipient's obligations under this Agreement 

-and any licenses granted by Recipient relating to the Program shall continue

-and survive. 

-

-Everyone is permitted to copy and distribute copies of this Agreement, but in 

-order to avoid inconsistency the Agreement is copyrighted and may only be 

-modified in the following manner. The Agreement Steward reserves the right to 

-publish new versions (including revisions) of this Agreement from time to time. 

-No one other than the Agreement Steward has the right to modify this Agreement. 

-IBM is the initial Agreement Steward. IBM may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly

-stated in Sections 2(a) and 2(b) above, Recipient receives no rights or

-licenses to the intellectual property of any Contributor under this Agreement,

-whether expressly, by implication, estoppel or otherwise. All rights in the

-Program not expressly granted under this Agreement are reserved. 

-

-This Agreement is governed by the laws of the State of New York and the 

-intellectual property laws of the United States of America. No party to this 

-Agreement will bring a legal action under this Agreement more than one year 

-after the cause of action arose. Each party waives its rights to a jury trial

-in any resulting litigation. 

-

-Special exception for LZMA compression module 

-

-Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for 

-NSIS, expressly permit you to statically or dynamically link your code (or bind 

-by name) to the files from the LZMA compression module for NSIS without 

-subjecting your linked code to the terms of the Common Public license version

-1.0.  Any modifications or additions to files from the LZMA compression module

-for NSIS, however, are subject to the terms of the Common Public License

-version 1.0. 

@@ -1,3 +1,12 @@

+ Wed Nov 14 21:56:33 EET 2007 (edwin)

+ ------------------------------------

+   * libclamav/phishcheck.[ch]: 

+     remove "all domain scan" feature from phishcheck

+     (--no-phishing-restrictedscan). Nobody is using it.

+     Don't care why an url is clean, just state it is clean.

+     Various cleanups resulting from this.

+     Prepare to introduce selective turn on of sub-features.

+ 

 Tue Oct  9 16:53:48 CEST 2007 (tk)

 ----------------------------------

   * 0.92rc2 (released with JS and PST code removed)

@@ -434,19 +434,6 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     if(cfgopt(copt,"PhishingScanURLs")->enabled) {

-	if(cfgopt(copt,"PhishingRestrictedScan")->enabled) {

-	    /* we don't scan urls from all domains, just those listed in

-	     * .pdb file. This is the safe default

-	     */

-	    options |= CL_SCAN_PHISHING_DOMAINLIST;

-	} else {

-	    /* This is a false positive prone option, since newsletters, etc.

-	     * often contain links that will be classified as phishing attempts,

-	     * even though the site they link to isn't a phish site.

-	     */

-	    logg("Phishing: Checking all URLs, regardless of domain (FP prone).\n");

-	}

-

 	if(cfgopt(copt,"PhishingAlwaysBlockCloak")->enabled) {

 	    options |= CL_SCAN_PHISHING_BLOCKCLOAK; 

 	    logg("Phishing: Always checking for cloaked urls\n");

@@ -174,10 +174,6 @@ int scanmanager(const struct optstruct *opt)

     if(!opt_check(opt,"no-phishing-scan-urls"))

 	dboptions |= CL_DB_PHISHING_URLS;

-    if(!opt_check(opt,"no-phishing-restrictedscan")) {

-	/* not scanning all domains, check only URLs with domains from .pdb */

-	options |= CL_SCAN_PHISHING_DOMAINLIST;

-    }

     if(opt_check(opt,"phishing-ssl")) {

 	options |= CL_SCAN_PHISHING_BLOCKSSL;

     }

@@ -26359,7 +26359,7 @@ echo "$as_me: WARNING: Unable to determine FPU endianess, some features may not

 esac

-ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"

+ac_config_files="$ac_config_files libclamav/lzma/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"

 cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure

@@ -26967,6 +26967,7 @@ do

   case $ac_config_target in

     "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;;

     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

+    "libclamav/lzma/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/lzma/Makefile" ;;

     "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;

     "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;;

     "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;;

@@ -1204,6 +1204,7 @@ AC_MSG_RESULT($have_signed_rightshift_extended);

 AC_C_FPU_BIGENDIAN

 AC_OUTPUT([

+libclamav/lzma/Makefile

 libclamav/Makefile

 clamscan/Makefile

 database/Makefile

@@ -255,11 +255,6 @@ Scan URLs found in mails for phishing attempts using heuristics. This will class

 .br

 Default: yes

 .TP

-\fBPhishingRestrictedScan BOOL\fR

-Use phishing detection only for domains listed in the .pdb database. It is not recommended to have this option turned off, because scanning of all domains may lead to many false positives!

-.br

-Default: yes

-.TP

 \fBPhishingAlwaysBlockSSLMismatch BOOL\fR

 Always block SSL mismatches in URLs, even if the URL isn't in the database. This can lead to false positives.

 .br

@@ -237,12 +237,6 @@ LocalSocket /tmp/clamd.socket

 # Default: yes

 #PhishingScanURLs yes

-# Use phishing detection only for domains listed in the .pdb database. It is

-# not recommended to have this option turned off, because scanning of all

-# domains may lead to many false positives!

-# Default: yes

-#PhishingRestrictedScan yes

-

 # Always block SSL mismatches in URLs, even if the URL isn't in the database.

 # This can lead to false positives.

 #

@@ -16,16 +16,16 @@

 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 #  MA 02110-1301, USA.

+SUBDIRS = lzma .

-INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis

+INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis -I@srcdir@/lzma

-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@

+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

 include_HEADERS = clamav.h

-

 libclamav_la_SOURCES = \

 	clamav.h \

         matcher-ac.c \

@@ -139,15 +139,9 @@ libclamav_la_SOURCES = \

 	unrar/unrarppm.h \

 	unarj.c \

 	unarj.h \

-	nsis/LZMADecode.c \

-	nsis/LZMADecode.h \

 	nsis/bzlib.c \

 	nsis/bzlib_private.h \

-	nsis/infblock.c \

 	nsis/nsis_bzlib.h \

-	nsis/nsis_zconf.h \

-	nsis/nsis_zlib.h \

-	nsis/nsis_zutil.h \

 	nsis/nulsft.c \

 	nsis/nulsft.h \

 	pdf.c \

@@ -189,7 +183,8 @@ libclamav_la_SOURCES = \

 	dconf.c \

 	dconf.h \

 	lockdb.c \

-	lockdb.h

+	lockdb.h \

+	lzma_iface.c

 lib_LTLIBRARIES = libclamav.la

 EXTRA_DIST = regex/engine.c

@@ -76,7 +76,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"

 libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES)

-libclamav_la_DEPENDENCIES =

+libclamav_la_DEPENDENCIES = lzma/liblzma.la

 am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	md5.lo others.lo readdb.lo cvd.lo dsig.lo str.lo scanners.lo \

 	filetypes.lo rtf.lo blob.lo mbox.lo message.lo snprintf.lo \

@@ -87,11 +87,10 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	is_tar.lo tnef.lo autoit.lo strlcpy.lo regcomp.lo regerror.lo \

 	regexec.lo regfree.lo unrar15.lo unrarvm.lo unrar.lo \

 	unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo unarj.lo \

-	LZMADecode.lo bzlib.lo infblock.lo nulsft.lo pdf.lo spin.lo \

-	yc.lo elf.lo sis.lo uuencode.lo pst.lo phishcheck.lo \

-	phish_domaincheck_db.lo phish_whitelist.lo regex_list.lo \

-	sha256.lo mspack.lo cab.lo entconv.lo hashtab.lo dconf.lo \

-	lockdb.lo

+	bzlib.lo nulsft.lo pdf.lo spin.lo yc.lo elf.lo sis.lo \

+	uuencode.lo pst.lo phishcheck.lo phish_domaincheck_db.lo \

+	phish_whitelist.lo regex_list.lo sha256.lo mspack.lo cab.lo \

+	entconv.lo hashtab.lo dconf.lo lockdb.lo lzma_iface.lo

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/depcomp

@@ -106,10 +105,17 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 	$(AM_LDFLAGS) $(LDFLAGS) -o $@

 SOURCES = $(libclamav_la_SOURCES)

 DIST_SOURCES = $(libclamav_la_SOURCES)

+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

+	html-recursive info-recursive install-data-recursive \

+	install-exec-recursive install-info-recursive \

+	install-recursive installcheck-recursive installdirs-recursive \

+	pdf-recursive ps-recursive uninstall-info-recursive \

+	uninstall-recursive

 includeHEADERS_INSTALL = $(INSTALL_HEADER)

 HEADERS = $(include_HEADERS)

 ETAGS = etags

 CTAGS = ctags

+DIST_SUBDIRS = $(SUBDIRS)

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 ACLOCAL = @ACLOCAL@

 AMDEP_FALSE = @AMDEP_FALSE@

@@ -237,8 +243,9 @@ target_alias = @target_alias@

 target_cpu = @target_cpu@

 target_os = @target_os@

 target_vendor = @target_vendor@

-INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis

-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@

+SUBDIRS = lzma .

+INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar -I@srcdir@/nsis -I@srcdir@/lzma

+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

 include_HEADERS = clamav.h

 libclamav_la_SOURCES = \

@@ -354,15 +361,9 @@ libclamav_la_SOURCES = \

 	unrar/unrarppm.h \

 	unarj.c \

 	unarj.h \

-	nsis/LZMADecode.c \

-	nsis/LZMADecode.h \

 	nsis/bzlib.c \

 	nsis/bzlib_private.h \

-	nsis/infblock.c \

 	nsis/nsis_bzlib.h \

-	nsis/nsis_zconf.h \

-	nsis/nsis_zlib.h \

-	nsis/nsis_zutil.h \

 	nsis/nulsft.c \

 	nsis/nulsft.h \

 	pdf.c \

@@ -404,11 +405,12 @@ libclamav_la_SOURCES = \

 	dconf.c \

 	dconf.h \

 	lockdb.c \

-	lockdb.h

+	lockdb.h \

+	lzma_iface.c

 lib_LTLIBRARIES = libclamav.la

 EXTRA_DIST = regex/engine.c

-all: all-am

+all: all-recursive

 .SUFFIXES:

 .SUFFIXES: .c .lo .o .obj

@@ -477,7 +479,6 @@ mostlyclean-compile:

 distclean-compile:

 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LZMADecode.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aspack.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoit.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binhex.Plo@am__quote@

@@ -494,10 +495,10 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsg.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtab.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlnorm.Plo@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infblock.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is_tar.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockdb.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma_iface.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matcher-ac.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matcher-bm.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matcher.Plo@am__quote@

@@ -660,13 +661,6 @@ unrarcmd.lo: unrar/unrarcmd.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unrarcmd.lo `test -f 'unrar/unrarcmd.c' || echo '$(srcdir)/'`unrar/unrarcmd.c

-LZMADecode.lo: nsis/LZMADecode.c

-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT LZMADecode.lo -MD -MP -MF "$(DEPDIR)/LZMADecode.Tpo" -c -o LZMADecode.lo `test -f 'nsis/LZMADecode.c' || echo '$(srcdir)/'`nsis/LZMADecode.c; \

-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/LZMADecode.Tpo" "$(DEPDIR)/LZMADecode.Plo"; else rm -f "$(DEPDIR)/LZMADecode.Tpo"; exit 1; fi

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/LZMADecode.c' object='LZMADecode.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o LZMADecode.lo `test -f 'nsis/LZMADecode.c' || echo '$(srcdir)/'`nsis/LZMADecode.c

-

 bzlib.lo: nsis/bzlib.c

 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bzlib.lo -MD -MP -MF "$(DEPDIR)/bzlib.Tpo" -c -o bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c; \

 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bzlib.Tpo" "$(DEPDIR)/bzlib.Plo"; else rm -f "$(DEPDIR)/bzlib.Tpo"; exit 1; fi

@@ -674,13 +668,6 @@ bzlib.lo: nsis/bzlib.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c

-infblock.lo: nsis/infblock.c

-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT infblock.lo -MD -MP -MF "$(DEPDIR)/infblock.Tpo" -c -o infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c; \

-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/infblock.Tpo" "$(DEPDIR)/infblock.Plo"; else rm -f "$(DEPDIR)/infblock.Tpo"; exit 1; fi

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nsis/infblock.c' object='infblock.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infblock.lo `test -f 'nsis/infblock.c' || echo '$(srcdir)/'`nsis/infblock.c

-

 nulsft.lo: nsis/nulsft.c

 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nulsft.lo -MD -MP -MF "$(DEPDIR)/nulsft.Tpo" -c -o nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c; \

 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/nulsft.Tpo" "$(DEPDIR)/nulsft.Plo"; else rm -f "$(DEPDIR)/nulsft.Tpo"; exit 1; fi

@@ -715,6 +702,77 @@ uninstall-includeHEADERS:

 	  rm -f "$(DESTDIR)$(includedir)/$$f"; \

 	done

+# This directory's subdirectories are mostly independent; you can cd

+# into them and run `make' without going through this Makefile.

+# To change the values of `make' variables: instead of editing Makefiles,

+# (1) if the variable is set in `config.status', edit `config.status'

+#     (which will cause the Makefiles to be regenerated when you run `make');

+# (2) otherwise, pass the desired values on the `make' command line.

+$(RECURSIVE_TARGETS):

+	@failcom='exit 1'; \

+	for f in x $$MAKEFLAGS; do \

+	  case $$f in \

+	    *=* | --[!k]*);; \

+	    *k*) failcom='fail=yes';; \

+	  esac; \

+	done; \

+	dot_seen=no; \

+	target=`echo $@ | sed s/-recursive//`; \

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  echo "Making $$target in $$subdir"; \

+	  if test "$$subdir" = "."; then \

+	    dot_seen=yes; \

+	    local_target="$$target-am"; \

+	  else \

+	    local_target="$$target"; \

+	  fi; \

+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

+	  || eval $$failcom; \

+	done; \

+	if test "$$dot_seen" = "no"; then \

+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \

+	fi; test -z "$$fail"

+

+mostlyclean-recursive clean-recursive distclean-recursive \

+maintainer-clean-recursive:

+	@failcom='exit 1'; \

+	for f in x $$MAKEFLAGS; do \

+	  case $$f in \

+	    *=* | --[!k]*);; \

+	    *k*) failcom='fail=yes';; \

+	  esac; \

+	done; \

+	dot_seen=no; \

+	case "$@" in \

+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \

+	  *) list='$(SUBDIRS)' ;; \

+	esac; \

+	rev=''; for subdir in $$list; do \

+	  if test "$$subdir" = "."; then :; else \

+	    rev="$$subdir $$rev"; \

+	  fi; \

+	done; \

+	rev="$$rev ."; \

+	target=`echo $@ | sed s/-recursive//`; \

+	for subdir in $$rev; do \

+	  echo "Making $$target in $$subdir"; \

+	  if test "$$subdir" = "."; then \

+	    local_target="$$target-am"; \

+	  else \

+	    local_target="$$target"; \

+	  fi; \

+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

+	  || eval $$failcom; \

+	done && test -z "$$fail"

+tags-recursive:

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

+	done

+ctags-recursive:

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

+	done

+

 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

 	unique=`for i in $$list; do \

@@ -725,10 +783,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

 	mkid -fID $$unique

 tags: TAGS

-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

 	here=`pwd`; \

+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

+	  include_option=--etags-include; \

+	  empty_fix=.; \

+	else \

+	  include_option=--include; \

+	  empty_fix=; \

+	fi; \

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  if test "$$subdir" = .; then :; else \

+	    test ! -f $$subdir/TAGS || \

+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

+	  fi; \

+	done; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

@@ -741,7 +812,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	    $$tags $$unique; \

 	fi

 ctags: CTAGS

-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

 	here=`pwd`; \

@@ -791,22 +862,38 @@ distdir: $(DISTFILES)

 	    || exit 1; \

 	  fi; \

 	done

+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

+	  if test "$$subdir" = .; then :; else \

+	    test -d "$(distdir)/$$subdir" \

+	    || $(mkdir_p) "$(distdir)/$$subdir" \

+	    || exit 1; \

+	    distdir=`$(am__cd) $(distdir) && pwd`; \

+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

+	    (cd $$subdir && \

+	      $(MAKE) $(AM_MAKEFLAGS) \

+	        top_distdir="$$top_distdir" \

+	        distdir="$$distdir/$$subdir" \

+	        distdir) \

+	      || exit 1; \

+	  fi; \

+	done

 check-am: all-am

-check: check-am

+check: check-recursive

 all-am: Makefile $(LTLIBRARIES) $(HEADERS)

-installdirs:

+installdirs: installdirs-recursive

+installdirs-am:

 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \

 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \

 	done

-install: install-am

-install-exec: install-exec-am

-install-data: install-data-am

-uninstall: uninstall-am

+install: install-recursive

+install-exec: install-exec-recursive

+install-data: install-data-recursive

+uninstall: uninstall-recursive

 install-am: all-am

 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

-installcheck: installcheck-am

+installcheck: installcheck-recursive

 install-strip:

 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \

 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \

@@ -822,24 +909,24 @@ distclean-generic:

 maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

-clean: clean-am