From 9c39c5da0226c746ca08cc08f7cbade01efcd794d4dfcf757d8f903fc242ff3f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 15 Apr 2010 22:00:32 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/clamav revision 30.0 OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=46f81c54e536534707375f6832b05d90 --- clamav-sles9.patch | 11 +++++++++++ clamav.changes | 7 +++++++ clamav.spec | 13 +++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/clamav-sles9.patch b/clamav-sles9.patch index 3923f00..c1f7d48 100644 --- a/clamav-sles9.patch +++ b/clamav-sles9.patch @@ -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(); diff --git a/clamav.changes b/clamav.changes index 1b7ca57..c353c0a 100644 --- a/clamav.changes +++ b/clamav.changes @@ -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 diff --git a/clamav.spec b/clamav.spec index f9ee33b..fd99427 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,20 +19,24 @@ 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 +Release: 3 License: GPLv2 Group: Productivity/Security Url: http://www.clamav.net @@ -148,6 +152,7 @@ CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET" --with-group=vscan \ --enable-milter \ %clamav_check \ + %llvm \ --disable-zlib-vcheck \ --enable-clamdtop