[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

UPDATE: security/clamav 0.84rc1



Hi,

I've had problem with libtool here, but making this change:

--- configure.orig      Thu Apr  7 19:59:55 2005
+++ configure   Sun Apr 10 17:40:07 2005
@@ -6314,7 +6314,7 @@ else
         ;;
       *)
         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        hardcode_libdir_flag_spec=
         ;;
       esac
     fi

workaround the compile problem. Currently (with-in-cvs-port) libtool feeds
gcc `-L' flags in order:

	    -L/usr/local/lib -L../libclamav/.libs -lclamav

That gives it links with /usr/local/lib/libclamav.so.1.8 (clamav-0.83 is
installed on my box):

$ ldd .libs/clamscan
.libs/clamscan:
        Start    End      Type Ref Name
        00000000 00000000 exe   1  .libs/clamscan
        02265000 22279000 rlib  1  /usr/local/lib/libclamav.so.1.8
        0a966000 2a96a000 rlib  2  /usr/local/lib/libbz2.so.10.2
        0237d000 22383000 rlib  2  /usr/local/lib/libgmp.so.6.3
        08eec000 28ef6000 rlib  2  /usr/local/lib/libcurl.so.2.2
        02bb6000 22bc1000 rlib  3  /usr/lib/libssl.so.9.0
        0415d000 2418d000 rlib  3  /usr/lib/libcrypto.so.11.0
        0b91b000 2b923000 rlib  3  /usr/lib/libz.so.4.0
        03852000 2385b000 rlib  1  /usr/lib/libpthread.so.6.1
        0b931000 2b968000 rlib  1  /usr/lib/libc.so.35.0
        04e2e000 04e2e000 rtld  1  /usr/libexec/ld.so

But it should (IMO) with ../libclamav/.libs/libclamav.so.1.9. Selecting
older lib (so.1.8) break compile of clamd:

[...]
server-th.o(.text+0x98a): In function `acceptloop_th':
: undefined reference to `cl_dup'
collect2: ld returned 1 exit status
*** Error code 1
[...]

When I compile last step of clamd by hand changing order with:

	-L../libclamav/.libs -lclamav -L/usr/local/lib

clamd compiles okey. I can't find best way to change this order :/ I'm
not sure that above patch don't sux. I'm attaching full update-patch.

-- 
best regards
q#
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/clamav/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	2005/02/21 09:36:29	1.3
+++ Makefile	2005/04/10 15:59:47
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
 
 COMMENT=		"free virus scanner"
-DISTNAME=		clamav-0.83
+DISTNAME=		clamav-0.84rc1
 CATEGORIES=		security
 
 HOMEPAGE=		http://www.clamav.net/
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/clamav/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2005/02/21 09:36:29	1.3
+++ distinfo	2005/04/10 15:59:47
@@ -1,4 +1,4 @@
-MD5 (clamav-0.83.tar.gz) = e3a1b6bbda8095c5aae4eb7bc753804c
-RMD160 (clamav-0.83.tar.gz) = 8fcecf6a94e9d873e797c350b50d3a7080696ff5
-SHA1 (clamav-0.83.tar.gz) = a8264834ee494b44d99db5b3a9e16599cb4e9026
-SIZE (clamav-0.83.tar.gz) = 3653658
+MD5 (clamav-0.84rc1.tar.gz) = 43cf89ccf2a3854aef7d0716433b44fe
+RMD160 (clamav-0.84rc1.tar.gz) = f323671f3edc6b0bf3cd0bfa10e3ac53465fd7aa
+SHA1 (clamav-0.84rc1.tar.gz) = 0d24884017cbd2bbbc62be5b0912eec963f24e86
+SIZE (clamav-0.84rc1.tar.gz) = 3864208
Index: patches/patch-clamav_milter-clamav_milter_c
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-clamav_milter-clamav_milter_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-clamav_milter-clamav_milter_c
--- patches/patch-clamav_milter-clamav_milter_c	2005/01/09 17:07:52	1.1.1.1
+++ patches/patch-clamav_milter-clamav_milter_c	2005/04/10 15:59:47
@@ -1,6 +1,6 @@
---- clamav-milter/clamav-milter.c.orig	Mon Oct 11 02:59:12 2004
-+++ clamav-milter/clamav-milter.c	Tue Dec 21 16:37:12 2004
-@@ -1138,7 +1138,7 @@ main(int argc, char **argv)
+--- clamav-milter/clamav-milter.c.orig	Thu Apr  7 19:50:14 2005
++++ clamav-milter/clamav-milter.c	Sat Apr  9 14:58:15 2005
+@@ -875,7 +875,7 @@ main(int argc, char **argv)
  		 * uid == 0 for that
  		 */
  		on = 1;
@@ -9,7 +9,7 @@
  			perror("setsockopt");
  			return EX_UNAVAILABLE;
  		}
-@@ -1155,7 +1155,7 @@ main(int argc, char **argv)
+@@ -892,7 +892,7 @@ main(int argc, char **argv)
  
  			memset(&ifr, '\0', sizeof(struct ifreq));
  			strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);
Index: patches/patch-clamdscan_client_c
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-clamdscan_client_c,v
retrieving revision 1.2
diff -u -r1.2 patch-clamdscan_client_c
--- patches/patch-clamdscan_client_c	2005/01/27 19:47:47	1.2
+++ patches/patch-clamdscan_client_c	2005/04/10 15:59:47
@@ -1,15 +1,15 @@
 $OpenBSD: patch-clamdscan_client_c,v 1.2 2005/01/27 19:47:47 mbalmer Exp $
---- clamdscan/client.c.orig	Sun Jan  9 12:24:58 2005
-+++ clamdscan/client.c	Sun Jan  9 12:27:44 2005
-@@ -25,6 +25,7 @@
+--- clamdscan/client.c.orig	Sun Feb  6 20:28:03 2005
++++ clamdscan/client.c	Sat Apr  9 14:58:15 2005
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
  #include <sys/stat.h>
- #include <unistd.h>
  #include <sys/socket.h>
 +#include <sys/param.h>
  #include <sys/un.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
-@@ -186,18 +187,18 @@ int dsstream(int sockd)
+@@ -283,18 +284,18 @@ int dsstream(int sockd, const struct opt
  char *abpath(const char *filename)
  {
  	struct stat foo;
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- patches/patch-configure	2005/01/09 17:07:52	1.1.1.1
+++ patches/patch-configure	2005/04/10 15:59:47
@@ -1,6 +1,15 @@
---- configure.orig	Sun Oct 17 18:37:47 2004
-+++ configure	Sun Jan  9 12:24:10 2005
-@@ -10339,11 +10339,11 @@ extern "C"
+--- configure.orig	Thu Apr  7 19:59:55 2005
++++ configure	Sun Apr 10 17:40:07 2005
+@@ -6314,7 +6314,7 @@ else
+         ;;
+       *)
+         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++        hardcode_libdir_flag_spec=
+         ;;
+       esac
+     fi
+@@ -10533,11 +10533,11 @@ extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -14,7 +23,7 @@
    ;
    return 0;
  }
-@@ -10704,6 +10704,8 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -10898,6 +10898,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -23,7 +32,7 @@
  #include <resolv.h>
  _ACEOF
  rm -f conftest.$ac_objext
-@@ -11527,6 +11529,7 @@ _ACEOF
+@@ -11704,6 +11706,7 @@ _ACEOF
  openbsd*)
      if test "$have_pthreads" = "yes"; then
  	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
@@ -31,7 +40,7 @@
  	if test "$disable_cr" = "yes"; then
  	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
  	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
-@@ -12405,6 +12408,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -12889,6 +12892,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39,7 +48,7 @@
  #include <tcpd.h>
  int allow_severity = 0;
  int deny_severity  = 0;
-@@ -12460,6 +12464,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -12944,6 +12948,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
Index: patches/patch-etc-freshclam_conf
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-etc-freshclam_conf,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-etc-freshclam_conf
--- patches/patch-etc-freshclam_conf	2005/01/09 17:07:52	1.1.1.1
+++ patches/patch-etc-freshclam_conf	2005/04/10 15:59:47
@@ -1,5 +1,5 @@
---- etc/freshclam.conf.orig	Mon Sep 27 22:35:01 2004
-+++ etc/freshclam.conf	Tue Dec 21 16:40:33 2004
+--- etc/freshclam.conf.orig	Thu Apr  7 19:55:34 2005
++++ etc/freshclam.conf	Sat Apr  9 14:58:15 2005
 @@ -11,7 +11,7 @@ Example
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
@@ -16,5 +16,5 @@
 -#DatabaseOwner clamav
 +#DatabaseOwner _clamav
  
- # Use DNS to verify virus database version. Freshclam uses DNS TXT records
- # to verify database and software versions. We highly recommend enabling
+ # Initialize supplementary group access (freshclam must be started by root).
+ # Default: disabled
Index: patches/patch-libclamav_mbox_c
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-libclamav_mbox_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-libclamav_mbox_c
--- patches/patch-libclamav_mbox_c	2005/01/09 17:07:52	1.1.1.1
+++ patches/patch-libclamav_mbox_c	2005/04/10 15:59:47
@@ -1,6 +1,6 @@
---- libclamav/mbox.c.orig	Sun Oct 17 15:25:31 2004
-+++ libclamav/mbox.c	Tue Dec 21 16:37:12 2004
-@@ -472,11 +472,6 @@ static	char	const	rcsid[] = "$Id: mbox.c
+--- libclamav/mbox.c.orig	Thu Apr  7 19:50:25 2005
++++ libclamav/mbox.c	Sat Apr  9 14:58:15 2005
+@@ -25,11 +25,6 @@ static	char	const	rcsid[] = "$Id: mbox.c
  #define	NDEBUG	/* map CLAMAV debug onto standard */
  #endif
  
Index: patches/patch-libclamav_scanner_c
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-libclamav_scanner_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-libclamav_scanner_c
--- patches/patch-libclamav_scanner_c	2005/01/09 17:07:52	1.1.1.1
+++ patches/patch-libclamav_scanner_c	2005/04/10 15:59:47
@@ -1,6 +1,6 @@
---- libclamav/scanners.c.orig	Sun Oct 17 01:24:48 2004
-+++ libclamav/scanners.c	Tue Dec 21 16:37:12 2004
-@@ -494,11 +494,6 @@ static int cli_scangzip(int desc, const 
+--- libclamav/scanners.c.orig	Thu Apr  7 00:45:28 2005
++++ libclamav/scanners.c	Sat Apr  9 14:58:15 2005
+@@ -632,11 +632,6 @@ static int cli_scangzip(int desc, const 
  
  #ifdef HAVE_BZLIB_H
  
@@ -10,9 +10,9 @@
 -#define BZ2_bzRead bzRead
 -#endif
  
- static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)
+ static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)
  {
-@@ -519,7 +514,7 @@ static int cli_scanbzip(int desc, const 
+@@ -657,7 +652,7 @@ static int cli_scanbzip(int desc, const 
  	if(limits->archivememlim)
  	    memlim = 1;
  
Index: patches/patch-ltmain_sh
===================================================================
RCS file: /cvs/ports/security/clamav/patches/patch-ltmain_sh,v
retrieving revision 1.3
diff -u -r1.3 patch-ltmain_sh
--- patches/patch-ltmain_sh	2005/02/21 09:36:29	1.3
+++ patches/patch-ltmain_sh	2005/04/10 15:59:47
@@ -1,6 +1,6 @@
 $OpenBSD: patch-ltmain_sh,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
---- ltmain.sh.orig	Tue Jun 24 00:48:14 2003
-+++ ltmain.sh	Tue Jun 24 00:50:20 2003
+--- ltmain.sh.orig	Tue Jul 29 17:37:51 2003
++++ ltmain.sh	Sat Apr  9 15:10:46 2005
 @@ -1035,39 +1035,45 @@ compiler."
  	;;
  
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/security/clamav/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared
--- pkg/PFRAG.shared	2005/02/21 09:36:29	1.3
+++ pkg/PFRAG.shared	2005/04/10 15:59:47
@@ -1,2 +1,2 @@
 @comment $OpenBSD: PFRAG.shared,v 1.3 2005/02/21 09:36:29 mbalmer Exp $
-_(_at_)_lib lib/libclamav.so.1.8
+_(_at_)_lib lib/libclamav.so.1.9