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

Updated to 0.91; from Andrew Dalgleish <openbsd@ajd.net.au>.

Browse Source
This commit is contained in:
naddy 2004-10-21 14:48:51 +00:00
parent 0eb0589235
commit 638b34bdc4
18 changed files with 187 additions and 236 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.13 2004/10/03 19:03:11 xsa Exp $
# $OpenBSD: Makefile,v 1.14 2004/10/21 14:48:51 naddy Exp $
COMMENT= "IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo"
DISTNAME= bitlbee-0.90a
DISTNAME= bitlbee-0.91
CATEGORIES= net
HOMEPAGE= http://bitlbee.org

6
net/bitlbee/distinfo
View File

@ -1,3 +1,3 @@
MD5 (bitlbee-0.90a.tar.gz) = aaef4ea0d53a66ea95320c0d2d983126
RMD160 (bitlbee-0.90a.tar.gz) = d01e6d109db49b02df39c6bc368f11b7303f062b
SHA1 (bitlbee-0.90a.tar.gz) = 8e9e75905544ffd2238b266a1a49074308cb5d66
MD5 (bitlbee-0.91.tar.gz) = a2fa42959708fd06eb281f03a7d7d3fe
RMD160 (bitlbee-0.91.tar.gz) = e86c0d404c942d90813bd959e92c5ce7158f5e3d
SHA1 (bitlbee-0.91.tar.gz) = f2f202ff86380e193044625ee3a258943d3b3aed

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

