cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to bitlbee-1.0.4

Browse Source 
ok simon@ and maintainer Andrew Dalgleish;  tested by Wiktor Izdebski
This commit is contained in:
martynas 2007-11-19 11:44:32 +00:00
parent 114dc94b6e
commit 117ac1f407
41 changed files with 229 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bitlbee/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2007/09/15 22:36:52 merdely Exp $
# $OpenBSD: Makefile,v 1.24 2007/11/19 11:44:32 martynas Exp $
COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
DISTNAME= bitlbee-1.0.3
DISTNAME= bitlbee-1.0.4
CATEGORIES= net
HOMEPAGE= http://bitlbee.org

10
net/bitlbee/distinfo
View File

@ -1,5 +1,5 @@
MD5 (bitlbee-1.0.3.tar.gz) = 5GaC1Uy9YmXdRDaztoONYw==
RMD160 (bitlbee-1.0.3.tar.gz) = 0nx6kQRShALU0+L3i0DtpfZJDXI=
SHA1 (bitlbee-1.0.3.tar.gz) = bkBl2LV2o8EcLmuwCOob3HsYLNE=
SHA256 (bitlbee-1.0.3.tar.gz) = HScshxLuJ57orDBVYue4WR5jT65pZkpaLUMwHLHWJ30=
SIZE (bitlbee-1.0.3.tar.gz) = 455344
MD5 (bitlbee-1.0.4.tar.gz) = uS4wGTDiMiqGtzsfbIV2dA==
RMD160 (bitlbee-1.0.4.tar.gz) = 9+RFlYRaq/mHpREv32udrtBESNA=
SHA1 (bitlbee-1.0.4.tar.gz) = gw6KK4kwpuWxl4o8rp2KFgNKt/8=
SHA256 (bitlbee-1.0.4.tar.gz) = byPzfqZB1n5Wxhtw06x9QEJDkpw5MwLq1HWNT/5tWxw=
SIZE (bitlbee-1.0.4.tar.gz) = 455833

