From 019b46999359402dbc0ec28f8c8bfeac70ca078d3e1842d220cbd0e035d95feb Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Thu, 8 May 2014 15:21:16 +0000
Subject: [PATCH] - Version 0.98.3

OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=99
---
 clamav-0.98.1.tar.gz      |   3 ---
 clamav-0.98.1.tar.gz.sig  | Bin 72 -> 0 bytes
 clamav-0.98.3.tar.gz      |   3 +++
 clamav-0.98.3.tar.gz.sig  | Bin 0 -> 72 bytes
 clamav-conf.patch         |  29 +++++++++++++++--------------
 clamav-fan-syscalls.patch |  21 ---------------------
 clamav.changes            |  37 +++++++++++++++++++++++++++++++++++++
 clamav.spec               |   6 +++---
 8 files changed, 58 insertions(+), 41 deletions(-)
 delete mode 100644 clamav-0.98.1.tar.gz
 delete mode 100644 clamav-0.98.1.tar.gz.sig
 create mode 100644 clamav-0.98.3.tar.gz
 create mode 100644 clamav-0.98.3.tar.gz.sig
 delete mode 100644 clamav-fan-syscalls.patch

diff --git a/clamav-0.98.1.tar.gz b/clamav-0.98.1.tar.gz
deleted file mode 100644
index 2d25c03..0000000
--- a/clamav-0.98.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35f5e84d734cdd4532c1cc6c92560c5b31d1c24f2e1e203bef0ca1351eb223dc
-size 15431484
diff --git a/clamav-0.98.1.tar.gz.sig b/clamav-0.98.1.tar.gz.sig
deleted file mode 100644
index 54fa11557cb28df1ec9adc745e6c4bad02946e26dec09d0a98c1787590ad13a8..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0#ei=DgX)z5J0%<BV-~SQz1(Lo;LnWkozlkEyRxtAjfri
eF9#(@<N%<lkNdz#xXBUuxj%`Y!o-%!dY!`<s~lti

