steffen: server/clamav kolab.patch,1.1,1.2

cvs at kolab.org cvs at kolab.org
Fri Mar 2 05:34:36 CET 2007


Author: steffen

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv27943

Modified Files:
	kolab.patch 
Log Message:
patch was outdated, works again now

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch	14 Feb 2007 17:44:17 -0000	1.1
+++ kolab.patch	2 Mar 2007 04:34:34 -0000	1.2
@@ -1,6 +1,6 @@
---- clamav.spec.orig	2007-02-14 06:54:23.000000000 +0100
-+++ clamav.spec	2007-02-14 17:54:29.000000000 +0100
-@@ -33,7 +33,7 @@
+--- clamav.spec.orig	2007-02-23 11:30:31.000000000 +0100
++++ clamav.spec	2007-02-23 11:30:59.000000000 +0100
+@@ -33,7 +33,7 @@ Class:        EVAL
  Group:        AntiVirus
  License:      GPL
  Version:      0.90
@@ -9,18 +9,18 @@
  
  #   package options
  %option       with_milter  no
-@@ -46,8 +46,8 @@
+@@ -46,8 +46,8 @@ Patch0:       clamav.patch
  #   build information
  Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
--BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2
+-BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc
 -PreReq:       OpenPKG, openpkg >= 20060823
-+BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2
++BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2, pkgconfig, bc
 +PreReq:       OpenPKG, openpkg >= 2.4.3
- BuildPreReq:  zlib, curl, gmp
- PreReq:       zlib, curl, gmp
+ BuildPreReq:  zlib, bzip2, curl, gmp, libiconv, openssl
+ PreReq:       zlib, bzip2, curl, gmp, libiconv, openssl
  %if "%{with_milter}" == "yes"
-@@ -84,6 +84,7 @@
+@@ -84,6 +84,7 @@ AutoReqProv:  no
      CFLAGS="%{l_cflags -O}" \
      CPPFLAGS="%{l_cppflags}" \
      LDFLAGS="%{l_ldflags}" \
@@ -28,16 +28,3 @@
      GREP="grep" \
      ./configure \
          --prefix=%{l_prefix} \
-@@ -121,10 +122,10 @@
-     %{l_shtool} install -c -m 644 \
-         -e 's;^\(Example\);#\1;' \
-         -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
--        -e 's;^#\(LogTime\).*;\1;' \
-+        -e 's;^#\(LogTime.*\);\1;' \
-         -e 's;^#\(PidFile\).*;\1 %{l_prefix}/var/clamav/clamd.pid;' \
-         -e 's;^\(LocalSocket\).*;\1 %{l_prefix}/var/clamav/clamd.sock;' \
--        -e 's;^#\(FixStaleSocket\).*;\1;' \
-+        -e 's;^#\(FixStaleSocket.*\);\1;' \
-         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
-         -e 's;^#\(User\).*;\1 %{l_rusr};' \
-         etc/clamd.conf \





More information about the commits mailing list