[packages/clamav] - partial update to 0.98

arekm arekm at pld-linux.org
Mon Oct 14 20:16:17 CEST 2013


commit 5e04f218946a2ed23cc00894816d14877f2702df
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Oct 14 20:16:13 2013 +0200

    - partial update to 0.98

 ac2.68.patch            |  6 +++---
 am-nosilentrules.patch  |  4 ++--
 clamav-nolibs.patch     |  4 ++--
 clamav-pld_config.patch | 18 +++++++++---------
 clamav.spec             |  8 +++-----
 5 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index 324468c..a75cd4e 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -13,12 +13,12 @@
 Summary:	An anti-virus utility for Unix
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
-Version:	0.97.8
-Release:	1
+Version:	0.98
+Release:	0.1
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
-# Source0-md5:	ac52bcbad3ea72eac08fedb9772f648b
+# Source0-md5:	ca0b8c930efcb8be1d47592d268006c5
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-milter.init
@@ -164,8 +164,6 @@ Biblioteki statyczne clamav.
 %patch3 -p1
 
 %build
-# automake 1.12+ needs configure.ac not .in
-mv configure.{in,ac}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
diff --git a/ac2.68.patch b/ac2.68.patch
index f7a2362..27bd529 100644
--- a/ac2.68.patch
+++ b/ac2.68.patch
@@ -10,9 +10,9 @@ diff -ur clamav-0.97.5/clamav-milter/Makefile.am clamav-0.97.5-am/clamav-milter/
  LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
  AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
  CLEANFILES=*.gcda *.gcno
-diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in
---- clamav-0.97.5/configure.in	2012-06-28 11:10:46.795377403 +0200
-+++ clamav-0.97.5-am/configure.in	2012-06-28 11:01:44.658245193 +0200
+diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac
+--- clamav-0.97.5/configure.ac	2012-06-28 11:10:46.795377403 +0200
++++ clamav-0.97.5-am/configure.ac	2012-06-28 11:01:44.658245193 +0200
 @@ -54,6 +54,8 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
diff --git a/am-nosilentrules.patch b/am-nosilentrules.patch
index 9625e0f..8ef38bf 100644
--- a/am-nosilentrules.patch
+++ b/am-nosilentrules.patch
@@ -1,5 +1,5 @@
---- clamav-0.96/configure.in~	2010-04-15 13:38:54.000000000 +0300
-+++ clamav-0.96/configure.in	2010-04-15 13:38:55.799688151 +0300
+--- clamav-0.96/configure.ac~	2010-04-15 13:38:54.000000000 +0300
++++ clamav-0.96/configure.ac	2010-04-15 13:38:55.799688151 +0300
 @@ -34,8 +34,7 @@
  
  dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
diff --git a/clamav-nolibs.patch b/clamav-nolibs.patch
index da49769..0d037c4 100644
--- a/clamav-nolibs.patch
+++ b/clamav-nolibs.patch
@@ -1,5 +1,5 @@
---- clamav-0.96.1/configure.in~	2010-05-19 14:23:09.000000000 +0200
-+++ clamav-0.96.1/configure.in	2010-05-20 09:28:22.297294559 +0200
+--- clamav-0.96.1/configure.ac~	2010-05-19 14:23:09.000000000 +0200
++++ clamav-0.96.1/configure.ac	2010-05-20 09:28:22.297294559 +0200
 @@ -430,8 +430,12 @@
  AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args])
  
diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index 4cb3958..3737c7d 100644
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,6 +1,6 @@
-diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-milter.conf
---- clamav-0.97.1/etc//clamav-milter.conf	2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//clamav-milter.conf	2011-07-14 18:24:02.801795736 +0200
+diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//clamav-milter.conf.sample
+--- clamav-0.97.1/etc//clamav-milter.conf.sample	2011-01-10 18:48:28.000000000 +0100
++++ clamav-0.97.1.new/etc//clamav-milter.conf.sample	2011-07-14 18:24:02.801795736 +0200
 @@ -3,7 +3,7 @@
  ##
  
@@ -68,9 +68,9 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-mil
  
  # Enable verbose logging.
  #
-diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
---- clamav-0.97.1/etc//clamd.conf	2011-05-13 13:25:31.000000000 +0200
-+++ clamav-0.97.1.new/etc//clamd.conf	2011-07-14 18:19:05.824861957 +0200
+diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf.sample
+--- clamav-0.97.1/etc//clamd.conf.sample	2011-05-13 13:25:31.000000000 +0200
++++ clamav-0.97.1.new/etc//clamd.conf.sample	2011-07-14 18:19:05.824861957 +0200
 @@ -5,13 +5,13 @@
  
  
@@ -159,9 +159,9 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  #ClamukoIncludePath /students
  
  # Set the exclude paths. All subdirectories are also excluded. (Dazuko only)
-diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
---- clamav-0.97.1/etc//freshclam.conf	2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//freshclam.conf	2011-07-14 18:14:32.705707450 +0200
+diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshclam.conf.sample
+--- clamav-0.97.1/etc//freshclam.conf.sample	2011-01-10 18:48:28.000000000 +0100
++++ clamav-0.97.1.new/etc//freshclam.conf.sample	2011-07-14 18:14:32.705707450 +0200
 @@ -3,9 +3,14 @@
  ## Please read the freshclam.conf(5) manual before editing this file.
  ##
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/5e04f218946a2ed23cc00894816d14877f2702df



More information about the pld-cvs-commit mailing list