diff --git a/clamav-0.98.3.tar.gz b/clamav-0.98.3.tar.gz
new file mode 100644
index 0000000..433fe65
--- /dev/null
+++ b/clamav-0.98.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2792a9e8706a516d2e81339846fc38f94fa8dd3f604b2fde9d0b07593727f62b
+size 15543335
diff --git a/clamav-0.98.3.tar.gz.sig b/clamav-0.98.3.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..36ff22ccbfffc3eed8523e5ce7096cbd4d6df11e7bfe12bced1aa12cd0d912f3
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0#j;;d;kgw5J0%<BV-~SQ`@@$pK-LU(c&7X=k?6ZBjTAD
edr?R`hX9=vAp)2X@iSoIEU0{4jC$6V{ROv)bR7o(

literal 0
HcmV?d00001

diff --git a/clamav-conf.patch b/clamav-conf.patch
index 2b29ebd..bd6160d 100644
--- a/clamav-conf.patch
+++ b/clamav-conf.patch
@@ -1,7 +1,7 @@
-Index: clamav-0.98.1/etc/clamav-milter.conf.sample
+Index: clamav-0.98.3/etc/clamav-milter.conf.sample
 ===================================================================
---- clamav-0.98.1.orig/etc/clamav-milter.conf.sample	2014-01-13 18:02:18.000000000 +0100
-+++ clamav-0.98.1/etc/clamav-milter.conf.sample	2014-01-24 16:26:53.379053521 +0100
+--- clamav-0.98.3.orig/etc/clamav-milter.conf.sample	2014-05-06 20:39:56.000000000 +0200
++++ clamav-0.98.3/etc/clamav-milter.conf.sample	2014-05-08 16:42:14.865949467 +0200
 @@ -2,10 +2,6 @@
  ## Example config file for clamav-milter
  ##
@@ -66,10 +66,10 @@ Index: clamav-0.98.1/etc/clamav-milter.conf.sample
  
  # Enable verbose logging.
  #
-Index: clamav-0.98.1/etc/clamd.conf.sample
+Index: clamav-0.98.3/etc/clamd.conf.sample
 ===================================================================
---- clamav-0.98.1.orig/etc/clamd.conf.sample	2014-01-13 18:02:34.000000000 +0100
-+++ clamav-0.98.1/etc/clamd.conf.sample	2014-01-24 16:26:53.380053533 +0100
+--- clamav-0.98.3.orig/etc/clamd.conf.sample	2014-05-08 16:42:07.318862339 +0200
++++ clamav-0.98.3/etc/clamd.conf.sample	2014-05-08 16:45:03.177891683 +0200
 @@ -1,12 +1,8 @@
  ##
 -## Example config file for the Clam AV daemon
@@ -117,7 +117,7 @@ Index: clamav-0.98.1/etc/clamd.conf.sample
  
  # Sets the group ownership on the unix socket.
  # Default: disabled (the primary group of the user running clamd)
-@@ -98,14 +94,14 @@
+@@ -98,7 +94,7 @@
  
  # TCP port address.
  # Default: no
@@ -126,15 +126,16 @@ Index: clamav-0.98.1/etc/clamd.conf.sample
  
  # TCP address.
  # By default we bind to INADDR_ANY, probably not wise.
- # Enable the following to provide some degree of protection
- # from the outside world.
+@@ -106,7 +102,7 @@
+ # from the outside world. This option can be specified multiple
+ # times if you want to listen on multiple IPs. IPv6 is now supported.
  # Default: no
 -#TCPAddr 127.0.0.1
 +TCPAddr 127.0.0.1
  
  # Maximum length the queue of pending connections may grow to.
  # Default: 200
-@@ -191,7 +187,7 @@
+@@ -192,7 +188,7 @@
  
  # Run as another user (clamd must be started by root for this option to work)
  # Default: don't drop privileges
@@ -143,7 +144,7 @@ Index: clamav-0.98.1/etc/clamd.conf.sample
  
  # Initialize supplementary group access (clamd must be started by root).
  # Default: no
-@@ -501,6 +497,10 @@
+@@ -525,6 +521,10 @@
  ##
  ## On-access Scan Settings
  ##
@@ -154,10 +155,10 @@ Index: clamav-0.98.1/etc/clamd.conf.sample
  
  # Enable on-access scanning. Currently, this is supported via fanotify.
  # Clamuko/Dazuko support has been deprecated.
-Index: clamav-0.98.1/etc/freshclam.conf.sample
+Index: clamav-0.98.3/etc/freshclam.conf.sample
 ===================================================================
---- clamav-0.98.1.orig/etc/freshclam.conf.sample	2014-01-13 18:02:18.000000000 +0100
-+++ clamav-0.98.1/etc/freshclam.conf.sample	2014-01-24 16:26:53.380053533 +0100
+--- clamav-0.98.3.orig/etc/freshclam.conf.sample	2014-05-08 16:42:07.349862696 +0200
++++ clamav-0.98.3/etc/freshclam.conf.sample	2014-05-08 16:42:14.866949479 +0200
 @@ -1,12 +1,8 @@
  ##
 -## Example config file for freshclam
diff --git a/clamav-fan-syscalls.patch b/clamav-fan-syscalls.patch
deleted file mode 100644
index 9334afd..0000000
--- a/clamav-fan-syscalls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/clamav.changes b/clamav.changes
index 145c2a2..29907b1 100644
--- a/clamav.changes
+++ b/clamav.changes
@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Thu May  8 15:02:40 UTC 2014 - max@suse.com
+
+- Version 0.98.3:
+  * Support for common raw disk image formats using 512 byte
+    sectors, specifically GPT, APM, and MBR partitioning.
+  * Experimental support of OpenIOC files. ClamAV will now extract
+    file hashes from OpenIOC files residing in the signature
+    database location, and generate ClamAV hash signatures. ClamAV
+    uses no other OpenIOC features at this time. No OpenIOC files
+    will be delivered through freshclam. See openioc.org and
+    iocbucket.com for additional information about OpenIOC.
+  * All ClamAV sockets (clamd, freshclam, clamav-milter, clamdscan,
+    clamdtop) now support IPV6 addresses and configuration
+    parameters.
+  * Use OpenSSL file hash functions for improved performance.
+    OpenSSL is now prerequisite software for ClamAV 0.98.3.
+  * Improved detection of malware scripts within image files.
+  * Change to circumvent possible denial of service when processing
+    icons within specially crafted PE files. Icon limits are now in
+    place with corresponding clamd and clamscan configuration
+    parameters. This issue was reported by Joxean Koret.
+  * Improvements to the fidelity of the ClamAV pattern matcher, an
+    issue reported by Christian Blichmann.
+  * Opt-in collection of statistics. Statistics collected are:
+    sizes and MD5 hashes of files, PE file section counts and
+    section MD5 hashes, and names and counts of detected
+    viruses. Enable statistics collection with the --enable-stats
+    clamscan flag or StatsEnabled clamd configuration parameter.
+  * Improvements to ClamAV build process, unit tests, and platform
+    support.
+  * Improve error handling in freshclam.
+  * ClamAV 0.98.3 also includes miscellaneous bug fixes and
+    documentation improvements.
+- clamav-fan-syscalls.patch isn't needed anymore because ClamAV
+  now uses sys/fanotify.h .
+
 -------------------------------------------------------------------
 Wed Apr 23 10:59:43 UTC 2014 - dmueller@suse.com
 
diff --git a/clamav.spec b/clamav.spec
index bf1724a..bb0ec23 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -37,6 +37,8 @@ BuildRequires:  gcc-c++
 %if 0%{?suse_version} >= 1030
 BuildRequires:  check-devel
 BuildRequires:  libbz2-devel
+BuildRequires:  libopenssl-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  pwdutils
 BuildRequires:  python-devel
 %define clamav_check --enable-check
@@ -47,7 +49,7 @@ BuildRequires:  bzip2
 Summary:        Antivirus Toolkit
 License:        GPL-2.0
 Group:          Productivity/Security
-Version:        0.98.1
+Version:        0.98.3
 Release:        0
 Url:            http://www.clamav.net
 Requires:       latex2html-pngicons
@@ -70,7 +72,6 @@ Source9:        service.clamav-milter
 Patch1:         clamav-conf.patch
 Patch2:         clamav-sles9.patch
 Patch3:         clamav-gcc47.patch
-Patch4:         clamav-fan-syscalls.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
@@ -94,7 +95,6 @@ and multiple signature languages for detecting threats.
 %patch2
 %endif
 %patch3 -p1
-%patch4 -p1
 
 %build
 %if 0%{?suse_version} >= 1010