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

update to version 1.0.3

Browse Source 
from Martynas Venckus <martynas at altroot dot org>
This commit is contained in:
simon 2007-01-14 21:53:01 +00:00
parent 85d0153e13
commit 53e6084bfe
12 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/bitlbee/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.21 2006/12/16 12:22:34 espie Exp $
# $OpenBSD: Makefile,v 1.22 2007/01/14 21:53:01 simon Exp $
COMMENT= "IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo"
DISTNAME= bitlbee-1.0.2
PKGNAME= ${DISTNAME}p0
DISTNAME= bitlbee-1.0.3
CATEGORIES= net
HOMEPAGE= http://bitlbee.org

8
net/bitlbee/distinfo
View File

@ -1,4 +1,4 @@
MD5 (bitlbee-1.0.2.tar.gz) = ead4433fca9444cb61d478f1af2a79dd
RMD160 (bitlbee-1.0.2.tar.gz) = 8d33e5e2635474444bca90d4d35d3b63d556f65d
SHA1 (bitlbee-1.0.2.tar.gz) = dd9658bacf921cfecd3bfa0da0dfb3fa06179c4f
SIZE (bitlbee-1.0.2.tar.gz) = 448459
MD5 (bitlbee-1.0.3.tar.gz) = e46682d54cbd6265dd4436b3b6838d63
RMD160 (bitlbee-1.0.3.tar.gz) = d27c7a9104528402d4d3e2f78b40eda5f6490d72
SHA1 (bitlbee-1.0.3.tar.gz) = 6e4065d8b576a3c11c2e6bb008ea1bdc7b182cd1
SIZE (bitlbee-1.0.3.tar.gz) = 455344

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

