Package: bnetd
Version: 0.4.25-0.1
Severity: important
Tags: patch

> Looks like bnetd fails to build on both alpha and ia64.
> Please could anyone try to fix it? I'd really appreciate
> if bnetd went into woody.

and build log at
http://buildd.debian.org/fetch.php?&pkg=bnetd&ver=0.4.25-0.1&arch=ia64&stamp=1014336351&file=log&as=raw

pretty standard 64-bit issues. patch attached

also please update config.{guess,sub} from autotools-dev or automake
(/usr/share/automake/config.*)

randolph
-- 
Debian Developer <[EMAIL PROTECTED]>
http://www.TauSq.org/


diff -uNr bnetd-0.4.25/src/d2cs/cmdline_parse.c 
bnetd-0.4.25-ia64/src/d2cs/cmdline_parse.c
--- bnetd-0.4.25/src/d2cs/cmdline_parse.c       Mon Jan 21 09:16:50 2002
+++ bnetd-0.4.25-ia64/src/d2cs/cmdline_parse.c  Sun Mar  3 18:43:39 2002
@@ -46,10 +46,10 @@
 
 static t_conf_table param_conf_table[]={
 #ifdef USE_CHECK_ALLOC
-       { "-m",                 offsetof(t_param,memlog_file),  conf_type_str,  
(int)DEFAULT_MEMLOG_FILE},
+       { "-m",                 offsetof(t_param,memlog_file),  conf_type_str,  
(long)DEFAULT_MEMLOG_FILE},
 #endif
-       { "-c",                 offsetof(t_param,prefs_file),   conf_type_str,  
(int)D2CS_DEFAULT_CONF_FILE  },
-       { "-l",                 offsetof(t_param,logfile),      conf_type_str,  
(int)NULL               },
+       { "-c",                 offsetof(t_param,prefs_file),   conf_type_str,  
(long)D2CS_DEFAULT_CONF_FILE  },
+       { "-l",                 offsetof(t_param,logfile),      conf_type_str,  
(long)NULL              },
        { "-h",                 offsetof(t_param,help),         conf_type_bool, 
0                       },
        { "--help",             offsetof(t_param,help),         conf_type_bool, 
0                       },
        { "-v",                 offsetof(t_param,version),      conf_type_bool, 
0                       },
diff -uNr bnetd-0.4.25/src/d2cs/conf.h bnetd-0.4.25-ia64/src/d2cs/conf.h
--- bnetd-0.4.25/src/d2cs/conf.h        Tue Dec 25 18:10:05 2001
+++ bnetd-0.4.25-ia64/src/d2cs/conf.h   Sun Mar  3 18:24:02 2002
@@ -32,7 +32,7 @@
        char const      * name;
        int             offset;
        e_conf_type     type;
-       int             def_value;
+       long            def_value;
 } t_conf_table;
 
 extern int conf_cleanup(t_conf_table * conf_table, void * param_data, int 
size);
diff -uNr bnetd-0.4.25/src/d2cs/prefs.c bnetd-0.4.25-ia64/src/d2cs/prefs.c
--- bnetd-0.4.25/src/d2cs/prefs.c       Tue Dec 25 18:10:05 2001
+++ bnetd-0.4.25-ia64/src/d2cs/prefs.c  Sun Mar  3 18:26:20 2002
@@ -42,18 +42,18 @@
 #include "common/setup_after.h"
 
 static t_conf_table prefs_conf_table[]={
-       { "logfile",            offsetof(t_prefs,logfile),      conf_type_str,  
(int)DEFAULT_LOG_FILE   },
-       { "loglevels",          offsetof(t_prefs,loglevels),    conf_type_str,  
(int)DEFAULT_LOG_LEVELS },
-       { "servaddrs",          offsetof(t_prefs,servaddrs),    conf_type_str,  
(int)D2CS_SERVER_ADDRS  },
-       { "gameservlist",       offsetof(t_prefs,gameservlist), conf_type_str,  
(int)D2GS_SERVER_LIST   },
-       { "bnetdaddr",          offsetof(t_prefs,bnetdaddr),    conf_type_str,  
(int)BNETD_SERVER_LIST  },
-       { "charsavedir",        offsetof(t_prefs,charsavedir),  conf_type_str,  
(int)D2CS_CHARSAVE_DIR  },
-       { "charinfodir",        offsetof(t_prefs,charinfodir),  conf_type_str,  
(int)D2CS_CHARINFO_DIR  },
+       { "logfile",            offsetof(t_prefs,logfile),      conf_type_str,  
(long)DEFAULT_LOG_FILE  },
+       { "loglevels",          offsetof(t_prefs,loglevels),    conf_type_str,  
(long)DEFAULT_LOG_LEVELS },
+       { "servaddrs",          offsetof(t_prefs,servaddrs),    conf_type_str,  
(long)D2CS_SERVER_ADDRS },
+       { "gameservlist",       offsetof(t_prefs,gameservlist), conf_type_str,  
(long)D2GS_SERVER_LIST  },
+       { "bnetdaddr",          offsetof(t_prefs,bnetdaddr),    conf_type_str,  
(long)BNETD_SERVER_LIST },
+       { "charsavedir",        offsetof(t_prefs,charsavedir),  conf_type_str,  
(long)D2CS_CHARSAVE_DIR },
+       { "charinfodir",        offsetof(t_prefs,charinfodir),  conf_type_str,  
(long)D2CS_CHARINFO_DIR },
        { "ladderdir",          offsetof(t_prefs,ladderdir),    conf_type_str,  
0                       },
        { 
"ladder_refresh_interval",offsetof(t_prefs,ladder_refresh_interval),conf_type_int,3600
        },
-       { "newbiefile",         offsetof(t_prefs,newbiefile),   conf_type_str,  
(int)D2CS_CHARSAVE_NEWBIE},
-       { "motd",               offsetof(t_prefs,motd),         
conf_type_hexstr,(int)D2CS_MOTD         },
-       { "realmname",          offsetof(t_prefs,realmname),    conf_type_str,  
(int)DEFAULT_REALM_NAME },
+       { "newbiefile",         offsetof(t_prefs,newbiefile),   conf_type_str,  
(long)D2CS_CHARSAVE_NEWBIE},
+       { "motd",               offsetof(t_prefs,motd),         
conf_type_hexstr,(long)D2CS_MOTD                },
+       { "realmname",          offsetof(t_prefs,realmname),    conf_type_str,  
(long)DEFAULT_REALM_NAME },
        { "maxchar",            offsetof(t_prefs,maxchar),      conf_type_int,  
MAX_CHAR_PER_ACCT       },
         { "listpurgeinterval",  
offsetof(t_prefs,listpurgeinterval),conf_type_int,LIST_PURGE_INTERVAL  },
        { "gqcheckinterval",    offsetof(t_prefs,gqcheckinterval), 
conf_type_int,GAMEQUEUE_CHECK_INTERVAL},
@@ -72,7 +72,7 @@
        { "sq_timeout",         offsetof(t_prefs,sq_timeout),   conf_type_int,  
DEFAULT_SQ_TIMEOUT      },
        { "d2gs_checksum",      offsetof(t_prefs,d2gs_checksum),conf_type_int,  
0                       },
        { "d2gs_version",       offsetof(t_prefs,d2gs_version), conf_type_int,  
0                       },
-       { "d2gs_password",      offsetof(t_prefs,d2gs_password),conf_type_str,  
(int)""                 },
+       { "d2gs_password",      offsetof(t_prefs,d2gs_password),conf_type_str,  
(long)""                        },
        { "check_multilogin",   
offsetof(t_prefs,check_multilogin),conf_type_int,1                      },
        { "s2s_idletime",       offsetof(t_prefs,s2s_idletime),conf_type_int,   
DEFAULT_S2S_IDLETIME    },
        { "s2s_keepalive_interval", 
offsetof(t_prefs,s2s_keepalive_interval),conf_type_int, 
DEFAULT_S2S_KEEPALIVE_INTERVAL},
diff -uNr bnetd-0.4.25/src/d2cs/xstring.c bnetd-0.4.25-ia64/src/d2cs/xstring.c
--- bnetd-0.4.25/src/d2cs/xstring.c     Mon Jan 21 09:16:28 2002
+++ bnetd-0.4.25-ia64/src/d2cs/xstring.c        Sun Mar  3 18:48:51 2002
@@ -173,7 +173,7 @@
        int     i ,n, index_size;
        int     in_delim, match;
        char    * temp, * result;
-       int     * pindex;
+       long    * pindex;
        char    * pd;
        char    const * ps;
        char    * realloc_tmp;
@@ -218,7 +218,7 @@
                                                free(temp);
                                                return NULL;
                                        }
