[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] SVN commit in packages r7542 - in
From:       cvsrep () annvix ! org
Date:       2007-08-01 4:43:50
Message-ID: E1IG63q-0004jd-VG () hades ! annvix ! org
[Download RAW message or body]

Author: vdanen
Date: 2007-07-31 22:43:50 -0600 (Tue, 31 Jul 2007)
New Revision: 7542

Modified:
   releases/2.1-CURRENT/clamav/SOURCES/clamav-0.91.1-avx-config.patch
   releases/2.1-CURRENT/clamav/SPECS/clamav.spec
Log:
- update major
- also patch freshclam.conf (P0)
- clamd.conf doesn't need to be in two packages


Modified: releases/2.1-CURRENT/clamav/SOURCES/clamav-0.91.1-avx-config.patch
===================================================================
--- releases/2.1-CURRENT/clamav/SOURCES/clamav-0.91.1-avx-config.patch	2007-08-01 04:29:02 UTC (rev 7541)
+++ releases/2.1-CURRENT/clamav/SOURCES/clamav-0.91.1-avx-config.patch	2007-08-01 04:43:50 UTC (rev 7542)
@@ -105,3 +105,86 @@
  
  # Enable debug messages in libclamav.
  # Default: no
+--- clamav-0.91.1/etc/freshclam.conf.avx	2007-07-31 22:32:48.211350250 -0600
++++ clamav-0.91.1/etc/freshclam.conf	2007-07-31 22:35:10.560246500 -0600
+@@ -4,21 +4,18 @@
+ ##
+ 
+ 
+-# Comment or remove the line below.
+-Example
+-
+ # Path to the database directory.
+ # WARNING: It must match clamd.conf's directive!
+ # Default: hardcoded (depends on installation options)
+-#DatabaseDirectory /var/lib/clamav
++DatabaseDirectory /var/lib/clamav
+ 
+ # Path to the log file (make sure it has proper permissions)
+ # Default: disabled
+-#UpdateLogFile /var/log/freshclam.log
++UpdateLogFile /dev/stderr
+ 
+ # Enable verbose logging.
+ # Default: no
+-#LogVerbose yes
++LogVerbose yes
+ 
+ # Use system logger (can work together with UpdateLogFile).
+ # Default: no
+@@ -31,16 +28,16 @@
+ 
+ # This option allows you to save the process identifier of the daemon
+ # Default: disabled
+-#PidFile /var/run/freshclam.pid
++PidFile /var/run/clamav/freshclam.pid
+ 
+ # By default when started freshclam drops privileges and switches to the
+ # "clamav" user. This directive allows you to change the database owner.
+ # Default: clamav (may depend on installation options)
+-#DatabaseOwner clamav
++DatabaseOwner clamav
+ 
+ # Initialize supplementary group access (freshclam must be started by root).
+ # Default: no
+-#AllowSupplementaryGroups yes
++AllowSupplementaryGroups yes
+ 
+ # Use DNS to verify virus database version. Freshclam uses DNS TXT records
+ # to verify database and software versions. With this directive you can change
+@@ -48,7 +45,7 @@
+ # WARNING: Do not touch it unless you're configuring freshclam to use your
+ # own database verification domain.
+ # Default: current.cvd.clamav.net
+-#DNSDatabaseInfo current.cvd.clamav.net
++DNSDatabaseInfo current.cvd.clamav.net
+ 
+ # Uncomment the following line and replace XY with your country
+ # code. See http://www.iana.org/cctld/cctld-whois.htm for the full list.
+@@ -62,7 +59,7 @@
+ 
+ # How many attempts to make before giving up.
+ # Default: 3 (per mirror)
+-#MaxAttempts 5
++MaxAttempts 5
+ 
+ # With this option you can control scripted updates. It's highly recommended
+ # to keep it enabled.
+@@ -92,7 +89,7 @@
+ 
+ # Send the RELOAD command to clamd.
+ # Default: no
+-#NotifyClamd /path/to/clamd.conf
++NotifyClamd /etc/clamd.conf
+ 
+ # Run command after successful database update.
+ # Default: disabled
+@@ -109,7 +106,7 @@
+ 
+ # Don't fork into background.
+ # Default: no
+-#Foreground yes
++Foreground yes
+ 
+ # Enable debug messages in libclamav.
+ # Default: no

Modified: releases/2.1-CURRENT/clamav/SPECS/clamav.spec
===================================================================
--- releases/2.1-CURRENT/clamav/SPECS/clamav.spec	2007-08-01 04:29:02 UTC (rev 7541)
+++ releases/2.1-CURRENT/clamav/SPECS/clamav.spec	2007-08-01 04:43:50 UTC (rev 7542)
@@ -12,7 +12,7 @@
 %define version		0.91.1
 %define release		%_revrel
 
-%define	major		1
+%define	major		2
 %define libname		%mklibname %{name} %{major}
 %define devname		%mklibname %{name} -d
 %define odevname	%mklibname %{name} 1 -d
@@ -94,6 +94,7 @@
 Summary:	Shared libraries for %{name}
 Group:          System/Libraries
 Provides:	lib%{name} = %{version}-%{release}
+Obsoletes:	%{mklibname clamav 1}-devel
 
 %description -n	%{libname}
 Shared libraries for %{name}
@@ -250,7 +251,6 @@
 
 %files -n clamd
 %defattr(-,root,root)
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/clamd.conf
 %{_sbindir}/clamd
 %{_mandir}/man8/clamd.8*
 %dir %attr(0750,root,admin) %{_srvdir}/clamd
@@ -286,6 +286,11 @@
       
 %changelog
 * Tue Jul 31 2007 Vincent Danen <vdanen-at-build.annvix.org> 0.91.1
+- update major
+- also patch freshclam.conf (P0)
+- clamd.conf doesn't need to be in two packages
+
+* Tue Jul 31 2007 Vincent Danen <vdanen-at-build.annvix.org> 0.91.1
 - 0.91.1: fixes CVE-2007-3725
 - rediff P0
 - implement devel naming policy


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs

[prev in list] [next in list] [prev in thread] [next in thread]