From 4b519d3c752561b7b733f83cb11393990960c0335d8b16736b2dbd2bf140fd8a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 28 Sep 2013 07:38:07 +0000 Subject: [PATCH] Accepting request 201239 from home:lemmy04 OBS-URL: https://build.opensuse.org/request/show/201239 OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=81 --- clamav-0.97.8.tar.gz | 3 --- clamav-0.98.tar.gz | 3 +++ clamav-conf.patch | 53 ++++++++++++++++++++++---------------------- clamav.changes | 5 +++++ clamav.spec | 14 ++++++++++-- 5 files changed, 47 insertions(+), 31 deletions(-) delete mode 100644 clamav-0.97.8.tar.gz create mode 100644 clamav-0.98.tar.gz diff --git a/clamav-0.97.8.tar.gz b/clamav-0.97.8.tar.gz deleted file mode 100644 index 820c448..0000000 --- a/clamav-0.97.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 -size 14609966 diff --git a/clamav-0.98.tar.gz b/clamav-0.98.tar.gz new file mode 100644 index 0000000..90701fd --- /dev/null +++ b/clamav-0.98.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6 +size 37075245 diff --git a/clamav-conf.patch b/clamav-conf.patch index f77d55f..0e7fcc1 100644 --- a/clamav-conf.patch +++ b/clamav-conf.patch @@ -1,7 +1,6 @@ -Index: etc/clamav-milter.conf -=================================================================== ---- etc/clamav-milter.conf.orig 2012-06-12 14:36:05.000000000 +0100 -+++ etc/clamav-milter.conf 2012-06-18 22:49:23.000000000 +0100 +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 ++++ clamav-0.98/etc/clamav-milter.conf.sample 2013-09-27 20:10:23.890676403 +0200 @@ -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 -=================================================================== ---- etc/clamd.conf.orig 2012-06-12 14:03:26.000000000 +0100 -+++ etc/clamd.conf 2012-06-18 22:49:23.000000000 +0100 +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 ++++ clamav-0.98/etc/clamd.conf.sample 2013-09-27 20:10:23.891676413 +0200 @@ -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 -=================================================================== ---- etc/freshclam.conf.orig 2012-06-12 14:36:05.000000000 +0100 -+++ etc/freshclam.conf 2012-06-18 22:49:23.000000000 +0100 +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 ++++ clamav-0.98/etc/freshclam.conf.sample 2013-09-27 20:10:23.892676423 +0200 @@ -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 diff --git a/clamav.changes b/clamav.changes index 390457f..e7e0475 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 27 11:11:57 UTC 2013 - Mathias.Homann@opensuse.org + +- update to clamav 0.98 + ------------------------------------------------------------------- Mon Apr 29 14:32:07 UTC 2013 - meissner@suse.com diff --git a/clamav.spec b/clamav.spec index 9f3e10b..df99fe3 100644 --- a/clamav.spec +++ b/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 @@ -75,9 +75,12 @@ signature updates. The core ClamAV library provides numerous file format detection mechanisms, file unpacking support, archive support, 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 @@ -135,6 +138,13 @@ 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