Author: tpg Date: Wed Feb 14 03:06:48 2007 New Revision: 120688 Added: packages/cooker/clamav/current/SOURCES/clamav-0.90-mdv-config.patch packages/cooker/clamav/current/SOURCES/clamav-0.90.tar.gz (contents, props changed) packages/cooker/clamav/current/SOURCES/clamav-0.90.tar.gz.sig (contents, props changed) Removed: packages/cooker/clamav/current/SOURCES/clamav-0.83-mdk_config.diff packages/cooker/clamav/current/SOURCES/clamav-0.88.7.tar.gz packages/cooker/clamav/current/SOURCES/clamav-0.88.7.tar.gz.sig Modified: packages/cooker/clamav/current/SPECS/clamav.spec
Log: - new version 0.90 - update patch 0 - own some files Added: packages/cooker/clamav/current/SOURCES/clamav-0.90-mdv-config.patch ============================================================================== --- (empty file) +++ packages/cooker/clamav/current/SOURCES/clamav-0.90-mdv-config.patch Wed Feb 14 03:06:48 2007 @@ -0,0 +1,225 @@ +--- etc/clamd.conf 2007-02-12 18:18:42.000000000 +0000 ++++ clamd.conf.tpg 2007-02-14 01:41:15.000000000 +0000 +@@ -11,7 +11,7 @@ + # LogFile must be writable for the user running daemon. + # A full path is required. + # Default: disabled +-#LogFile /tmp/clamd.log ++LogFile /var/log/clamav/clamd.log + + # By default the log file is locked for writing - the lock protects against + # running clamd multiple times (if want to run another clamd, please +@@ -49,27 +49,27 @@ + + # Enable verbose logging. + # Default: no +-#LogVerbose yes ++LogVerbose yes + + # This option allows you to save a process identifier of the listening + # daemon (main thread). + # Default: disabled +-#PidFile /var/run/clamd.pid ++PidFile /var/run/clamav/clamd.pid + + # Optional path to the global temporary directory. + # Default: system specific (usually /tmp or /var/tmp). +-#TemporaryDirectory /var/tmp ++TemporaryDirectory /var/lib/clamav + + # Path to the database directory. + # Default: hardcoded (depends on installation options) +-#DatabaseDirectory /var/lib/clamav ++DatabaseDirectory /var/lib/clamav + + # The daemon works in a local OR a network mode. Due to security reasons we + # recommend the local mode. + + # Path to a local socket file the daemon will listen on. + # Default: disabled (must be specified by a user) +-LocalSocket /tmp/clamd ++LocalSocket /var/lib/clamav/clamd.socket + + # Remove stale socket after unclean shutdown. + # Default: no +@@ -107,12 +107,12 @@ + + # Maximum number of threads running at the same time. + # Default: 10 +-#MaxThreads 20 ++MaxThreads 64 + + # Waiting for data from a client socket will timeout after this time (seconds). + # Value of 0 disables the timeout. + # Default: 120 +-#ReadTimeout 300 ++ReadTimeout 300 + + # Waiting for a new job will timeout after this time (seconds). + # Default: 30 +@@ -124,11 +124,11 @@ + + # Follow directory symlinks. + # Default: no +-#FollowDirectorySymlinks yes ++FollowDirectorySymlinks yes + + # Follow regular file symlinks. + # Default: no +-#FollowFileSymlinks yes ++FollowFileSymlinks yes + + # Perform a database check. + # Default: 1800 (30 min) +@@ -142,11 +142,11 @@ + # Run as another user (clamd must be started by root to make this option + # working). + # Default: don't drop privileges +-#User clamav ++User clamav + + # Initialize supplementary group access (clamd must be started by root). + # Default: no +-#AllowSupplementaryGroups no ++AllowSupplementaryGroups no + + # Stop daemon when libclamav reports out of memory condition. + #ExitOnOOM yes +@@ -179,12 +179,12 @@ + # required for decompression of popular executable packers such as UPX, FSG, + # and Petite. + # Default: yes +-#ScanPE yes ++ScanPE yes + + # Executable and Linking Format is a standard format for UN*X executables. + # This option allows you to control the scanning of ELF files. + # Default: yes +-#ScanELF yes ++#canELF yes + + # With this option clamav will try to detect broken executables (both PE and + # ELF) and mark them as Broken.Executable. +@@ -199,7 +199,7 @@ + # This option enables scanning of OLE2 files, such as Microsoft Office + # documents and .msi files. + # Default: yes +-#ScanOLE2 yes ++ScanOLE2 yes + + ## + ## Mail files +@@ -207,7 +207,7 @@ + + # Enable internal e-mail scanner. + # Default: yes +-#ScanMail yes ++ScanMail yes + + # If an email contains URLs ClamAV can download and scan them. + # WARNING: This option may open your system to a DoS attack. +@@ -222,7 +222,7 @@ + # With this option enabled ClamAV will try to detect phishing attempts by using + # signatures. + # Default: yes +-#PhishingSignatures yes ++PhishingSignatures yes + + + # Scan urls found in mails for phishing attempts. +@@ -257,7 +257,7 @@ + + # Perform HTML normalisation and decryption of MS Script Encoder code. + # Default: yes +-#ScanHTML yes ++ScanHTML yes + + + ## +@@ -266,7 +266,7 @@ + + # ClamAV can scan within archives and compressed files. + # Default: yes +-#ScanArchive yes ++ScanArchive yes + + # The options below protect your system against Denial of Service attacks + # using archive bombs. +--- etc/freshclam.conf 2007-02-11 09:54:46.000000000 +0000 ++++ freshclam.conf.tpg 2007-02-14 01:34:01.000000000 +0000 +@@ -10,15 +10,15 @@ + # 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 /var/log/clamav/freshclam.log + + # Enable verbose logging. + # Default: no +-#LogVerbose yes ++LogVerbose yes + + # Use system logger (can work together with UpdateLogFile). + # Default: no +@@ -31,16 +31,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 +48,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,15 +62,15 @@ + + # 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. +-#ScriptedUpdates yes ++ScriptedUpdates yes + + # Number of database checks per day. + # Default: 12 (every two hours) +-#Checks 24 ++Checks 24 + + # Proxy settings + # Default: disabled +@@ -92,7 +92,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 Added: packages/cooker/clamav/current/SOURCES/clamav-0.90.tar.gz ============================================================================== Binary file. No diff available. Added: packages/cooker/clamav/current/SOURCES/clamav-0.90.tar.gz.sig ============================================================================== Binary file. No diff available. Modified: packages/cooker/clamav/current/SPECS/clamav.spec ============================================================================== --- packages/cooker/clamav/current/SPECS/clamav.spec (original) +++ packages/cooker/clamav/current/SPECS/clamav.spec Wed Feb 14 03:06:48 2007 @@ -11,7 +11,7 @@ Summary: An anti-virus utility for Unix Name: clamav -Version: 0.88.7 +Version: 0.90 Release: %mkrel 1 License: GPL Group: File tools @@ -24,7 +24,7 @@ Source5: clamav-freshclam.logrotate Source6: clamav-milter.init Source7: clamav-milter.sysconfig -Patch0: clamav-0.83-mdk_config.diff +Patch0: clamav-0.90-mdv-config.patch Requires(post): clamav-db Requires(preun): clamav-db Requires(post): %{libname} = %{version} @@ -142,7 +142,7 @@ if [ -e "$i" ]; then rm -rf $i; fi >&/dev/null done -%patch0 -p1 -b .mdkconf +%patch0 -p0 -b .mdkconf mkdir -p Mandriva cp %{SOURCE2} Mandriva/clamav-clamd.init @@ -323,7 +323,7 @@ %files %defattr(-,root,root) %doc AUTHORS BUGS ChangeLog FAQ NEWS README test UPGRADE -%doc docs/*.pdf contrib/clamdwatch contrib/clamavmon +%doc docs/*.pdf contrib/clamdwatch contrib/clamdmon %doc README.qmail+qmail-scanner COPYING %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/clamd.conf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/freshclam.conf @@ -331,9 +331,11 @@ %attr(0755,root,root) %{_initrddir}/freshclam %{_bindir}/clamscan %{_bindir}/clamdscan +%{_bindir}/clamconf %{_bindir}/freshclam %{_bindir}/sigtool %{_mandir}/man1/sigtool.1* +%{_mandir}/man1/clamconf.1.* %{_mandir}/man1/clamdscan.1* %{_mandir}/man1/clamscan.1* %{_mandir}/man1/freshclam.1*
