Use LLVM only on newer disks and x86(_64).

OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=27
This commit is contained in:
Reinhard Max 2010-04-14 14:49:22 +00:00 committed by Git OBS Bridge
parent aa0d1b2247
commit 77ad1f03e3
3 changed files with 27 additions and 3 deletions

View File

@ -20,3 +20,14 @@ Index: clamav-milter/clamfi.c
}
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();

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 14 15:59:45 CEST 2010 - max@suse.de
- Extended the libmilter compatibility patch for SLES9.
- Explicitly disabling LLVM for versions older than SLES10 and
archs other than i586 and x86_64.
-------------------------------------------------------------------
Mon Apr 12 11:42:39 CEST 2010 - max@suse.de

View File

@ -15,21 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# neededforbuild bc openssl openssl-devel pkgconfig sendmail sendmail-devel
Name: clamav
BuildRequires: ncurses-devel sed sendmail sendmail-devel
%define llvm --disable-llvm
%if 0%{?suse_version} >= 1010
BuildRequires: bc pkgconfig zlib-devel
%ifarch %ix86 x86_64
%define llvm --enable-llvm
# Needed for compiling and testing LLVM.
BuildRequires: gcc-c++ python
%endif
%endif
%if 0%{?suse_version} >= 1030
BuildRequires: check-devel pwdutils python
BuildRequires: check-devel pwdutils
%define clamav_check --enable-check
%else
%define clamav_check --disable-check
%endif
# Needed for the JIT bytecode compiler
BuildRequires: gcc-c++
Summary: Antivirus Toolkit
Version: 0.96
Release: 2
@ -148,6 +153,7 @@ CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET"
--with-group=vscan \
--enable-milter \
%clamav_check \
%llvm \
--disable-zlib-vcheck \
--enable-clamdtop