@ -1,22 +1,16 @@
$OpenBSD: patch-bitlbee_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- bitlbee.c.orig 2004-05-28 08:31:48.000000000 +1000
+++ bitlbee.c 2004-06-09 22:14:42.000000000 +1000
@@ -314,12 +314,13 @@ int bitlbee_load( irc_t *irc, char* pass
$OpenBSD: patch-bitlbee_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- bitlbee.c.orig Wed Jul 21 09:36:07 2004
+++ bitlbee.c Fri Oct 15 14:43:15 2004
@@ -306,7 +306,7 @@ int bitlbee_load( irc_t *irc, char* pass
if( irc->status == USTATUS_IDENTIFIED )
return( 1 );
- g_snprintf( s, 511, "%s%s", irc->nick, ".accounts" );
+ g_snprintf( s, sizeof(s), "%s%s", irc->nick, ".accounts" );
path = g_build_path( G_DIR_SEPARATOR_S, global.conf->configdir, s, NULL );
fp = fopen( path, "r" );
g_free( path );
- g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+ g_snprintf( s, sizeof(s), "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
fp = fopen( s, "r" );
if( !fp ) return( 0 );
+ COMPILE_TIME_ASSERT(32 < sizeof(s));
fscanf( fp, "%32[^\n]s", s );
if( setpass( irc, password, s ) < 0 )
return( -1 );
@@ -328,6 +329,7 @@ int bitlbee_load( irc_t *irc, char* pass
@@ -318,6 +318,7 @@ int bitlbee_load( irc_t *irc, char* pass
account command will not work otherwise. */
irc->status = USTATUS_IDENTIFIED;
@ -24,82 +18,73 @@ $OpenBSD: patch-bitlbee_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
while( fscanf( fp, "%511[^\n]s", s ) > 0 )
{
fgetc( fp );
@@ -337,12 +339,14 @@ int bitlbee_load( irc_t *irc, char* pass
@@ -327,7 +328,7 @@ int bitlbee_load( irc_t *irc, char* pass
}
fclose( fp );
- g_snprintf( s, 511, "%s%s", irc->nick, ".nicks" );
+ g_snprintf( s, sizeof(s), "%s%s", irc->nick, ".nicks" );
path = g_build_path( G_DIR_SEPARATOR_S, global.conf->configdir, s, NULL );
fp = fopen( path, "r" );
g_free( path );
- g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+ g_snprintf( s, sizeof(s), "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
fp = fopen( s, "r" );
if( !fp ) return( 0 );
- while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
+ COMPILE_TIME_ASSERT(511 < sizeof(s));
+ COMPILE_TIME_ASSERT(24 < sizeof(nick));
+ while( fscanf( fp, "%511s %d %24s", s, &proto, nick ) > 0 )
{
http_decode( s );
nick_set( irc, s, proto, nick );
@@ -351,7 +355,7 @@ int bitlbee_load( irc_t *irc, char* pass
while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
@@ -339,7 +340,7 @@ int bitlbee_load( irc_t *irc, char* pass
if( set_getint( IRC, "auto_connect" ) )
if( set_getint( irc, "auto_connect" ) )
{
- strcpy( s, "account on" ); /* Can't do this directly because r_c_s alters the string */
+ strlcpy( s, "account on", sizeof(s) ); /* Can't do this directly because r_c_s alters the string */
root_command_string( irc, ru, s );
}
@@ -391,16 +395,16 @@ int bitlbee_save( irc_t *irc )
@@ -380,15 +381,15 @@ int bitlbee_save( irc_t *irc )
return( 0 );
}
- g_snprintf( s, 511, "%s%s", irc->nick, ".nicks~" );
+ g_snprintf( s, sizeof(s), "%s%s", irc->nick, ".nicks~" );
path = g_build_path(G_DIR_SEPARATOR_S, global.conf->configdir, s, NULL);
- g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks~" );
+ g_snprintf( path, sizeof(s), "%s%s%s", global.conf->configdir, irc->nick, ".nicks~" );
fp = fopen( path, "w" );
if( !fp ) return( 0 );
while( n )
for( n = irc->nicks; n; n = n->next )
{
- strcpy( s, n->handle );
- s[169] = 0; /* Prevent any overflow (169 ~ 512 / 3) */
- http_encode( s );
- g_snprintf( s + strlen( s ), 510 - strlen( s ), " %d %s", n->proto, n->nick );
+ strlcpy( s, n->handle, sizeof(s) );
+ s[sizeof(s)/3] = 0; /* Prevent any overflow when expanding to %02X */
+ s[sizeof(s)/3] = 0; /* Prevent any overflow (169 ~ 512 / 3) */
+ http_encode( s, sizeof(s) );
+ g_snprintf( s + strlen( s ), sizeof(s)-strlen( s ), " %d %s", n->proto, n->nick );
+ g_snprintf( s + strlen( s ), sizeof(s) - strlen( s ), " %d %s", n->proto, n->nick );
if( fprintf( fp, "%s\n", s ) != strlen( s ) + 1 )
{
irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
@@ -412,7 +416,7 @@ int bitlbee_save( irc_t *irc )
@@ -398,7 +399,7 @@ int bitlbee_save( irc_t *irc )
}
fclose( fp );
- g_snprintf( s, 512, "%s%s", irc->nick, ".nicks" );
+ g_snprintf( s, sizeof(s), "%s%s", irc->nick, ".nicks" );
old_path = g_build_path(G_DIR_SEPARATOR_S, global.conf->configdir, s, NULL);
if( unlink( old_path ) != 0 )
- g_snprintf( new_path, 512, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+ g_snprintf( new_path, sizeof(new_path), "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
if( unlink( new_path ) != 0 )
{
@@ -435,7 +439,7 @@ int bitlbee_save( irc_t *irc )
g_free( old_path );
if( errno != ENOENT )
@@ -413,7 +414,7 @@ int bitlbee_save( irc_t *irc )
return( 0 );
}
- g_snprintf( s, 511, "%s%s", irc->nick, ".accounts~" );
+ g_snprintf( s, sizeof(s), "%s%s", irc->nick, ".accounts~" );
path = g_build_path(G_DIR_SEPARATOR_S, global.conf->configdir, s, NULL);
- g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" );
+ g_snprintf( path, sizeof(path), "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" );
fp = fopen( path, "w" );
if( !fp ) return( 0 );
@@ -509,7 +513,7 @@ int bitlbee_save( irc_t *irc )
if( fprintf( fp, "%s", hash ) != strlen( hash ) )
@@ -481,7 +482,7 @@ int bitlbee_save( irc_t *irc )
}
fclose( fp );
- g_snprintf( s, 512, "%s%s", irc->nick, ".accounts" );
+ g_snprintf( s, sizeof(s), "%s%s", irc->nick, ".accounts" );
old_path = g_build_path(G_DIR_SEPARATOR_S, global.conf->configdir, s, NULL);
if( unlink( old_path ) != 0 )
- g_snprintf( new_path, 512, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+ g_snprintf( new_path, sizeof(new_path), "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
if( unlink( new_path ) != 0 )
{
@@ -600,8 +604,9 @@ void http_decode( char *s )
if( errno != ENOENT )
@@ -565,8 +566,9 @@ void http_decode( char *s )
{
char *t;
int i, j, k;
@ -110,7 +95,7 @@ $OpenBSD: patch-bitlbee_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
for( i = j = 0; s[i]; i ++, j ++ )
{
@@ -625,24 +630,24 @@ void http_decode( char *s )
@@ -590,24 +592,24 @@ void http_decode( char *s )
}
t[j] = 0;

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

@ -1,8 +1,8 @@
$OpenBSD: patch-bitlbee_h,v 1.4 2004/07/01 16:11:59 naddy Exp $
$OpenBSD: patch-bitlbee_h,v 1.5 2004/10/21 14:48:51 naddy Exp $
Use a more usefull name for the server
--- bitlbee.h.orig Wed May 19 05:36:42 2004
+++ bitlbee.h Sun Jun 27 16:50:35 2004
@@ -79,7 +79,7 @@
--- bitlbee.h.orig Sat Sep 25 21:15:15 2004
+++ bitlbee.h Thu Oct 14 15:43:33 2004
@@ -75,7 +75,7 @@
#define _( x ) x
@ -11,7 +11,7 @@ Use a more usefull name for the server
#define ROOT_CHAN "#bitlbee"
#define ROOT_FN "User manager"
@@ -131,7 +131,7 @@ int root_command( irc_t *irc, char *comm
@@ -127,7 +127,7 @@ int root_command( irc_t *irc, char *comm
int bitlbee_load( irc_t *irc, char *password );
int bitlbee_save( irc_t *irc );
double gettime( void );
@ -20,8 +20,8 @@ Use a more usefull name for the server
G_MODULE_EXPORT void http_decode( char *s );
void *bitlbee_alloc(size_t size);
@@ -142,5 +142,12 @@ G_MODULE_EXPORT irc_t *get_IRC();
extern irc_t *IRC;
@@ -135,5 +135,12 @@ void *bitlbee_realloc(void *oldmem, size
extern global_t global;
extern GList *connection_list;
+

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

@ -1,6 +1,6 @@
$OpenBSD: patch-commands_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- commands.c.orig 2004-05-12 21:36:25.000000000 +1000
+++ commands.c 2004-06-08 19:59:37.000000000 +1000
$OpenBSD: patch-commands_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- commands.c.orig Tue Sep 21 07:07:16 2004
+++ commands.c Fri Oct 15 14:30:16 2004
@@ -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,56 +12,29 @@ $OpenBSD: patch-commands_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
s = help_get( &(global.help), param );
@@ -111,6 +111,7 @@ int cmd_register( irc_t *irc, char **cmd
{
int checkie;
char *path, *file;
+ size_t file_len;
if( global.conf->authmode == AUTHMODE_REGISTERED )
{
@@ -118,17 +119,18 @@ int cmd_register( irc_t *irc, char **cmd
@@ -118,10 +118,10 @@ int cmd_register( irc_t *irc, char **cmd
return( 0 );
}
- file = (char *) bitlbee_alloc( strlen( irc->nick ) + strlen( ".accounts" ) + 1 );
+ file_len = strlen( irc->nick ) + strlen( ".accounts" ) + 1;
+ file = (char *) bitlbee_alloc( file_len );
- g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+ g_snprintf( path, sizeof(path), "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
checkie = access( path, F_OK );
- strcpy( file, irc->nick );
- strcat( file, ".accounts" );
+ strlcpy( file, irc->nick, file_len );
+ strlcat( file, ".accounts", file_len );
path = g_build_path( G_DIR_SEPARATOR_S, global.conf->configdir, file, NULL );
- g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+ g_snprintf( path, sizeof(path), "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
checkie += access( path, F_OK );
checkie = g_file_test( path, G_FILE_TEST_EXISTS ) ? 0 : -1 ;
g_free( path );
- strcpy( file, irc->nick );
- strcat( file, ".nicks" );
+ strlcpy( file, irc->nick, file_len );
+ strlcat( file, ".nicks", file_len );
path = g_build_path( G_DIR_SEPARATOR_S, global.conf->configdir, file, NULL );
checkie += g_file_test( path, G_FILE_TEST_EXISTS ) ? 0 : -1;
@@ -154,11 +156,13 @@ int cmd_drop( irc_t *irc, char **cmd )
{
char *path, *file, s[512];
if( checkie == -2 )
@@ -143,7 +143,7 @@ int cmd_drop( irc_t *irc, char **cmd )
char s[512];
FILE *fp;
+ size_t file_len;
- file = (char *) bitlbee_alloc( strlen( irc->nick ) + strlen( ".accounts" ) + 1 );
+ file_len = strlen( irc->nick ) + strlen( ".accounts" ) + 1;
+ file = (char *) bitlbee_alloc( file_len );
- strcpy( file, irc->nick );
- strcat( file, ".accounts" );
+ strlcpy( file, irc->nick, file_len );
+ strlcat( file, ".accounts", file_len );
path = g_build_path( G_DIR_SEPARATOR_S, global.conf->configdir, file, NULL );
fp = fopen( path, "r" );
@@ -170,6 +174,7 @@ int cmd_drop( irc_t *irc, char **cmd )
- g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+ g_snprintf( s, sizeof(s), "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
fp = fopen( s, "r" );
if( !fp )
{
@@ -151,6 +151,7 @@ int cmd_drop( irc_t *irc, char **cmd )
return( 0 );
}
@ -69,18 +42,20 @@ $OpenBSD: patch-commands_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
fscanf( fp, "%32[^\n]s", s );
fclose( fp );
if( setpass( irc, cmd[1], s ) < 0 )
@@ -183,8 +188,8 @@ int cmd_drop( irc_t *irc, char **cmd )
unlink( path );
g_free( path );
@@ -159,10 +160,10 @@ int cmd_drop( irc_t *irc, char **cmd )
return( 0 );
}
- strcpy( file, irc->nick );
- strcat( file, ".nicks" );
+ strlcpy( file, irc->nick, file_len );
+ strlcat( file, ".nicks", file_len );
path = g_build_path( G_DIR_SEPARATOR_S, global.conf->configdir, file, NULL );
- g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
+ g_snprintf( s, sizeof(s), "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
unlink( s );
unlink( path );
@@ -676,21 +681,21 @@ int cmd_blist( irc_t *irc, char **cmd )
- g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
+ g_snprintf( s, sizeof(s), "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
unlink( s );
setpassnc( irc, NULL );
@@ -663,21 +664,21 @@ int cmd_blist( irc_t *irc, char **cmd )
if( online == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
{

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

@ -1,7 +1,7 @@
$OpenBSD: patch-conf_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- conf.c.orig 2004-04-05 06:50:52.000000000 +1000
+++ conf.c 2004-06-09 21:17:00.000000000 +1000
@@ -131,9 +131,10 @@ conf_t *conf_load( int argc, char *argv[
$OpenBSD: patch-conf_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- conf.c.orig Fri Sep 24 05:42:32 2004
+++ conf.c Thu Oct 14 15:43:33 2004
@@ -130,9 +130,10 @@ conf_t *conf_load( int argc, char *argv[
if( conf->configdir[strlen(conf->configdir)-1] != '/' )
{

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

@ -1,6 +1,6 @@
$OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- irc.c.orig 2004-05-15 23:15:12.000000000 +1000
+++ irc.c 2004-06-09 22:09:00.000000000 +1000
$OpenBSD: patch-irc_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- irc.c.orig Sat Sep 25 04:48:04 2004
+++ irc.c Thu Oct 14 15:43:33 2004
@@ -44,7 +44,7 @@ irc_t *irc_new( int fd )
irc->userhash = g_hash_table_new( g_str_hash, g_str_equal );
@ -10,7 +10,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
irc->mynick = g_strdup( ROOT_NICK );
irc->channel = g_strdup( ROOT_CHAN );
@@ -299,7 +299,7 @@ int irc_fill_buffer( irc_t *irc )
@@ -282,7 +282,7 @@ int irc_fill_buffer( irc_t *irc )
while( select( irc->fd + 1, readfds, NULL, NULL, tv ) > 0 )
{
@ -19,7 +19,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
if( st <= 0 )
return( 0 );
line[st]='\0';
@@ -307,8 +307,9 @@ int irc_fill_buffer( irc_t *irc )
@@ -290,8 +290,9 @@ int irc_fill_buffer( irc_t *irc )
irc->readbuffer = g_strdup( line );
else
{
@ -31,7 +31,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
}
return 1;
@@ -370,8 +371,9 @@ int irc_write_buffer( irc_t *irc )
@@ -353,8 +354,9 @@ int irc_write_buffer( irc_t *irc )
}
else
{
@ -43,7 +43,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
g_free( irc->sendbuffer );
irc->sendbuffer = temp;
}
@@ -735,8 +737,8 @@ int irc_exec( irc_t *irc, char **cmd )
@@ -718,8 +720,8 @@ int irc_exec( irc_t *irc, char **cmd )
* cares?
*/
@ -54,7 +54,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
}
@@ -845,7 +847,7 @@ void irc_reply( irc_t *irc, int code, ch
@@ -828,7 +830,7 @@ void irc_reply( irc_t *irc, int code, ch
va_list params;
va_start( params, format );
@ -63,7 +63,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
va_end( params );
irc_write( irc, ":%s %03d %s %s", irc->myhost, code, irc->nick?irc->nick:"*", text );
@@ -888,9 +890,10 @@ void irc_vawrite( irc_t *irc, char *form
@@ -871,9 +873,10 @@ void irc_vawrite( irc_t *irc, char *form
if( irc->quit )
return;
@ -76,7 +76,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
if( irc->sendbuffer != NULL ) {
size=strlen( irc->sendbuffer ) + strlen( line );
@@ -910,7 +913,7 @@ void irc_vawrite( irc_t *irc, char *form
@@ -893,7 +896,7 @@ void irc_vawrite( irc_t *irc, char *form
}
#endif
irc->sendbuffer=bitlbee_realloc( irc->sendbuffer, size + 1 );
@ -85,7 +85,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
else
irc->sendbuffer = g_strdup(line);
@@ -1080,15 +1083,19 @@ void irc_motd( irc_t *irc )
@@ -1063,15 +1066,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 )
{
@ -108,7 +108,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
if( linebuf[len] == 'h' )
add = irc->myhost;
else if( linebuf[len] == 'v' )
@@ -1097,14 +1104,30 @@ void irc_motd( irc_t *irc )
@@ -1080,14 +1087,30 @@ void irc_motd( irc_t *irc )
add = irc->nick;
else
add = "%";
@ -142,7 +142,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
irc_reply( irc, 376, ":End of MOTD" );
closesocket( fd );
@@ -1367,8 +1390,8 @@ int buddy_send_handler( irc_t *irc, user
@@ -1361,8 +1384,8 @@ int buddy_send_handler( irc_t *irc, user
u->sendbuf = bitlbee_realloc( u->sendbuf, u->sendbuf_len );
}
@ -153,7 +153,7 @@ $OpenBSD: patch-irc_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
if( u->sendbuf_timer > 0 )
g_source_remove( u->sendbuf_timer );
@@ -1432,7 +1455,7 @@ int irc_msgfrom( irc_t *irc, char *nick,
@@ -1426,7 +1449,7 @@ int irc_msgfrom( irc_t *irc, char *nick,
if( !u->is_private && nick_cmp( u->nick, irc->mynick ) != 0 )
{

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

@ -1,10 +1,10 @@
$OpenBSD: patch-nick_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- nick.c.orig 2004-05-12 17:58:27.000000000 +1000
+++ nick.c 2004-06-09 22:04:54.000000000 +1000
$OpenBSD: patch-nick_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- nick.c.orig Sun Jul 18 21:13:15 2004
+++ nick.c Fri Oct 15 14:31:10 2004
@@ -66,7 +66,7 @@ char *nick_get( irc_t *irc, char *handle
while( n && !*nick )
if( ( n->proto == proto ) && ( g_ascii_strcasecmp( n->handle, handle ) == 0 ) )
if( ( n->proto == proto ) && ( g_strcasecmp( n->handle, handle ) == 0 ) )
- strcpy( nick, n->nick );
+ strlcpy( nick, n->nick, sizeof(nick) );
else
@ -27,8 +27,8 @@ $OpenBSD: patch-nick_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
+ g_snprintf( nick, sizeof(nick), "%s", realname );
nick_strip( nick );
nick_lc( nick );
@@ -114,7 +114,7 @@ char *nick_get( irc_t *irc, char *handle
if (set_getint(irc, "lcnicks"))
@@ -120,7 +120,7 @@ char *nick_get( irc_t *irc, char *handle
"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.1 2004/06/20 16:27:49 naddy Exp $
break;
}
@@ -238,8 +238,8 @@ int nick_cmp( char *a, char *b )
@@ -244,8 +244,8 @@ int nick_cmp( char *a, char *b )
{
char aa[1024] = "", bb[1024] = "";
@ -48,7 +48,7 @@ $OpenBSD: patch-nick_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
if( nick_lc( aa ) && nick_lc( bb ) )
{
return( strcmp( aa, bb ) );
@@ -253,10 +253,11 @@ int nick_cmp( char *a, char *b )
@@ -259,10 +259,11 @@ int nick_cmp( char *a, char *b )
char *nick_dup( char *nick )
{
char *cp;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_jabber_jabber_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/jabber/jabber.c.orig 2004-05-23 22:24:02.000000000 +1000
+++ protocols/jabber/jabber.c 2004-06-09 21:18:06.000000000 +1000
@@ -281,7 +281,7 @@ static char *gjab_getsid(gjconn gjc)
$OpenBSD: patch-protocols_jabber_jabber_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/jabber/jabber.c.orig Wed Sep 8 06:54:23 2004
+++ protocols/jabber/jabber.c Fri Oct 15 14:33:18 2004
@@ -287,7 +287,7 @@ static char *gjab_getsid(gjconn gjc)
static char *gjab_getid(gjconn gjc)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
return &gjc->idbuf[0];
}
@@ -366,10 +366,11 @@ static void gjab_auth(gjconn gjc)
@@ -383,10 +383,11 @@ static void gjab_auth(gjconn gjc)
xmlnode_insert_cdata(z, gjc->user->resource, -1);
if (gjc->sid) {
@ -25,17 +25,17 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
hash = shahash(hash);
xmlnode_insert_cdata(z, hash, 40);
} else {
@@ -1268,8 +1269,7 @@ static void jabber_handlebuddy(gjconn gj
@@ -1241,8 +1242,7 @@ static void jabber_handlebuddy(gjconn gj
serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle, uc, 0);
}
} else if(name != NULL && strcmp(b->show, name)) {
- strncpy(b->show, name, BUDDY_ALIAS_MAXLEN);
- b->show[BUDDY_ALIAS_MAXLEN - 1] = '\0'; /* cheap safety feature */
+ strlcpy(b->show, name, BUDDY_ALIAS_MAXLEN);
handle_buddy_rename(b, buddyname);
serv_buddy_rename(GJ_GC(gjc), buddyname, b->show);
}
}
@@ -1416,7 +1416,7 @@ static void jabber_handlelast(gjconn gjc
@@ -1389,7 +1389,7 @@ static void jabber_handlelast(gjconn gjc
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.1 2004/06/20 16:27:49 naddy Exp $
xmlnode_put_attrib(querytag, "seconds", idle_time);
gjab_send(gjc, x);
@@ -2498,7 +2498,7 @@ static xmlnode insert_tag_to_parent_tag(
@@ -2170,7 +2170,7 @@ static xmlnode insert_tag_to_parent_tag(
/*
* Descend?
*/
@ -53,13 +53,3 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
char *parent;
if((parent = strrchr(grand_parent, '/')) != NULL) {
@@ -2655,8 +2655,7 @@ static void jabber_setup_set_info(struct
/#*
* Get existing, XML-formatted, user info
*#/
- if((user_info = g_malloc(strlen(tmp->user_info) + 1)) != NULL) {
- strcpy(user_info, tmp->user_info);
+ if((user_info = g_strdup(tmp->user_info)) != NULL) {
x_vc_data = xmlstr2xmlnode(user_info);
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_msn_passport_c,v 1.2 2004/07/01 16:11:59 naddy Exp $
--- protocols/msn/passport.c.orig Thu Apr 29 22:30:18 2004
+++ protocols/msn/passport.c Sun Jun 27 16:50:35 2004
@@ -67,23 +67,30 @@ int passport_get_id( gpointer data, char
$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
static char *passport_create_header( char *reply, char *email, char *pwd )
{
@ -40,7 +40,7 @@ $OpenBSD: patch-protocols_msn_passport_c,v 1.2 2004/07/01 16:11:59 naddy Exp $
"Authorization: Passport1.4 OrgVerb=GET,"
"OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
"sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
@@ -191,7 +198,7 @@ static int passport_get_id_from( gpointe
@@ -179,7 +186,7 @@ static int passport_get_id_from( gpointe
rep->func = func;
rep->redirects = 4;
@ -49,7 +49,7 @@ $OpenBSD: patch-protocols_msn_passport_c,v 1.2 2004/07/01 16:11:59 naddy Exp $
dummy = strchr( server, '/' );
if( dummy )
*dummy = 0;
@@ -232,14 +239,14 @@ static void passport_get_id_connected( g
@@ -220,14 +227,14 @@ static void passport_get_id_connected( g
return;
}
@ -67,7 +67,7 @@ $OpenBSD: patch-protocols_msn_passport_c,v 1.2 2004/07/01 16:11:59 naddy Exp $
"%s\r\n\r\n", dummy, rep->header );
ssl_write( ssl, buffer, strlen( buffer ) );
@@ -280,7 +287,7 @@ static void passport_get_id_connected( g
@@ -265,7 +272,7 @@ static void passport_get_id_connected( g
g_free( rep->url );
rep->url = g_strdup( dummy );

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

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_nogaim_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/nogaim.c.orig 2004-05-29 06:05:06.000000000 +1000
+++ protocols/nogaim.c 2004-06-09 21:25:22.000000000 +1000
@@ -468,8 +468,8 @@ void add_buddy( struct gaim_connection *
$OpenBSD: patch-protocols_nogaim_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/nogaim.c.orig Wed Sep 8 06:52:47 2004
+++ protocols/nogaim.c Thu Oct 14 15:43:34 2004
@@ -442,8 +442,8 @@ void add_buddy( struct gaim_connection *
/* Buddy seems to exist already. Let's ignore this request then... */
}
@ -12,7 +12,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
u = user_add( gc->irc, nick );
@@ -513,8 +513,8 @@ struct buddy *find_buddy( struct gaim_co
@@ -487,8 +487,8 @@ struct buddy *find_buddy( struct gaim_co
return( NULL );
memset( b, 0, sizeof( b ) );
@ -23,7 +23,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
b->present = u->online;
b->gc = u->gc;
@@ -818,8 +818,11 @@ struct conversation *serv_got_joined_cha
@@ -800,8 +800,11 @@ struct conversation *serv_got_joined_cha
c->gc = gc;
c->title = g_strdup( handle );
@ -37,7 +37,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
c->channel = g_strdup( s );
g_free( s );
@@ -995,7 +998,7 @@ char *set_eval_away_devoice( irc_t *irc,
@@ -977,7 +980,7 @@ char *set_eval_away_devoice( irc_t *irc,
count = 0;
}

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

@ -1,30 +1,30 @@
$OpenBSD: patch-protocols_oscar_oscar_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/oscar/oscar.c.orig 2004-05-19 05:30:36.000000000 +1000
+++ protocols/oscar/oscar.c 2004-06-09 21:19:12.000000000 +1000
@@ -304,7 +304,7 @@ static void oscar_callback(gpointer data
$OpenBSD: patch-protocols_oscar_oscar_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/oscar/oscar.c.orig Sat Sep 25 21:30:31 2004
+++ protocols/oscar/oscar.c Fri Oct 15 14:34:08 2004
@@ -297,7 +297,7 @@ static void oscar_callback(gpointer data
c->inpa = 0;
c->fd = -1;
aim_conn_kill(odata->sess, &conn);
- sprintf(buf, _("You have been disconnected from chat room %s."), c->name);
+ g_snprintf(buf, sizeof(buf), _("You have been disconnected from chat room %s."), c->name);
do_error_dialog(buf, _("Chat Error!"));
do_error_dialog(sess->aux_data, buf, _("Chat Error!"));
} else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
if (odata->cnpa > 0)
@@ -1428,7 +1428,7 @@ static int gaim_parse_msgerr(aim_session
@@ -1353,7 +1353,7 @@ static int gaim_parse_msgerr(aim_session
destn = va_arg(ap, char *);
va_end(ap);
- sprintf(buf, _("Your message to %s did not get sent: %s"), destn,
+ g_snprintf(buf, sizeof(buf), _("Your message to %s did not get sent: %s"), destn,
(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
do_error_dialog(buf, _("Gaim - Error"));
do_error_dialog(sess->aux_data, buf, _("Gaim - Error"));
@@ -1446,7 +1446,7 @@ static int gaim_parse_locerr(aim_session
@@ -1371,7 +1371,7 @@ static int gaim_parse_locerr(aim_session
destn = va_arg(ap, char *);
va_end(ap);
- sprintf(buf, _("User information for %s unavailable: %s"), destn,
+ g_snprintf(buf, sizeof(buf), _("User information for %s unavailable: %s"), destn,
(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
do_error_dialog(buf, _("Gaim - Error"));
do_error_dialog(sess->aux_data, buf, _("Gaim - Error"));

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.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/oscar/oscar_util.c.orig 2004-05-19 05:44:58.000000000 +1000
+++ protocols/oscar/oscar_util.c 2004-06-09 21:12:06.000000000 +1000
@@ -87,8 +87,7 @@ faim_export char *aimutil_itemidx(char *
$OpenBSD: patch-protocols_oscar_oscar_util_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/oscar/oscar_util.c.orig Wed Apr 28 01:36:33 2004
+++ protocols/oscar/oscar_util.c Thu Oct 14 15:43:35 2004
@@ -86,8 +86,7 @@ char *aimutil_itemidx(char *toSearch, in
toReturn = g_strdup("");
} else {
if (next == NULL) {

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

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_ssi_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/oscar/ssi.c.orig 2004-05-19 05:26:49.000000000 +1000
+++ protocols/oscar/ssi.c 2004-06-09 21:18:29.000000000 +1000
@@ -46,11 +46,7 @@ static struct aim_ssi_item *aim_ssi_item
$OpenBSD: patch-protocols_oscar_ssi_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/oscar/ssi.c.orig Wed Sep 22 06:34:44 2004
+++ protocols/oscar/ssi.c Thu Oct 14 15:43:35 2004
@@ -45,11 +45,7 @@ static struct aim_ssi_item *aim_ssi_item
/* Set the name */
if (name) {
@ -14,7 +14,7 @@ $OpenBSD: patch-protocols_oscar_ssi_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
} else
newitem->name = NULL;
@@ -413,9 +409,7 @@ faim_export int aim_ssi_cleanlist(aim_se
@@ -412,9 +408,7 @@ int aim_ssi_cleanlist(aim_session_t *ses
if (!cur) {
for (parentgroup=sess->ssi.items; ((parentgroup) && (parentgroup->type!=AIM_SSI_TYPE_GROUP) && (parentgroup->gid==0x0000)); parentgroup=parentgroup->next);
if (!parentgroup) {
@ -25,9 +25,9 @@ $OpenBSD: patch-protocols_oscar_ssi_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
aim_ssi_addgroups(sess, conn, &newgroup, 1);
}
}
@@ -1393,7 +1387,7 @@ faim_internal int ssi_modfirst(aim_sessi
@@ -1518,7 +1512,7 @@ int ssi_modfirst(aim_session_t *sess, ai
mod->toolid = 0x0110;
mod->toolversion = 0x047b;
mod->toolversion = 0x0629;
mod->flags = 0;
- strncpy(mod->name, "ssi", sizeof(mod->name));
+ strlcpy(mod->name, "ssi", sizeof(mod->name));

17
net/bitlbee/patches/patch-protocols_util_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_util_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/util.c.orig 2004-03-18 07:21:12.000000000 +1100
+++ protocols/util.c 2004-06-09 19:29:44.000000000 +1000
$OpenBSD: patch-protocols_util_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/util.c.orig Sat Sep 11 02:03:07 2004
+++ protocols/util.c Thu Oct 14 15:43:35 2004
@@ -131,14 +131,15 @@ char *str_to_utf8(unsigned char *in)
void strip_linefeed(gchar *text)
{
@ -19,7 +19,7 @@ $OpenBSD: patch-protocols_util_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
g_free(text2);
}
@@ -238,7 +239,6 @@ char *normalize(const char *s)
@@ -239,7 +240,6 @@ char *normalize(const char *s)
u = t = g_strdup(s);
@ -27,7 +27,7 @@ $OpenBSD: patch-protocols_util_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
g_strdown(t);
while (*t && (x < BUF_LEN - 1)) {
@@ -301,7 +301,8 @@ static htmlentity_t ent[] =
@@ -304,7 +304,8 @@ static htmlentity_t ent[] =
void strip_html( char *in )
{
char *start = in;
@ -35,9 +35,9 @@ $OpenBSD: patch-protocols_util_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
+ size_t in_len = strlen( in ) + 1;
+ char *out = g_malloc(in_len);
char *s = out, *cs;
int i;
int matched;
@@ -344,6 +345,6 @@ void strip_html( char *in )
int i, matched;
@@ -363,7 +364,7 @@ void strip_html( char *in )
}
}
@ -45,3 +45,4 @@ $OpenBSD: patch-protocols_util_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
+ strlcpy( start, out, in_len );
g_free( out );
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp $
--- protocols/yahoo/libyahoo2.c.orig Sun Jun 27 16:50:35 2004
+++ protocols/yahoo/libyahoo2.c Sun Jun 27 16:50:36 2004
@@ -626,7 +626,7 @@ static void yahoo_packet_read(struct yah
$OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.3 2004/10/21 14:48:51 naddy Exp $
--- protocols/yahoo/libyahoo2.c.orig Sat Sep 25 21:26:09 2004
+++ protocols/yahoo/libyahoo2.c Thu Oct 14 15:43:35 2004
@@ -638,7 +638,7 @@ static void yahoo_packet_read(struct yah
}
}
@ -10,7 +10,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
{
YList *l;
int pos = 0;
@@ -636,12 +636,12 @@ static void yahoo_packet_write(struct ya
@@ -648,12 +648,12 @@ static void yahoo_packet_write(struct ya
unsigned char buf[100];
snprintf((char *)buf, sizeof(buf), "%d", pair->key);
@ -25,7 +25,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
pos += strlen(pair->value);
data[pos++] = 0xc0;
data[pos++] = 0x80;
@@ -750,7 +750,7 @@ static void yahoo_send_packet(struct yah
@@ -762,7 +762,7 @@ static void yahoo_send_packet(struct yah
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.2 2004/07/01 16:11:59 naddy Exp
yahoo_packet_dump(data, len);
@@ -1549,8 +1549,10 @@ static void yahoo_process_auth_pre_0x0b(
@@ -1561,8 +1561,10 @@ static void yahoo_process_auth_pre_0x0b(
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.2 2004/07/01 16:11:59 naddy Exp
char checksum;
@@ -1577,37 +1579,37 @@ static void yahoo_process_auth_pre_0x0b(
@@ -1589,37 +1591,37 @@ static void yahoo_process_auth_pre_0x0b(
switch (sv) {
case 0:
checksum = seed[seed[7] % 16];
@ -95,7 +95,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
"%c%s%s%s", checksum, crypt_hash, seed, yd->user);
break;
}
@@ -1933,29 +1935,29 @@ static void yahoo_process_auth_0x0b(stru
@@ -1945,29 +1947,29 @@ static void yahoo_process_auth_0x0b(stru
lookup &= 0x1f;
if (lookup >= strlen(alphabet1))
break;
@ -134,7 +134,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
}
/* Our second authentication response is based off
@@ -2024,29 +2026,29 @@ static void yahoo_process_auth_0x0b(stru
@@ -2036,29 +2038,29 @@ static void yahoo_process_auth_0x0b(stru
lookup &= 0x1f;
if (lookup >= strlen(alphabet1))
break;
@ -173,7 +173,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
}
pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->initial_status, yd->session_id);
@@ -3067,11 +3069,9 @@ static void yahoo_process_yab_connection
@@ -3079,11 +3081,9 @@ static void yahoo_process_yab_connection
if(yab->nname) {
bud->real_name = strdup(yab->nname);
} else if(yab->fname && yab->lname) {
@ -188,7 +188,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
yab->fname, yab->lname);
} else if(yab->fname) {
bud->real_name = strdup(yab->fname);
@@ -3670,7 +3670,7 @@ void yahoo_get_yab(int id)
@@ -3682,7 +3682,7 @@ void yahoo_get_yab(int id)
yid->yd = yd;
yid->type = YAHOO_CONNECTION_YAB;
@ -197,7 +197,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
snprintf(buff, sizeof(buff), "Y=%s; T=%s",
yd->cookie_y, yd->cookie_t);
@@ -3697,63 +3697,63 @@ void yahoo_set_yab(int id, struct yab *
@@ -3709,63 +3709,63 @@ void yahoo_set_yab(int id, struct yab *
yid->type = YAHOO_CONNECTION_YAB;
yid->yd = yd;
@ -281,7 +281,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
snprintf(buff, sizeof(buff), "Y=%s; T=%s",
yd->cookie_y, yd->cookie_t);
@@ -4124,9 +4124,9 @@ void yahoo_get_chatrooms(int id, int cha
@@ -4136,9 +4136,9 @@ void yahoo_get_chatrooms(int id, int cha
yid->type = YAHOO_CONNECTION_CHATCAT;
if (chatroomid == 0) {
@ -293,7 +293,7 @@ $OpenBSD: patch-protocols_yahoo_libyahoo2_c,v 1.2 2004/07/01 16:11:59 naddy Exp
}
snprintf(buff, sizeof(buff), "Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
@@ -4361,7 +4361,7 @@ static void yahoo_search_internal(int id
@@ -4373,7 +4373,7 @@ static void yahoo_search_internal(int id
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.1 2004/06/20 16:27:49 naddy Exp $
--- protocols/yahoo/yahoo.c.orig 2004-05-11 21:43:50.000000000 +1000
+++ protocols/yahoo/yahoo.c 2004-06-09 20:27:32.000000000 +1000
@@ -350,8 +350,11 @@ static int byahoo_chat_open( struct gaim
$OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- protocols/yahoo/yahoo.c.orig Thu Sep 9 22:06:54 2004
+++ protocols/yahoo/yahoo.c Thu Oct 14 15:43:35 2004
@@ -360,8 +360,11 @@ static int byahoo_chat_open( struct gaim
char *roomname;
YList *members;
@ -15,7 +15,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
c = serv_got_joined_chat( gc, ++byahoo_chat_id, roomname );
add_chat_buddy( c, gc->username );
@@ -503,13 +506,17 @@ void ext_yahoo_login_response( int id, i
@@ -527,13 +530,17 @@ void ext_yahoo_login_response( int id, i
if( url && *url )
{
@ -37,7 +37,7 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
if( yd->logged_in )
@@ -710,7 +717,7 @@ int ext_yahoo_connect(char *host, int po
@@ -736,7 +743,7 @@ int ext_yahoo_connect(char *host, int po
if(!(server = gethostbyname(host))) {
return -1;
}
@ -46,8 +46,8 @@ $OpenBSD: patch-protocols_yahoo_yahoo_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
}
if((servfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -772,7 +779,7 @@ void ext_yahoo_got_conf_invite( int id,
if( g_ascii_strcasecmp( m->data, gc->username ) != 0 )
@@ -799,7 +806,7 @@ void ext_yahoo_got_conf_invite( int id,
if( g_strcasecmp( m->data, gc->username ) != 0 )
add_chat_buddy( inv->c, m->data );
- g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", room, who, msg );

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

@ -1,7 +1,7 @@
$OpenBSD: patch-utils_bitlbeed_c,v 1.1 2004/06/20 16:27:49 naddy Exp $
--- utils/bitlbeed.c.orig 2004-05-15 22:23:20.000000000 +1000
+++ utils/bitlbeed.c 2004-06-09 20:38:47.000000000 +1000
@@ -352,14 +352,14 @@ void log( char *fmt, ... )
$OpenBSD: patch-utils_bitlbeed_c,v 1.2 2004/10/21 14:48:51 naddy Exp $
--- utils/bitlbeed.c.orig Wed Jul 7 23:27:38 2004
+++ utils/bitlbeed.c Thu Oct 14 15:43:35 2004
@@ -408,14 +408,14 @@ void do_log( char *fmt, ... )
memset( line, 0, MAX_LOG_LEN );
tm = time( NULL );