re-enable ARJ in standard builds; bump f-level

git-svn: trunk@3290
18 years ago · 018222a24e
parent 997cefa464
commit 018222a24e
3 changed files with 7 additions and 2 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Tue Oct  9 16:28:56 CEST 2007 (tk)
+----------------------------------
+  * libclamav/dconf.c: re-enable ARJ in standard builds
+  * libclamav/others.c: bump f-level
+
 Tue Oct  9 11:36:44 BST 2007 (trog)
 -----------------------------------
  * libclamav/unarj.c: Improve bounds checking.
--- a/libclamav/dconf.c
+++ b/libclamav/dconf.c
@ -71,7 +71,7 @@ static struct dconf_module modules[] = {
    { "ARCHIVE",    "ZIP",	    ARCH_CONF_ZIP,	    1 },
    { "ARCHIVE",    "GZIP",	    ARCH_CONF_GZ,	    1 },
    { "ARCHIVE",    "BZIP",	    ARCH_CONF_BZ,	    1 },
-    { "ARCHIVE",    "ARJ",          ARCH_CONF_ARJ,          DCONF_ENABLE_EXPERIMENTAL }, /* exp */
+    { "ARCHIVE",    "ARJ",          ARCH_CONF_ARJ,	    1 },
    { "ARCHIVE",    "SZDD",	    ARCH_CONF_SZDD,	    1 },
    { "ARCHIVE",    "CAB",	    ARCH_CONF_CAB,	    1 },
    { "ARCHIVE",    "CHM",	    ARCH_CONF_CHM,	    1 },
--- a/libclamav/others.c
+++ b/libclamav/others.c
@ -80,7 +80,7 @@ static pthread_mutex_t cli_gentemp_mutex = PTHREAD_MUTEX_INITIALIZER;
 #define       P_tmpdir        "C:\\WINDOWS\\TEMP"
 #endif

-#define CL_FLEVEL 22 /* don't touch it */
+#define CL_FLEVEL 23 /* don't touch it */

 uint8_t cli_debug_flag = 0, cli_leavetemps_flag = 0;