[csw-devel] SF.net SVN: gar:[10705] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Aug 6 16:42:12 CEST 2010
Revision: 10705
http://gar.svn.sourceforge.net/gar/?rev=10705&view=rev
Author: dmichelsen
Date: 2010-08-06 14:42:11 +0000 (Fri, 06 Aug 2010)
Log Message:
-----------
bitlbee: Initial commit
Added Paths:
-----------
csw/mgar/pkg/bitlbee/
csw/mgar/pkg/bitlbee/branches/
csw/mgar/pkg/bitlbee/tags/
csw/mgar/pkg/bitlbee/trunk/
csw/mgar/pkg/bitlbee/trunk/Makefile
csw/mgar/pkg/bitlbee/trunk/checksums
csw/mgar/pkg/bitlbee/trunk/files/
csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch
csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch
csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch
csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch
csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch
csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch
csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch
Property changes on: csw/mgar/pkg/bitlbee/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/bitlbee/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/Makefile 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,68 @@
+# $Id$
+GARNAME = bitlbee
+GARVERSION = 1.2.8
+CATEGORIES = apps
+
+DESCRIPTION = An IRC to other chat networks gateway
+define BLURB
+ BitlBee brings IM (instant messaging) to IRC clients. It's a great solution for people who have an
+ IRC client running all the time and don't want to run an additional MSN/AIM/whatever client.
+ BitlBee currently supports the following IM networks/protocols: XMPP/Jabber (including Google Talk),
+ MSN Messenger, Yahoo! Messenger, AIM and ICQ.
+endef
+
+MASTER_SITES = http://get.bitlbee.org/src/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+
+PATCHFILES = 0001-Do-not-use-gcc-specific-Wall.patch
+PATCHFILES += 0002-Use-putenv-instead-of-setenv.patch
+PATCHFILES += 0003-Remove-more-GCC-specific-Wall.patch
+PATCHFILES += 0004-Use-inttypes.h-instead-of-stdint.h.patch
+PATCHFILES += 0005-Do-not-return-values-in-void-functions-and-make-seco.patch
+PATCHFILES += 0006-Remove-definition-on-Solaris-confusing-includes.patch
+
+# This must be patched in at this place as the includes of the local dirs must come before
+# the one we set for OpenCSW
+PATCHFILES += 0007-Honour-CPPFLAGS.patch
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# Build mechanism ignores CPPFLAGS
+# EXTRA_CFLAGS = $(CPPFLAGS)
+
+BUILD_DEP_PKGS = CSWossldevel CSWlibevent-devel CSWggettext CSWglib2devel
+RUNTIME_DEP_PKGS = CSWosslrt CSWlibevent CSWggettextrt CSWglib2
+
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
+
+# bash configure --prefix=/opt/csw --ssl=openssl --events=libevent
+CONFIGURE_SCRIPTS = custom
+CONFIGURE_ARGS = --prefix=$(prefix)
+CONFIGURE_ARGS += --etcdir=$(sysconfdir)
+CONFIGURE_ARGS += --pidfile=/var/run/bitlbee.pid
+CONFIGURE_ARGS += --config=$(localstatedir)/bitlbee/
+CONFIGURE_ARGS += --ipcsocket=/var/run/bitlbee.sock
+CONFIGURE_ARGS += --ssl=openssl --events=libevent
+
+# Critical check.h is missing on Solaris
+SKIPTEST ?= 1
+TEST_TARGET = check
+
+PRESERVECONF = $(sysconfdir)/bitlbee.conf
+
+include gar/category.mk
+
+configure-custom:
+ @echo " ==> Running configure in $*"
+ cd $(WORKSRC) && $(CONFIGURE_ENV) bash ./configure $(CONFIGURE_ARGS)
+ @$(MAKECOOKIE)
+
+# Make sure the right install is in place
+install-%/Makefile: PATH:=/usr/ucb:$(PATH)
+
+post-install-modulated:
+ ginstall -d $(DESTDIR)$(sysconfdir)
+ ginstall $(WORKSRC)/bitlbee.conf $(DESTDIR)$(sysconfdir)/bitlbee.conf.CSW
+ @$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/bitlbee/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/bitlbee/trunk/checksums
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/checksums (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/checksums 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,8 @@
+86455864950f3515af0aa3139261116d 0001-Do-not-use-gcc-specific-Wall.patch
+eb620e3a4a5039257e82e5b79b11a53e 0002-Use-putenv-instead-of-setenv.patch
+35de44f17737a50ef0a76116244eae9e 0003-Remove-more-GCC-specific-Wall.patch
+16477a0ba0a265d4d36bfbed00a5018d 0004-Use-inttypes.h-instead-of-stdint.h.patch
+bbeb1ac0c41643a7f0a90e81a7cc0f18 0005-Do-not-return-values-in-void-functions-and-make-seco.patch
+a019ebad5677f5f85a4c18e3ad584bb0 0006-Remove-definition-on-Solaris-confusing-includes.patch
+f370d257f076fbd269edbff912d281d1 0007-Honour-CPPFLAGS.patch
+e1fbbd9d96ec7c2377b1b286689c1b83 bitlbee-1.2.8.tar.gz
Added: csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,37 @@
+From 7069c4750ecf45a92810d9610ee040206b8afc41 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 14:49:34 +0200
+Subject: [PATCH 1/6] Do not use gcc-specific -Wall
+
+---
+ Makefile | 1 -
+ lib/Makefile | 1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 15db509..fd49aef 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,7 +25,6 @@ endif
+
+ # Expansion of variables
+ subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
+-CFLAGS += -Wall
+
+ all: $(OUTFILE)
+ $(MAKE) -C doc
+diff --git a/lib/Makefile b/lib/Makefile
+index 441634c..d1149b0 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -11,7 +11,6 @@
+ # [SH] Program variables
+ objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+
+-CFLAGS += -Wall
+ LFLAGS += -r
+
+ # [SH] Phony targets
+--
+1.7.1
+
Added: csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,49 @@
+From c876a8c9db773cccaf4da87a7a30d95bff0e42d9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 15:32:10 +0200
+Subject: [PATCH 2/6] Use putenv instead of setenv
+
+---
+ conf.c | 6 ++++++
+ unix.c | 6 ++++++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/conf.c b/conf.c
+index 337d0cf..21802b8 100644
+--- a/conf.c
++++ b/conf.c
+@@ -159,7 +159,13 @@ conf_t *conf_load( int argc, char *argv[] )
+ /* Backward compatibility; older BitlBees passed this
+ info using a command-line flag. Allow people to
+ upgrade from such a version for now. */
++#if(__sun)
++ char dummy[100];
++ g_snprintf( dummy, sizeof( dummy ), "_BITLBEE_RESTART_STATE=%s", optarg );
++ putenv( dummy );
++#else
+ setenv( "_BITLBEE_RESTART_STATE", optarg, 0 );
++#endif
+ }
+ else if( opt == 'u' )
+ {
+diff --git a/unix.c b/unix.c
+index d58395a..fbf64ef 100644
+--- a/unix.c
++++ b/unix.c
+@@ -155,7 +155,13 @@ int main( int argc, char *argv[] )
+
+ chdir( old_cwd );
+
++#if(__sun)
++ char dummy[100];
++ g_snprintf( dummy, sizeof( dummy ), "_BITLBEE_RESTART_STATE=%s", fn );
++ putenv( dummy );
++#else
+ setenv( "_BITLBEE_RESTART_STATE", fn, 1 );
++#endif
+ g_free( fn );
+
+ close( global.listen_socket );
+--
+1.7.1
+
Added: csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,90 @@
+From cdcf79c13688a644aa23d8421a43f93f00386d69 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 15:33:32 +0200
+Subject: [PATCH 3/6] Remove more GCC specific -Wall
+
+---
+ protocols/Makefile | 1 -
+ protocols/jabber/Makefile | 1 -
+ protocols/msn/Makefile | 1 -
+ protocols/oscar/Makefile | 1 -
+ protocols/twitter/Makefile | 1 -
+ protocols/yahoo/Makefile | 2 +-
+ 6 files changed, 1 insertions(+), 6 deletions(-)
+
+diff --git a/protocols/Makefile b/protocols/Makefile
+index 18d79e8..b360808 100644
+--- a/protocols/Makefile
++++ b/protocols/Makefile
+@@ -20,7 +20,6 @@ subdirobjs = $(PROTOOBJS)
+
+ # Expansion of variables
+ subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
+-CFLAGS += -Wall
+ LFLAGS += -r
+
+ # [SH] Phony targets
+diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile
+index e7a505b..f41e616 100644
+--- a/protocols/jabber/Makefile
++++ b/protocols/jabber/Makefile
+@@ -11,7 +11,6 @@
+ # [SH] Program variables
+ objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
+
+-CFLAGS += -Wall
+ LFLAGS += -r
+
+ # [SH] Phony targets
+diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile
+index 6a58861..4089eda 100644
+--- a/protocols/msn/Makefile
++++ b/protocols/msn/Makefile
+@@ -11,7 +11,6 @@
+ # [SH] Program variables
+ objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+
+-CFLAGS += -Wall
+ LFLAGS += -r
+
+ # [SH] Phony targets
+diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile
+index 2792f22..5e9307d 100644
+--- a/protocols/oscar/Makefile
++++ b/protocols/oscar/Makefile
+@@ -11,7 +11,6 @@
+ # [SH] Program variables
+ objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
+
+-CFLAGS += -Wall
+ LFLAGS += -r
+
+ # [SH] Phony targets
+diff --git a/protocols/twitter/Makefile b/protocols/twitter/Makefile
+index ca1e469..111ae4b 100644
+--- a/protocols/twitter/Makefile
++++ b/protocols/twitter/Makefile
+@@ -11,7 +11,6 @@
+ # [SH] Program variables
+ objects = twitter.o twitter_http.o twitter_lib.o
+
+-CFLAGS += -Wall
+ LFLAGS += -r
+
+ # [SH] Phony targets
+diff --git a/protocols/yahoo/Makefile b/protocols/yahoo/Makefile
+index b4fe56e..a38a1cb 100644
+--- a/protocols/yahoo/Makefile
++++ b/protocols/yahoo/Makefile
+@@ -11,7 +11,7 @@
+ # [SH] Program variables
+ objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
+
+-CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
++CFLAGS += -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
+ LFLAGS += -r
+
+ # [SH] Phony targets
+--
+1.7.1
+
Added: csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,64 @@
+From 389ee34d25b02a9ad2df1da49d9f6035766f3c45 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 15:34:40 +0200
+Subject: [PATCH 4/6] Use inttypes.h instead of stdint.h
+
+---
+ lib/md5.h | 4 ++++
+ lib/sha1.h | 4 ++++
+ protocols/nogaim.h | 6 ++++++
+ 3 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/lib/md5.h b/lib/md5.h
+index 094507b..3ba2858 100644
+--- a/lib/md5.h
++++ b/lib/md5.h
+@@ -26,7 +26,11 @@
+
+ #include <sys/types.h>
+ #include <gmodule.h>
++#if(__sun)
++#include <inttypes.h>
++#else
+ #include <stdint.h>
++#endif
+
+ typedef uint8_t md5_byte_t;
+ typedef struct MD5Context {
+diff --git a/lib/sha1.h b/lib/sha1.h
+index 368c066..4ef8ac9 100644
+--- a/lib/sha1.h
++++ b/lib/sha1.h
+@@ -23,7 +23,11 @@
+ #ifndef _SHA1_H_
+ #define _SHA1_H_
+
++#if(__sun)
++#include <inttypes.h>
++#else
+ #include <stdint.h>
++#endif
+ #include <gmodule.h>
+
+ #ifndef _SHA_enum_
+diff --git a/protocols/nogaim.h b/protocols/nogaim.h
+index 48a8041..27ef511 100644
+--- a/protocols/nogaim.h
++++ b/protocols/nogaim.h
+@@ -38,7 +38,13 @@
+ #ifndef _NOGAIM_H
+ #define _NOGAIM_H
+
++#if(__sun)
++#include <inttypes.h>
++#else
+ #include <stdint.h>
++#endif
++
++#include "lib/events.h"
+
+ #include "bitlbee.h"
+ #include "account.h"
+--
+1.7.1
+
Added: csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,209 @@
+From 858b58c86e8a1150d7ca3ab3f8ae5c8b83ad5f36 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 15:37:29 +0200
+Subject: [PATCH 5/6] Do not return values in void functions and make second argument in ternary explicit
+
+---
+ irc_commands.c | 3 ++-
+ lib/oauth.c | 2 +-
+ lib/xmltree.c | 3 ++-
+ protocols/jabber/jabber.c | 4 ++--
+ protocols/jabber/message.c | 4 ++--
+ protocols/msn/msn.c | 2 +-
+ protocols/nogaim.c | 13 +++++++------
+ protocols/yahoo/libyahoo2.c | 9 +++++----
+ 8 files changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/irc_commands.c b/irc_commands.c
+index 7a286ce..e1a2201 100644
+--- a/irc_commands.c
++++ b/irc_commands.c
+@@ -38,7 +38,8 @@ static void irc_cmd_pass( irc_t *irc, char **cmd )
+ command last. (Possibly it won't send it at all if it turns
+ out we don't require it, which will break this feature.)
+ Try to identify using the given password. */
+- return root_command( irc, send_cmd );
++ root_command( irc, send_cmd );
++ return;
+ }
+ /* Handling in pre-logged-in state, first see if this server is
+ password-protected: */
+diff --git a/lib/oauth.c b/lib/oauth.c
+index c60a5a5..57dd10f 100644
+--- a/lib/oauth.c
++++ b/lib/oauth.c
+@@ -59,7 +59,7 @@ static char *oauth_sign( const char *method, const char *url,
+ else
+ {
+ g_snprintf( (gchar*) key, HMAC_BLOCK_SIZE + 1, "%s&%s",
+- oi->sp->consumer_secret, oi->token_secret ? : "" );
++ oi->sp->consumer_secret, oi->token_secret ? oi->token_secret : "" );
+ }
+
+ /* Inner part: H(K XOR 0x36, text) */
+diff --git a/lib/xmltree.c b/lib/xmltree.c
+index 31f8ee9..3da6e42 100644
+--- a/lib/xmltree.c
++++ b/lib/xmltree.c
+@@ -214,7 +214,8 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth )
+ return;
+
+ if( node == NULL )
+- return xt_cleanup( xt, xt->root, depth );
++ xt_cleanup( xt, xt->root, depth );
++ return;
+
+ if( node->flags & XT_SEEN && node == xt->root )
+ {
+diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
+index 75351d0..c24d231 100644
+--- a/protocols/jabber/jabber.c
++++ b/protocols/jabber/jabber.c
+@@ -366,7 +366,7 @@ static void jabber_get_info( struct im_connection *ic, char *who )
+ imcb_log( ic, "Buddy %s (%d) information:", bud->full_jid, bud->priority );
+ if( bud->away_state )
+ imcb_log( ic, "Away state: %s", bud->away_state->full_name );
+- imcb_log( ic, "Status message: %s", bud->away_message ? : "(none)" );
++ imcb_log( ic, "Status message: %s", bud->away_message ? bud->away_message : "(none)" );
+
+ bud = bud->next;
+ }
+@@ -381,7 +381,7 @@ static void jabber_set_away( struct im_connection *ic, char *state_txt, char *me
+ /* state_txt == NULL -> Not away.
+ Unknown state -> fall back to the first defined away state. */
+ jd->away_state = state_txt ? jabber_away_state_by_name( state_txt )
+- ? : jabber_away_state_list : NULL;
++ ? jabber_away_state_by_name( state_txt ) : jabber_away_state_list : NULL;
+
+ g_free( jd->away_message );
+ jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL;
+diff --git a/protocols/jabber/message.c b/protocols/jabber/message.c
+index fa915bd..86dd6f5 100644
+--- a/protocols/jabber/message.c
++++ b/protocols/jabber/message.c
+@@ -58,7 +58,7 @@ xt_status jabber_pkt_message( struct xt_node *node, gpointer data )
+ ( inv = xt_find_node( c->children, "invite" ) ) )
+ {
+ room = from;
+- from = xt_find_attr( inv, "from" ) ? : from;
++ from = xt_find_attr( inv, "from" ) ? xt_find_attr( inv, "from" ) : from;
+
+ g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
+ if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 )
+@@ -71,7 +71,7 @@ xt_status jabber_pkt_message( struct xt_node *node, gpointer data )
+ if( bud )
+ {
+ bud->last_msg = time( NULL );
+- from = bud->ext_jid ? : bud->bare_jid;
++ from = bud->ext_jid ? bud->ext_jid : bud->bare_jid;
+ }
+ else
+ *s = 0; /* We need to generate a bare JID now. */
+diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
+index 7dbdb9d..0e7e73c 100644
+--- a/protocols/msn/msn.c
++++ b/protocols/msn/msn.c
+@@ -153,7 +153,7 @@ static void msn_set_away( struct im_connection *ic, char *state, char *message )
+ struct msn_data *md = ic->proto_data;
+
+ if( state )
+- md->away_state = msn_away_state_by_name( state ) ? :
++ md->away_state = msn_away_state_by_name( state ) ? msn_away_state_by_name( state ) :
+ msn_away_state_list + 1;
+ else
+ md->away_state = msn_away_state_list;
+diff --git a/protocols/nogaim.c b/protocols/nogaim.c
+index 2248d11..12940a3 100644
+--- a/protocols/nogaim.c
++++ b/protocols/nogaim.c
+@@ -578,7 +578,7 @@ void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *re
+ realname_ = g_strdup_printf( " (%s)", realname );
+
+ s = g_strdup_printf( "The user %s%s wants to add you to his/her buddy list.",
+- handle, realname_ ?: "" );
++ handle, realname_ ? realname_ : "" );
+
+ g_free( realname_ );
+
+@@ -600,7 +600,8 @@ static void imcb_ask_add_cb_yes( void *data )
+
+ cbd->ic->acc->prpl->add_buddy( cbd->ic, cbd->handle, NULL );
+
+- return imcb_ask_add_cb_no( data );
++ imcb_ask_add_cb_no( data );
++ return;
+ }
+
+ void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
+@@ -971,7 +972,7 @@ void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t fl
+ char *ts = NULL;
+ if( set_getbool( &ic->irc->set, "display_timestamps" ) )
+ ts = format_timestamp( ic->irc, sent_at );
+- irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? : "", wrapped );
++ irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? ts : "", wrapped );
+ g_free( ts );
+ }
+ else
+@@ -1302,17 +1303,17 @@ int imc_away_send_update( struct im_connection *ic )
+ return 0;
+
+ away = set_getstr( &ic->acc->set, "away" ) ?
+- : set_getstr( &ic->irc->set, "away" );
++ set_getstr( &ic->acc->set, "away" ) : set_getstr( &ic->irc->set, "away" );
+ if( away && *away )
+ {
+ GList *m = ic->acc->prpl->away_states( ic );
+ msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
+- away = imc_away_state_find( m, away, &msg ) ? : m->data;
++ away = imc_away_state_find( m, away, &msg ) ? imc_away_state_find( m, away, &msg ) : m->data;
+ }
+ else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE )
+ {
+ away = NULL;
+- msg = set_getstr( &ic->acc->set, "status" ) ?
++ msg = set_getstr( &ic->acc->set, "status" ) ? set_getstr( &ic->acc->set, "status" )
+ : set_getstr( &ic->irc->set, "status" );
+ }
+
+diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c
+index 1bfc2e5..eeab5a1 100644
+--- a/protocols/yahoo/libyahoo2.c
++++ b/protocols/yahoo/libyahoo2.c
+@@ -2366,7 +2366,8 @@ static void yahoo_https_auth_token_finish(struct http_request *req)
+ goto fail;
+ }
+
+- return yahoo_https_auth_init(had);
++ yahoo_https_auth_init(had);
++ return;
+
+ fail:
+ g_free(had->token);
+@@ -4369,7 +4370,7 @@ void yahoo_accept_buddy_ymsg13(int id,const char* me,const char* who){
+ struct yahoo_packet* pkt=NULL;
+ pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
+
+- yahoo_packet_hash(pkt,1,me ?: yd->user);
++ yahoo_packet_hash(pkt,1,me ? me : yd->user);
+ yahoo_packet_hash(pkt,5,who);
+ yahoo_packet_hash(pkt,13,"1");
+ yahoo_packet_hash(pkt,334,"0");
+@@ -4388,13 +4389,13 @@ void yahoo_reject_buddy_ymsg13(int id,const char* me,const char* who,const char*
+ struct yahoo_packet* pkt=NULL;
+ pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
+
+- yahoo_packet_hash(pkt,1,me ?: yd->user);
++ yahoo_packet_hash(pkt,1,me ? me : yd->user);
+ yahoo_packet_hash(pkt,5,who);
+ // yahoo_packet_hash(pkt,241,YAHOO_PROTO_VER);
+ yahoo_packet_hash(pkt,13,"2");
+ yahoo_packet_hash(pkt,334,"0");
+ yahoo_packet_hash(pkt,97,"1");
+- yahoo_packet_hash(pkt,14,msg?:"");
++ yahoo_packet_hash(pkt,14,msg? msg :"");
+
+ yahoo_send_packet(yid, pkt, 0);
+ yahoo_packet_free(pkt);
+--
+1.7.1
+
Added: csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,34 @@
+From 442db668872dfbe469e8b272a86109511f45523f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 15:38:01 +0200
+Subject: [PATCH 6/6] Remove definition on Solaris confusing includes
+
+---
+ protocols/twitter/twitter_lib.c | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c
+index d1b65c2..8e9c5af 100644
+--- a/protocols/twitter/twitter_lib.c
++++ b/protocols/twitter/twitter_lib.c
+@@ -22,7 +22,10 @@
+ ****************************************************************************/
+
+ /* For strptime(): */
++#if(__sun)
++#else
+ #define _XOPEN_SOURCE
++#endif
+
+ #include "twitter_http.h"
+ #include "twitter.h"
+@@ -735,4 +738,4 @@ void twitter_friendships_create_destroy(struct im_connection *ic, char *who, int
+ args[0] = "screen_name";
+ args[1] = who;
+ twitter_http(ic, create ? TWITTER_FRIENDSHIPS_CREATE_URL : TWITTER_FRIENDSHIPS_DESTROY_URL, twitter_http_post, ic, 1, args, 2);
+-}
+\ No newline at end of file
++}
+--
+1.7.1
+
Added: csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch (rev 0)
+++ csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch 2010-08-06 14:42:11 UTC (rev 10705)
@@ -0,0 +1,25 @@
+From 484c67ccecd26bde8992d79a8a2260fa91bfef40 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Aug 2010 16:00:48 +0200
+Subject: [PATCH] Honour CPPFLAGS
+
+---
+ configure | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index 24f60d7..756d144 100755
+--- a/configure
++++ b/configure
+@@ -159,6 +159,8 @@ fi
+ echo CFLAGS=$CFLAGS >> Makefile.settings
+ echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
+
++echo CFLAGS+=$CPPFLAGS >> Makefile.settings
++
+ echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
+
+ if [ -n "$CC" ]; then
+--
+1.7.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list