OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 09-Apr-2009 18:46:57
Branch: HEAD Handle: 2009040917465700
Modified files:
openpkg-src/clamav clamav.patch clamav.spec
Log:
get rid of unrar stuff
Summary:
Revision Changes Path
1.16 +24 -10 openpkg-src/clamav/clamav.patch
1.100 +1 -0 openpkg-src/clamav/clamav.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 clamav.patch
--- openpkg-src/clamav/clamav.patch 23 Mar 2009 21:02:19 -0000 1.15
+++ openpkg-src/clamav/clamav.patch 9 Apr 2009 16:46:57 -0000 1.16
@@ -1,6 +1,6 @@
Index: clamav-milter/clamav-milter.c
---- clamav-milter/clamav-milter.c.orig 2009-03-16 19:37:26 +0100
-+++ clamav-milter/clamav-milter.c 2009-03-23 21:50:53 +0100
+--- clamav-milter/clamav-milter.c.orig 2009-04-01 13:48:54 +0200
++++ clamav-milter/clamav-milter.c 2009-04-09 17:25:12 +0200
@@ -32,7 +32,7 @@
#include <syslog.h>
#endif
@@ -11,8 +11,8 @@
#include "clamav.h"
Index: clamav-milter/clamfi.c
---- clamav-milter/clamfi.c.orig 2009-03-20 22:15:38 +0100
-+++ clamav-milter/clamfi.c 2009-03-23 21:52:24 +0100
+--- clamav-milter/clamfi.c.orig 2009-04-02 18:36:34 +0200
++++ clamav-milter/clamfi.c 2009-04-09 17:25:12 +0200
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <ctype.h>
@@ -24,7 +24,7 @@
#include "shared/output.h"
Index: clamav-milter/clamfi.h
--- clamav-milter/clamfi.h.orig 2009-03-16 19:37:26 +0100
-+++ clamav-milter/clamfi.h 2009-03-23 21:52:57 +0100
++++ clamav-milter/clamfi.h 2009-04-09 17:25:12 +0200
@@ -22,7 +22,7 @@
#define _CLAMFI_H
@@ -35,9 +35,9 @@
extern uint64_t maxfilesize;
extern int addxvirus;
Index: configure
---- configure.orig 2009-03-23 18:10:11 +0100
-+++ configure 2009-03-23 21:49:35 +0100
-@@ -20946,9 +20946,6 @@
+--- configure.orig 2009-04-08 16:38:23 +0200
++++ configure 2009-04-09 17:25:12 +0200
+@@ -20949,9 +20949,6 @@
save_LIBS="$LIBS"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
@@ -47,7 +47,7 @@
LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
{ $as_echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
$as_echo_n "checking for mi_stop in -lmilter... " >&6; }
-@@ -21188,7 +21185,7 @@
+@@ -21191,7 +21188,7 @@
LIBS="$save_LIBS"
@@ -56,9 +56,23 @@
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+Index: libclamav/others.c
+--- libclamav/others.c.orig 2009-04-03 10:33:24 +0200
++++ libclamav/others.c 2009-04-09 17:29:05 +0200
+@@ -176,8 +176,10 @@
+ if(is_rar_initd) return;
+ is_rar_initd = 1;
+
++#if 0
+ rhandle = lt_dlfind("libclamunrar_iface", "unrar");
+ if (!rhandle)
++#endif
+ return;
+
+ if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t
*))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
Index: shared/output.c
--- shared/output.c.orig 2009-03-16 19:37:26 +0100
-+++ shared/output.c 2009-03-23 21:47:48 +0100
++++ shared/output.c 2009-04-09 17:25:12 +0200
@@ -67,7 +67,7 @@
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.spec
============================================================================
$ cvs diff -u -r1.99 -r1.100 clamav.spec
--- openpkg-src/clamav/clamav.spec 9 Apr 2009 07:53:29 -0000 1.99
+++ openpkg-src/clamav/clamav.spec 9 Apr 2009 16:46:57 -0000 1.100
@@ -103,6 +103,7 @@
%else
--disable-milter \
%endif
+ --disable-unrar \
--disable-shared
# build package
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
