--- Begin Message ---
Package: klamav
Version: 0.38-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my klamav 0.38-1.1 NMU.
I plan to upload in a day or two, unless you have any objections. This
is targetted at etch, so I would prefer to fix the version we have than
to push a new upstream in.
Thanks,
--
-----------------------------------------------------------------
| ,''`. Stephen Gran |
| : :' : [EMAIL PROTECTED] |
| `. `' Debian user, admin, and developer |
| `- http://www.debian.org |
-----------------------------------------------------------------
diff -u klamav-0.38/admin/config.sub klamav-0.38/admin/config.sub
--- klamav-0.38/admin/config.sub
+++ klamav-0.38/admin/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff -u klamav-0.38/debian/changelog klamav-0.38/debian/changelog
--- klamav-0.38/debian/changelog
+++ klamav-0.38/debian/changelog
@@ -1,3 +1,11 @@
+klamav (0.38-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix cl_loaddbdir/cl_load (closes: #409636)
+ * This rebuild will also (closes: #411810)
+
+ -- Stephen Gran <[EMAIL PROTECTED]> Wed, 28 Feb 2007 14:43:37 +0000
+
klamav (0.38-1) unstable; urgency=low
* New upstream release
diff -u klamav-0.38/debian/patches/series klamav-0.38/debian/patches/series
--- klamav-0.38/debian/patches/series
+++ klamav-0.38/debian/patches/series
@@ -3,0 +4 @@
+03-clamav-0.90
only in patch2:
unchanged:
--- klamav-0.38.orig/debian/patches/03-clamav-0.90
+++ klamav-0.38/debian/patches/03-clamav-0.90
@@ -0,0 +1,121 @@
+--- klamav-0.38.orig/src/klamd/klamd.c
++++ klamav-0.38/src/klamd/klamd.c
+@@ -69,6 +69,7 @@
+ struct cl_node *root = NULL;
+ const char *dbdir, *cfgfile;
+ int ret, virnum = 0, tcpsock;
++ unsigned int cl_options = CL_DB_STDOPT;
+ #ifdef C_LINUX
+ struct stat sb;
+ #endif
+@@ -242,7 +243,7 @@
+
+ logg("Reading databases from %s\n", dbdir);
+
+- if((ret = cl_loaddbdir(dbdir, &root, &virnum))) {
++ if((ret = cl_load(dbdir, &root, &virnum, cl_options))) {
+ fprintf(stderr, "ERROR: %s\n", cl_strerror(ret));
+ logg("!%s\n", cl_strerror(ret));
+ exit(1);
+only in patch2:
+unchanged:
+--- klamav-0.38.orig/src/klamd/server-th.c
++++ klamav-0.38/src/klamd/server-th.c
+@@ -93,6 +93,7 @@
+ {
+ const char *dbdir;
+ int virnum=0, retval;
++ unsigned int cl_options = CL_DB_STDOPT;
+ struct cfgstruct *cpt;
+ static struct cl_stat *dbstat=NULL;
+
+@@ -133,7 +134,7 @@
+
+ memset(dbstat, 0, sizeof(struct cl_stat));
+ cl_statinidir(dbdir, dbstat);
+- if((retval = cl_loaddbdir(dbdir, &root, &virnum))) {
++ if((retval = cl_load(dbdir, &root, &virnum, cl_options))) {
+ logg("!reload db failed: %s\n", cl_strerror(retval));
+ exit(-1);
+ }
+only in patch2:
+unchanged:
+--- klamav-0.38.orig/src/dbviewer.cpp
++++ klamav-0.38/src/dbviewer.cpp
+@@ -790,6 +790,7 @@
+ unsigned int no = 0;
+ struct cl_node *root = NULL;
+ QStringList lastDownloadPaths;
++ unsigned int cl_options = CL_DB_STDOPT;
+ QString dbdir;
+ QString db;
+
+@@ -799,7 +800,7 @@
+ dbdir = lastDownloadPaths.first();
+
+
+- ret = cl_loaddbdir((const char *)dbdir, &root, &no);
++ ret = cl_load((const char *)dbdir, &root, &no, cl_options);
+ //kdDebug() << "no " << no << endl;
+ cl_free(root);
+ return no;
+only in patch2:
+unchanged:
+--- klamav-0.38.orig/src/klammail/clamdmail.c
++++ klamav-0.38/src/klammail/clamdmail.c
+@@ -97,6 +97,7 @@
+ struct cl_node *root = NULL;
+ struct cl_limits limits;
+ struct stat sb;
++ unsigned int cl_options = CL_DB_STDOPT;
+
+
+
+@@ -192,13 +193,13 @@
+ stat(getargc(opt, 'd'), &sb);
+ switch(sb.st_mode & S_IFMT) {
+ case S_IFREG:
+- if((ret = cl_loaddb(getargc(opt, 'd'), &root, &no))) {
++ if((ret = cl_load(getargc(opt, 'd'), &root, &no, cl_options))) {
+ mprintf("@%s\n", cl_strerror(ret));
+ return 50;
+ }
+ break;
+ case S_IFDIR:
+- if((ret = cl_loaddbdir(getargc(opt, 'd'), &root, &no))) {
++ if((ret = cl_load(getargc(opt, 'd'), &root, &no, cl_options))) {
+ mprintf("@%s\n", cl_strerror(ret));
+ return 50;
+ }
+@@ -208,8 +209,8 @@
+ return 50;
+ }
+ }else{
+- if((ret = cl_loaddbdir(cl_retdbdir(), &root, &no))) {
+- printf("cl_loaddbdir: %s\n", cl_strerror(ret));
++ if((ret = cl_load(cl_retdbdir(), &root, &no, cl_options))) {
++ printf("cl_load: %s\n", cl_strerror(ret));
+ close(fd);
+ exit(2);
+ }
+only in patch2:
+unchanged:
+--- klamav-0.38.orig/src/freshklam.cpp
++++ klamav-0.38/src/freshklam.cpp
+@@ -825,6 +825,7 @@
+ QStringList lastDownloadPaths;
+ QString dbdir;
+ QString db;
++ unsigned int cl_options = CL_DB_STDOPT;
+
+ config = KGlobal::config();
+ config->setGroup("Freshklam");
+@@ -835,7 +836,7 @@
+
+
+ if (dbdir != dir_combo->url()){
+- ret = cl_loaddbdir((const char *)dir_combo->url(), &root, &no);
++ ret = cl_load((const char *)dir_combo->url(), &root, &no, cl_options);
+ ////kdDebug() << "ret " << ret << endl;
+ if (no == 0){
+ db = dbdir;
signature.asc
Description: Digital signature
--- End Message ---
