From 79b83dad82d53832827d57a6be454b3f4091adf9 Mon Sep 17 00:00:00 2001 From: dequis Date: Sun, 8 Jan 2017 20:23:04 -0300 Subject: BitlBee 3.5 --- doc/CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CHANGES b/doc/CHANGES index 6f8095f4..17a75640 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -59,7 +59,7 @@ Version 3.5: for ABI version checking in the future. It's optional for now, but will be enforced later. See the commit log of d28fe1c for details. (jgeboski) -Finished ... 200XX +Finished 8 Jan 2017 Version 3.4.2: - irc: -- cgit v1.2.3 From d17b3e15bdf114b39b6203ba1c545b2a579ff45c Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 24 Jan 2017 22:16:59 +0000 Subject: Remove dead/now unsupported IM protocols from debian/control. --- debian/control | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/control b/debian/control index ff6eee43..6a28cc26 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Conflicts: bitlbee-libpurple Replaces: bitlbee-libpurple Description: IRC to other chat networks gateway (default version) This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber (which includes Google Talk - and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net. + say to people on other chat networks: Jabber (which includes Google + Talk), ICQ, AIM, MSN and Twitter. Package: bitlbee-libpurple Architecture: any @@ -26,8 +26,8 @@ Conflicts: bitlbee Replaces: bitlbee Description: IRC to other chat networks gateway (using libpurple) This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber (which includes Google Talk - and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net. + say to people on other chat networks: Jabber (which includes Google + Talk), ICQ, AIM, MSN and Twitter. . This package contains a version of BitlBee that uses the libpurple instant messaging library instead of built-in code, which adds support for more IM @@ -42,8 +42,8 @@ Depends: ${misc:Depends}, adduser Replaces: bitlbee Description: IRC to other chat networks gateway (common files/docs) This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber (which includes Google Talk - and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net. + say to people on other chat networks: Jabber (which includes Google + Talk), ICQ, AIM, MSN and Twitter. . This package contains common files (mostly documentation) for bitlbee and bitlbee-libpurple. @@ -53,8 +53,8 @@ Architecture: all Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version}) Description: IRC to other chat networks gateway (dev files) This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber (which includes Google Talk - and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net. + say to people on other chat networks: Jabber (which includes Google + Talk), ICQ, AIM, MSN and Twitter. . This package holds development stuff for compiling plug-ins. @@ -63,8 +63,8 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version}) Description: IRC to other chat networks gateway (OTR plugin) This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber (which includes Google Talk - and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net. + say to people on other chat networks: Jabber (which includes Google + Talk), ICQ, AIM, MSN and Twitter. . This package contains a plugin that adds support for Off-The-Record encryption of instant messages. @@ -75,8 +75,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bit Recommends: skyped Description: IRC to other chat networks gateway (Skype plugin) This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber (which includes Google Talk - and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net. + say to people on other chat networks: Jabber (which includes Google + Talk), ICQ, AIM, MSN and Twitter. . This package contains a plugin that adds support for the Skype IM network. You need to download and install the Skype client for this to work. -- cgit v1.2.3 From b8bc39837a21d5adf12d4252b4ba6b30098010db Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 24 Jan 2017 22:27:01 +0000 Subject: Slight changes for Debian 3.5-1 upload. --- debian/NEWS | 2 +- debian/changelog | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/NEWS b/debian/NEWS index e7087d23..b8552fe8 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -bitlbee (3.5-1) UNRELEASED; urgency=medium +bitlbee (3.5-1) unstable; urgency=medium * /etc/default/bitlbee is now deprecated and no longer used. Any local modifications to the following settings won't be automatically migrated: diff --git a/debian/changelog b/debian/changelog index d373358f..ff135807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -bitlbee (3.5-1) UNRELEASED; urgency=medium +bitlbee (3.5-1) unstable; urgency=medium [ Jochen Sprickerhof ] * Drop dependency on net-tools @@ -12,7 +12,10 @@ bitlbee (3.5-1) UNRELEASED; urgency=medium * Remove some mentions of yahoo in control and copyright * Remove outdated stuff from README.debian - -- dequis Mon, 02 Jan 2017 14:25:05 -0300 + [ Wilmer van der Gaast ] + * New upstream release. + + -- Wilmer van der Gaast Tue, 24 Jan 2017 22:21:33 +0000 bitlbee (3.4.2-1) unstable; urgency=medium -- cgit v1.2.3 From b5fb9033d479bba6b22d7d66f7d0ec3e24086d93 Mon Sep 17 00:00:00 2001 From: dequis Date: Thu, 26 Jan 2017 21:44:52 -0300 Subject: debian: Merge changes from 3.4.2-1.1 NMU into 3.5-1 Because apparently not having build-arch is now a build failure, even though lintian only considered it a warning and a "recommended" target --- debian/changelog | 11 +++++++++++ debian/control | 2 +- debian/rules | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ff135807..b5b30f85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +bitlbee (3.5-1.1) UNRELEASED; urgency=medium + + [ Michael Lustfield ] + * Adding build-{arch,indep} targets. (Closes: #821967) + * Added python to build depends. + + [ dequis ] + * Merge changes from 3.4.2-1.1 NMU into 3.5-1 + + -- dequis Thu, 26 Jan 2017 21:39:24 -0300 + bitlbee (3.5-1) unstable; urgency=medium [ Jochen Sprickerhof ] diff --git a/debian/control b/debian/control index 6a28cc26..89a7efb3 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Wilmer van der Gaast Uploaders: Jelmer Vernooij Standards-Version: 3.9.8 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227) +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227), python Homepage: http://www.bitlbee.org/ Vcs-Git: https://github.com/bitlbee/bitlbee Vcs-Browser: https://github.com/bitlbee/bitlbee diff --git a/debian/rules b/debian/rules index b1b3bd5c..5cbc7070 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,9 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed") +# https://bugs.debian.org/821967 +build-indep: binary-indep +build-arch: binary-arch build: build-stamp build-stamp: -- cgit v1.2.3 From eaffd0dbb31861022409e4948558de43883ecf56 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 28 Jan 2017 11:54:45 +0000 Subject: Few more tweaks to integrate 3.4.2-1.1 back into Debian history properly. --- debian/changelog | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5b30f85..9610fbca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,7 @@ -bitlbee (3.5-1.1) UNRELEASED; urgency=medium - - [ Michael Lustfield ] - * Adding build-{arch,indep} targets. (Closes: #821967) - * Added python to build depends. +bitlbee (3.5-1.1) unstable; urgency=medium [ dequis ] - * Merge changes from 3.4.2-1.1 NMU into 3.5-1 + * Merge back changes from 3.4.2-1.1 (Closes: #852897) -- dequis Thu, 26 Jan 2017 21:39:24 -0300 @@ -28,6 +24,14 @@ bitlbee (3.5-1) unstable; urgency=medium -- Wilmer van der Gaast Tue, 24 Jan 2017 22:21:33 +0000 +bitlbee (3.4.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Adding build-{arch,indep} targets. (Closes: #821967) + * Added python to build depends. + + -- Michael Lustfield Mon, 18 Jul 2016 01:02:17 -0700 + bitlbee (3.4.2-1) unstable; urgency=medium [ Jelmer Vernooij ] -- cgit v1.2.3 From 53cb4ae80e54b89efebc7d19f739d17fc3286383 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 28 Jan 2017 22:36:26 +0000 Subject: More troubles because the fix from the Debian bug didn't match the fix actually NMU'd. :-( Now this fix really should work. Third time's the charm after all, innit. --- debian/changelog | 11 +++++++++++ debian/rules | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9610fbca..7c411798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +bitlbee (3.5-2) unstable; urgency=medium + + * TFW you find out the corrected fix diff posted on #821967 was still the + broken one and you end up doing your third upload in a weekend. :-( + Obviously build-* targets shouldn't call into binary-*, as that one + starts requiring root. This broke builds on buildd's. + * Now contains the same fix like 3.4.2-1.1, which as it turns out 3.5-1.1 + did not. (Closes: #853017) + + -- Wilmer van der Gaast Sat, 28 Jan 2017 21:06:27 +0000 + bitlbee (3.5-1.1) unstable; urgency=medium [ dequis ] diff --git a/debian/rules b/debian/rules index 5cbc7070..4699d1c3 100755 --- a/debian/rules +++ b/debian/rules @@ -40,9 +40,11 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed") -# https://bugs.debian.org/821967 -build-indep: binary-indep -build-arch: binary-arch + +# No difference at the build stage so just call main build target. +# (Well indep could be docs-only but we prebuild them plus it's really +# not that much work.) +build-arch build-indep: build build: build-stamp build-stamp: -- cgit v1.2.3 From 30d598ce7cd3f136ee9d7097f39fa9818a272441 Mon Sep 17 00:00:00 2001 From: dequis Date: Sun, 29 Jan 2017 19:40:09 -0300 Subject: purple: Fix crash on ft requests from unknown contacts Followup to 701ab81 (included in 3.5) which was a partial fix which only improved things for non-libpurple file transfers (that is, just jabber) --- protocols/purple/ft.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/protocols/purple/ft.c b/protocols/purple/ft.c index 81fee8d0..79476ebc 100644 --- a/protocols/purple/ft.c +++ b/protocols/purple/ft.c @@ -145,6 +145,10 @@ static gboolean prplcb_xfer_new_send_cb(gpointer data, gint fd, b_input_conditio /* TODO(wilmer): After spreading some more const goodness in BitlBee, remove the evil cast below. */ px->ft = imcb_file_send_start(ic, (char *) who, xfer->filename, xfer->size); + + if (!px->ft) { + return FALSE; + } px->ft->data = px; px->ft->accept = prpl_xfer_accept; -- cgit v1.2.3 From 262a82b875f2a05cdcf2258260c5e8a9e538f405 Mon Sep 17 00:00:00 2001 From: dequis Date: Mon, 30 Jan 2017 17:44:32 -0300 Subject: BitlBee 3.5.1 --- bitlbee.h | 4 ++-- doc/CHANGES | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bitlbee.h b/bitlbee.h index 20bc3284..f0bd68c8 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -35,10 +35,10 @@ extern "C" { #endif #define PACKAGE "BitlBee" -#define BITLBEE_VERSION "3.5" +#define BITLBEE_VERSION "3.5.1" #define VERSION BITLBEE_VERSION #define BITLBEE_VER(a, b, c) (((a) << 16) + ((b) << 8) + (c)) -#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 5, 0) +#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 5, 1) #define BITLBEE_ABI_VERSION_CODE 1 #define MAX_STRING 511 diff --git a/doc/CHANGES b/doc/CHANGES index 17a75640..10c0c3f5 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -3,6 +3,22 @@ found in the git commit logs, for example you can try: https://github.com/bitlbee/bitlbee/commits/master +Version 3.5.1: + +- purple: + * Fix crash on file transfer requests from unknown contacts. This was the + result of an incomplete fix in the previous release and may result in + remote DoS. Read the full security advisory at: + https://bugs.bitlbee.org/ticket/1282 +- After some investigation we decided to reclassify a crash fix from the + previous release as a security issue. Read the full security advisory at: + https://bugs.bitlbee.org/ticket/1281 +- Included help.txt in the release tarball, which was missing in the previous + release and resulted in adding python as a build dependency. The release + tarball of 3.5.1 does not require python. + +Finished 30 Jan 2017 + Version 3.5: - ui: -- cgit v1.2.3