Accepting request 283477 from security

- Don't need sendmail for building clamav-milter anymore,
  sendmail-devel is enough (bnc#915414).

- bnc#914505: Config file merging and temp file creation got moved
  to %pre by mistake. Put them back to %post.
- Restore the updateclamconf script (bnc#908731).
- Fix a step backwards in the soname version from 0.98.4 to 0.98.5
  (https://bugzilla.clamav.net/show_bug.cgi?id=11193,
  clamav-soname.patch).

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

clamav-soname.patch

@@ -0,0 +1,26 @@
+diff --git a/configure b/configure
+index 95168bb..c31f831 100755
+--- a/configure
++++ b/configure
+@@ -5090,7 +5090,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ VERSION="0.98.5"
+ 
+ LC_CURRENT=7
+-LC_REVISION=22
++LC_REVISION=24
+ LC_AGE=1
+ LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
+ 
+diff --git a/m4/reorganization/version.m4 b/m4/reorganization/version.m4
+index ea263b2..f4fe8b1 100644
+--- a/m4/reorganization/version.m4
++++ b/m4/reorganization/version.m4
+@@ -3,7 +3,7 @@ dnl VERSION="devel-`date +%Y%m%d`"
+ VERSION="0.98.5"
+ 
+ LC_CURRENT=7
+-LC_REVISION=22
++LC_REVISION=24
+ LC_AGE=1
+ LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
+ AC_SUBST([LIBCLAMAV_VERSION])

clamav.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Jan 30 15:19:34 UTC 2015 - max@suse.com
+
+- Don't need sendmail for building clamav-milter anymore,
+  sendmail-devel is enough (bnc#915414).
+
+-------------------------------------------------------------------
+Fri Jan 23 14:03:18 UTC 2015 - max@suse.com
+
+- bnc#914505: Config file merging and temp file creation got moved
+  to %pre by mistake. Put them back to %post.
+- Restore the updateclamconf script (bnc#908731).
+- Fix a step backwards in the soname version from 0.98.4 to 0.98.5
+  (https://bugzilla.clamav.net/show_bug.cgi?id=11193,
+  clamav-soname.patch).
+
 -------------------------------------------------------------------
 Thu Jan  1 21:34:01 UTC 2015 - meissner@suse.com
 

clamav.spec

@@ -21,7 +21,6 @@
 Name:           clamav
 BuildRequires:  ncurses-devel
 BuildRequires:  sed
-BuildRequires:  sendmail
 BuildRequires:  sendmail-devel
 %define llvm --disable-llvm
 %if 0%{?suse_version} >= 1010
@@ -68,6 +67,7 @@ Source9:        service.clamav-milter
 Patch1:         clamav-conf.patch
 Patch2:         clamav-sles9.patch
 Patch3:         clamav-gcc47.patch
+Patch4:         clamav-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  systemd
 %systemd_requires
@@ -90,6 +90,7 @@ and multiple signature languages for detecting threats.
 %patch2
 %endif
 %patch3 -p1
+%patch4 -p1
 
 %build
 %if 0%{?suse_version} >= 1010
@@ -130,6 +131,7 @@ make V=1 %{?jobs:-j%jobs}
 
 %install
 %makeinstall
+install -m755 %SOURCE3 %buildroot%_sbindir/updateclamconf
 install -d -m755 %buildroot/var/lib/clamav
 install -d -m755 %buildroot/%_tmpfilesdir
 install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf
@@ -195,8 +197,13 @@ VALGRIND_GENSUP=1 make check
 %_sbindir/groupadd -r vscan 2> /dev/null || :
 %_sbindir/useradd -r -o -g vscan -u 65 -s /bin/false -c "Vscan account" -d /var/spool/amavis vscan 2> /dev/null || :
 %_sbindir/usermod vscan -g vscan 2> /dev/null || :
+%service_add_pre clamd.service freshclam.service clamav-milter.service
 
+%post
 /sbin/ldconfig
+systemd-tmpfiles --create %_tmpfilesdir/clamav.conf
+%service_add_post clamd.service freshclam.service clamav-milter.service
+
 # merge config files on update
 test "0$1" -lt 2 && exit 0
 umask 022
@@ -212,11 +219,6 @@ for f in /etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf; do
     fi
   fi
 done
-systemd-tmpfiles --create %_tmpfilesdir/clamav.conf
-%service_add_pre clamd.service freshclam.service clamav-milter.service
-
-%post
-%service_add_post clamd.service freshclam.service clamav-milter.service
 
 %preun
 %service_del_preun clamd.service freshclam.service clamav-milter.service