-                                       pindex=(int *)realloc_tmp;
+                                       pindex=(long *)realloc_tmp;
                                }
                                pindex[*count]= pd-temp;
                                in_delim = 0;
@@ -247,7 +247,7 @@
        }
        memcpy(result+index_size,temp,pd-temp);
        for (i=0; i< *count; i++) {
-               pindex[i]+=(int)result+index_size;
+               pindex[i]+=(long)result+index_size;
        }
        memcpy(result,pindex,index_size);
        free(temp);
@@ -260,7 +260,7 @@
        unsigned int    n, index_size;
        char            * temp;
        int             i, j;
-       int             * pindex;
+       long            * pindex;
        char            * result;
        char            * realloc_tmp;
 
@@ -283,7 +283,7 @@
                                free(temp);
                                return NULL;
                        }
-                       pindex=(int *)realloc_tmp;
+                       pindex=(long *)realloc_tmp;
                }
                pindex[*count]=j;
                (*count)++;
@@ -320,7 +320,7 @@
        }
        memcpy(result+index_size,temp,j);
        for (i=0; i< *count; i++) {
-               pindex[i] +=(int)result+index_size;
+               pindex[i] +=(long)result+index_size;
        }
        memcpy(result,pindex,index_size);
        free(temp);
diff -uNr bnetd-0.4.25/src/d2dbs/cmdline_parse.c 
bnetd-0.4.25-ia64/src/d2dbs/cmdline_parse.c
--- bnetd-0.4.25/src/d2dbs/cmdline_parse.c      Tue Dec 25 18:10:05 2001
+++ bnetd-0.4.25-ia64/src/d2dbs/cmdline_parse.c Sun Mar  3 18:53:10 2002
@@ -46,10 +46,10 @@
 
 static t_conf_table param_conf_table[]={
 #ifdef USE_CHECK_ALLOC
-       { "-m",                 offsetof(t_param,memlog_file),  conf_type_str,  
(int)DEFAULT_MEMLOG_FILE},
+       { "-m",                 offsetof(t_param,memlog_file),  conf_type_str,  
(long)DEFAULT_MEMLOG_FILE},
 #endif
-       { "-c",                 offsetof(t_param,prefs_file),   conf_type_str,  
(int)D2DBS_DEFAULT_CONF_FILE  },
-       { "-l",                 offsetof(t_param,logfile),      conf_type_str,  
(int)NULL               },
+       { "-c",                 offsetof(t_param,prefs_file),   conf_type_str,  
(long)D2DBS_DEFAULT_CONF_FILE  },
+       { "-l",                 offsetof(t_param,logfile),      conf_type_str,  
(long)NULL              },
        { "-h",                 offsetof(t_param,help),         conf_type_bool, 
0                       },
        { "--help",             offsetof(t_param,help),         conf_type_bool, 
0                       },
        { "-v",                 offsetof(t_param,version),      conf_type_bool, 
0                       },
diff -uNr bnetd-0.4.25/src/d2dbs/prefs.c bnetd-0.4.25-ia64/src/d2dbs/prefs.c
--- bnetd-0.4.25/src/d2dbs/prefs.c      Thu Jan 17 10:43:53 2002
+++ bnetd-0.4.25-ia64/src/d2dbs/prefs.c Sun Mar  3 18:27:34 2002
@@ -43,13 +43,13 @@
 #include "common/setup_after.h"
 
 static t_conf_table prefs_conf_table[]={
-       { "logfile",            offsetof(t_prefs,logfile),              
conf_type_str,  (int)DEFAULT_LOG_FILE   },
-       { "logfile-gs",         offsetof(t_prefs,logfile_gs),           
conf_type_str,  (int)DEFAULT_LOG_FILE_GS},
-       { "loglevels",          offsetof(t_prefs,loglevels),    conf_type_str,  
(int)DEFAULT_LOG_LEVELS },
-       { "servaddrs",          offsetof(t_prefs,servaddrs),    conf_type_str,  
(int)D2DBS_SERVER_ADDRS },
-       { "gameservlist",       offsetof(t_prefs,gameservlist), conf_type_str,  
(int)D2GS_SERVER_LIST   },
-       { "charsavedir",        offsetof(t_prefs,charsavedir),  conf_type_str,  
(int)D2DBS_CHARSAVE_DIR },
-       { "charinfodir",        offsetof(t_prefs,charinfodir),  conf_type_str,  
(int)D2DBS_CHARINFO_DIR },
+       { "logfile",            offsetof(t_prefs,logfile),              
conf_type_str,  (long)DEFAULT_LOG_FILE  },
+       { "logfile-gs",         offsetof(t_prefs,logfile_gs),           
conf_type_str,  (long)DEFAULT_LOG_FILE_GS},
+       { "loglevels",          offsetof(t_prefs,loglevels),    conf_type_str,  
(long)DEFAULT_LOG_LEVELS },
+       { "servaddrs",          offsetof(t_prefs,servaddrs),    conf_type_str,  
(long)D2DBS_SERVER_ADDRS        },
+       { "gameservlist",       offsetof(t_prefs,gameservlist), conf_type_str,  
(long)D2GS_SERVER_LIST  },
+       { "charsavedir",        offsetof(t_prefs,charsavedir),  conf_type_str,  
(long)D2DBS_CHARSAVE_DIR        },
+       { "charinfodir",        offsetof(t_prefs,charinfodir),  conf_type_str,  
(long)D2DBS_CHARINFO_DIR        },
        { "bak_charsavedir",offsetof(t_prefs,charsavebakdir),conf_type_str,     
0                       },
        { "bak_charinfodir",offsetof(t_prefs,charinfobakdir),conf_type_str,     
0                       },
        { "ladderdir",          offsetof(t_prefs,ladderdir),    conf_type_str,  
0                       },


Reply via email to