Accepting request 347175 from home:posophe:branches:security

update + clean-up

OBS-URL: https://build.opensuse.org/request/show/347175
OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=122

clamav-0.98.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:282417b707740de13cd8f18d4cbca9ddd181cf96b444db2cad98913a5153e272
-size 15118851

clamav-0.99.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2792c8cfadd685fffc40b2199679628815df031fd3149ccf961649fc8787ea9
+size 15968038

clamav-sles9.patch

@@ -1,33 +0,0 @@
-Index: clamav-milter/clamfi.c
-===================================================================
---- clamav-milter/clamfi.c.orig
-+++ clamav-milter/clamfi.c
-@@ -90,16 +90,11 @@ static void add_x_header(SMFICTX *ctx, c
- 	while(status)
- 	    if(smfi_chgheader(ctx, (char *)"X-Virus-Status", status--, NULL) != MI_SUCCESS)
- 		logg("^Failed to remove existing X-Virus-Status header\n");
-+    }
- 	if(smfi_addheader(ctx, (char *)"X-Virus-Scanned", xvirushdr) != MI_SUCCESS)
- 	    logg("^Failed to add X-Virus-Scanned header\n");
- 	if(smfi_addheader(ctx, (char *)"X-Virus-Status", st) != MI_SUCCESS)
- 	    logg("^Failed to add X-Virus-Status header\n");
--    } else { /* Add */
--	if(smfi_insheader(ctx, 1, (char *)"X-Virus-Scanned", xvirushdr) != MI_SUCCESS)
--	    logg("^Failed to insert X-Virus-Scanned header\n");
--	if(smfi_insheader(ctx, 1, (char *)"X-Virus-Status", st) != MI_SUCCESS)
--	    logg("^Failed to insert X-Virus-Status header\n");
--    }
- }
- 
- enum CFWHAT {
---- clamav-milter/clamav-milter.c
-+++ clamav-milter/clamav-milter.c
-@@ -282,7 +282,7 @@
-     }
-     opt = optget(opts, "FixStaleSocket");
-     umsk = umask(0777); /* socket is created with 000 to avoid races */ 
--    if(smfi_opensocket(opt->enabled) == MI_FAILURE) {
-+    if(smfi_opensocket() == MI_FAILURE) {
- 	logg("!Failed to create socket %s\n", my_socket);
- 	localnets_free();
- 	whitelist_free();

clamav.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Wed Dec  2 13:23:40 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 0.99
+  * Processing of YARA rules(some limitations- see signatures.pdf).
+  * Support in ClamAV logical signatures for many of the features
+    added for YARA, such as Perl Compatible Regular Expressions,
+    alternate strings, and YARA string attributes. See signatures.pdf
+    for full details.
+  * New and improved on-access scanning for Linux. See the recent blog
+    post and clamdoc.pdf for details on the new on-access capabilities.
+  * A new ClamAV API callback function that is invoked when a virus 
+    is found. This is intended primarily for applications running in 
+    all-match mode. Any applications using all-match mode must use 
+    the new callback function to record and report detected viruses.    
+  * Configurable default password list to attempt zip file decryption.
+  * TIFF file support.
+  * Upgrade Windows pthread library to 2.9.1.
+  * A new signature target type for designating signatures to run
+    against files with unknown file types.
+  * Improved fidelity of the "data loss prevention" heuristic
+    algorithm. Code supplied by Bill Parker.
+  * Support for LZMA decompression within Adobe Flash files.
+  * Support for MSO attachments within Microsoft Office 2003 XML files.
+  * A new sigtool option(--ascii-normalize) allowing signature authors
+    to more easily generate normalized versions of ascii files.
+  * Windows installation directories changed from \Program Files\Sourcefire\
+    ClamAV to \Program Files\ClamAV or \Program Files\ClamAV-x64.
+- Refactor a little the specfile; remove some obsolete conditional
+  macros, as clamav doesn't build for SLE11 anyway
+- Remove clamav-sles9.patch; sles9 is not supported for a while
+
 -------------------------------------------------------------------
 Wed Jul  1 12:17:04 UTC 2015 - mpluskal@suse.com
 

clamav.spec

@@ -16,14 +16,11 @@
 #
 
 
-%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
-
 Name:           clamav
 BuildRequires:  ncurses-devel
 BuildRequires:  sed
 BuildRequires:  sendmail-devel
 %define llvm --disable-llvm
-%if 0%{?suse_version} >= 1010
 BuildRequires:  bc
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
@@ -32,8 +29,6 @@ BuildRequires:  zlib-devel
 # Needed for compiling LLVM.
 BuildRequires:  gcc-c++
 %endif
-%endif
-%if 0%{?suse_version} >= 1030
 BuildRequires:  check-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libopenssl-devel
@@ -41,20 +36,16 @@ BuildRequires:  libxml2-devel
 BuildRequires:  pwdutils
 BuildRequires:  python-devel
 %define clamav_check --enable-check
-%else
-BuildRequires:  bzip2
-%define clamav_check --disable-check
-%endif
 Summary:        Antivirus Toolkit
 License:        GPL-2.0
 Group:          Productivity/Security
-Version:        0.98.7
+Version:        0.99
 Release:        0
 Url:            http://www.clamav.net
 Requires:       latex2html-pngicons
 Obsoletes:      clamav-db < 0.88.3
-PreReq:         %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
+Requires(pre):  %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
-PreReq:         /usr/bin/awk /bin/sed /bin/tar
+Requires(pre):  /usr/bin/awk /bin/sed /bin/tar
 Source0:        http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
 Source11:       clamav.keyring
 Source3:        clamav-updateclamconf
@@ -64,9 +55,7 @@ Source7:        service.clamd
 Source8:        service.freshclam
 Source9:        service.clamav-milter
 Patch1:         clamav-conf.patch
-Patch2:         clamav-sles9.patch
 Patch3:         clamav-gcc47.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  systemd
 %systemd_requires
 
@@ -83,33 +72,19 @@ and multiple signature languages for detecting threats.
 %prep
 %setup -q
 %patch1 -p1
-%if 0%{?suse_version} == 0910
-# SLES9's libmilter doesn't have smfi_insheader()
-%patch2
-%endif
 %patch3 -p1
 
 %build
-%if 0%{?suse_version} >= 1010
 CFLAGS="-fstack-protector"
 CXXFLAGS="-fstack-protector"
-%endif
+export CFLAGS="%optflags $CFLAGS -fPIE -fno-strict-aliasing"
-export CFLAGS="%optflags $CFLAGS -fPIE"
+export CXXFLAGS="%optflags $CXXFLAGS -fPIE -fno-strict-aliasing"
-export CXXFLAGS="%optflags $CXXFLAGS -fPIE"
 export LDFLAGS="-pie"
-%if 0%{?suse_version} == 0910
-# SLES9 needs this macro to enable the quarantine feature in libmilter
-CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET"
-%endif
 %if "%_lib" == "lib64"
 # tomsfastmath needs this for correct operation on 64-bit platforms
 CFLAGS="$CFLAGS -DFP_64BIT"
 %endif
-./configure \
+%configure \
-	--prefix=%_prefix \
-	--libdir=%_libdir \
-	--mandir=%_mandir \
-	--sysconfdir=%_sysconfdir \
 	--disable-clamav \
 	--disable-static \
 	--with-dbdir=/var/lib/clamav \
@@ -118,9 +93,6 @@ CFLAGS="$CFLAGS -DFP_64BIT"
 	--enable-milter \
 	%clamav_check \
 	%llvm \
-%if 0%{?suse_version} == 0910
-	--disable-zlib-vcheck \
-%endif
 	--enable-clamdtop \
 	--disable-timestamps
 
@@ -133,9 +105,7 @@ install -d -m755 %buildroot/var/lib/clamav
 install -d -m755 %buildroot/%_tmpfilesdir
 install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf
 mkdir -p %buildroot/var/spool/amavis
-%if 0%{?suse_version} > 1020
 rm %buildroot/%_libdir/*.la
-%endif
 # Remove bogus dependencies from libclamav.pc
 sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc
 
@@ -147,19 +117,15 @@ mv freshclam.conf.sample freshclam.conf
 popd
 
 # Systemd...
-%if 0%{?suse_version} >= 1210
 install -d -m 0755 %buildroot/%{_unitdir}
 install -m 0644 %{SOURCE7} %buildroot/%{_unitdir}/clamd.service
 install -m 0644 %{SOURCE8} %buildroot/%{_unitdir}/freshclam.service
 install -m 0644 %{SOURCE9} %buildroot/%{_unitdir}/clamav-milter.service
 # this is broken if system does not have systemd so don't 
 # use it at all on systems without mandatory systemd
-%if 0%{?suse_version} >= 1230
 for srvname in clamd freshclam clamav-milter;do
         (export PATH=/usr/sbin:/sbin:$PATH ;ln -sf $(which service) %{buildroot}/%{_sbindir}/rc${srvname})
 done
-%endif
-%endif
 
 %check
 
@@ -172,11 +138,9 @@ VALGRIND_GENSUP=1 make check
 %defattr(-,root,root,-)
 %config(noreplace) %_sysconfdir/*.conf
 #systemd...
-%if 0%{?suse_version} >= 1210
 %{_unitdir}/clamd.service
 %{_unitdir}/freshclam.service
 %{_unitdir}/clamav-milter.service
-%endif
 %_tmpfilesdir
 %doc AUTHORS BUGS ChangeLog COPYING FAQ NEWS README UPGRADE
 %doc docs/*.pdf docs/html