Changes in / [41658da:792a93b]


Ignore:
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • bitlbee.conf

    r41658da r792a93b  
    139139## verification is completely disabled.
    140140##
     141## The location of this file may be different on other distros/OSes. For
     142## example, try /etc/ssl/ca-bundle.pem on OpenSUSE.
     143##
    141144# CAfile = /etc/ssl/certs/ca-certificates.crt
    142145

  • debian/changelog

    r41658da r792a93b  
    1 bitlbee (3.0.4-1) unstable; urgency=low
    2 
    3   * New upstream release.
     1bitlbee (3.0.4+z-2) UNRELEASED; urgency=low
     2
     3  * Removed some version override stuff from Debian build scripts. Instead,
     4    my buildbot now uses dch to generate a changelog entry with the right
     5    version number.
     6
     7 -- Wilmer van der Gaast <wilmer@gaast.net>  Fri, 23 Dec 2011 09:45:55 +0100
     8
     9bitlbee (3.0.4+bzr855-1) unstable; urgency=low
     10
     11  * New upstream release.
     12  * This is not a vanilla 3.0.4 tree but a Bazaar snapshot. The source
     13    release was a few weeks ago by now. There should be no significant
     14    differences.
    415  * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee
    5     instead of a separate package.
    6   * Fixed dependencies of bitlbee-plugin-otr package to not break with
    7     binary MTUs. (Closes: #651612)
     16    instead of a separate package. Not building these for Debian for now
     17    though since python-skype was removed.
    818  * ^B and some other things are stripped in outgoing XMPP stanzas.
    919    (Closes: #507856)
    … …  
    1121    one from bugs.bitlbee.org. I hope that covers it. (Closes: #646369)
    1222  * Closing a few old bugs that were filed against the Debian package
    13     instead of upstream:
     23    instead of/as well as upstream:
    1424    - Joining password-protected MUCs is working for a while already, set
    1525      the password using "chan set". (Closes: #615624)
    … …  
    1828    - identi.ca support is documented. (Closes: #613789)
    1929
    20  -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 11 Dec 2011 16:53:31 +0000
     30 -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 20 Dec 2011 12:46:42 +0100
     31
     32bitlbee (3.0.3-1.1) unstable; urgency=low
     33
     34  * Non-maintainer upload.
     35  * Use the standard ${source:Version} and ${binary:Version} substvars instead
     36    of the custom and broken ${bee:Version} (closes: #651612).
     37
     38 -- Julien Cristau <jcristau@debian.org>  Thu, 15 Dec 2011 20:34:32 +0100
    2139
    2240bitlbee (3.0.3-1) unstable; urgency=low

  • debian/control

    r41658da r792a93b  
    1212Package: bitlbee
    1313Architecture: any
    14 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
     14Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
    1515Conflicts: bitlbee-libpurple
    1616Replaces: bitlbee-libpurple
    … …  
    2222Package: bitlbee-libpurple
    2323Architecture: any
    24 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
     24Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
    2525Conflicts: bitlbee
    2626Replaces: bitlbee
    … …  
    5151Package: bitlbee-dev
    5252Architecture: all
    53 Depends: ${misc:Depends}, bitlbee (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~), bitlbee-common (= ${bee:Version})
     53Depends: ${misc:Depends}, bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
    5454Description: An IRC to other chat networks gateway (dev files)
    5555 This program can be used as an IRC server which forwards everything you
    … …  
    6161Package: bitlbee-plugin-otr
    6262Architecture: any
    63 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~), bitlbee-common (= ${bee:Version})
     63Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
    6464Description: An IRC to other chat networks gateway (OTR plugin)
    6565 This program can be used as an IRC server which forwards everything you
    … …  
    7272Package: bitlbee-plugin-skype
    7373Architecture: any
    74 Depends: ${shlibs:Depends}, ${misc:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~)
     74Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
    7575Recommends: skyped
    7676Description: An IRC to other chat networks gateway (Skype plugin)
    … …  
    8383
    8484Package: skyped
    85 Architecture: any
    86 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7)
     85Architecture: all
     86Depends: ${misc:Depends}, ${shlibs:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7)
    8787Recommends: skype
    8888Description: Daemon to control Skype remotely

  • debian/rules

    r41658da r792a93b  
    88#
    99
    10 # Include the bitlbee-libpurple variant and OTR plugin by default
     10# Include the bitlbee-libpurple variant and OTR plugin by default.
     11# Don't build skype by default since it depends on deleted/non-free
     12# packages. Need to at least get python-skype back into Debian.
    1113BITLBEE_LIBPURPLE ?= 1
    1214BITLBEE_OTR ?= plugin
    13 BITLBEE_SKYPE ?= plugin
     15BITLBEE_SKYPE ?= 0
    1416BITLBEE_CONFIGURE_FLAGS ?=
    1517DEBUG ?= 0
    … …  
    1719ifndef BITLBEE_VERSION
    1820# Want to use the full package version number instead of just the release.
    19 BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
     21BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')\"
    2022endif
    2123
    … …  
    7274        $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
    7375
     76ifneq ($(BITLBEE_SKYPE),0)
    7477        mkdir -p debian/bitlbee-plugin-skype/usr
    7578        mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
    … …  
    7780        mkdir -p debian/skyped/usr/share/man/man1
    7881        mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1
     82endif
    7983
    8084ifeq ($(BITLBEE_LIBPURPLE),1)
    … …  
    106110        dh_installdeb
    107111        dh_shlibdeps
    108 ifdef BITLBEE_VERSION
    109         dh_gencontrol -- -v$(BITLBEE_VERSION)  -Vbee:Version=$(BITLBEE_VERSION)
    110 else
    111         dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+b[0-9]\+$$//')
    112 endif
     112        dh_gencontrol
    113113        dh_md5sums
    114114        dh_builddeb

  • doc/user-guide/commands.xml

    r41658da r792a93b  
    15021502
    15031503                        <para>
    1504                                 Please note that no certificate verification is performed when the <emphasis>ssl</emphasis> setting is used, or when the CAfile setting in bitlbee.conf is not set.
     1504                                Please note that no certificate verification is performed when the <emphasis>ssl</emphasis> setting is used, or when the <emphasis>CAfile</emphasis> setting in <emphasis>bitlbee.conf</emphasis> is not set.
    15051505                        </para>
    15061506                </description>

  • lib/events_glib.c

    r41658da r792a93b  
    7575        b_input_condition gaim_cond = 0;
    7676        gboolean st;
     77       
     78        if (condition & G_IO_NVAL)
     79                return FALSE;
    7780
    7881        if (condition & GAIM_READ_COND)

  • lib/http_client.c

    r41658da r792a93b  
    173173static gboolean http_ssl_connected( gpointer data, int returncode, void *source, b_input_condition cond )
    174174{
    175         //The returncode is not used at the moment.
    176175        struct http_request *req = data;
    177176       

  • protocols/jabber/io.c

    r41658da r792a93b  
    173173        if( st > 0 )
    174174        {
     175                if( jd->flags & JFLAG_MOCK )
     176                        return TRUE;
     177               
    175178                /* Parse. */
    176179                if( xt_feed( jd->xt, buf, st ) < 0 )

  • protocols/jabber/jabber.c

    r41658da r792a93b  
    339339        if( g_strcasecmp( who, JABBER_XMLCONSOLE_HANDLE ) == 0 )
    340340                return jabber_write( ic, message, strlen( message ) );
     341
     342        if( g_strcasecmp( who, JABBER_MOCK_HANDLE ) == 0 )
     343        {
     344                /* Parse. */
     345                if( xt_feed( jd->xt, message, strlen( message ) ) < 0 )
     346                {
     347                        imcb_error( ic, "XML stream error" );
     348                        imc_logout( ic, TRUE );
     349                        return FALSE;
     350                }
     351               
     352                /* Execute all handlers. */
     353                if( !xt_handle( jd->xt, NULL, 1 ) )
     354                {
     355                        /* Don't do anything, the handlers should have
     356                           aborted the connection already. */
     357                        return FALSE;
     358                }
     359        }
    341360       
    342361        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_jid( ic, s + 1 ) )
    … …  
    429448        {
    430449                jd->flags |= JFLAG_XMLCONSOLE;
    431                 imcb_add_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
     450                imcb_add_buddy( ic, who, NULL );
     451                return;
     452        }
     453        else if( g_strcasecmp( who, JABBER_MOCK_HANDLE ) == 0 )
     454        {
     455                jd->flags |= JFLAG_MOCK;
     456                imcb_add_buddy( ic, who, NULL );
    432457                return;
    433458        }
    … …  
    449474                imcb_remove_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
    450475                */
     476                return;
     477        }
     478        else if( g_strcasecmp( who, JABBER_MOCK_HANDLE ) == 0 )
     479        {
     480                jd->flags &= ~JFLAG_MOCK;
    451481                return;
    452482        }

  • protocols/jabber/jabber.h

    r41658da r792a93b  
    4747        JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
    4848        JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
     49        JFLAG_MOCK = 256,               /* If the user added a mock buddy. */
    4950} jabber_flags_t;
    5051
    … …  
    188189
    189190#define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
     191#define JABBER_MOCK_HANDLE "mock"
    190192
    191193/* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the

  • unix.c

    r41658da r792a93b  
    4141#include <pwd.h>
    4242#include <locale.h>
     43#include <grp.h>
    4344
    4445#if defined(OTR_BI) || defined(OTR_PI)
    … …  
    152153                if( pw )
    153154                {
     155                        initgroups( global.conf->user, pw->pw_gid );
    154156                        setgid( pw->pw_gid );
    155157                        setuid( pw->pw_uid );
     158                }
     159                else
     160                {
     161                        log_message( LOGLVL_WARNING, "Failed to look up user %s.", global.conf->user );
    156162                }
    157163        }
Note: See TracChangeset for help on using the changeset viewer.