rpms/clamav/F-11 clamav.spec,1.89,1.90

[ensc]

Author: ensc

Update of /cvs/extras/rpms/clamav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1329

Modified Files:
	clamav.spec 
Log Message:
- add the '%milteruser' user to the '%scanuser' group when the -scanner
  subpackage is installed (#505739)
- whitespace cleanups



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- clamav.spec	9 Aug 2009 11:25:07 -0000	1.89
+++ clamav.spec	13 Sep 2009 12:39:14 -0000	1.90
@@ -1,7 +1,7 @@
 #global snapshot	rc1
 
 ## Fedora Extras specific customization below...
-%bcond_without       	fedora
+%bcond_without		fedora
 %bcond_with		unrar
 ##
 
@@ -21,7 +21,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.2
-Release:	%release_func 2%{?snapshot:.%snapshot}
+Release:	%release_func 3%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -30,7 +30,7 @@ URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz
 Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz.sig
 %else
-# Unfortunately, clamav includes support for RAR v3, derived from GPL 
+# Unfortunately, clamav includes support for RAR v3, derived from GPL
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #   make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
@@ -159,7 +159,7 @@ Source410:	clamd.scan.upstart
 Provides:	init(clamav-scanner) = upstart
 Requires:	clamav-scanner = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 
@@ -208,7 +208,7 @@ Source310:	clamav-milter.upstart
 Provides:	init(clamav-milter) = upstart
 Requires:	clamav-milter = %version-%release
 # implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d	
+Requires(pre):		/etc/event.d
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 
@@ -347,7 +347,7 @@ export have_cv_ipv6=yes
 
 # build with --as-needed and disable rpath
 sed -i \
-	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
+	-e 's! -shared ! -Wl,--as-needed\0!g'					\
 	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g'	\
 	libtool
 
@@ -397,10 +397,10 @@ mkdir _doc_server
 install -m644 -p %SOURCE2	_doc_server/clamd.sysconfig
 install -m644 -p %SOURCE3       _doc_server/clamd.logrotate
 install -m755 -p %SOURCE7	_doc_server/clamd.init
-install -m644 -p %SOURCE5      	_doc_server/README
+install -m644 -p %SOURCE5	_doc_server/README
 install -m644 -p etc/clamd.conf _doc_server/clamd.conf
 
-install -m644 -p %SOURCE1  	$RPM_BUILD_ROOT%pkgdatadir
+install -m644 -p %SOURCE1	$RPM_BUILD_ROOT%pkgdatadir
 install -m755 -p %SOURCE100     $RPM_BUILD_ROOT%pkgdatadir
 cp -pa _doc_server/*            $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
@@ -507,6 +507,12 @@ test -e %freshclamlog || {
 	%__chown root:%username %freshclamlog
 }
 
+
+%triggerin milter -- clamav-scanner
+# Add the milteruser to the scanuser group; this is required when
+# milter and clamd communicate through local sockets
+/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || :
+
 %pre milter
 %__fe_groupadd 5 -r %milteruser &>/dev/null || :
 %__fe_useradd  5 -r -s /sbin/nologin -d %milterstatedir -M \
@@ -666,6 +672,10 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-3
+- add the '%milteruser' user to the '%scanuser' group when the -scanner
+  subpackage is installed (#505739)
+
 * Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-2
 - disabled LocalSocket option in sample configuration
 - fixed clamav-milter sysv initscript to use bash interpreter and to
@@ -769,7 +779,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability
 
 * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.91.2-3
-- remove RAR decompression code from source tarball because of 
+- remove RAR decompression code from source tarball because of
   legal problems (resolves 334371)
 - correct license tag
 
@@ -796,7 +806,7 @@ test "$1" != "0" || /sbin/initctl -q sto
   in FC6- and F7+
 
 * Fri Apr 13 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.90.2-1
-- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 
+- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997
 
 * Fri Mar  2 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.90.1-2
 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers'