diff --git a/clamav-0.99.1.tar.gz b/clamav-0.99.1.tar.gz deleted file mode 100644 index e02f443..0000000 --- a/clamav-0.99.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a -size 15990867 diff --git a/clamav-0.99.2.tar.gz b/clamav-0.99.2.tar.gz new file mode 100644 index 0000000..a22b196 --- /dev/null +++ b/clamav-0.99.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a +size 16067497 diff --git a/clamav-updateclamconf b/clamav-updateclamconf deleted file mode 100644 index 4097de5..0000000 --- a/clamav-updateclamconf +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/awk -f -# -# updateclamconf -# -# Merge two clamd.conf or freshclam.conf files and write the result to -# the standard output. The result file contains all comments from the -# second file with the active (i.e. not commented-out) settings from -# the first file merged into it. Settings which were only in the first -# file file and not mentioned in the second file any more, are appended -# at the end, but commented out. -# -# Any comment must start with a hash and a space: -# # comment -# while any commented out setting must start with a hash and no space: -# #settingname settingvalue -# -# The first file may optionally have the format that was used up to -# version 0.88.7. In that case the settings will be converted to the -# format that is used in version 0.90 and newer. -# -# Known issues: -# -# If an option exists more than once in eiter file, only the first -# occurance will be moved over from the first file. AFAIK this -# currently only applies to the DatabaseMirror option in -# freshclam.conf. - -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# Authors: Reinhard Max -# Kurt Keller -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -BEGIN { - if (ARGC != 3) { - print "usage: updateclamconf oldfile newfile" > "/dev/stderr" - exit 1 - } - # some options may be overridden from the command line - $0 = override - for (i=1; i<=NF; i+=2) { - options[$i] = $i " " $(i+1) - } - pass = 0 -} -lastname != FILENAME { - lastname = FILENAME - pass++ -} -# collect options from the first file -pass == 1 && $0 ~ /^[[:space:]]*#?[^[:space:]]/ { - if (NF == 1) { - $2 = "yes" - } - # copy $1, so that sub() doesn't modify $0 - o = $1 - sub("^#", "", o) - if (!(o in options)) { - options[o] = $0 - } -} -# merge options into the content of the second file -pass == 2 { - # copy $1, so that sub() doesn't modify $0 - o = $1 - sub("^[[:space:]]*#", "", o) - if (o in options) { - if (options[o] ~ /^[[:space:]]*#/ && $0 ~ /^[[:space:]]*#/) { - print - } else { - print options[o] - } - delete options[o] - } else { - print - } -} -# print out any options that were only found in the first file -END { - for (o in options) { - print "\n# These options weren't found in the new config file" - for (o in options) { - print "# " options[o] - } - break - } -} diff --git a/clamav.changes b/clamav.changes index 0dfb9b5..d7f539d 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Thu Jun 23 07:30:49 UTC 2016 - fweiss@suse.com + +- Update to version 0.99.2 (bsc#978459) + * 7z: fix for FolderStartPackStreamIndex array index heck + * print all CDBNAME entries for a zip file when using the -z + flag. + * try to minimize the err cleanup path + * clamunrar: notice if unpacking comment failed + * signature manual update. + * use temp var for realloc to prevent pointer loss. + * fix debug VI hex truncation + * freshclam: avoid random data in mirrors.dat. + * libclamav: print raw certificate metadata + * freshclam manager check return code of strdup. + * additional suppress IP notification when using proxy + * fix download and verification of *.cld through PrivateMirrors + * suppress IP notification when using proxy + * remove redundant mempool assignment + * divide out dumpcerts output for better readability + * fix dconf and option handling for nocert and dumpcert + * patch by Jim Morris to increase clamd's soft file descriptor to + its potential maximum on 64-bit systems + * Move libfreshclam config to m4/reorganization. + * adding libfreshclam + * Add 'cdb' datafile to sigtools list of datafile types. + * NULL pointer check. + * malloc() NULL pointer check. + * clamscan 'block-macros' option. + * initialize cpio name buffer + * initialize mspack decompression buffers + * prevent memory allocations on used pointers (folder objects) + * prevent memory allocations on used pointers (boolvectors) + * initialize ARJ metadata structures + * change cli_malloc with cli_calloc + * check packSizes prior to dereference + * fixed inconsistent folder state on failure + * pre-check on (*unpackSizes) dereference + * fix on pre-checks on dereferenced array + * pre-checks on dereferenced array size values (not =0) + * adding sanity checks to 7z header parsing + * fixed mew source read issue + * documentation update on targets + * filetype consistency + * move llvm option flag handling to new m4 file + * hwp5.x: fix for streams without names + +- bsc#958451: Remove updateclamconf, because it breaks + configurations that have multiple occurances of the same keyword. + + Henceforth the configuration files have to be merged manually, if + a ClamAV update adds or removs options. + ------------------------------------------------------------------- Fri Jun 17 10:07:51 UTC 2016 - martin.liska@suse.com diff --git a/clamav.spec b/clamav.spec index da20499..80f0e65 100644 --- a/clamav.spec +++ b/clamav.spec @@ -40,16 +40,15 @@ BuildRequires: python-devel Summary: Antivirus Toolkit License: GPL-2.0 Group: Productivity/Security -Version: 0.99.1 +Version: 0.99.2 Release: 0 Url: http://www.clamav.net Requires: latex2html-pngicons Obsoletes: clamav-db < 0.88.3 Requires(pre): %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod Requires(pre): /usr/bin/awk /bin/sed /bin/tar -Source0: http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz +Source0: http://www.clamav.net/downloads/%{name}-%{version}.tar.gz Source11: clamav.keyring -Source3: clamav-updateclamconf Source4: clamav-rpmlintrc Source6: clamav-tmpfiles.conf Source7: service.clamd @@ -101,7 +100,6 @@ make V=1 %{?jobs:-j%jobs} %install %makeinstall -install -m755 %SOURCE3 %buildroot%_sbindir/updateclamconf install -d -m755 %buildroot/var/lib/clamav install -d -m755 %buildroot/%_tmpfilesdir install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf @@ -166,22 +164,6 @@ VALGRIND_GENSUP=1 make check systemd-tmpfiles --create %_tmpfilesdir/clamav.conf %service_add_post clamd.service freshclam.service clamav-milter.service -# merge config files on update -test "0$1" -lt 2 && exit 0 -umask 022 -for f in /etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf; do - if test -e $f.rpmnew; then - echo "Merging $f and $f.rpmnew" - %_sbindir/updateclamconf -v override="$OVERRIDE" $f $f.rpmnew > $f.tmp - if test $? = 0; then - mv $f $f.old - mv $f.tmp $f - else - echo "Merging $f with $f.rpmnew failed" - fi - fi -done - %preun %service_del_preun clamd.service freshclam.service clamav-milter.service