Changeset b006464


Ignore:
Timestamp:
2012-11-17T23:51:21Z (7 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5aa96fc8
Parents:
d1356cb (diff), e1d3f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline.

Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • configure

    rd1356cb rb006464  
    9191
    9292--events=...    Event handler (glib, libevent)          $events
    93 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
     93--ssl=...       SSL library to use (gnutls, nss, openssl, auto)
    9494                                                        $ssl
    9595
     
    434434       
    435435        ret=1
    436 elif [ "$ssl" = "bogus" ]; then
    437         echo
    438         echo 'Using bogus SSL code. This means some features will not work properly.'
    439        
    440         ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
    441         if [ "$msn" = "1" -o "$yahoo" = "1" ]; then
    442                 echo
    443                 echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'
    444                 msn=0
    445                 yahoo=0
    446         fi
    447        
    448         ret=1
    449436else
    450437        echo
     
    457444        echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
    458445        echo '       Please note that this script doesn'\''t have detection code for OpenSSL,'
    459         echo '       so if you want to use that, you have to select it by hand. If you don'\''t'
    460         echo '       need SSL support, you can select the "bogus" SSL library. (--ssl=bogus)'
     446        echo '       so if you want to use that, you have to select it by hand.'
    461447       
    462448        exit 1
  • debian/changelog

    rd1356cb rb006464  
     1bitlbee (3.0.6-2) UNRELEASED; urgency=low
     2
     3  * Depend on gnutls-dev instead of libgnutls-dev. (Closes: #691766)
     4  * Also, drop nss dependency. GnuTLS is supported officially, the rest is
     5    use-at-your-own-risk (so compile it yourself).
     6
     7 -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 30 Oct 2012 23:25:56 +0000
     8
    19bitlbee (3.0.6-1) unstable; urgency=low
    210
  • debian/control

    rd1356cb rb006464  
    55Uploaders: Jelmer Vernooij <jelmer@samba.org>
    66Standards-Version: 3.9.1
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, gnutls-dev | libgnutls-dev, po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
  • debian/copyright

    rd1356cb rb006464  
    55
    66Authors: Wilmer van der Gaast, Sjoerd Hemminga, Jelmer Vernooij,
    7          Maurits Dijkstra and others.
     7         Maurits Dijkstra, Geert Mulders, Miklos Vajna and others.
    88
    99Mainly Copyright 2002-2012 Wilmer van der Gaast.
  • doc/AUTHORS

    rd1356cb rb006464  
    1 Current developers:
     1Core team:
    22
    33Wilmer van der Gaast <wilmer@gaast.net>
    44        Main developer
     5
     6
     7Other contributors:
     8
     9Miklos Vajna <vmiklos@frugalware.org>
     10        Skype module
     11
     12pesco <pesco@khjk.org>
     13        OTR support
     14
     15
     16Retired developers:
     17
     18Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl>
     19        NickServ, documentation
    520
    621Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org>
     
    1025        Daemon dude, plus some other stuff
    1126
     27Geert Mulders <g.c.w.m.mulders@gmail.com>
     28        Initial version of the Twitter module
    1229
    13 Retired developer:
    14 
    15 Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl>
    16         NickServ, documentation
    17 
    18 The development team wishes to thank Sjoerd for his contributions to the
    19 Bee.
     30ulim <a.sporto+bee@gmail.com>
     31Marijn Kruisselbrink
     32        File transfer support
  • doc/bitlbee.8

    rd1356cb rb006464  
    114114.PP
    115115 Wilmer van der Gaast <wilmer@gaast.net>
    116 .BR
    117  Jelmer Vernooij <jelmer@vernstok.nl>
    118 .BR
    119  Maurits Dijkstra <mauritsd@xs4all.nl>
  • doc/user-guide/help.xml

    rd1356cb rb006464  
    2626
    2727<para>
    28 BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
     28Some more help can be found on <ulink link="http://wiki.bitlbee.org/">http://wiki.bitlbee.org/</ulink>. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
    2929</para>
    3030
  • lib/ssl_gnutls.c

    rd1356cb rb006464  
    8585                gnutls_certificate_set_x509_trust_file( xcred, global.conf->cafile, GNUTLS_X509_FMT_PEM );
    8686               
    87                 /* Not needed in GnuTLS 2.11+ but we support older versions for now. */
    88                 gnutls_certificate_set_verify_flags( xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT );
     87                /* Not needed in GnuTLS 2.11+ (enabled by default there) so
     88                   don't do it (resets possible other defaults). */
     89                if( !gnutls_check_version( "2.11" ) )
     90                        gnutls_certificate_set_verify_flags( xcred, GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT );
    8991        }
    9092        initialized = TRUE;
     
    108110        struct scd *conn = g_new0( struct scd, 1 );
    109111       
    110         conn->fd = proxy_connect( host, port, ssl_connected, conn );
    111112        conn->func = func;
    112113        conn->data = data;
     
    114115        conn->hostname = g_strdup( host );
    115116        conn->verify = verify && global.conf->cafile;
     117        conn->fd = proxy_connect( host, port, ssl_connected, conn );
    116118       
    117119        if( conn->fd < 0 )
  • motd.txt

    rd1356cb rb006464  
    1414The developers of the Bee hope you have a buzzing time.
    1515
    16 * BitlBee development team: wilmer, jelmer, Maurits
     16* BitlBee development team.
    1717 
    1818... Buzzing, haha, get it?
  • protocols/jabber/iq.c

    rd1356cb rb006464  
    128128                                                   XMLNS_MUC,
    129129                                                   XMLNS_PING,
     130                                                   XMLNS_RECEIPTS,
    130131                                                   XMLNS_SI,
    131132                                                   XMLNS_BYTESTREAMS,
  • protocols/jabber/jabber.c

    rd1356cb rb006464  
    231231        if( set_getbool( &acc->set, "ssl" ) )
    232232        {
    233                 jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), FALSE, jabber_connected_ssl, ic );
     233                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), set_getbool( &acc->set, "tls_verify" ), jabber_connected_ssl, ic );
    234234                jd->fd = jd->ssl ? ssl_getfd( jd->ssl ) : -1;
    235235        }
  • protocols/jabber/jabber.h

    rd1356cb rb006464  
    227227#define XMLNS_TIME         "urn:xmpp:time"                                       /* XEP-0202 */
    228228#define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
     229#define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
    229230#define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
    230231#define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
  • protocols/jabber/message.c

    rd1356cb rb006464  
    2929        char *from = xt_find_attr( node, "from" );
    3030        char *type = xt_find_attr( node, "type" );
     31        char *id = xt_find_attr( node, "id" );
    3132        struct xt_node *body = xt_find_node( node->children, "body" ), *c;
     33        struct xt_node *request = xt_find_node( node->children, "request" );
    3234        struct jabber_buddy *bud = NULL;
    3335        char *s, *room = NULL, *reason = NULL;
     
    3537        if( !from )
    3638                return XT_HANDLED; /* Consider this packet corrupted. */
     39
     40        if( request && id )
     41        {
     42                /* Send a message receipt (XEP-0184), looking like this:
     43                 * <message
     44                 *  from='kingrichard@royalty.england.lit/throne'
     45                 *  id='bi29sg183b4v'
     46                 *  to='northumberland@shakespeare.lit/westminster'>
     47                 *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
     48                 * </message> */
     49                struct xt_node *received, *receipt;
     50               
     51                received = xt_new_node( "received", NULL, NULL );
     52                xt_add_attr( received, "xmlns", XMLNS_RECEIPTS );
     53                xt_add_attr( received, "id", id );
     54                receipt = jabber_make_packet( "message", NULL, from, received );
     55
     56                jabber_write_packet( ic, receipt );
     57                xt_free_node( receipt );
     58        }
    3759       
    3860        bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT );
  • protocols/nogaim.h

    rd1356cb rb006464  
    9090        int permdeny;
    9191       
    92         char displayname[128];
    9392        char *away;
    94        
    95         int evil;
    9693       
    9794        /* BitlBee */
     
    129126        char show[BUDDY_ALIAS_MAXLEN];
    130127        int present;
    131         int evil;
    132128        time_t signon;
    133129        time_t idle;
  • protocols/oscar/oscar.c

    rd1356cb rb006464  
    946946                        g_hash_table_insert(od->ips, uin, (gpointer) (long) info->icqinfo.ipaddr);
    947947        }
    948 
    949         if (!aim_sncmp(ic->acc->user, info->sn))
    950                 g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
    951948
    952949        tmp = normalize(info->sn);
     
    15361533
    15371534static int gaim_selfinfo(aim_session_t *sess, aim_frame_t *fr, ...) {
    1538         va_list ap;
    1539         aim_userinfo_t *info;
    1540         struct im_connection *ic = sess->aux_data;
    1541 
    1542         va_start(ap, fr);
    1543         info = va_arg(ap, aim_userinfo_t *);
    1544         va_end(ap);
    1545 
    1546         ic->evil = info->warnlevel/10;
    1547         /* ic->correction_time = (info->onlinesince - ic->login_time); */
    1548 
    15491535        return 1;
    15501536}
Note: See TracChangeset for help on using the changeset viewer.