[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit ec32c565ba43d4a87a218625a1bc1777fdd7bcc2
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Dec 16 14:30:18 2009 +0200

    Don't use -ldl since its not portable.
    
    ClamAV itself is already linked to the appropriate library due to libltdl,
    so linking the LLVM parts to -ldl is not needed.
    With -ldl it was failing to link on FreeBSD, reported by Renato Botelho.

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index 534639d..d20952f 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -71,7 +71,7 @@ LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused
 EXTRA_DIST=$(top_srcdir)/llvm llvmdejagnu.sh
 
 libllvmsystem_la_LDFLAGS=-pthread
-libllvmsystem_la_LIBADD=-ldl
+libllvmsystem_la_LIBADD=
 libllvmsystem_la_SOURCES=\
 	llvm/lib/System/Alarm.cpp\
 	llvm/lib/System/Atomic.cpp\
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 997925d..e5b40b4 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -807,7 +807,7 @@ libclamavcxx_la_SOURCES = bytecode2llvm.cpp
 LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros
 EXTRA_DIST = $(top_srcdir)/llvm llvmdejagnu.sh
 libllvmsystem_la_LDFLAGS = -pthread
-libllvmsystem_la_LIBADD = -ldl
+libllvmsystem_la_LIBADD = 
 libllvmsystem_la_SOURCES = llvm/lib/System/Alarm.cpp \
 	llvm/lib/System/Atomic.cpp llvm/lib/System/Disassembler.cpp \
 	llvm/lib/System/DynamicLibrary.cpp llvm/lib/System/Errno.cpp \
diff --git a/libclamav/c++/llvm/lib/System/Unix/Signals.inc b/libclamav/c++/llvm/lib/System/Unix/Signals.inc
index 676e1e5..b6f6d53 100644
--- a/libclamav/c++/llvm/lib/System/Unix/Signals.inc
+++ b/libclamav/c++/llvm/lib/System/Unix/Signals.inc
@@ -191,7 +191,8 @@ static void PrintStackTrace(void *) {
   // Use backtrace() to output a backtrace on Linux systems with glibc.
   int depth = backtrace(StackTrace,
                         static_cast<int>(array_lengthof(StackTrace)));
-#if HAVE_DLFCN_H && __GNUG__
+#if HAVE_DLFCN_H && __GNUG__ && 0
+/* CLAMAV LOCAL: turn off dladdr() because we don't link -ldl */
   int width = 0;
   for (int i = 0; i < depth; ++i) {
     Dl_info dlinfo;
diff --git a/libclamav/disasm.c b/libclamav/disasm.c
index 0c58464..a920f45 100644
--- a/libclamav/disasm.c
+++ b/libclamav/disasm.c
@@ -1545,8 +1545,12 @@ static uint8_t *disasm_x86(uint8_t *command, unsigned int len, struct DISASMED *
 	    GETBYTE(b);
 	    shiftme+=b<<(i*8);
 	  }
-	  shiftme<<=((8-mod)*8);
-	  s->args[reversed].arg.marg.disp=shiftme>>((8-mod)*8);
+	  if (mod) {
+	      shiftme<<=((8-mod)*8);
+	      s->args[reversed].arg.marg.disp=shiftme>>((8-mod)*8);
+	  } else {
+	      s->args[reversed].arg.marg.disp=0;
+	  }
 	} else {
 	  if (mod==0 && rm==6) {
 	    s->args[reversed].arg.marg.r1=REG_INVALID;
diff --git a/libclamav/spin.c b/libclamav/spin.c
index 62b1251..456bde2 100644
--- a/libclamav/spin.c
+++ b/libclamav/spin.c
@@ -146,7 +146,7 @@ static uint32_t summit (char *src, int size)
       eax ^= ebx>>8 & 0xff;
       eax += 0x7801a108;
       eax ^= ebx;
-      CLI_ROR(eax, ebx&0xff);
+      CLI_ROR(eax, ebx&0x1f);
       swap = eax;
       eax = ebx;
       ebx = swap;

-- 
Debian repository for ClamAV