Accepting request 201270 from security

- Version 0.98 (bnc#841815)
 * code quality fixes on libclamav, clamd, sigtool, clamav-milter, clamconf and clamdtop
 * code quality fixes on libclamav, libclamunrar and freshclam
 * valgrind suppression rules for dl_catch_error complaints
 * bb #8385: PDF ASCII85Decode zero-length fix
 * libclamav: SCAN_ALL mode fixes
 * bb #7436: elf64 header early exit
 * iso9660: iso_scan_file rewrite
- use source urls, add gpg signature retrieval.

OBS-URL: https://build.opensuse.org/request/show/201270
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clamav?expand=0&rev=60

clamav-0.97.8.tar.gz

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

clamav-0.98.tar.gz

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

clamav-conf.patch

@@ -1,7 +1,6 @@
-Index: etc/clamav-milter.conf
+diff -burNE clamav-0.98_orig/etc/clamav-milter.conf.sample clamav-0.98/etc/clamav-milter.conf.sample
-===================================================================
+--- clamav-0.98_orig/etc/clamav-milter.conf.sample	2013-09-27 20:10:07.805516478 +0200
---- etc/clamav-milter.conf.orig	2012-06-12 14:36:05.000000000 +0100
++++ clamav-0.98/etc/clamav-milter.conf.sample	2013-09-27 20:10:23.890676403 +0200
-+++ etc/clamav-milter.conf	2012-06-18 22:49:23.000000000 +0100
 @@ -2,10 +2,6 @@
  ## Example config file for clamav-milter
  ##
@@ -13,7 +12,7 @@ Index: etc/clamav-milter.conf
  ##
  ## Main options
  ##
-@@ -17,8 +13,7 @@ Example
+@@ -17,8 +13,7 @@
  # inet6:port@[hostname|ip-address] - to specify an ipv6 socket
  #
  # Default: no default
@@ -23,7 +22,7 @@ Index: etc/clamav-milter.conf
  
  # Define the group ownership for the (unix) milter socket.
  # Default: disabled (the primary group of the user running clamd)
-@@ -36,7 +31,7 @@ Example
+@@ -36,7 +31,7 @@
  # Run as another user (clamav-milter must be started by root for this option to work)
  #
  # Default: unset (don't drop privileges)
@@ -32,7 +31,7 @@ Index: etc/clamav-milter.conf
  
  # Initialize supplementary group access (clamav-milter must be started by root).
  #
-@@ -64,7 +59,7 @@ Example
+@@ -64,7 +59,7 @@
  # daemon (main thread).
  #
  # Default: disabled
@@ -41,7 +40,7 @@ Index: etc/clamav-milter.conf
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -90,7 +85,7 @@ Example
+@@ -90,7 +85,7 @@
  # with the same socket: clamd servers will be selected in a round-robin fashion.
  #
  # Default: no default
@@ -50,7 +49,7 @@ Index: etc/clamav-milter.conf
  
  
  ##
-@@ -238,13 +233,13 @@ Example
+@@ -239,13 +234,13 @@
  # Use system logger (can work together with LogFile).
  #
  # Default: no
@@ -66,10 +65,9 @@ Index: etc/clamav-milter.conf
  
  # Enable verbose logging.
  #
-Index: etc/clamd.conf
+diff -burNE clamav-0.98_orig/etc/clamd.conf.sample clamav-0.98/etc/clamd.conf.sample
-===================================================================
+--- clamav-0.98_orig/etc/clamd.conf.sample	2013-09-27 20:10:07.805516478 +0200
---- etc/clamd.conf.orig	2012-06-12 14:03:26.000000000 +0100
++++ clamav-0.98/etc/clamd.conf.sample	2013-09-27 20:10:23.891676413 +0200
-+++ etc/clamd.conf	2012-06-18 22:49:23.000000000 +0100
 @@ -1,12 +1,8 @@
  ##
 -## Example config file for the Clam AV daemon
@@ -84,7 +82,7 @@ Index: etc/clamd.conf
  # Uncomment this option to enable logging.
  # LogFile must be writable for the user running daemon.
  # A full path is required.
-@@ -40,12 +36,12 @@ Example
+@@ -41,12 +37,12 @@
  
  # Use system logger (can work together with LogFile).
  # Default: no
@@ -99,7 +97,7 @@ Index: etc/clamd.conf
  
  # Enable verbose logging.
  # Default: no
-@@ -58,7 +54,7 @@ Example
+@@ -63,7 +59,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -108,7 +106,7 @@ Index: etc/clamd.conf
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -77,7 +73,7 @@ Example
+@@ -82,7 +78,7 @@
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
@@ -117,7 +115,7 @@ Index: etc/clamd.conf
  
  # Sets the group ownership on the unix socket.
  # Default: disabled (the primary group of the user running clamd)
-@@ -93,14 +89,14 @@ Example
+@@ -98,14 +94,14 @@
  
  # TCP port address.
  # Default: no
@@ -134,7 +132,7 @@ Index: etc/clamd.conf
  
  # Maximum length the queue of pending connections may grow to.
  # Default: 200
-@@ -186,7 +182,7 @@ Example
+@@ -191,7 +187,7 @@
  
  # Run as another user (clamd must be started by root for this option to work)
  # Default: don't drop privileges
@@ -143,7 +141,7 @@ Index: etc/clamd.conf
  
  # Initialize supplementary group access (clamd must be started by root).
  # Default: no
-@@ -440,6 +436,10 @@ Example
+@@ -501,6 +497,10 @@
  # Enable Clamuko. Dazuko must be configured and running. Clamuko supports
  # both Dazuko (/dev/dazuko) and DazukoFS (/dev/dazukofs.ctrl). DazukoFS
  # is the preferred option. For more information please visit www.dazuko.org
@@ -154,10 +152,9 @@ Index: etc/clamd.conf
  # Default: no
  #ClamukoScanOnAccess yes
  
-Index: etc/freshclam.conf
+diff -burNE clamav-0.98_orig/etc/freshclam.conf.sample clamav-0.98/etc/freshclam.conf.sample
-===================================================================
+--- clamav-0.98_orig/etc/freshclam.conf.sample	2013-09-27 20:10:07.805516478 +0200
---- etc/freshclam.conf.orig	2012-06-12 14:36:05.000000000 +0100
++++ clamav-0.98/etc/freshclam.conf.sample	2013-09-27 20:10:23.892676423 +0200
-+++ etc/freshclam.conf	2012-06-18 22:49:23.000000000 +0100
 @@ -1,12 +1,8 @@
  ##
 -## Example config file for freshclam
@@ -172,7 +169,7 @@ Index: etc/freshclam.conf
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
  # Default: hardcoded (depends on installation options)
-@@ -34,21 +30,21 @@ Example
+@@ -35,12 +31,12 @@
  
  # Use system logger (can work together with UpdateLogFile).
  # Default: no
@@ -185,6 +182,10 @@ Index: etc/freshclam.conf
 -#LogFacility LOG_MAIL
 +LogFacility LOG_MAIL
  
+ # Enable log rotation. Always enabled when LogFileMaxSize is enabled.
+ # Default: no
+@@ -48,12 +44,12 @@
+ 
  # This option allows you to save the process identifier of the daemon
  # Default: disabled
 -#PidFile /var/run/freshclam.pid
@@ -198,7 +199,7 @@ Index: etc/freshclam.conf
  
  # Initialize supplementary group access (freshclam must be started by root).
  # Default: no
-@@ -118,7 +114,7 @@ DatabaseMirror database.clamav.net
+@@ -136,7 +132,7 @@
  
  # Send the RELOAD command to clamd.
  # Default: no
@@ -207,7 +208,7 @@ Index: etc/freshclam.conf
  
  # Run command after successful database update.
  # Default: disabled
-@@ -161,7 +157,7 @@ DatabaseMirror database.clamav.net
+@@ -179,7 +175,7 @@
  # detected in the field and in what geographic area they are.
  # Freshclam will connect to clamd in order to get recent statistics.
  # Default: no

clamav.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Sep 28 07:35:34 UTC 2013 - meissner@suse.com
+
+- Version 0.98 (bnc#841815)
+ * code quality fixes on libclamav, clamd, sigtool, clamav-milter, clamconf and clamdtop
+ * code quality fixes on libclamav, libclamunrar and freshclam
+ * valgrind suppression rules for dl_catch_error complaints
+ * bb #8385: PDF ASCII85Decode zero-length fix
+ * libclamav: SCAN_ALL mode fixes
+ * bb #7436: elf64 header early exit
+ * iso9660: iso_scan_file rewrite
+- use source urls, add gpg signature retrieval.
+
 -------------------------------------------------------------------
 Mon Apr 29 14:32:07 UTC 2013 - meissner@suse.com
 

clamav.keyring

@@ -0,0 +1,43 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+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
+MjiCtk3kDuDp
+=xBx3
+-----END PGP PUBLIC KEY BLOCK-----

clamav.spec

@@ -45,7 +45,7 @@ BuildRequires:  bzip2
 Summary:        Antivirus Toolkit
 License:        GPL-2.0
 Group:          Productivity/Security
-Version:        0.97.8
+Version:        0.98
 Release:        0
 Url:            http://www.clamav.net
 Requires:       latex2html-pngicons
@@ -53,7 +53,8 @@ Obsoletes:      clamav-db < 0.88.3
 PreReq:         %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
 PreReq:         /usr/bin/awk /bin/sed /bin/tar
 PreReq:         %insserv_prereq
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
+Source10:       http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz.sig
 Source1:        clamav-rcclamd
 Source2:        clamav-rcfreshclam
 Source3:        clamav-updateclamconf
@@ -77,7 +78,7 @@ and multiple signature languages for detecting threats.
 
 %prep
 %setup -q
-%patch1
+%patch1 -p1
 %if 0%{?suse_version} == 0910
 # SLES9's libmilter doesn't have smfi_insheader()
 %patch2
@@ -112,7 +113,7 @@ CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET"
 	--enable-clamdtop \
 	--disable-timestamps
 
-make %{?jobs:-j%jobs}
+make V=1 %{?jobs:-j%jobs}
 
 %install
 %makeinstall
@@ -135,9 +136,16 @@ rm %buildroot/%_libdir/*.la
 # Remove bogus dependencies from libclamav.pc
 sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc
 
+# fix the new config file names
+pushd %buildroot/etc
+mv clamd.conf.sample clamd.conf
+mv clamav-milter.conf.sample clamav-milter.conf
+mv freshclam.conf.sample freshclam.conf
+popd
+
 %check
 
-# regressoin tests
+# regression tests
 %if !0%{?qemu_user_space_build:1}
 VALGRIND_GENSUP=1 make check
 %endif