Accepting request 223009 from home:msmeissn:branches:security

- add fanotify systemcalls for power, s390 and arm

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

clamav-fan-syscalls.patch

@@ -0,0 +1,21 @@
+Index: clamav-0.98.1/clamd/fan-syscalllib.h
+===================================================================
+--- clamav-0.98.1.orig/clamd/fan-syscalllib.h
++++ clamav-0.98.1/clamd/fan-syscalllib.h
+@@ -10,6 +10,16 @@
+ #elif defined(__i386__)
+ # define __NR_fanotify_init	338
+ # define __NR_fanotify_mark	339
++#elif defined(__s390__) || defined(__s390x__)
++# define __NR_fanotify_init     332
++# define __NR_fanotify_mark     333
++#elif defined(__powerpc__) || defined(__powerpc64__)
++# define __NR_fanotify_init     323
++# define __NR_fanotify_mark     324
++#elif defined(__arm__) || defined(__aarch64__)
++/* check ... base offset 0 */
++# define __NR_fanotify_init     367
++# define __NR_fanotify_mark     368
+ #else
+ # error "System call numbers not defined for this architecture"
+ #endif

clamav.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 19 07:02:06 UTC 2014 - meissner@suse.com
+
+- add fanotify systemcalls for power, s390 and arm 
+
 -------------------------------------------------------------------
 Tue Feb  4 14:19:01 UTC 2014 - max@suse.com
 

clamav.spec

@@ -57,6 +57,7 @@ PreReq:         /usr/bin/awk /bin/sed /bin/tar
 PreReq:         %insserv_prereq
 Source0:        http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
 Source10:       http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz.sig
+Source11:       clamav.keyring
 Source1:        clamav-rcclamd
 Source2:        clamav-rcfreshclam
 Source3:        clamav-updateclamconf
@@ -66,6 +67,7 @@ Source6:        clamav-tmpfiles.conf
 Patch1:         clamav-conf.patch
 Patch2:         clamav-sles9.patch
 Patch3:         clamav-gcc47.patch
+Patch4:         clamav-fan-syscalls.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -86,6 +88,7 @@ and multiple signature languages for detecting threats.
 %patch2
 %endif
 %patch3 -p1
+%patch4 -p1
 
 %build
 %if 0%{?suse_version} >= 1010
@@ -115,9 +118,6 @@ CFLAGS="$CFLAGS -DFP_64BIT"
 	--enable-milter \
 	%clamav_check \
 	%llvm \
-%ifnarch %ix86 x86_64
-	--disable-fanotify \
-%endif
 	--disable-zlib-vcheck \
 	--enable-clamdtop \
 	--disable-timestamps