Browse code

Applying patch to master to bring master 100% in line with dev/100 development branch in preparation for new development fork.

Micah Snyder authored on 2018/03/23 01:46:06
Showing 5 changed files
... ...
@@ -636,9 +636,7 @@ ac_includes_default="\
636 636
 
637 637
 ac_func_list=
638 638
 enable_option_checking=no
639
-ac_subst_vars='ENABLE_CLAMSUBMIT_FALSE
640
-ENABLE_CLAMSUBMIT_TRUE
641
-ENABLE_YARA_FALSE
639
+ac_subst_vars='ENABLE_YARA_FALSE
642 640
 ENABLE_YARA_TRUE
643 641
 ENABLE_LLVM_FALSE
644 642
 ENABLE_LLVM_TRUE
... ...
@@ -696,6 +694,8 @@ LIBPRELUDE_CFLAGS
696 696
 LIBPRELUDE_CONFIG
697 697
 ENABLE_LIBFRESHCLAM_FALSE
698 698
 ENABLE_LIBFRESHCLAM_TRUE
699
+ENABLE_CLAMSUBMIT_FALSE
700
+ENABLE_CLAMSUBMIT_TRUE
699 701
 SYSTEM_LFS_FTS_FALSE
700 702
 SYSTEM_LFS_FTS_TRUE
701 703
 HAVE_YARA
... ...
@@ -23608,6 +23608,15 @@ $as_echo "#define HAVE_SYSTEM_LFS_FTS 0" >>confdefs.h
23608 23608
 	lfs_fts_msg="internal, libc's is not LFS compatible"
23609 23609
 fi
23610 23610
 
23611
+ if test "$have_curl" = "yes"; then
23612
+  ENABLE_CLAMSUBMIT_TRUE=
23613
+  ENABLE_CLAMSUBMIT_FALSE='#'
23614
+else
23615
+  ENABLE_CLAMSUBMIT_TRUE='#'
23616
+  ENABLE_CLAMSUBMIT_FALSE=
23617
+fi
23618
+
23619
+
23611 23620
 # Check whether --enable-libfreshclam was given.
23612 23621
 if test "${enable_libfreshclam+set}" = set; then :
23613 23622
   enableval=$enable_libfreshclam; enable_libfreshclam=$enableval
... ...
@@ -24618,6 +24627,10 @@ if test -z "${SYSTEM_LFS_FTS_TRUE}" && test -z "${SYSTEM_LFS_FTS_FALSE}"; then
24618 24618
   as_fn_error $? "conditional \"SYSTEM_LFS_FTS\" was never defined.
24619 24619
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
24620 24620
 fi
24621
+if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then
24622
+  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.
24623
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
24624
+fi
24621 24625
 if test -z "${ENABLE_LIBFRESHCLAM_TRUE}" && test -z "${ENABLE_LIBFRESHCLAM_FALSE}"; then
24622 24626
   as_fn_error $? "conditional \"ENABLE_LIBFRESHCLAM\" was never defined.
24623 24627
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -27286,6 +27299,10 @@ if test -z "${SYSTEM_LFS_FTS_TRUE}" && test -z "${SYSTEM_LFS_FTS_FALSE}"; then
27286 27286
   as_fn_error $? "conditional \"SYSTEM_LFS_FTS\" was never defined.
27287 27287
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
27288 27288
 fi
27289
+if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then
27290
+  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.
27291
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
27292
+fi
27289 27293
 if test -z "${ENABLE_LIBFRESHCLAM_TRUE}" && test -z "${ENABLE_LIBFRESHCLAM_FALSE}"; then
27290 27294
   as_fn_error $? "conditional \"ENABLE_LIBFRESHCLAM\" was never defined.
27291 27295
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -87,7 +87,6 @@
87 87
 87d
88 88
 88d
89 89
 89d
90
-90d
91 90
     \copyright \  2018 Cisco Systems, Inc.
92 91
     Authors: Tomasz Kojm\\
93 92
     This document is distributed under the terms of the GNU General
... ...
@@ -975,7 +975,7 @@ Eicar-Test-Signature:bc356bae4c42f19a3de16e333ba3569c
975 975
         \end{verbatim}
976 976
         This will ensure that the YARA condition always performs the desired action (checking the file size in this example),
977 977
     \end{itemize}
978
-
978
+    
979 979
     \subsection{Passwords for archive files [experimental]}
980 980
     ClamAV 0.99 allows for users to specify password attempts for certain password-compatible archives.
981 981
     Passwords will be attempted in order of appearance in the password signature file which use the extension
... ...
@@ -1,3 +1,5 @@
1
+AM_CONDITIONAL([ENABLE_CLAMSUBMIT], [test "$have_curl" = "yes"])
2
+
1 3
 AC_ARG_ENABLE([libfreshclam],
2 4
                           [AS_HELP_STRING([--enable-libfreshclam], [enable building of libfreshclam])],
3 5
                           enable_libfreshclam=$enableval, enable_libfreshclam="no")
... ...
@@ -38,7 +38,7 @@ BEGIN
38 38
 	    VALUE "OriginalFilename", RES_FNAME
39 39
 	    VALUE "ProductName", "ClamAV"
40 40
 	    VALUE "ProductVersion", RES_VER_S " ("  REPO_VERSION ")"
41
-	    VALUE "LegalCopyright", "(C) 2015 Cisco Systems, Inc."
41
+	    VALUE "LegalCopyright", "(C) 2017 Cisco Systems, Inc."
42 42
 	    VALUE "LegalTrademarks", "License: GNU GPL, Version 2"
43 43
 	    VALUE "Comments", REPO_VERSION
44 44
 	}