@ -1,6 +1,6 @@
$OpenBSD: patch-commands_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- commands.c.orig Sun Apr 2 04:53:38 2006
+++ commands.c Thu Apr 6 23:39:32 2006
$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
@@ -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++ ) {
@ -55,7 +55,7 @@ $OpenBSD: patch-commands_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
unlink( s );
setpassnc( irc, NULL );
@@ -706,21 +707,21 @@ int cmd_blist( irc_t *irc, char **cmd )
@@ -718,21 +719,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 )
{

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

@ -1,6 +1,6 @@
$OpenBSD: patch-irc_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- irc.c.orig Sun Apr 2 04:53:39 2006
+++ irc.c Thu Apr 6 23:42:45 2006
$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
@@ -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 );
@ -31,18 +31,18 @@ $OpenBSD: patch-irc_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
cmd[1] = irc->mynick;
for( i = 0; i < strlen( cmd[2] ); i ++ )
@@ -709,8 +709,8 @@ int irc_exec( irc_t *irc, char **cmd )
* cares?
*/
@@ -708,8 +708,8 @@ int irc_exec( irc_t *irc, char **cmd )
if( lenleft < 0 )
break;
- strcat( buff, u->nick );
- strcat( buff, " " );
+ strlcat( buff, u->nick, sizeof(buff) );
+ strlcat( buff, " ", sizeof(buff) );
}
- strcat( buff, u->nick );
- strcat( buff, " " );
+ strlcat( buff, u->nick, sizeof(buff) );
+ strlcat( buff, " ", sizeof(buff) );
}
}
@@ -861,7 +861,7 @@ void irc_reply( irc_t *irc, int code, ch
if( next )
@@ -869,7 +869,7 @@ void irc_reply( irc_t *irc, int code, ch
va_list params;
va_start( params, format );
@ -51,7 +51,7 @@ $OpenBSD: patch-irc_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
va_end( params );
irc_write( irc, ":%s %03d %s %s", irc->myhost, code, irc->nick?irc->nick:"*", text );
@@ -915,14 +915,14 @@ void irc_vawrite( irc_t *irc, char *form
@@ -923,14 +923,14 @@ void irc_vawrite( irc_t *irc, char *form
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.3 2006/04/11 15:11:33 naddy Exp $
}
else
irc->sendbuffer = g_strdup(line);
@@ -992,7 +992,7 @@ void irc_names( irc_t *irc, char *channe
@@ -1000,7 +1000,7 @@ void irc_names( irc_t *irc, char *channe
}
else if( !u->gc )
{
@ -80,7 +80,7 @@ $OpenBSD: patch-irc_c,v 1.3 2006/04/11 15:11:33 naddy 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 = "@";
@@ -1112,15 +1112,19 @@ void irc_motd( irc_t *irc )
@@ -1120,15 +1120,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.3 2006/04/11 15:11:33 naddy Exp $
if( linebuf[len] == 'h' )
add = irc->myhost;
else if( linebuf[len] == 'v' )
@@ -1129,14 +1133,30 @@ void irc_motd( irc_t *irc )
@@ -1137,14 +1141,30 @@ void irc_motd( irc_t *irc )
add = irc->nick;
else
add = "%";
@ -137,7 +137,7 @@ $OpenBSD: patch-irc_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
}
irc_reply( irc, 376, ":End of MOTD" );
close( fd );
@@ -1467,8 +1487,8 @@ int buddy_send_handler( irc_t *irc, user
@@ -1475,8 +1495,8 @@ int buddy_send_handler( irc_t *irc, user
u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_jabber_jabber_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- protocols/jabber/jabber.c.orig Sun Apr 2 04:53:39 2006
+++ protocols/jabber/jabber.c Thu Apr 6 23:39:32 2006
$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
@@ -285,7 +285,7 @@ static char *gjab_getsid(gjconn gjc)
static char *gjab_getid(gjconn gjc)
@ -44,7 +44,7 @@ $OpenBSD: patch-protocols_jabber_jabber_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
xmlnode_put_attrib(querytag, "seconds", idle_time);
gjab_send(gjc, x);
@@ -2132,7 +2132,7 @@ static xmlnode insert_tag_to_parent_tag(
@@ -2134,7 +2134,7 @@ static xmlnode insert_tag_to_parent_tag(
/*
* 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.2 2006/04/11 15:11:33 naddy Exp $
--- protocols/msn/msn_util.c.orig Sun Apr 2 04:53:39 2006
+++ protocols/msn/msn_util.c Thu Apr 6 23:39:32 2006
@@ -69,9 +69,12 @@ int msn_buddy_list_add( struct gaim_conn
$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
if( g_strcasecmp( l->data, who ) == 0 )
return( 1 );

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

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_msn_sb_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
--- protocols/msn/sb.c.orig Sun Apr 2 04:53:40 2006
+++ protocols/msn/sb.c Thu Apr 6 23:39:32 2006
$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
if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
@ -15,7 +15,7 @@ $OpenBSD: patch-protocols_msn_sb_c,v 1.2 2006/04/11 15:11:33 naddy Exp $
for( j = 0; text[j]; j ++ )
{
if( text[j] == '\n' )
@@ -630,7 +631,7 @@ static int msn_sb_message( gpointer data
@@ -632,7 +633,7 @@ static int msn_sb_message( gpointer data
}
else
{

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

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_nogaim_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- protocols/nogaim.c.orig Sun Apr 2 04:53:40 2006
+++ protocols/nogaim.c Thu Apr 6 23:39:32 2006
$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 *
/* Buddy seems to exist already. Let's ignore this request then... */
}
@ -12,7 +12,7 @@ $OpenBSD: patch-protocols_nogaim_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
u = user_add( gc->irc, nick );
@@ -469,8 +469,8 @@ struct buddy *find_buddy( struct gaim_co
@@ -476,8 +476,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.3 2006/04/11 15:11:33 naddy Exp $
b->present = u->online;
b->gc = u->gc;
@@ -778,8 +778,11 @@ struct conversation *serv_got_joined_cha
@@ -817,8 +817,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.3 2006/04/11 15:11:33 naddy Exp $
c->channel = g_strdup( s );
g_free( s );
@@ -955,7 +958,7 @@ char *set_eval_away_devoice( irc_t *irc,
@@ -994,7 +997,7 @@ char *set_eval_away_devoice( irc_t *irc,
count = 0;
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-protocols_oscar_oscar_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/oscar.c.orig Sun Apr 2 04:53:40 2006
+++ protocols/oscar/oscar.c Thu Apr 6 23:39:32 2006
$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
tmp[j++] = x[i];
continue;
@ -19,7 +19,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
do_error_dialog(sess->aux_data, buf, _("Chat Error!"));
} else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
if (odata->cnpa > 0)
@@ -1361,7 +1361,7 @@ static int gaim_parse_msgerr(aim_session
@@ -1362,7 +1362,7 @@ static int gaim_parse_msgerr(aim_session
destn = va_arg(ap, char *);
va_end(ap);
@ -28,7 +28,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
do_error_dialog(sess->aux_data, buf, _("Gaim - Error"));
@@ -1379,7 +1379,7 @@ static int gaim_parse_locerr(aim_session
@@ -1380,7 +1380,7 @@ static int gaim_parse_locerr(aim_session
destn = va_arg(ap, char *);
va_end(ap);
@ -37,7 +37,7 @@ $OpenBSD: patch-protocols_oscar_oscar_c,v 1.3 2006/04/11 15:11:33 naddy Exp $
(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
do_error_dialog(sess->aux_data, buf, _("Gaim - Error"));
@@ -2382,7 +2382,7 @@ static char *oscar_encoding_to_utf8(char
@@ -2383,7 +2383,7 @@ static char *oscar_encoding_to_utf8(char
* 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_service_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-protocols_oscar_service_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- protocols/oscar/service.c.orig Sun Apr 2 04:53:40 2006
+++ protocols/oscar/service.c Thu Apr 6 23:39:32 2006
@@ -936,7 +936,7 @@ int general_modfirst(aim_session_t *sess
$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
mod->toolid = 0x0110;
mod->toolversion = 0x0629;
mod->flags = 0;

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

@ -1,6 +1,6 @@
$OpenBSD: patch-set_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- set.c.orig Fri Nov 18 11:17:04 2005
+++ set.c Sun Jan 29 12:30:04 2006
$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
{
while( s->next ) s = s->next;
@ -31,7 +31,7 @@ $OpenBSD: patch-set_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
return( set_setstr( irc, key, s ) );
}
@@ -179,12 +185,16 @@ char *set_eval_bool( irc_t *irc, set_t *
@@ -183,12 +189,16 @@ char *set_eval_bool( irc_t *irc, set_t *
char *set_eval_to_char( irc_t *irc, set_t *set, char *value )
{
@ -51,7 +51,7 @@ $OpenBSD: patch-set_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
return( s );
}
@@ -197,7 +207,7 @@ char *set_eval_ops( irc_t *irc, set_t *s
@@ -201,7 +211,7 @@ char *set_eval_ops( irc_t *irc, set_t *s
irc->channel, "+o-o", irc->nick, irc->mynick );
return( value );
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-util_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
--- util.c.orig Sun Apr 2 04:53:41 2006
+++ util.c Thu Apr 6 23:39:32 2006
$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
@@ -43,14 +43,15 @@
void strip_linefeed(gchar *text)
{
@ -97,3 +97,12 @@ $OpenBSD: patch-util_c,v 1.1 2006/04/11 15:11:33 naddy Exp $
j += 2;
}
else
@@ -420,7 +421,7 @@ signed int do_iconv( char *from_cs, char
iconv_t cd;
size_t res;
size_t inbytesleft, outbytesleft;
- char *inbuf = src;
+ const char *inbuf = src;
char *outbuf = dst;
cd = iconv_open( to_cs, from_cs );