8
net/bitlbee/patches/patch-account_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-account_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- account.c.orig Sat Sep 17 22:42:26 2005
+++ account.c Tue Nov 1 21:50:11 2005
@@ -134,9 +134,9 @@ void account_on( irc_t *irc, account_t *
$OpenBSD: patch-account_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- account.c.orig Mon Aug 20 16:27:13 2007
+++ account.c Mon Nov 19 13:39:00 2007
@@ -134,9 +134,9 @@ void account_on( irc_t *irc, account_t *a )
u = g_new0 ( struct aim_user, 1 );
u->irc = irc;
u->protocol = a->protocol;

14
net/bitlbee/patches/patch-bitlbee_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bitlbee_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- bitlbee.c.orig Sun Apr 2 04:53:38 2006
+++ bitlbee.c Thu Apr 6 23:39:32 2006
$OpenBSD: patch-bitlbee_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- bitlbee.c.orig Mon Aug 20 16:27:13 2007
+++ bitlbee.c Mon Nov 19 13:39:00 2007
@@ -35,7 +35,7 @@
gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
@ -10,7 +10,7 @@ $OpenBSD: patch-bitlbee_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
struct sockaddr_in conn_info;
int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info,
&size );
@@ -154,8 +154,9 @@ gboolean bitlbee_io_current_client_read(
@@ -154,8 +154,9 @@ gboolean bitlbee_io_current_client_read( GIOChannel *s
}
else
{
@ -22,7 +22,7 @@ $OpenBSD: patch-bitlbee_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
}
if( !irc_process( irc ) )
@@ -228,10 +229,11 @@ int bitlbee_load( irc_t *irc, const char
@@ -228,10 +229,11 @@ int bitlbee_load( irc_t *irc, const char* password )
if( irc->status == USTATUS_IDENTIFIED )
return( 1 );
@ -35,7 +35,7 @@ $OpenBSD: patch-bitlbee_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
fscanf( fp, "%32[^\n]s", s );
if( setpass( irc, password, s ) < 0 )
{
@@ -243,6 +245,7 @@ int bitlbee_load( irc_t *irc, const char
@@ -243,6 +245,7 @@ int bitlbee_load( irc_t *irc, const char* password )
account command will not work otherwise. */
irc->status = USTATUS_IDENTIFIED;
@ -43,7 +43,7 @@ $OpenBSD: patch-bitlbee_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
while( fscanf( fp, "%511[^\n]s", s ) > 0 )
{
fgetc( fp );
@@ -252,19 +255,21 @@ int bitlbee_load( irc_t *irc, const char
@@ -252,19 +255,21 @@ int bitlbee_load( irc_t *irc, const char* password )
}
fclose( fp );

8
net/bitlbee/patches/patch-commands_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-commands_c,v 1.4 2007/01/14 21:53:01 simon Exp $
--- commands.c.orig Sat Jun 24 17:00:43 2006
+++ commands.c Fri Dec 15 21:20:07 2006
$OpenBSD: patch-commands_c,v 1.5 2007/11/19 11:44:33 martynas Exp $
--- commands.c.orig Mon Aug 20 16:27:13 2007
+++ commands.c Mon Nov 19 13:39:01 2007
@@ -63,8 +63,8 @@ int cmd_help( irc_t *irc, char **cmd )
memset( param, 0, sizeof(param) );
for ( i = 1; (cmd[i] != NULL && ( strlen(param) < (sizeof(param)-1) ) ); i++ ) {
@ -12,7 +12,7 @@ $OpenBSD: patch-commands_c,v 1.4 2007/01/14 21:53:01 simon Exp $
}
s = help_get( &(global.help), param );
@@ -118,10 +118,10 @@ int cmd_register( irc_t *irc, char **cmd
@@ -118,10 +118,10 @@ int cmd_register( irc_t *irc, char **cmd )
return( 0 );
}

10
net/bitlbee/patches/patch-conf_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-conf_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- conf.c.orig Thu Feb 24 02:47:58 2005
+++ conf.c Tue Nov 1 21:50:32 2005
@@ -129,9 +129,10 @@ conf_t *conf_load( int argc, char *argv[
$OpenBSD: patch-conf_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- conf.c.orig Mon Aug 20 16:27:13 2007
+++ conf.c Mon Nov 19 13:39:01 2007
@@ -129,9 +129,10 @@ conf_t *conf_load( int argc, char *argv[] )
if( conf->configdir[strlen(conf->configdir)-1] != '/' )
{
@ -14,7 +14,7 @@ $OpenBSD: patch-conf_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
g_free( conf->configdir );
conf->configdir = s;
}
@@ -226,9 +227,9 @@ static int conf_loadini( conf_t *conf, c
@@ -226,9 +227,9 @@ static int conf_loadini( conf_t *conf, char *file )
return( 0 );
}

8
net/bitlbee/patches/patch-doc_user-guide_help_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_user-guide_help_txt,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- doc/user-guide/help.txt.orig Sun Dec 4 13:51:10 2005
+++ doc/user-guide/help.txt Sun Jan 29 13:00:20 2006
@@ -27,7 +27,7 @@ You can read more about them with help
$OpenBSD: patch-doc_user-guide_help_txt,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- doc/user-guide/help.txt.orig Mon Aug 20 16:27:13 2007
+++ doc/user-guide/help.txt Mon Nov 19 13:39:01 2007
@@ -27,7 +27,7 @@ You can read more about them with help <subject>
?quickstart
Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant Messaging Systems.

8
net/bitlbee/patches/patch-help_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-help_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- help.c.orig Sun Apr 2 04:53:39 2006
+++ help.c Thu Apr 6 23:39:32 2006
$OpenBSD: patch-help_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- help.c.orig Mon Aug 20 16:27:13 2007
+++ help.c Mon Nov 19 13:39:01 2007
@@ -83,8 +83,7 @@ help_t *help_init( help_t **help )
}
h->string = g_new ( char, i );
@ -11,7 +11,7 @@ $OpenBSD: patch-help_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
h->fd = (*help)->fd;
h->offset.file_offset = lseek( h->fd, 0, SEEK_CUR ) - buflen + i + 1;
h->length = t - s - i - 1;
@@ -138,7 +137,7 @@ char *help_get( help_t **help, char *str
@@ -138,7 +137,7 @@ char *help_get( help_t **help, char *string )
}
else
{

22
net/bitlbee/patches/patch-irc_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
--- irc.c.orig Sat Jun 24 17:00:43 2006
+++ irc.c Fri Dec 15 21:21:27 2006
$OpenBSD: patch-irc_c,v 1.5 2007/11/19 11:44:33 martynas Exp $
--- irc.c.orig Mon Aug 20 16:34:05 2007
+++ irc.c Mon Nov 19 13:39:01 2007
@@ -59,7 +59,7 @@ irc_t *irc_new( int fd )
irc->userhash = g_hash_table_new( g_str_hash, g_str_equal );
irc->watches = g_hash_table_new( g_str_hash, g_str_equal );
@ -22,7 +22,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
set_add( irc, "lcnicks", "true", set_eval_bool );
set_add( irc, "ops", "both", set_eval_ops );
set_add( irc, "private", "true", set_eval_bool );
@@ -621,7 +621,7 @@ int irc_exec( irc_t *irc, char **cmd )
@@ -617,7 +617,7 @@ int irc_exec( irc_t *irc, char **cmd )
if( g_strcasecmp( t, "last" ) == 0 && irc->last_target )
cmd[1] = irc->last_target;
@ -31,7 +31,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
cmd[1] = irc->mynick;
for( i = 0; i < strlen( cmd[2] ); i ++ )
@@ -708,8 +708,8 @@ int irc_exec( irc_t *irc, char **cmd )
@@ -704,8 +704,8 @@ int irc_exec( irc_t *irc, char **cmd )
if( lenleft < 0 )
break;
@ -42,7 +42,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
}
if( next )
@@ -869,7 +869,7 @@ void irc_reply( irc_t *irc, int code, ch
@@ -865,7 +865,7 @@ void irc_reply( irc_t *irc, int code, char *format, ..
va_list params;
va_start( params, format );
@ -51,7 +51,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
va_end( params );
irc_write( irc, ":%s %03d %s %s", irc->myhost, code, irc->nick?irc->nick:"*", text );
@@ -923,14 +923,14 @@ void irc_vawrite( irc_t *irc, char *form
@@ -919,14 +919,14 @@ void irc_vawrite( irc_t *irc, char *format, va_list pa
conv[IRC_MAX_LINE] = 0;
if( do_iconv( "UTF-8", cs, line, conv, 0, IRC_MAX_LINE - 2 ) != -1 )
@ -71,7 +71,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
}
else
irc->sendbuffer = g_strdup(line);
@@ -1000,7 +1000,7 @@ void irc_names( irc_t *irc, char *channe
@@ -996,7 +996,7 @@ void irc_names( irc_t *irc, char *channel )
}
else if( !u->gc )
{
@ -80,7 +80,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
s = "@";
else if( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( set_getstr( irc, "ops" ), "user" ) == 0 || strcmp( set_getstr( irc, "ops" ), "both" ) == 0 ) )
s = "@";
@@ -1120,15 +1120,19 @@ void irc_motd( irc_t *irc )
@@ -1116,15 +1116,19 @@ void irc_motd( irc_t *irc )
irc_reply( irc, 375, ":- %s Message Of The Day - ", irc->myhost );
while( read( fd, linebuf + len, 1 ) == 1 )
{
@ -103,7 +103,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
if( linebuf[len] == 'h' )
add = irc->myhost;
else if( linebuf[len] == 'v' )
@@ -1137,14 +1141,30 @@ void irc_motd( irc_t *irc )
@@ -1133,14 +1137,30 @@ void irc_motd( irc_t *irc )
add = irc->nick;
else
add = "%";
@ -137,7 +137,7 @@ $OpenBSD: patch-irc_c,v 1.4 2007/01/14 21:53:01 simon Exp $
}
irc_reply( irc, 376, ":End of MOTD" );
close( fd );
@@ -1475,8 +1495,8 @@ int buddy_send_handler( irc_t *irc, user
@@ -1471,8 +1491,8 @@ int buddy_send_handler( irc_t *irc, user_t *u, char *m
u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );
}

16
net/bitlbee/patches/patch-nick_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-nick_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- nick.c.orig Fri Dec 9 22:59:55 2005
+++ nick.c Sun Jan 29 03:28:20 2006
@@ -65,7 +65,7 @@ char *nick_get( irc_t *irc, const char *
$OpenBSD: patch-nick_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- nick.c.orig Mon Aug 20 16:27:13 2007
+++ nick.c Mon Nov 19 13:39:01 2007
@@ -65,7 +65,7 @@ char *nick_get( irc_t *irc, const char *handle, int pr
while( n && !*nick )
if( ( n->proto == proto ) && ( g_strcasecmp( n->handle, handle ) == 0 ) )
@ -10,7 +10,7 @@ $OpenBSD: patch-nick_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
else
n = n->next;
@@ -73,7 +73,7 @@ char *nick_get( irc_t *irc, const char *
@@ -73,7 +73,7 @@ char *nick_get( irc_t *irc, const char *handle, int pr
{
char *s;
@ -19,7 +19,7 @@ $OpenBSD: patch-nick_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
if( ( s = strchr( nick, '@' ) ) )
while( *s )
*(s++) = 0;
@@ -82,7 +82,7 @@ char *nick_get( irc_t *irc, const char *
@@ -82,7 +82,7 @@ char *nick_get( irc_t *irc, const char *handle, int pr
use the realname instead. */
for( s = nick; *s && isdigit( *s ); s ++ );
if( !*s && realname && *realname )
@ -28,7 +28,7 @@ $OpenBSD: patch-nick_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
nick_strip( nick );
if (set_getint(irc, "lcnicks"))
@@ -119,7 +119,7 @@ char *nick_get( irc_t *irc, const char *
@@ -119,7 +119,7 @@ char *nick_get( irc_t *irc, const char *handle, int pr
"Good luck, and please don't forget to paste the lines up here "
"in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );
@ -37,7 +37,7 @@ $OpenBSD: patch-nick_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
break;
}
@@ -240,8 +240,8 @@ int nick_cmp( const char *a, const char
@@ -240,8 +240,8 @@ int nick_cmp( const char *a, const char *b )
{
char aa[1024] = "", bb[1024] = "";

12
net/bitlbee/patches/patch-protocols_jabber_jabber_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_jabber_jabber_c,v 1.4 2007/01/14 21:53:01 simon Exp $
--- protocols/jabber/jabber.c.orig Sat Jun 24 17:00:44 2006
+++ protocols/jabber/jabber.c Fri Dec 15 21:20:07 2006
$OpenBSD: patch-protocols_jabber_jabber_c,v 1.5 2007/11/19 11:44:33 martynas Exp $
--- protocols/jabber/jabber.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/jabber/jabber.c Mon Nov 19 13:39:01 2007
@@ -285,7 +285,7 @@ static char *gjab_getsid(gjconn gjc)
static char *gjab_getid(gjconn gjc)
@ -25,7 +25,7 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.4 2007/01/14 21:53:01 simon Exp $
hash = shahash(hash);
xmlnode_insert_cdata(z, hash, 40);
} else {
@@ -1214,8 +1215,7 @@ static void jabber_handlebuddy(gjconn gj
@@ -1214,8 +1215,7 @@ static void jabber_handlebuddy(gjconn gjc, xmlnode x)
serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle, uc, 0);
}
} else if(name != NULL && strcmp(b->show, name)) {
@ -35,7 +35,7 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.4 2007/01/14 21:53:01 simon Exp $
serv_buddy_rename(GJ_GC(gjc), buddyname, b->show);
}
}
@@ -1355,7 +1355,7 @@ static void jabber_handlelast(gjconn gjc
@@ -1355,7 +1355,7 @@ static void jabber_handlelast(gjconn gjc, xmlnode iqno
xmlnode_put_attrib(x, "to", from);
xmlnode_put_attrib(x, "id", id);
querytag = xmlnode_get_tag(x, "query");
@ -44,7 +44,7 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.4 2007/01/14 21:53:01 simon Exp $
xmlnode_put_attrib(querytag, "seconds", idle_time);
gjab_send(gjc, x);
@@ -2134,7 +2134,7 @@ static xmlnode insert_tag_to_parent_tag(
@@ -2134,7 +2134,7 @@ static xmlnode insert_tag_to_parent_tag(xmlnode start,
/*
* Descend?
*/

8
net/bitlbee/patches/patch-protocols_msn_msn_util_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_msn_msn_util_c,v 1.3 2007/01/14 21:53:01 simon Exp $
--- protocols/msn/msn_util.c.orig Sat Jun 24 17:00:44 2006
+++ protocols/msn/msn_util.c Fri Dec 15 21:20:07 2006
@@ -66,9 +66,12 @@ int msn_buddy_list_add( struct gaim_conn
$OpenBSD: patch-protocols_msn_msn_util_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- protocols/msn/msn_util.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/msn/msn_util.c Mon Nov 19 13:39:01 2007
@@ -66,9 +66,12 @@ int msn_buddy_list_add( struct gaim_connection *gc, ch
if( g_strcasecmp( l->data, who ) == 0 )
return( 1 );

20
net/bitlbee/patches/patch-protocols_msn_ns_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
--- protocols/msn/ns.c.orig Fri Jun 3 11:15:35 2005
+++ protocols/msn/ns.c Tue Nov 1 21:26:47 2005
@@ -216,10 +216,9 @@ static int msn_ns_command( gpointer data
$OpenBSD: patch-protocols_msn_ns_c,v 1.3 2007/11/19 11:44:33 martynas Exp $
--- protocols/msn/ns.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/msn/ns.c Mon Nov 19 13:39:01 2007
@@ -216,10 +216,9 @@ static int msn_ns_command( gpointer data, char **cmd,
}
else if( num_parts == 7 && strcmp( cmd[2], "OK" ) == 0 )
{
@ -14,7 +14,7 @@ $OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
set_login_progress( gc, 1, "Authenticated, getting buddy list" );
@@ -291,7 +290,7 @@ static int msn_ns_command( gpointer data
@@ -291,7 +290,7 @@ static int msn_ns_command( gpointer data, char **cmd,
return( 0 );
}
@ -23,7 +23,7 @@ $OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
list = atoi( cmd[3] );
if( list & 1 ) /* FL */
@@ -352,7 +351,7 @@ static int msn_ns_command( gpointer data
@@ -352,7 +351,7 @@ static int msn_ns_command( gpointer data, char **cmd,
g_snprintf( buf, sizeof( buf ), "QRY %d %s %d\r\n", ++md->trId, QRY_NAME, 32 );
for( i = 0; i < 16; i ++ )
@ -32,7 +32,7 @@ $OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
return( msn_write( gc, buf, strlen( buf ) ) );
}
@@ -373,7 +372,7 @@ static int msn_ns_command( gpointer data
@@ -373,7 +372,7 @@ static int msn_ns_command( gpointer data, char **cmd,
return( 0 );
}
@ -41,7 +41,7 @@ $OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
serv_buddy_rename( gc, cmd[3], cmd[4] );
st = msn_away_state_by_code( cmd[2] );
@@ -401,7 +400,7 @@ static int msn_ns_command( gpointer data
@@ -401,7 +400,7 @@ static int msn_ns_command( gpointer data, char **cmd,
return( 0 );
}
@ -50,7 +50,7 @@ $OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
serv_buddy_rename( gc, cmd[2], cmd[3] );
st = msn_away_state_by_code( cmd[1] );
@@ -457,7 +456,7 @@ static int msn_ns_command( gpointer data
@@ -457,7 +456,7 @@ static int msn_ns_command( gpointer data, char **cmd,
{
GSList *l;
@ -59,7 +59,7 @@ $OpenBSD: patch-protocols_msn_ns_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
if( strchr( cmd[4], '@' ) == NULL )
{
@@ -511,14 +510,13 @@ static int msn_ns_command( gpointer data
@@ -511,14 +510,13 @@ static int msn_ns_command( gpointer data, char **cmd,
if( g_strcasecmp( cmd[3], gc->username ) == 0 )
{

14
net/bitlbee/patches/patch-protocols_msn_passport_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_msn_passport_c,v 1.3 2004/10/21 14:48:51 naddy Exp $
--- protocols/msn/passport.c.orig Wed Jul 7 23:38:16 2004
+++ protocols/msn/passport.c Thu Oct 14 15:43:34 2004
@@ -59,23 +59,30 @@ int passport_get_id( gpointer data, char
$OpenBSD: patch-protocols_msn_passport_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- protocols/msn/passport.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/msn/passport.c Mon Nov 19 13:39:01 2007
@@ -59,23 +59,30 @@ int passport_get_id( gpointer data, char *username, ch
static char *passport_create_header( char *reply, char *email, char *pwd )
{
@ -40,7 +40,7 @@ $OpenBSD: patch-protocols_msn_passport_c,v 1.3 2004/10/21 14:48:51 naddy Exp $
"Authorization: Passport1.4 OrgVerb=GET,"
"OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
"sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
@@ -179,7 +186,7 @@ static int passport_get_id_from( gpointe
@@ -179,7 +186,7 @@ static int passport_get_id_from( gpointer data, gpoint
rep->func = func;
rep->redirects = 4;
@ -49,7 +49,7 @@ $OpenBSD: patch-protocols_msn_passport_c,v 1.3 2004/10/21 14:48:51 naddy Exp $
dummy = strchr( server, '/' );
if( dummy )
*dummy = 0;
@@ -220,14 +227,14 @@ static void passport_get_id_connected( g
@@ -220,14 +227,14 @@ static void passport_get_id_connected( gpointer data,
return;
}
@ -67,7 +67,7 @@ $OpenBSD: patch-protocols_msn_passport_c,v 1.3 2004/10/21 14:48:51 naddy Exp $
"%s\r\n\r\n", dummy, rep->header );
ssl_write( ssl, buffer, strlen( buffer ) );
@@ -265,7 +272,7 @@ static void passport_get_id_connected( g
@@ -265,7 +272,7 @@ static void passport_get_id_connected( gpointer data,
g_free( rep->url );
rep->url = g_strdup( dummy );

10
net/bitlbee/patches/patch-protocols_msn_sb_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_msn_sb_c,v 1.3 2007/01/14 21:53:01 simon Exp $
--- protocols/msn/sb.c.orig Sat Jun 24 17:00:44 2006
+++ protocols/msn/sb.c Fri Dec 15 21:20:07 2006
@@ -126,10 +126,11 @@ int msn_sb_sendmessage( struct msn_switc
$OpenBSD: patch-protocols_msn_sb_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- protocols/msn/sb.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/msn/sb.c Mon Nov 19 13:39:01 2007
@@ -126,10 +126,11 @@ int msn_sb_sendmessage( struct msn_switchboard *sb, ch
if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
{
@ -15,7 +15,7 @@ $OpenBSD: patch-protocols_msn_sb_c,v 1.3 2007/01/14 21:53:01 simon Exp $
for( j = 0; text[j]; j ++ )
{
if( text[j] == '\n' )
@@ -632,7 +633,7 @@ static int msn_sb_message( gpointer data
@@ -632,7 +633,7 @@ static int msn_sb_message( gpointer data, char *msg, i
}
else
{

14
net/bitlbee/patches/patch-protocols_nogaim_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_nogaim_c,v 1.4 2007/01/14 21:53:01 simon Exp $
--- protocols/nogaim.c.orig Sat Jun 24 17:00:44 2006
+++ protocols/nogaim.c Fri Dec 15 21:20:07 2006
@@ -423,8 +423,8 @@ void add_buddy( struct gaim_connection *
$OpenBSD: patch-protocols_nogaim_c,v 1.5 2007/11/19 11:44:33 martynas Exp $
--- protocols/nogaim.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/nogaim.c Mon Nov 19 13:39:01 2007
@@ -423,8 +423,8 @@ void add_buddy( struct gaim_connection *gc, char *grou
/* Buddy seems to exist already. Let's ignore this request then... */
}
@ -12,7 +12,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.4 2007/01/14 21:53:01 simon Exp $
u = user_add( gc->irc, nick );
@@ -476,8 +476,8 @@ struct buddy *find_buddy( struct gaim_co
@@ -476,8 +476,8 @@ struct buddy *find_buddy( struct gaim_connection *gc,
return( NULL );
memset( b, 0, sizeof( b ) );
@ -23,7 +23,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.4 2007/01/14 21:53:01 simon Exp $
b->present = u->online;
b->gc = u->gc;
@@ -817,8 +817,11 @@ struct conversation *serv_got_joined_cha
@@ -817,8 +817,11 @@ struct conversation *serv_got_joined_chat( struct gaim
c->gc = gc;
c->title = g_strdup( handle );
@ -37,7 +37,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.4 2007/01/14 21:53:01 simon Exp $
c->channel = g_strdup( s );
g_free( s );
@@ -994,7 +997,7 @@ char *set_eval_away_devoice( irc_t *irc,
@@ -994,7 +997,7 @@ char *set_eval_away_devoice( irc_t *irc, set_t *set, c
count = 0;
}

8
net/bitlbee/patches/patch-protocols_oscar_admin_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_admin_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/admin.c.orig Thu Mar 24 00:38:46 2005
+++ protocols/oscar/admin.c Tue Nov 1 21:54:16 2005
@@ -80,7 +80,7 @@ int admin_modfirst(aim_session_t *sess,
$OpenBSD: patch-protocols_oscar_admin_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/admin.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/admin.c Mon Nov 19 13:39:01 2007
@@ -80,7 +80,7 @@ int admin_modfirst(aim_session_t *sess, aim_module_t *
mod->toolid = AIM_TOOL_NEWWIN;
mod->toolversion = 0x0629;
mod->flags = 0;

10
net/bitlbee/patches/patch-protocols_oscar_auth_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_auth_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/auth.c.orig Fri Nov 18 11:17:05 2005
+++ protocols/oscar/auth.c Sun Jan 29 03:23:00 2006
@@ -395,7 +395,7 @@ static int parse(aim_session_t *sess, ai
$OpenBSD: patch-protocols_oscar_auth_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/auth.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/auth.c Mon Nov 19 13:39:01 2007
@@ -395,7 +395,7 @@ static int parse(aim_session_t *sess, aim_module_t *mo
memset(sess->sn, 0, sizeof(sess->sn));
if (aim_gettlv(tlvlist, 0x0001, 1)) {
info.sn = aim_gettlv_str(tlvlist, 0x0001, 1);
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_oscar_auth_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
}
/*
@@ -529,7 +529,7 @@ int auth_modfirst(aim_session_t *sess, a
@@ -529,7 +529,7 @@ int auth_modfirst(aim_session_t *sess, aim_module_t *m
mod->family = 0x0017;
mod->version = 0x0000;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_bos_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_bos_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/bos.c.orig Thu Mar 24 00:38:46 2005
+++ protocols/oscar/bos.c Tue Nov 1 22:03:38 2005
@@ -152,7 +152,7 @@ int bos_modfirst(aim_session_t *sess, ai
$OpenBSD: patch-protocols_oscar_bos_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/bos.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/bos.c Mon Nov 19 13:39:01 2007
@@ -152,7 +152,7 @@ int bos_modfirst(aim_session_t *sess, aim_module_t *mo
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_buddylist_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_buddylist_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/buddylist.c.orig Thu Mar 24 00:38:46 2005
+++ protocols/oscar/buddylist.c Tue Nov 1 22:03:24 2005
@@ -85,7 +85,7 @@ int buddylist_modfirst(aim_session_t *se
$OpenBSD: patch-protocols_oscar_buddylist_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/buddylist.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/buddylist.c Mon Nov 19 13:39:01 2007
@@ -85,7 +85,7 @@ int buddylist_modfirst(aim_session_t *sess, aim_module
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

10
net/bitlbee/patches/patch-protocols_oscar_chat_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_chat_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/chat.c.orig Sun Jan 15 02:04:28 2006
+++ protocols/oscar/chat.c Sun Jan 29 03:23:00 2006
@@ -204,7 +204,7 @@ int aim_chat_join(aim_session_t *sess, a
$OpenBSD: patch-protocols_oscar_chat_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/chat.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/chat.c Mon Nov 19 13:39:01 2007
@@ -204,7 +204,7 @@ int aim_chat_join(aim_session_t *sess, aim_conn_t *con
memset(&csi, 0, sizeof(csi));
csi.exchange = exchange;
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_oscar_chat_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
csi.instance = instance;
snacid = aim_cachesnac(sess, 0x0001, 0x0004, 0x0000, &csi, sizeof(csi));
@@ -681,7 +681,7 @@ int chat_modfirst(aim_session_t *sess, a
@@ -681,7 +681,7 @@ int chat_modfirst(aim_session_t *sess, aim_module_t *m
mod->toolid = 0x0010;
mod->toolversion = 0x0629;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_chatnav_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_chatnav_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/chatnav.c.orig Thu Mar 24 00:38:46 2005
+++ protocols/oscar/chatnav.c Tue Nov 1 22:02:48 2005
@@ -414,7 +414,7 @@ int chatnav_modfirst(aim_session_t *sess
$OpenBSD: patch-protocols_oscar_chatnav_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/chatnav.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/chatnav.c Mon Nov 19 13:39:01 2007
@@ -414,7 +414,7 @@ int chatnav_modfirst(aim_session_t *sess, aim_module_t
mod->toolid = 0x0010;
mod->toolversion = 0x0629;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_conn_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_conn_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/conn.c.orig Mon Nov 21 03:27:39 2005
+++ protocols/oscar/conn.c Sun Jan 29 03:23:00 2006
@@ -446,7 +446,7 @@ aim_conn_t *aim_newconn(aim_session_t *s
$OpenBSD: patch-protocols_oscar_conn_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/conn.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/conn.c Mon Nov 19 13:39:01 2007
@@ -446,7 +446,7 @@ aim_conn_t *aim_newconn(aim_session_t *sess, int type,
}
host = (char *)g_malloc(i+1);

8
net/bitlbee/patches/patch-protocols_oscar_icq_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_icq_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/icq.c.orig Thu Mar 24 00:38:46 2005
+++ protocols/oscar/icq.c Tue Nov 1 22:01:32 2005
@@ -432,7 +432,7 @@ int icq_modfirst(aim_session_t *sess, ai
$OpenBSD: patch-protocols_oscar_icq_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/icq.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/icq.c Mon Nov 19 13:39:01 2007
@@ -432,7 +432,7 @@ int icq_modfirst(aim_session_t *sess, aim_module_t *mo
mod->toolid = 0x0110;
mod->toolversion = 0x047c;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_im_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_im_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/im.c.orig Sun Jan 15 02:04:29 2006
+++ protocols/oscar/im.c Sun Jan 29 03:23:14 2006
@@ -2134,7 +2134,7 @@ int msg_modfirst(aim_session_t *sess, ai
$OpenBSD: patch-protocols_oscar_im_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/im.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/im.c Mon Nov 19 13:39:01 2007
@@ -2134,7 +2134,7 @@ int msg_modfirst(aim_session_t *sess, aim_module_t *mo
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

10
net/bitlbee/patches/patch-protocols_oscar_info_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_info_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/info.c.orig Mon Sep 12 03:21:52 2005
+++ protocols/oscar/info.c Tue Nov 1 22:01:08 2005
@@ -26,7 +26,7 @@ int aim_getinfo(aim_session_t *sess, aim
$OpenBSD: patch-protocols_oscar_info_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/info.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/info.c Mon Nov 19 13:39:01 2007
@@ -26,7 +26,7 @@ int aim_getinfo(aim_session_t *sess, aim_conn_t *conn,
if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 12+1+strlen(sn))))
return -ENOMEM;
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_oscar_info_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
privdata.infotype = infotype;
snacid = aim_cachesnac(sess, 0x0002, 0x0005, 0x0000, &privdata, sizeof(struct aim_priv_inforeq));
@@ -718,7 +718,7 @@ int locate_modfirst(aim_session_t *sess,
@@ -718,7 +718,7 @@ int locate_modfirst(aim_session_t *sess, aim_module_t
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

12
net/bitlbee/patches/patch-protocols_oscar_misc_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_misc_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/misc.c.orig Sun Oct 10 21:24:06 2004
+++ protocols/oscar/misc.c Tue Nov 1 22:00:53 2005
@@ -32,9 +32,11 @@ int aim_bos_setbuddylist(aim_session_t *
$OpenBSD: patch-protocols_oscar_misc_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/misc.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/misc.c Mon Nov 19 13:39:01 2007
@@ -32,9 +32,11 @@ int aim_bos_setbuddylist(aim_session_t *sess, aim_conn
int len = 0;
char *localcpy = NULL;
char *tmpptr = NULL;
@ -13,7 +13,7 @@ $OpenBSD: patch-protocols_oscar_misc_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
len += 1 + strlen(tmpptr);
@@ -47,7 +49,7 @@ int aim_bos_setbuddylist(aim_session_t *
@@ -47,7 +49,7 @@ int aim_bos_setbuddylist(aim_session_t *sess, aim_conn
snacid = aim_cachesnac(sess, 0x0003, 0x0004, 0x0000, NULL, 0);
aim_putsnac(&fr->data, 0x0003, 0x0004, 0x0000, snacid);
@ -22,7 +22,7 @@ $OpenBSD: patch-protocols_oscar_misc_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
@@ -387,7 +389,7 @@ int misc_modfirst(aim_session_t *sess, a
@@ -387,7 +389,7 @@ int misc_modfirst(aim_session_t *sess, aim_module_t *m
mod->family = 0xffff;
mod->version = 0x0000;
mod->flags = AIM_MODFLAG_MULTIFAMILY;

16
net/bitlbee/patches/patch-protocols_oscar_oscar_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_oscar_c,v 1.4 2007/01/14 21:53:01 simon Exp $
--- protocols/oscar/oscar.c.orig Sat Jun 24 17:00:44 2006
+++ protocols/oscar/oscar.c Fri Dec 15 21:20:08 2006
@@ -146,7 +146,7 @@ static char *extract_name(const char *na
$OpenBSD: patch-protocols_oscar_oscar_c,v 1.5 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/oscar.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/oscar.c Mon Nov 19 13:39:01 2007
@@ -146,7 +146,7 @@ static char *extract_name(const char *name) {
tmp[j++] = x[i];
continue;
}
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.4 2007/01/14 21:53:01 simon Exp $
i++;
tmp[j++] = (char)strtol(hex, NULL, 16);
}
@@ -291,7 +291,7 @@ static void oscar_callback(gpointer data
@@ -291,7 +291,7 @@ static void oscar_callback(gpointer data, gint source,
c->inpa = 0;
c->fd = -1;
aim_conn_kill(odata->sess, &conn);
@ -19,7 +19,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.4 2007/01/14 21:53:01 simon Exp $
do_error_dialog(sess->aux_data, buf, _("Chat Error!"));
} else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
if (odata->cnpa > 0)
@@ -1362,7 +1362,7 @@ static int gaim_parse_msgerr(aim_session
@@ -1362,7 +1362,7 @@ static int gaim_parse_msgerr(aim_session_t *sess, aim_
destn = va_arg(ap, char *);
va_end(ap);
@ -28,7 +28,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.4 2007/01/14 21:53:01 simon Exp $
(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
do_error_dialog(sess->aux_data, buf, _("Gaim - Error"));
@@ -1380,7 +1380,7 @@ static int gaim_parse_locerr(aim_session
@@ -1380,7 +1380,7 @@ static int gaim_parse_locerr(aim_session_t *sess, aim_
destn = va_arg(ap, char *);
va_end(ap);
@ -37,7 +37,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.4 2007/01/14 21:53:01 simon Exp $
(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
do_error_dialog(sess->aux_data, buf, _("Gaim - Error"));
@@ -2383,7 +2383,7 @@ static char *oscar_encoding_to_utf8(char
@@ -2384,7 +2384,7 @@ static char *oscar_encoding_to_utf8(char *encoding, ch
* that was specified. So we assume it's UTF-8 and hope for the best.
*/
if (*utf8 == 0) {

8
net/bitlbee/patches/patch-protocols_oscar_oscar_util_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_oscar_util_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/oscar_util.c.orig Fri Nov 18 11:17:07 2005
+++ protocols/oscar/oscar_util.c Sun Jan 29 03:23:14 2006
@@ -80,8 +80,7 @@ char *aimutil_itemidx(char *toSearch, in
$OpenBSD: patch-protocols_oscar_oscar_util_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/oscar_util.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/oscar_util.c Mon Nov 19 13:39:01 2007
@@ -80,8 +80,7 @@ char *aimutil_itemidx(char *toSearch, int index, char
toReturn = g_strdup("");
} else {
if (next == NULL) {

8
net/bitlbee/patches/patch-protocols_oscar_search_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_search_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/search.c.orig Sun Oct 10 21:24:06 2004
+++ protocols/oscar/search.c Tue Nov 1 21:55:55 2005
@@ -112,7 +112,7 @@ int search_modfirst(aim_session_t *sess,
$OpenBSD: patch-protocols_oscar_search_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/search.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/search.c Mon Nov 19 13:39:01 2007
@@ -112,7 +112,7 @@ int search_modfirst(aim_session_t *sess, aim_module_t
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_service_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_service_c,v 1.2 2007/01/14 21:53:01 simon Exp $
--- protocols/oscar/service.c.orig Sat Jun 24 17:00:44 2006
+++ protocols/oscar/service.c Fri Dec 15 21:20:08 2006
@@ -937,7 +937,7 @@ int general_modfirst(aim_session_t *sess
$OpenBSD: patch-protocols_oscar_service_c,v 1.3 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/service.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/service.c Mon Nov 19 13:39:01 2007
@@ -937,7 +937,7 @@ int general_modfirst(aim_session_t *sess, aim_module_t
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

14
net/bitlbee/patches/patch-protocols_oscar_ssi_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_ssi_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/ssi.c.orig Tue Nov 1 04:10:13 2005
+++ protocols/oscar/ssi.c Tue Nov 1 21:26:48 2005
@@ -46,11 +46,7 @@ static struct aim_ssi_item *aim_ssi_item
$OpenBSD: patch-protocols_oscar_ssi_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/ssi.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/ssi.c Mon Nov 19 13:39:01 2007
@@ -46,11 +46,7 @@ static struct aim_ssi_item *aim_ssi_itemlist_add(struc
/* Set the name */
if (name) {
@ -14,7 +14,7 @@ $OpenBSD: patch-protocols_oscar_ssi_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
} else
newitem->name = NULL;
@@ -413,9 +409,7 @@ int aim_ssi_cleanlist(aim_session_t *ses
@@ -413,9 +409,7 @@ int aim_ssi_cleanlist(aim_session_t *sess, aim_conn_t
if (!cur) {
for (parentgroup=sess->ssi.items; ((parentgroup) && (parentgroup->type!=AIM_SSI_TYPE_GROUP) && (parentgroup->gid==0x0000)); parentgroup=parentgroup->next);
if (!parentgroup) {
@ -25,7 +25,7 @@ $OpenBSD: patch-protocols_oscar_ssi_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
aim_ssi_addgroups(sess, conn, &newgroup, 1);
}
}
@@ -1375,9 +1369,10 @@ int aim_ssi_addmoddel(aim_session_t *ses
@@ -1375,9 +1369,10 @@ int aim_ssi_addmoddel(aim_session_t *sess, aim_conn_t
snaclen += strlen(items[i]->name);
if (subtype == AIM_CB_SSI_ADD) {
@ -39,7 +39,7 @@ $OpenBSD: patch-protocols_oscar_ssi_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
}
} else {
if (subtype == AIM_CB_SSI_ADD) {
@@ -1515,7 +1510,7 @@ int ssi_modfirst(aim_session_t *sess, ai
@@ -1515,7 +1510,7 @@ int ssi_modfirst(aim_session_t *sess, aim_module_t *mo
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

8
net/bitlbee/patches/patch-protocols_oscar_stats_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_stats_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/stats.c.orig Wed Apr 28 01:36:33 2004
+++ protocols/oscar/stats.c Tue Nov 1 21:54:29 2005
@@ -31,7 +31,7 @@ int stats_modfirst(aim_session_t *sess,
$OpenBSD: patch-protocols_oscar_stats_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/oscar/stats.c.orig Mon Aug 20 16:27:15 2007
+++ protocols/oscar/stats.c Mon Nov 19 13:39:01 2007
@@ -31,7 +31,7 @@ int stats_modfirst(aim_session_t *sess, aim_module_t *
mod->toolid = 0x0104;
mod->toolversion = 0x0001;
mod->flags = 0;

12
net/bitlbee/patches/patch-protocols_proxy_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_proxy_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/proxy.c.orig Fri Dec 9 22:59:55 2005
+++ protocols/proxy.c Sun Jan 29 03:37:58 2006
$OpenBSD: patch-protocols_proxy_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- protocols/proxy.c.orig Mon Aug 20 16:27:14 2007
+++ protocols/proxy.c Mon Nov 19 13:39:01 2007
@@ -25,6 +25,7 @@
, 2nd provide an easy way to add socks support */
@ -9,7 +9,7 @@ $OpenBSD: patch-protocols_proxy_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -82,6 +83,7 @@ static struct sockaddr_in *gaim_gethostb
@@ -82,6 +83,7 @@ static struct sockaddr_in *gaim_gethostbyname(const ch
return NULL;
}
memset(&sin, 0, sizeof(struct sockaddr_in));
@ -17,7 +17,7 @@ $OpenBSD: patch-protocols_proxy_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
sin.sin_family = hp->h_addrtype;
} else
@@ -406,6 +408,7 @@ static void s5_sendconnect(gpointer data
@@ -406,6 +408,7 @@ static void s5_sendconnect(gpointer data, gint source)
buf[2] = 0x00; /* reserved */
buf[3] = 0x03; /* address type -- host name */
buf[4] = hlen;
@ -25,7 +25,7 @@ $OpenBSD: patch-protocols_proxy_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
memcpy(buf + 5, phb->host, hlen);
buf[5 + strlen(phb->host)] = phb->port >> 8;
buf[5 + strlen(phb->host) + 1] = phb->port & 0xff;
@@ -474,8 +477,10 @@ static void s5_canread(gpointer data, gi
@@ -474,8 +477,10 @@ static void s5_canread(gpointer data, gint source, Gai
unsigned int i = strlen(proxyuser), j = strlen(proxypass);
buf[0] = 0x01; /* version 1 */
buf[1] = i;

28
net/bitlbee/patches/patch-protocols_yahoo_libyahoo2_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp $
--- protocols/yahoo/libyahoo2.c.orig Wed Nov 30 23:07:40 2005
+++ protocols/yahoo/libyahoo2.c Sun Jan 29 03:23:16 2006
@@ -634,7 +634,7 @@ static void yahoo_packet_read(struct yah
$OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.5 2007/11/19 11:44:33 martynas Exp $
--- protocols/yahoo/libyahoo2.c.orig Mon Aug 20 16:27:16 2007
+++ protocols/yahoo/libyahoo2.c Mon Nov 19 13:39:01 2007
@@ -634,7 +634,7 @@ static void yahoo_packet_read(struct yahoo_packet *pkt
}
}
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
{
YList *l;
int pos = 0;
@@ -644,12 +644,12 @@ static void yahoo_packet_write(struct ya
@@ -644,12 +644,12 @@ static void yahoo_packet_write(struct yahoo_packet *pk
unsigned char buf[100];
snprintf((char *)buf, sizeof(buf), "%d", pair->key);
@ -25,7 +25,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
pos += strlen(pair->value);
data[pos++] = 0xc0;
data[pos++] = 0x80;
@@ -758,7 +758,7 @@ static void yahoo_send_packet(struct yah
@@ -758,7 +758,7 @@ static void yahoo_send_packet(struct yahoo_input_data
pos += yahoo_put32(data + pos, pkt->status);
pos += yahoo_put32(data + pos, pkt->id);
@ -34,7 +34,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
yahoo_packet_dump(data, len);
@@ -1557,8 +1557,10 @@ static void yahoo_process_auth_pre_0x0b(
@@ -1557,8 +1557,10 @@ static void yahoo_process_auth_pre_0x0b(struct yahoo_i
char *crypt_result;
unsigned char *password_hash = malloc(25);
unsigned char *crypt_hash = malloc(25);
@ -47,7 +47,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
char checksum;
@@ -1585,37 +1587,37 @@ static void yahoo_process_auth_pre_0x0b(
@@ -1585,37 +1587,37 @@ static void yahoo_process_auth_pre_0x0b(struct yahoo_i
switch (sv) {
case 0:
checksum = seed[seed[7] % 16];
@ -95,7 +95,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
"%c%s%s%s", checksum, crypt_hash, seed, yd->user);
break;
}
@@ -1941,29 +1943,29 @@ static void yahoo_process_auth_0x0b(stru
@@ -1941,29 +1943,29 @@ static void yahoo_process_auth_0x0b(struct yahoo_input
lookup &= 0x1f;
if (lookup >= strlen(alphabet1))
break;
@ -134,7 +134,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
}
/* Our second authentication response is based off
@@ -2032,29 +2034,29 @@ static void yahoo_process_auth_0x0b(stru
@@ -2032,29 +2034,29 @@ static void yahoo_process_auth_0x0b(struct yahoo_input
lookup &= 0x1f;
if (lookup >= strlen(alphabet1))
break;
@ -173,7 +173,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
}
pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->initial_status, yd->session_id);
@@ -3075,11 +3077,9 @@ static void yahoo_process_yab_connection
@@ -3075,11 +3077,9 @@ static void yahoo_process_yab_connection(struct yahoo_
if(yab->nname) {
bud->real_name = strdup(yab->nname);
} else if(yab->fname && yab->lname) {
@ -197,7 +197,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
snprintf(buff, sizeof(buff), "Y=%s; T=%s",
yd->cookie_y, yd->cookie_t);
@@ -3705,63 +3705,63 @@ void yahoo_set_yab(int id, struct yab *
@@ -3705,63 +3705,63 @@ void yahoo_set_yab(int id, struct yab * yab)
yid->type = YAHOO_CONNECTION_YAB;
yid->yd = yd;
@ -281,7 +281,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
snprintf(buff, sizeof(buff), "Y=%s; T=%s",
yd->cookie_y, yd->cookie_t);
@@ -4132,9 +4132,9 @@ void yahoo_get_chatrooms(int id, int cha
@@ -4132,9 +4132,9 @@ void yahoo_get_chatrooms(int id, int chatroomid)
yid->type = YAHOO_CONNECTION_CHATCAT;
if (chatroomid == 0) {
@ -293,7 +293,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.4 2006/04/11 15:11:33 naddy Exp
}
snprintf(buff, sizeof(buff), "Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
@@ -4369,7 +4369,7 @@ static void yahoo_search_internal(int id
@@ -4369,7 +4369,7 @@ static void yahoo_search_internal(int id, int t, const
while((p = strchr(ctext, ' ')))
*p = '+';

16
net/bitlbee/patches/patch-protocols_yahoo_yahoo_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- protocols/yahoo/yahoo.c.orig Sun Jan 15 04:09:23 2006
+++ protocols/yahoo/yahoo.c Sun Jan 29 03:23:16 2006
@@ -379,8 +379,11 @@ static int byahoo_chat_open( struct gaim
$OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.4 2007/11/19 11:44:33 martynas Exp $
--- protocols/yahoo/yahoo.c.orig Mon Aug 20 16:27:16 2007
+++ protocols/yahoo/yahoo.c Mon Nov 19 13:39:01 2007
@@ -382,8 +382,11 @@ static int byahoo_chat_open( struct gaim_connection *g
char *roomname;
YList *members;
@ -15,7 +15,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
c = serv_got_joined_chat( gc, ++byahoo_chat_id, roomname );
add_chat_buddy( c, gc->username );
@@ -558,13 +561,17 @@ void ext_yahoo_login_response( int id, i
@@ -561,13 +564,17 @@ void ext_yahoo_login_response( int id, int succ, char
if( url && *url )
{
@ -37,7 +37,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
}
if( yd->logged_in )
@@ -774,7 +781,7 @@ int ext_yahoo_connect(char *host, int po
@@ -777,7 +784,7 @@ int ext_yahoo_connect(char *host, int port)
if(!(server = gethostbyname(host))) {
return -1;
}
@ -46,7 +46,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
}
if((servfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -785,6 +792,7 @@ int ext_yahoo_connect(char *host, int po
@@ -788,6 +795,7 @@ int ext_yahoo_connect(char *host, int port)
{
memset(&serv_addr, 0, sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
@ -54,7 +54,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
memcpy(&serv_addr.sin_addr.s_addr, *p, server->h_length);
serv_addr.sin_port = htons(port);
@@ -837,7 +845,7 @@ void ext_yahoo_got_conf_invite( int id,
@@ -840,7 +848,7 @@ void ext_yahoo_got_conf_invite( int id, char *who, cha
if( g_strcasecmp( m->data, gc->username ) != 0 )
add_chat_buddy( inv->c, m->data );

14
net/bitlbee/patches/patch-protocols_yahoo_yahoo_httplib_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_yahoo_yahoo_httplib_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
--- protocols/yahoo/yahoo_httplib.c.orig Wed Nov 30 23:07:43 2005
+++ protocols/yahoo/yahoo_httplib.c Sun Jan 29 03:23:16 2006
@@ -97,7 +97,7 @@ int yahoo_tcp_readline(char *ptr, int ma
$OpenBSD: patch-protocols_yahoo_yahoo_httplib_c,v 1.3 2007/11/19 11:44:33 martynas Exp $
--- protocols/yahoo/yahoo_httplib.c.orig Mon Aug 20 16:27:16 2007
+++ protocols/yahoo/yahoo_httplib.c Mon Nov 19 13:39:01 2007
@@ -97,7 +97,7 @@ int yahoo_tcp_readline(char *ptr, int maxlen, int fd)
}
static int url_to_host_port_path(const char *url,
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_httplib_c,v 1.2 2006/04/11 15:11:33 naddy
{
char *urlcopy=NULL;
char *slash=NULL;
@@ -132,13 +132,13 @@ static int url_to_host_port_path(const c
@@ -132,13 +132,13 @@ static int url_to_host_port_path(const char *url,
}
if(!slash) {
@ -47,7 +47,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_httplib_c,v 1.2 2006/04/11 15:11:33 naddy
bpos+=3;
ipos++;
}
@@ -314,7 +315,7 @@ void yahoo_http_post(int id, const char
@@ -314,7 +315,7 @@ void yahoo_http_post(int id, const char *url, const ch
char path[255];
char buff[1024];
@ -56,7 +56,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_httplib_c,v 1.2 2006/04/11 15:11:33 naddy
return;
snprintf(buff, sizeof(buff),
@@ -339,7 +340,7 @@ void yahoo_http_get(int id, const char *
@@ -339,7 +340,7 @@ void yahoo_http_get(int id, const char *url, const cha
char path[255];
char buff[1024];

10
net/bitlbee/patches/patch-protocols_yahoo_yahoo_util_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_yahoo_yahoo_util_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
--- protocols/yahoo/yahoo_util.c.orig Sun Jan 15 02:12:41 2006
+++ protocols/yahoo/yahoo_util.c Sun Jan 29 03:23:16 2006
@@ -42,11 +42,11 @@ char * y_string_append(char * string, ch
$OpenBSD: patch-protocols_yahoo_yahoo_util_c,v 1.3 2007/11/19 11:44:33 martynas Exp $
--- protocols/yahoo/yahoo_util.c.orig Mon Aug 20 16:27:16 2007
+++ protocols/yahoo/yahoo_util.c Mon Nov 19 13:39:01 2007
@@ -42,11 +42,11 @@ char * y_string_append(char * string, char * append)
if(new_string == NULL) {
new_string = y_new(char, size);
@ -15,7 +15,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_util_c,v 1.2 2006/04/11 15:11:33 naddy Exp
return new_string;
}
@@ -82,7 +82,7 @@ char ** y_strsplit(char * str, char * se
@@ -82,7 +82,7 @@ char ** y_strsplit(char * str, char * sep, int nelem)
for(p=str, s=strstr(p,sep); i<nelem && s; p=s+l, s=strstr(p,sep), i++) {
int len = s-p;
vector[i] = y_new(char, len+1);

14
net/bitlbee/patches/patch-set_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-set_c,v 1.2 2007/01/14 21:53:01 simon Exp $
--- set.c.orig Sat Jun 24 17:00:43 2006
+++ set.c Fri Dec 15 21:20:08 2006
@@ -35,14 +35,20 @@ set_t *set_add( irc_t *irc, char *key, c
$OpenBSD: patch-set_c,v 1.3 2007/11/19 11:44:33 martynas Exp $
--- set.c.orig Mon Aug 20 16:27:13 2007
+++ set.c Mon Nov 19 13:39:01 2007
@@ -35,14 +35,20 @@ set_t *set_add( irc_t *irc, char *key, char *def, void
{
while( s->next ) s = s->next;
s->next = g_new ( set_t, 1 );
@ -22,7 +22,7 @@ $OpenBSD: patch-set_c,v 1.2 2007/01/14 21:53:01 simon Exp $
}
if( s->def )
@@ -133,7 +139,7 @@ int set_setint( irc_t *irc, char *key, i
@@ -133,7 +139,7 @@ int set_setint( irc_t *irc, char *key, int value )
{
char s[24]; /* Not quite 128-bit clean eh? ;-) */
@ -31,7 +31,7 @@ $OpenBSD: patch-set_c,v 1.2 2007/01/14 21:53:01 simon Exp $
return( set_setstr( irc, key, s ) );
}
@@ -183,12 +189,16 @@ char *set_eval_bool( irc_t *irc, set_t *
@@ -183,12 +189,16 @@ char *set_eval_bool( irc_t *irc, set_t *set, char *val
char *set_eval_to_char( irc_t *irc, set_t *set, char *value )
{
@ -51,7 +51,7 @@ $OpenBSD: patch-set_c,v 1.2 2007/01/14 21:53:01 simon Exp $
return( s );
}
@@ -201,7 +211,7 @@ char *set_eval_ops( irc_t *irc, set_t *s
@@ -201,7 +211,7 @@ char *set_eval_ops( irc_t *irc, set_t *set, char *valu
irc->channel, "+o-o", irc->nick, irc->mynick );
return( value );
}

8
net/bitlbee/patches/patch-user_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-user_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- user.c.orig Thu Nov 18 21:34:31 2004
+++ user.c Tue Nov 1 21:51:33 2005
@@ -132,7 +132,7 @@ user_t *user_find( irc_t *irc, char *nic
$OpenBSD: patch-user_c,v 1.2 2007/11/19 11:44:33 martynas Exp $
--- user.c.orig Mon Aug 20 16:27:13 2007
+++ user.c Mon Nov 19 13:39:02 2007
@@ -132,7 +132,7 @@ user_t *user_find( irc_t *irc, char *nick )
{
char key[512] = "";

10
net/bitlbee/patches/patch-util_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-util_c,v 1.2 2007/01/14 21:53:01 simon Exp $
--- util.c.orig Sat Jun 24 17:01:00 2006
+++ util.c Sat Dec 16 15:19:38 2006
$OpenBSD: patch-util_c,v 1.3 2007/11/19 11:44:33 martynas Exp $
--- util.c.orig Mon Aug 20 16:27:32 2007
+++ util.c Mon Nov 19 13:39:02 2007
@@ -43,14 +43,15 @@
void strip_linefeed(gchar *text)
{
@ -52,7 +52,7 @@ $OpenBSD: patch-util_c,v 1.2 2007/01/14 21:53:01 simon Exp $
g_free( out );
}
@@ -334,12 +335,12 @@ void info_string_append(GString *str, ch
@@ -334,12 +335,12 @@ void info_string_append(GString *str, char *newline, c
}
/* Decode%20a%20file%20name */
@ -97,7 +97,7 @@ $OpenBSD: patch-util_c,v 1.2 2007/01/14 21:53:01 simon Exp $
j += 2;
}
else
@@ -420,7 +421,7 @@ signed int do_iconv( char *from_cs, char
@@ -420,7 +421,7 @@ signed int do_iconv( char *from_cs, char *to_cs, char
iconv_t cd;
size_t res;
size_t inbytesleft, outbytesleft;