head 1.3; access; symbols pkgsrc-2019Q3:1.2.0.90 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.88 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.86 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.84 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.82 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.80 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.78 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.76 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.74 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.70 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.68 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.66 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.64 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.62 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.60 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.58 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.56 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.54 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.52 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.50 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.48 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.46 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.44 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.42 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.40 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.38 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.36 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.34 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.32 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.30 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.28 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.26 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.24 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.22 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.20 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.18 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.16 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.14 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.12 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.10 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2019.10.29.17.59.18; author nia; state dead; branches; next 1.2; commitid 8C7pmlqLQqVa1NIB; 1.2 date 2008.11.04.08.36.34; author adam; state Exp; branches; next 1.1; 1.1 date 2006.06.11.11.36.47; author adrianp; state Exp; branches; next ; desc @@ 1.3 log @crossfire*: Update to 1.73.0 Note that the GTK1 and X11 clients are now deprecated and no longer receiving releases. crossfire-client is now the GTK2 version. @ text @$NetBSD: patch-ab,v 1.2 2008/11/04 08:36:34 adam Exp $ --- configure.orig 2008-02-01 07:09:40.000000000 +0100 +++ configure @@@@ -27010,7 +27010,7 @@@@ fi pkgstatedir=$localstatedir/$PACKAGE -pkgconfdir=$sysconfdir/$PACKAGE +pkgconfdir=$sysconfdir @@@@ -28519,9 +28519,6 @@@@ EOF { echo "$as_me:$LINENO: checking xslt compliance of $xslt_prog" >&5 echo $ECHO_N "checking xslt compliance of $xslt_prog... $ECHO_C" >&6; } to_run=$xslt_prog - to_run=${to_run/\%1/configtest.xml} - to_run=${to_run/\%2/configtest.xsl} - to_run=${to_run/\%3/configtest.out} if { ac_try='$to_run' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 @@@@ -28540,7 +28537,7 @@@@ echo "${ECHO_T}no" >&6; }; fi xslt_prog="notfound" if test "$check_xslt_xsltprocfound" != notfound -a "$xslt_prog" = notfound; then - xslt_prog="$check_xslt_xsltprocfound -o %3 %2 %1" + xslt_prog="$check_xslt_xsltprocfound -o configtest.out configtest.xsl configtest.xml" cat << \EOF > configtest.xml @@@@ -28599,9 +28596,6 @@@@ EOF { echo "$as_me:$LINENO: checking xslt compliance of $xslt_prog" >&5 echo $ECHO_N "checking xslt compliance of $xslt_prog... $ECHO_C" >&6; } to_run=$xslt_prog - to_run=${to_run/\%1/configtest.xml} - to_run=${to_run/\%2/configtest.xsl} - to_run=${to_run/\%3/configtest.out} if { ac_try='$to_run' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 @@@@ -28619,7 +28613,7 @@@@ echo "${ECHO_T}no" >&6; }; fi if test "$check_xslt_sablotronfound" != notfound -a "$xslt_prog" = notfound; then - xslt_prog="$check_xslt_sablotronfound %2 %1 %3" + xslt_prog="$check_xslt_sablotronfound configtest.xsl configtest.xml configtest.out" cat << \EOF > configtest.xml @@@@ -28678,9 +28672,6 @@@@ EOF { echo "$as_me:$LINENO: checking xslt compliance of $xslt_prog" >&5 echo $ECHO_N "checking xslt compliance of $xslt_prog... $ECHO_C" >&6; } to_run=$xslt_prog - to_run=${to_run/\%1/configtest.xml} - to_run=${to_run/\%2/configtest.xsl} - to_run=${to_run/\%3/configtest.out} if { ac_try='$to_run' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 @ 1.2 log @Changes for 1.11.0: * Bug fixes * Improvements PkgSrc: * crossfire-maps is integrated into crossfire-server, since the server requires maps to run @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Security fix for CAN-2006-1236 PKGREVISON bumped @ text @d3 59 a61 215 --- socket/request.c.orig 2006-02-25 08:02:11.000000000 +0000 +++ socket/request.c @@@@ -109,7 +109,7 @@@@ short atnr_cs_stat[NROFATTACKS] = {CS_ST /** This is the Setup cmd - easy first implementation */ void SetUp(char *buf, int len, NewSocket *ns) { - int s; + int s, slen; char *cmd, *param, cmdback[HUGE_BUF]; /* run through the cmds of setup @@@@ -139,40 +139,40 @@@@ void SetUp(char *buf, int len, NewSocket buf[s++]=0; while (buf[s] == ' ') s++; - strcat(cmdback, " "); - strcat(cmdback, cmd); - strcat(cmdback, " "); - + slen = strlen(cmdback); + safe_strcat(cmdback, " ", &slen, HUGE_BUF); + safe_strcat(cmdback, cmd, &slen, HUGE_BUF); + safe_strcat(cmdback, " ", &slen, HUGE_BUF); if (!strcmp(cmd,"sound")) { ns->sound = atoi(param); - strcat(cmdback, param); + safe_strcat(cmdback, param, &slen, HUGE_BUF); } else if (!strcmp(cmd,"exp64")) { ns->exp64 = atoi(param); - strcat(cmdback, param); + safe_strcat(cmdback, param, &slen, HUGE_BUF); } else if (!strcmp(cmd, "spellmon")) { ns->monitor_spells = atoi(param); - strcat(cmdback, param); + safe_strcat(cmdback, param, &slen, HUGE_BUF); } else if (!strcmp(cmd,"darkness")) { ns->darkness = atoi(param); - strcat(cmdback, param); + safe_strcat(cmdback, param, &slen, HUGE_BUF); } else if (!strcmp(cmd,"map1cmd")) { if (atoi(param)) ns->mapmode = Map1Cmd; /* if beyond this size, need to use map1cmd no matter what */ if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd; - strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0"); + safe_strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0", &slen, HUGE_BUF); } else if (!strcmp(cmd,"map1acmd")) { if (atoi(param)) ns->mapmode = Map1aCmd; /* if beyond this size, need to use map1acmd no matter what */ if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd; - strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0"); + safe_strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0", &slen, HUGE_BUF); } else if (!strcmp(cmd,"newmapcmd")) { ns->newmapcmd= atoi(param); - strcat(cmdback, param); + safe_strcat(cmdback, param, &slen, HUGE_BUF); } else if (!strcmp(cmd,"facecache")) { ns->facecache = atoi(param); - strcat(cmdback, param); + safe_strcat(cmdback, param, &slen, HUGE_BUF); } else if (!strcmp(cmd,"faceset")) { char tmpbuf[20]; int q = atoi(param); @@@@ -180,7 +180,7 @@@@ void SetUp(char *buf, int len, NewSocket if (is_valid_faceset(q)) ns->faceset=q; sprintf(tmpbuf,"%d", ns->faceset); - strcat(cmdback, tmpbuf); + safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); /* if the client is using faceset, it knows about image2 command */ ns->image2=1; } else if (!strcmp(cmd,"itemcmd")) { @@@@ -196,7 +196,7 @@@@ void SetUp(char *buf, int len, NewSocket ns->itemcmd = q; sprintf(tmpbuf,"%d", ns->itemcmd); } - strcat(cmdback, tmpbuf); + safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); } else if (!strcmp(cmd,"mapsize")) { int x, y=0; char tmpbuf[MAX_BUF], *cp; @@@@ -209,7 +209,7 @@@@ void SetUp(char *buf, int len, NewSocket } if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) { sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); - strcat(cmdback, tmpbuf); + safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); } else { ns->mapx = x; ns->mapy = y; @@@@ -217,34 +217,35 @@@@ void SetUp(char *buf, int len, NewSocket * param as given to us in case it gets parsed differently. */ sprintf(tmpbuf,"%dx%d", x,y); - strcat(cmdback, tmpbuf); + safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); /* If beyond this size and still using orig map command, need to * go to map1cmd. */ if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd; } } else if (!strcmp(cmd,"extendedMapInfos")) { - /* Added by tchize - * prepare to use the mapextended command - */ + /* Added by tchize + * prepare to use the mapextended command + */ char tmpbuf[20]; - ns->ext_mapinfos = (atoi(param)); + ns->ext_mapinfos = (atoi(param)); sprintf(tmpbuf,"%d", ns->ext_mapinfos); - strcat(cmdback, tmpbuf); + safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); } else if (!strcmp(cmd,"extendedTextInfos")) { - /* Added by tchize - * prepare to use the extended text commands - * Client toggle this to non zero to get exttext - */ + /* Added by tchize + * prepare to use the extended text commands + * Client toggle this to non zero to get exttext + */ char tmpbuf[20]; - ns->has_readable_type = (atoi(param)); + + ns->has_readable_type = (atoi(param)); sprintf(tmpbuf,"%d", ns->has_readable_type); - strcat(cmdback, tmpbuf); + safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); } else { /* Didn't get a setup command we understood - * report a failure to the client. */ - strcat(cmdback, "FALSE"); + safe_strcat(cmdback, "FALSE", &slen, HUGE_BUF); } } /* for processing all the setup commands */ LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback); @@@@ -619,7 +620,7 @@@@ void VersionCmd(char *buf, int len,NewSo } cp = strchr(cp+1, ' '); if (cp) { - LOG(llevDebug,"CS: connection from client of type <%s>\n", cp); + LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host); /* This is first implementation - i skip all beta DX clients with it * Add later stuff here for other clients @@@@ -1925,12 +1926,12 @@@@ void send_skill_info(NewSocket *ns, char int i; sl.buf = malloc(MAXSOCKBUF); - strcpy(sl.buf,"replyinfo skill_info\n"); + strcpy((char*)sl.buf,"replyinfo skill_info\n"); for (i=1; i< NUM_SKILLS; i++) { - sprintf(sl.buf + strlen(sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, + sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, skill_names[i]); } - sl.len = strlen(sl.buf); + sl.len = strlen((char*)sl.buf); if (sl.len > MAXSOCKBUF) { LOG(llevError,"Buffer overflow in send_skill_info!\n"); fatal(0); @@@@ -1948,10 +1949,10 @@@@ void send_spell_paths (NewSocket *ns, ch int i; sl.buf = malloc(MAXSOCKBUF); - strcpy(sl.buf,"replyinfo spell_paths\n"); + strcpy((char*)sl.buf,"replyinfo spell_paths\n"); for(i=0; i MAXSOCKBUF) { LOG(llevError,"Buffer overflow in send_spell_paths!\n"); fatal(0); @@@@ -1986,7 +1987,7 @@@@ void esrv_update_spells(player *pl) { } if (flags !=0) { sl.buf = malloc(MAXSOCKBUF); - strcpy(sl.buf,"updspell "); + strcpy((char*)sl.buf,"updspell "); sl.len=strlen((char*)sl.buf); SockList_AddChar(&sl, flags); SockList_AddInt(&sl, spell->count); @@@@ -2010,7 +2011,7 @@@@ void esrv_remove_spell(player *pl, objec return; } sl.buf = malloc(MAXSOCKBUF); - strcpy(sl.buf,"delspell "); + strcpy((char*)sl.buf,"delspell "); sl.len=strlen((char*)sl.buf); SockList_AddInt(&sl, spell->count); Send_With_Handling(&pl->socket, &sl); @@@@ -2078,7 +2079,7 @@@@ void esrv_add_spells(player *pl, object } if (!pl->socket.monitor_spells) return; sl.buf = malloc(MAXSOCKBUF); - strcpy(sl.buf,"addspell "); + strcpy((char*)sl.buf,"addspell "); sl.len=strlen((char*)sl.buf); if (!spell) { for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { @@@@ -2099,7 +2100,7 @@@@ void esrv_add_spells(player *pl, object if (sl.len > (MAXSOCKBUF - (26 + strlen(spell->name) + (spell->msg?strlen(spell->msg):0)))) { Send_With_Handling(&pl->socket, &sl); - strcpy(sl.buf,"addspell "); + strcpy((char*)sl.buf,"addspell "); sl.len=strlen((char*)sl.buf); } append_spell(pl, &sl, spell); @