libpurple 32344:e5da7785a265: There really isn't a good section ...
commits at adium.im
commits at adium.im
Tue Sep 25 22:01:38 UTC 2012
details: http://hg.adium.im/libpurple/rev/e5da7785a265
revision: 32344:e5da7785a265
branch: release-2.x.y
author: John Bailey <rekkanoryo at rekkanoryo.org>
date: Mon May 14 03:02:20 2012 +0000
There really isn't a good section to stuff Eion's name in, so this should do.
Subject: libpurple 32345:0aa32fc00dc2: Fix crash when ignoring message from a user not in the room. Fixes #15139
details: http://hg.adium.im/libpurple/rev/0aa32fc00dc2
revision: 32345:0aa32fc00dc2
branch: release-2.x.y
author: Paul Aurich <darkrain42 at pidgin.im>
date: Thu May 31 03:45:21 2012 +0000
Fix crash when ignoring message from a user not in the room. Fixes #15139
Occurs with IRC system messages on-login.
Subject: libpurple 32346:98a6cc751323: Add support for reading GNOME3 proxy settings.
details: http://hg.adium.im/libpurple/rev/98a6cc751323
revision: 32346:98a6cc751323
branch: release-2.x.y
author: Mihai Serban <mihai.serban at gmail.com>
date: Sat Jun 02 02:27:41 2012 +0000
Add support for reading GNOME3 proxy settings.
Patch by Mihai Serban, with some small changes to remove extra
variable parameters.
committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32347:e4d663169108: applied changes from 444dec0882a9950944852a408a50904a458629bf
details: http://hg.adium.im/libpurple/rev/e4d663169108
revision: 32347:e4d663169108
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sat Jun 02 02:30:13 2012 +0000
applied changes from 444dec0882a9950944852a408a50904a458629bf
through 1f233991b11d30d7bd9d1e058e19fe162a9600f3
Apparently, some random servers have decided to send us an annotation
with no name, and the value isn't really self-describing either. Anyway,
this empty name could cause a crash.
Fixes #15126.
Subject: libpurple 32348:3c484eb8725e: msn: Fix build on Windows w/ MSVC (broke in 2.10.4)
details: http://hg.adium.im/libpurple/rev/3c484eb8725e
revision: 32348:3c484eb8725e
branch: release-2.x.y
author: Florian Quèze <florian at instantbird.org>
date: Tue Jun 12 03:37:03 2012 +0000
msn: Fix build on Windows w/ MSVC (broke in 2.10.4)
Merged https://hg.instantbird.org/instantbird/rev/392231064149 from
InstantBird. Thanks, Florian!
committer: Paul Aurich <darkrain42 at pidgin.im>
Subject: libpurple 32349:02ad66f62757: Merge 5b5516d9a5dbbd6e534eba231284bbd1c4c16f57 to fix package_version.h
details: http://hg.adium.im/libpurple/rev/02ad66f62757
revision: 32349:02ad66f62757
branch: release-2.x.y
author: Hg Conversion <devel at pidgin.im>
date: Wed Jun 13 19:30:38 2012 -0400
Merge 5b5516d9a5dbbd6e534eba231284bbd1c4c16f57 to fix package_version.h
Subject: libpurple 32350:28f1ae9ef95c: Merge d58bb79313d0 to convert .hgignore
details: http://hg.adium.im/libpurple/rev/28f1ae9ef95c
revision: 32350:28f1ae9ef95c
branch: release-2.x.y
author: Hg Conversion <devel at pidgin.im>
date: Wed Jun 13 19:33:51 2012 -0400
Merge d58bb79313d0 to convert .hgignore
Subject: libpurple 32351:98c9a8c2daf0: Improve the message that appears in a chat windo when you're disconnected
details: http://hg.adium.im/libpurple/rev/98c9a8c2daf0
revision: 32351:98c9a8c2daf0
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Thu Jun 14 21:47:42 2012 +0100
Improve the message that appears in a chat windo when you're disconnected
Instead of "You will be automatically rejoined in the chat...", now it's
"You will automatically rejoin the chat..."
@@ -7604,7 +7604,7 @@
purple_conversation_get_account(conv) == account
) {
purple_conversation_set_data(conv, "want-to-rejoin", GIN
T_TO_POINTER(TRUE));
purple_conversation_write(conv, NULL, _("The account has
disconnected and you are no "
- "longer in this chat. You will b
e automatically rejoined in the chat when "
+ "longer in this chat. You will a
utomatically rejoin the chat when "
"the account reconnects."),
PURPLE_MESSAGE_SYSTEM, time(NULL));
Subject: libpurple 32352:a5a5365dbaa5: Add some missing .hgignore values needed on windows
details: http://hg.adium.im/libpurple/rev/a5a5365dbaa5
revision: 32352:a5a5365dbaa5
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Thu Jun 14 21:48:21 2012 +0100
Add some missing .hgignore values needed on windows
Subject: libpurple 32353:ded93865ef42: Fix a buffer overflow vulnerability when parsing incoming messages
details: http://hg.adium.im/libpurple/rev/ded93865ef42
revision: 32353:ded93865ef42
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 18:54:06 2012 -0700
Fix a buffer overflow vulnerability when parsing incoming messages
containing inline images. Thanks to Ulf Härnhammar for reporting
this!
Subject: libpurple 32354:b0ac46e6bef2: Commit two updated translations, including what I believe is the first
details: http://hg.adium.im/libpurple/rev/b0ac46e6bef2
revision: 32354:b0ac46e6bef2
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 22:08:07 2012 -0700
Commit two updated translations, including what I believe is the first
Burmese update in 8 years??
Subject: libpurple 32355:ba14a33cadd3: Prepare for release
details: http://hg.adium.im/libpurple/rev/ba14a33cadd3
revision: 32355:ba14a33cadd3
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 22:08:47 2012 -0700
Prepare for release
Subject: libpurple 32356:2cac629e4549: Add a few comments and change version-check to not depend on commit-check
details: http://hg.adium.im/libpurple/rev/2cac629e4549
revision: 32356:2cac629e4549
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 22:47:42 2012 -0700
Add a few comments and change version-check to not depend on commit-check
because I don't see any reason for that
Subject: libpurple 32357:280854ddb8d4: - Slightly better comments
details: http://hg.adium.im/libpurple/rev/280854ddb8d4
revision: 32357:280854ddb8d4
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 22:58:16 2012 -0700
- Slightly better comments
- Always check for a version in ChangeLog.API (not just for major and
minor releases). I think it's clearly if we have a line in ChangeLog.API
for micro releases that says "No Changes"
- Don't check the date in ChangeLog. I find this to be cumbersome because
I often build packages before the date in the release date listed in
the ChangeLog
Subject: libpurple 32358:a3d157700972: Looks like Transifex is using transifex.com now
details: http://hg.adium.im/libpurple/rev/a3d157700972
revision: 32358:a3d157700972
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 23:00:46 2012 -0700
Looks like Transifex is using transifex.com now
Subject: libpurple 32359:d8e716bfd316: Added tag v2.10.5 for changeset a3d157700972
details: http://hg.adium.im/libpurple/rev/d8e716bfd316
revision: 32359:d8e716bfd316
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Mon Jul 02 23:02:14 2012 -0700
Added tag v2.10.5 for changeset a3d157700972
Subject: libpurple 32360:4a49f817e5de: Prep for 2.10.6
details: http://hg.adium.im/libpurple/rev/4a49f817e5de
revision: 32360:4a49f817e5de
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Thu Jul 05 08:38:20 2012 -0700
Prep for 2.10.6
Subject: libpurple 32361:b9810091d39c: Typo fix
details: http://hg.adium.im/libpurple/rev/b9810091d39c
revision: 32361:b9810091d39c
branch: release-2.x.y
author: Kevin Stange <kstange at pidgin.im>
date: Thu Jul 05 21:25:16 2012 -0500
Typo fix
Subject: libpurple 32362:811eadbbda34: This was accidentally commited by John and causes the triple-click bug.
details: http://hg.adium.im/libpurple/rev/811eadbbda34
revision: 32362:811eadbbda34
branch: release-2.x.y
author: Kevin Stange <kstange at pidgin.im>
date: Thu Jul 05 23:24:10 2012 -0500
This was accidentally commited by John and causes the triple-click bug.
I think the reason is, at least in some versions of GTK+, indicating
that we handled the double-click means that the double-click can't be
used for firing activation. In other versions of GTK+, it seems the
treeview looks at each GDK_BUTTON_PRESS separately, and does its own
double-click testing and will still work.
References #11942
Subject: libpurple 32363:bd3d12de856b: ChangeLog update for last commit.
details: http://hg.adium.im/libpurple/rev/bd3d12de856b
revision: 32363:bd3d12de856b
branch: release-2.x.y
author: Kevin Stange <kstange at pidgin.im>
date: Thu Jul 05 23:28:48 2012 -0500
ChangeLog update for last commit.
Subject: libpurple 32364:1729264d0c4f: Specify the component in the changelog!
details: http://hg.adium.im/libpurple/rev/1729264d0c4f
revision: 32364:1729264d0c4f
branch: release-2.x.y
author: Kevin Stange <kstange at pidgin.im>
date: Thu Jul 05 23:30:18 2012 -0500
Specify the component in the changelog!
Subject: libpurple 32365:4992bd90d8ad: I guess I'll release this later today. Is that ok with everyone?
details: http://hg.adium.im/libpurple/rev/4992bd90d8ad
revision: 32365:4992bd90d8ad
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Fri Jul 06 08:05:14 2012 -0700
I guess I'll release this later today. Is that ok with everyone?
Subject: libpurple 32366:4cfe697ea3ae: Added tag v2.10.6 for changeset 4992bd90d8ad
details: http://hg.adium.im/libpurple/rev/4cfe697ea3ae
revision: 32366:4cfe697ea3ae
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Fri Jul 06 08:24:08 2012 -0700
Added tag v2.10.6 for changeset 4992bd90d8ad
Subject: libpurple 32367:a8030d1fde12: AND THERE WAS AS GREAT BUMPING OF VERSION NUMBERS IN VARIOUS FILES
details: http://hg.adium.im/libpurple/rev/a8030d1fde12
revision: 32367:a8030d1fde12
branch: release-2.x.y
author: Mark Doliner <mark at kingant.net>
date: Fri Jul 06 08:37:36 2012 -0700
AND THERE WAS AS GREAT BUMPING OF VERSION NUMBERS IN VARIOUS FILES
Subject: libpurple 32368:aabfa3e0d19e: Update list of ignored files.
details: http://hg.adium.im/libpurple/rev/aabfa3e0d19e
revision: 32368:aabfa3e0d19e
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Thu Jun 14 18:31:26 2012 -0400
Update list of ignored files.
Monotone apparently ignores quite a few files by default, that
Mercurial does not.
Subject: libpurple 32369:cc3ae7790a33: Let's at least try and put something relevant here.
details: http://hg.adium.im/libpurple/rev/cc3ae7790a33
revision: 32369:cc3ae7790a33
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 08 17:59:53 2012 -0400
Let's at least try and put something relevant here.
Subject: libpurple 32370:2527a9bdb5d2: Re-sort translator lists.
details: http://hg.adium.im/libpurple/rev/2527a9bdb5d2
revision: 32370:2527a9bdb5d2
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 08 18:14:19 2012 -0400
Re-sort translator lists.
Subject: libpurple 32371:b88e67391b58: Update German translation
details: http://hg.adium.im/libpurple/rev/b88e67391b58
revision: 32371:b88e67391b58
branch: release-2.x.y
author: Jochen Kemnade <jochenkemnade at web.de>
date: Thu Jul 12 17:37:59 2012 +0200
Update German translation
Subject: libpurple 32372:dbf343cd9e05: Fix a double-free in Yahoo profile/picture code.
details: http://hg.adium.im/libpurple/rev/dbf343cd9e05
revision: 32372:dbf343cd9e05
branch: release-2.x.y
author: Mihai Serban <mihai.serban at gmail.com>
date: Sun Jul 22 04:17:38 2012 -0400
Fix a double-free in Yahoo profile/picture code.
Fixes #15053.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32373:f029e154012d: Fix a crash when a MSN user is removed before its icon is loaded.
details: http://hg.adium.im/libpurple/rev/f029e154012d
revision: 32373:f029e154012d
branch: release-2.x.y
author: Mark Barfield <msb333 at aol.com>
date: Sun Jul 22 02:03:36 2012 -0400
Fix a crash when a MSN user is removed before its icon is loaded.
Fixes #15217.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32374:ddba270a9740: Add previous patch author to COPYRIGHT.
details: http://hg.adium.im/libpurple/rev/ddba270a9740
revision: 32374:ddba270a9740
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 22 03:51:06 2012 -0400
Add previous patch author to COPYRIGHT.
Subject: libpurple 32375:4498909adc2a: It's 2012 now.
details: http://hg.adium.im/libpurple/rev/4498909adc2a
revision: 32375:4498909adc2a
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 22 03:52:16 2012 -0400
It's 2012 now.
Subject: libpurple 32376:6bfa5b87e99f: Fixup READMEs a bit.
details: http://hg.adium.im/libpurple/rev/6bfa5b87e99f
revision: 32376:6bfa5b87e99f
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 22 04:02:53 2012 -0400
Fixup READMEs a bit.
Subject: libpurple 32377:a52fdc5403e8: Remove an outdated line in the man page.
details: http://hg.adium.im/libpurple/rev/a52fdc5403e8
revision: 32377:a52fdc5403e8
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 22 19:00:50 2012 -0400
Remove an outdated line in the man page.
Fixes #14041 (from bobpaul).
Subject: libpurple 32378:f343f7e1a31f: ChangeLog the last couple commits.
details: http://hg.adium.im/libpurple/rev/f343f7e1a31f
revision: 32378:f343f7e1a31f
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Sun Jul 22 19:52:09 2012 -0400
ChangeLog the last couple commits.
Subject: libpurple 32379:db3a62c8006c: Gadu-Gadu: disable avatars support for buddies. Fixes #15226
details: http://hg.adium.im/libpurple/rev/db3a62c8006c
revision: 32379:db3a62c8006c
branch: release-2.x.y
author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
date: Sat Jul 28 19:34:15 2012 +0200
Gadu-Gadu: disable avatars support for buddies. Fixes #15226
Subject: libpurple 32380:4f8d94fe3913: Fix status box icon positioning.
details: http://hg.adium.im/libpurple/rev/4f8d94fe3913
revision: 32380:4f8d94fe3913
branch: release-2.x.y
author: David Michael <fedora.dm0 at gmail.com>
date: Mon Jul 30 00:12:45 2012 -0400
Fix status box icon positioning.
Fixes #15046.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32381:5aada1464bf1: Optimize some pointer accesses.
details: http://hg.adium.im/libpurple/rev/5aada1464bf1
revision: 32381:5aada1464bf1
branch: release-2.x.y
author: David Michael <fedora.dm0 at gmail.com>
date: Sun Jul 29 01:07:51 2012 -0400
Optimize some pointer accesses.
Fixes #15062.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32382:7e266d890064: Remove trailing commas from enums.
details: http://hg.adium.im/libpurple/rev/7e266d890064
revision: 32382:7e266d890064
branch: release-2.x.y
author: David Michael <fedora.dm0 at gmail.com>
date: Sun Jul 29 01:11:54 2012 -0400
Remove trailing commas from enums.
Fixes #15102.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32383:f7b7a6c58ad3: Fix a loop when closing conversation windows with custom conversations.
details: http://hg.adium.im/libpurple/rev/f7b7a6c58ad3
revision: 32383:f7b7a6c58ad3
branch: release-2.x.y
author: David Michael <fedora.dm0 at gmail.com>
date: Sun Jul 29 01:21:26 2012 -0400
Fix a loop when closing conversation windows with custom conversations.
Fixes #15148.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32384:f3069c38804b: Fix typo in libgnt Makefile.am libtool parameters.
details: http://hg.adium.im/libpurple/rev/f3069c38804b
revision: 32384:f3069c38804b
branch: release-2.x.y
author: Brad Smith <brad at comstyle.com>
date: Mon Aug 13 21:02:27 2012 -0400
Fix typo in libgnt Makefile.am libtool parameters.
Subject: libpurple 32385:333351a5424c: Add support for selecting the sndio backends in the VV config plugin.
details: http://hg.adium.im/libpurple/rev/333351a5424c
revision: 32385:333351a5424c
branch: release-2.x.y
author: Brad Smith <brad at comstyle.com>
date: Thu Dec 22 01:27:58 2011 +0000
Add support for selecting the sndio backends in the VV config plugin.
Fixes #14414.
committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32386:ba9ee604d50a: Update sndio audio backend names in vvconfig plugin.
details: http://hg.adium.im/libpurple/rev/ba9ee604d50a
revision: 32386:ba9ee604d50a
branch: release-2.x.y
author: Brad Smith <brad at comstyle.com>
date: Sat Aug 11 19:34:36 2012 -0400
Update sndio audio backend names in vvconfig plugin.
Fixes #15259.
Committer: Elliott Sales de Andrade <qulogic at pidgin.im>
Subject: libpurple 32387:8dd359c4bfdc: Fixup ChangeLog entry.
details: http://hg.adium.im/libpurple/rev/8dd359c4bfdc
revision: 32387:8dd359c4bfdc
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Fri Aug 17 00:20:12 2012 -0400
Fixup ChangeLog entry.
Subject: libpurple 32388:213ea319f7cd: Update silc to 1.1.10 in the win32 build. Refs #15286
details: http://hg.adium.im/libpurple/rev/213ea319f7cd
revision: 32388:213ea319f7cd
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Mon Aug 27 16:09:37 2012 +0100
Update silc to 1.1.10 in the win32 build. Refs #15286
Subject: libpurple 32389:105ed1adbcd1: Fix a silc 1.1.10 packaging issue that I missed in the initial commit
details: http://hg.adium.im/libpurple/rev/105ed1adbcd1
revision: 32389:105ed1adbcd1
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Aug 28 03:48:02 2012 +0100
Fix a silc 1.1.10 packaging issue that I missed in the initial commit
Subject: libpurple 32390:ace2bba864d7: Update NSS to 3.13.6 and NSPR to 4.9.2 in the win32 build. Fixes #15284 Refs #15286
details: http://hg.adium.im/libpurple/rev/ace2bba864d7
revision: 32390:ace2bba864d7
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Aug 28 04:07:22 2012 +0100
Update NSS to 3.13.6 and NSPR to 4.9.2 in the win32 build. Fixes #15284 Refs #15286
Subject: libpurple 32391:3b55f180e38d: Update Cyrus SASL to 2.1.25 in the win32 build. Refs #15286
details: http://hg.adium.im/libpurple/rev/3b55f180e38d
revision: 32391:3b55f180e38d
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Aug 28 05:24:42 2012 +0100
Update Cyrus SASL to 2.1.25 in the win32 build. Refs #15286
Subject: libpurple 32392:aba982dbb801: Fix sizing for the file-chooser image preview.
details: http://hg.adium.im/libpurple/rev/aba982dbb801
revision: 32392:aba982dbb801
branch: release-2.x.y
author: Elliott Sales de Andrade <qulogic at pidgin.im>
date: Tue Aug 28 03:39:53 2012 -0400
Fix sizing for the file-chooser image preview.
Fixes #15282.
Subject: libpurple 32393:d9ebf57cd361: Enable DEP and ASLR flags as well as some other security related compiler flags
details: http://hg.adium.im/libpurple/rev/d9ebf57cd361
revision: 32393:d9ebf57cd361
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Thu Sep 06 04:33:08 2012 +0100
Enable DEP and ASLR flags as well as some other security related compiler flags
for win32 builds. Refs #15290
Thanks goes to Jacob Appelbaum for pointing at the related patch he came up with for pidgin-otr.
Subject: libpurple 32394:3d82cc32b7a2: Use SetProcessDEPPolicy to permanently enable DEP during startup on supported
details: http://hg.adium.im/libpurple/rev/3d82cc32b7a2
revision: 32394:3d82cc32b7a2
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Thu Sep 06 04:38:07 2012 +0100
Use SetProcessDEPPolicy to permanently enable DEP during startup on supported
versions of Windows. Refs #15290
Subject: libpurple 32395:75dbccde9fc7: Enable the GCC Stack-Smashing Protection functionality (-fstack-protector-all)
details: http://hg.adium.im/libpurple/rev/75dbccde9fc7
revision: 32395:75dbccde9fc7
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Thu Sep 06 05:30:17 2012 +0100
Enable the GCC Stack-Smashing Protection functionality (-fstack-protector-all)
Thanks again to Jacob Appelbaum for pointing at his pidgin-otr patch.
Fixes #15290
Subject: libpurple 32396:36b1f6ba0564: Remove the ability to launch Pidgin from the last page of the installer.
details: http://hg.adium.im/libpurple/rev/36b1f6ba0564
revision: 32396:36b1f6ba0564
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Thu Sep 06 05:47:27 2012 +0100
Remove the ability to launch Pidgin from the last page of the installer.
The installer will most likely be run with Admin privileges and we don't want
the Pidgin process to inherit them.
Fixes #12443
Subject: libpurple 32397:6d93866a4a3f: Explictly set the calling conventions for some dynamic functions on win32.
details: http://hg.adium.im/libpurple/rev/6d93866a4a3f
revision: 32397:6d93866a4a3f
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Fri Sep 07 15:06:40 2012 +0100
Explictly set the calling conventions for some dynamic functions on win32.
This fixes issues when building with newer gcc versions (yay).
Subject: libpurple 32398:562961da7c0d: Avoid unnecessary sizeof(char); it must always be 1
details: http://hg.adium.im/libpurple/rev/562961da7c0d
revision: 32398:562961da7c0d
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Mon Sep 10 23:15:35 2012 -0400
Avoid unnecessary sizeof(char); it must always be 1
* If it wasn't always 1, there would be a bug in this (line ~705)
* WideCharToMultiByte returns the size in bytes, not chars, so this was also wrong in that respect.
Subject: libpurple 32399:e576f52a2627: Combine duplicated ReserveFile sections in the win32 installer
details: http://hg.adium.im/libpurple/rev/e576f52a2627
revision: 32399:e576f52a2627
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Mon Sep 10 23:15:37 2012 -0400
Combine duplicated ReserveFile sections in the win32 installer
Subject: libpurple 32400:bd3d53e730ba: Pidgin won't currently work in Windows NT4, so there's no need to have special behavior in the installer.
details: http://hg.adium.im/libpurple/rev/bd3d53e730ba
revision: 32400:bd3d53e730ba
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Mon Sep 10 23:15:37 2012 -0400
Pidgin won't currently work in Windows NT4, so there's no need to have special behavior in the installer.
Subject: libpurple 32401:e56515365c37: Add sha1sum checking to the gtk bundle components that are downloaded
details: http://hg.adium.im/libpurple/rev/e56515365c37
revision: 32401:e56515365c37
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Sep 11 22:04:23 2012 -0400
Add sha1sum checking to the gtk bundle components that are downloaded
Subject: libpurple 32402:722813575d5f: Exclude the Gtk directory in the win32-install-dir from being included in the installer.
details: http://hg.adium.im/libpurple/rev/722813575d5f
revision: 32402:722813575d5f
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Sep 11 23:18:23 2012 -0400
Exclude the Gtk directory in the win32-install-dir from being included in the installer.
Subject: libpurple 32403:d0ec164c8f20: Make sure to generate a fresh zip file for the Gtk bundle.
details: http://hg.adium.im/libpurple/rev/d0ec164c8f20
revision: 32403:d0ec164c8f20
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Sep 18 13:54:15 2012 -0400
Make sure to generate a fresh zip file for the Gtk bundle.
* This shouldn't ever be problematic in real situations, but when testing it's
helpful to make sure nothing old is there.
Subject: libpurple 32404:15591913dd85: Use https to check for updates in the Release Notification plugin. Refs #15276
details: http://hg.adium.im/libpurple/rev/15591913dd85
revision: 32404:15591913dd85
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Tue Sep 18 13:54:16 2012 -0400
Use https to check for updates in the Release Notification plugin. Refs #15276
* The one potential concern with this is that it cripples the functionality if
libpurple doesn't have SSL support, but really if that's the case, then a
number of protocols won't work.
Subject: libpurple 32405:40eb50cbc39d: Add support to the win32 installer to check the sha1sum of the downloaded GTK
details: http://hg.adium.im/libpurple/rev/40eb50cbc39d
revision: 32405:40eb50cbc39d
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Wed Sep 19 22:57:46 2012 -0400
Add support to the win32 installer to check the sha1sum of the downloaded GTK
Bundle and debug symbols. Refs #15277
* To make this worthwhile, the download redirection URL (which also
serves the sha1sums) now uses https.
* This uses a custom NSIS plugin (distributed, along with its source in the
Pidgin installer deps) to do the sha1sum calculation on the downloaded
resources. The plugin is based on the win32 sha1sum implementation by
Werner Koch (http://lists.gnupg.org/pipermail/gnupg-announce/2004q4/000184.html).
Subject: libpurple 32406:95f3a353993a: This is a tamed down version of the original string I proposed on the mailing
details: http://hg.adium.im/libpurple/rev/95f3a353993a
revision: 32406:95f3a353993a
branch: release-2.x.y
author: John Bailey <rekkanoryo at rekkanoryo.org>
date: Sun Sep 23 16:22:11 2012 -0400
This is a tamed down version of the original string I proposed on the mailing
list. I'm not convinced that it's a good idea to search for "oracle" (even
case insensitively) in account names as the sole indicator of whether this
message should appear or not, because we have in the past had Oracle employees
who could not even manage to connect to their internal XMPP service; a check
for an existing account would be entirely unhelpful in this case.
At any rate, this revision introduces a new string (not translatable, per
Daniel's suggestion) to indicate to Oracle employees that they need to contact
their internal helpdesk or IT department for support.
Subject: libpurple 32407:a7dab773e3f6: Update win32 build to sign pidgin.exe and the two installers using MS authenticode
details: http://hg.adium.im/libpurple/rev/a7dab773e3f6
revision: 32407:a7dab773e3f6
branch: release-2.x.y
author: Daniel Atallah <datallah at pidgin.im>
date: Wed Sep 19 22:57:46 2012 -0400
Update win32 build to sign pidgin.exe and the two installers using MS authenticode
* This uses the signcode utility that mono provides.
* https://developer.mozilla.org/en-US/docs/Signing_an_executable_with_Authenticode
* 3 new build variables
** MONO_SIGNCODE - path to mono signcode utility ("signcode" by default)
** SIGNCODE_SPC - path to cert file (undefined by default - define in local.mak)
** SIGNCODE_PVK - path to private key file (undefined by default - define in local.mak)
Subject: libpurple 32408:bbd52f93184e: Implement SASL support for IRC, using Cyrus.
details: http://hg.adium.im/libpurple/rev/bbd52f93184e
revision: 32408:bbd52f93184e
branch: release-2.x.y
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Tue Sep 25 22:58:51 2012 +0200
Implement SASL support for IRC, using Cyrus.
This is compatible with Freenode etc. That means
only PLAIN currently works, as Freenode only
offers PLAIN and DH-BLOWFISH, but we try a number
of others (as we can't query what the server
supports...) in case a server adds them.
Credit goes to Andy Spencer for the original patch.
Fixes #13270
diffs (truncated from 28804 to 1000 lines):
diff -r 3c88b0729083 -r bbd52f93184e .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Tue Sep 25 22:58:51 2012 +0200
@@ -0,0 +1,113 @@
+syntax: regexp
+(.*/)?TAGS$
+(.*/)?\.svn
+.*/?.*\.pc$
+.*/?Makefile(\.in)?$
+.*/?Makefile\.am\.mingw$
+.*/perl/common/[^/]+\.c$
+.*/perl/common/blib.*
+.*/perl/common/pm_to_blib$
+.*~$
+.*\.a$
+.*\.bak$
+.*\.bs$
+.*\.def$
+\.deps
+.*\.dll$
+.*\.exe$
+.*\.g?mo$
+.*\.la$
+\.libs
+.*\.lo$
+.*\.loT$
+.*\.o$
+.*\.orig$
+.*\.pyc$
+.*\.pyo$
+.*\.rej$
+.*\.so$
+Doxyfile(\.mingw)?$
+VERSION$
+aclocal.m4
+autogen.args
+autom4te.*\.cache
+compile
+config.cache
+config.guess
+config.h$
+config.h.in
+config.log
+config.status
+config.sub
+configure$
+depcomp
+doc/finch.1$
+doc/html
+doc/pidgin.1$
+finch/finch$
+finch/libgnt/gntmarshal.c
+finch/libgnt/gntmarshal.h
+install-sh
+intltool-.*
+libpurple/dbus-bindings.c
+libpurple/dbus-signals.c
+libpurple/dbus-types.c
+libpurple/dbus-types.h
+libpurple/example/nullclient
+libpurple/gconf/purple.schemas$
+libpurple/marshallers.[ch]
+libpurple/plugins/dbus-example-bindings.c
+libpurple/plugins/perl/common/Makefile.PL$
+libpurple/plugins/perl/common/Makefile.old
+libpurple/plugins/perl/common/const-c.inc
+libpurple/plugins/perl/common/const-xs.inc
+libpurple/plugins/perl/common/lib
+libpurple/purple-client-bindings.c
+libpurple/purple-client-bindings.h
+libpurple/purple-client-example
+libpurple/purple.h$
+libpurple/tests/check_libpurple
+libpurple/tests/libpurple..
+libpurple/version.h$
+libpurple/win32/libpurplerc.rc$
+libtool
+local.mak
+ltmain.sh
+missing
+mkinstalldirs
+package_revision.h
+package_revision_raw.txt
+pidgin-*.*.*-dbgsym$
+pidgin-*.*.*-dbgsym.zip$
+pidgin-*.*.*-win32-bin.zip$
+pidgin-*.*.*-win32bin$
+pidgin-.*.tar.bz2
+pidgin-.*.tar.gz
+pidgin.apspec$
+pidgin.desktop$
+pidgin.spec$
+pidgin/pidgin$
+pidgin/pixmaps/emotes/default/24/theme
+pidgin/pixmaps/emotes/none/theme
+pidgin/pixmaps/emotes/small/16/theme
+pidgin/plugins/musicmessaging/music-messaging-bindings.c
+pidgin/plugins/perl/common/Makefile.PL$
+pidgin/plugins/perl/common/Makefile.old
+pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip
+pidgin/win32/nsis/gtk_runtime_stage$
+pidgin/win32/nsis/langmacros.nsh
+pidgin/win32/nsis/nsis_translations.desktop
+pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
+pidgin/win32/nsis/pidgin-spellcheck.nsh
+pidgin/win32/nsis/pidgin-translations.nsh$
+pidgin/win32/nsis/translations
+pidgin/win32/pidgin_dll_rc.rc$
+pidgin/win32/pidgin_exe_rc.rc$
+po/Makefile.in.in
+po/POTFILES$
+po/missing
+po/notexist
+po/pidgin.pot
+po/stamp-it
+stamp-h1
+win32-install-dir(\.release)?
diff -r 3c88b0729083 -r bbd52f93184e .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Tue Sep 25 22:58:51 2012 +0200
@@ -0,0 +1,2 @@
+a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
+4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
diff -r 3c88b0729083 -r bbd52f93184e .mtn-ignore
--- a/.mtn-ignore Mon May 07 18:06:01 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-(.*/)?TAGS$
-(.*/)?\.svn
-.*/?.*\.pc$
-.*/?Makefile(\.in)?$
-.*/?Makefile\.am\.mingw$
-.*/perl/common/[^/]+\.c$
-.*/perl/common/blib.*
-.*/perl/common/pm_to_blib$
-.*\.bs$
-.*\.def$
-.*\.dll$
-.*\.exe$
-.*\.loT$
-Doxyfile(\.mingw)?$
-VERSION$
-aclocal.m4
-autogen.args
-compile
-config.cache
-config.guess
-config.h$
-config.h.in
-config.log
-config.status
-config.sub
-configure$
-depcomp
-doc/finch.1$
-doc/html
-doc/pidgin.1$
-finch/finch$
-finch/libgnt/gntmarshal.c
-finch/libgnt/gntmarshal.h
-install-sh
-intltool-.*
-libpurple/dbus-bindings.c
-libpurple/dbus-signals.c
-libpurple/dbus-types.c
-libpurple/dbus-types.h
-libpurple/example/nullclient
-libpurple/gconf/purple.schemas$
-libpurple/marshallers.[ch]
-libpurple/plugins/dbus-example-bindings.c
-libpurple/plugins/perl/common/Makefile.PL$
-libpurple/plugins/perl/common/Makefile.old
-libpurple/plugins/perl/common/const-c.inc
-libpurple/plugins/perl/common/const-xs.inc
-libpurple/plugins/perl/common/lib
-libpurple/purple-client-bindings.c
-libpurple/purple-client-bindings.h
-libpurple/purple-client-example
-libpurple/purple.h$
-libpurple/tests/check_libpurple
-libpurple/tests/libpurple..
-libpurple/version.h$
-libpurple/win32/libpurplerc.rc$
-libtool
-local.mak
-ltmain.sh
-missing
-mkinstalldirs
-package_revision.h
-package_revision_raw.txt
-pidgin-*.*.*-dbgsym$
-pidgin-*.*.*-dbgsym.zip$
-pidgin-*.*.*-win32-bin.zip$
-pidgin-*.*.*-win32bin$
-pidgin-.*.tar.bz2
-pidgin-.*.tar.gz
-pidgin.apspec$
-pidgin.desktop$
-pidgin.spec$
-pidgin/pidgin$
-pidgin/pixmaps/emotes/default/24/theme
-pidgin/pixmaps/emotes/none/theme
-pidgin/pixmaps/emotes/small/16/theme
-pidgin/plugins/musicmessaging/music-messaging-bindings.c
-pidgin/plugins/perl/common/Makefile.PL$
-pidgin/plugins/perl/common/Makefile.old
-pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip
-pidgin/win32/nsis/gtk_runtime_stage$
-pidgin/win32/nsis/langmacros.nsh
-pidgin/win32/nsis/nsis_translations.desktop
-pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
-pidgin/win32/nsis/pidgin-spellcheck.nsh
-pidgin/win32/nsis/pidgin-translations.nsh$
-pidgin/win32/nsis/translations
-pidgin/win32/pidgin_dll_rc.rc$
-pidgin/win32/pidgin_exe_rc.rc$
-po/Makefile.in.in
-po/POTFILES$
-po/missing
-po/notexist
-po/pidgin.pot
-po/stamp-it
-stamp-h1
-win32-install-dir(\.release)?
diff -r 3c88b0729083 -r bbd52f93184e .tx/config
--- a/.tx/config Mon May 07 18:06:01 2012 +0000
+++ b/.tx/config Tue Sep 25 22:58:51 2012 +0200
@@ -1,8 +1,7 @@
[main]
-host = https://www.transifex.net
+host = https://www.transifex.com
[pidgin.pidgin]
file_filter = po/<lang>.po
source_file = po/pidgin.pot
source_lang = en
-
diff -r 3c88b0729083 -r bbd52f93184e COPYRIGHT
--- a/COPYRIGHT Mon May 07 18:06:01 2012 +0000
+++ b/COPYRIGHT Tue Sep 25 22:58:51 2012 +0200
@@ -15,7 +15,7 @@
piece of code, then that code should be traced through our version
control system to see from where it came and who has modified it.
-Copyright (C) 1998-2011 by the following:
+Copyright (C) 1998-2012 by the following:
Saleem Abdulrasool
Jakub Adam
@@ -39,6 +39,7 @@
Chris Banal
Luca Barbato
Levi Bard
+Mark Barfield
Ryan Barrett
Kevin Barry
Lukas Barth
@@ -339,6 +340,7 @@
Robert McQueen
Mihály Mészáros
Robert Mibus
+David Michael
Lars T. Mikkelsen
Benjamin Miller
Kevin Miller
@@ -475,6 +477,7 @@
Torrey Searle
Peter Seebach
Don Seiler
+Mihai Serban
Leonardo Serra
Matteo Settenvini
Colin Seymour
diff -r 3c88b0729083 -r bbd52f93184e ChangeLog
--- a/ChangeLog Mon May 07 18:06:01 2012 +0000
+++ b/ChangeLog Tue Sep 25 22:58:51 2012 +0200
@@ -1,7 +1,46 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
-version 2.10.5:
- No changes
+version 2.10.7:
+ Alien hatchery:
+ * No changes
+
+ Gadu-Gadu:
+ * Fix a crash at startup with large contact list. Avatar support for
+ buddies will be disabled till 3.0.0. (#15226, #14305)
+
+ MSN:
+ * Fix a crash when removing a user before its icon is loaded. (Mark
+ Barfield) (#15217)
+
+ Yahoo!:
+ * Fix a double-free in profile/picture loading code. (Mihai Serban)
+ (#15053)
+
+ Plugins:
+ * The Voice/Video Settings plugin supports using the sndio GStreamer
+ backends. (Brad Smith) (#14414)
+
+version 2.10.6 (07/06/2012):
+ Pidgin:
+ * Fix a bug that requires a triple-click to open a conversation
+ window from the buddy list. (#15199)
+
+version 2.10.5 (07/05/2012):
+ libpurple:
+ * Add support for GNOME3 proxy settings. (Mihai Serban) (#15054)
+
+ Pidgin:
+ * Fix a crash that may occur when trying to ignore a user who is
+ not in the current chat room. (#15139)
+
+ MSN:
+ * Fix building with MSVC on Windows (broken in 2.10.4). (Florian
+ Quèze)
+
+ MXit:
+ * Fix a buffer overflow vulnerability when parsing incoming messages
+ containing inline images. Thanks to Ulf Härnhammar for reporting
+ this! (CVE-2012-3374)
version 2.10.4 (05/06/2012):
General:
diff -r 3c88b0729083 -r bbd52f93184e ChangeLog.API
--- a/ChangeLog.API Mon May 07 18:06:01 2012 +0000
+++ b/ChangeLog.API Tue Sep 25 22:58:51 2012 +0200
@@ -1,5 +1,11 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+version 2.10.7:
+ * No changes
+
+version 2.10.6:
+ * No changes
+
version 2.10.5:
* No changes
diff -r 3c88b0729083 -r bbd52f93184e Makefile.am
--- a/Makefile.am Mon May 07 18:06:01 2012 +0000
+++ b/Makefile.am Tue Sep 25 22:58:51 2012 +0200
@@ -34,28 +34,27 @@
commit-check:
(cd po ; intltool-update -m 2>&1 | grep -v '^mismatched quotes.*\.py$$' | sed "s|current directory|po directory|" | grep . ; if [ $$? = 0 ] ; then exit 1 ; else exit 0 ; fi)
+
+# Ensure these files are sorted and contain no duplicates:
LC_ALL=C sort -c -t/ -u po/POTFILES.in
LC_ALL=C sort -c -t/ -u po/POTFILES.skip
+
+# Ensure COPYRIGHT is 100% UTF-8
iconv -f utf8 -t utf8 COPYRIGHT | cmp COPYRIGHT -
-version-check: commit-check
-# We don't want to release development versions.
+version-check:
+# Ensure our version string does not contain "dev"
test x`echo $(PACKAGE_VERSION) | grep dev` = x
-# When doing a new minor (or major) release (X.Y.0), there must be a section in
-# ChangeLog.API.
- echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
-
-# For all releases, check the ChangeLogs.
- head ChangeLog | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
- head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
+# Ensure ChangeLogs have the correct version
+ head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
+ head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
+ head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
- test x`mtn automate select t:v$(PACKAGE_VERSION)` = x`mtn automate get_base_revision_id`
-# ... and have no changes in the working copy.
- test "x`mtn diff | grep -v '^#'`" = x
-
-release: version-check distcheck packages
+ test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
+# ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
+ test "x`hg st -mard`" = x
packages:
gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz
@@ -63,6 +62,8 @@
gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
+release: commit-check version-check distcheck packages
+
if INSTALL_I18N
PO_DIR=po
DESKTOP_FILE=pidgin.desktop
@@ -93,8 +94,7 @@
# successfully; the rm -f ensures both
package_revision_raw.txt:
$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
- (cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
- || (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+ (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@ \
|| rm -f $@
package_revision.h: package_revision_raw.txt
$(AM_V_GEN)if test -f $<; then \
diff -r 3c88b0729083 -r bbd52f93184e Makefile.mingw
--- a/Makefile.mingw Mon May 07 18:06:01 2012 +0000
+++ b/Makefile.mingw Tue Sep 25 22:58:51 2012 +0200
@@ -55,6 +55,7 @@
libplc4.dll \
libplds4.dll \
libsasl.dll \
+ libssp-0.dll \
libxml2-2.dll \
nss3.dll \
nssckbi.dll \
@@ -66,7 +67,7 @@
saslLOGIN.dll \
saslPLAIN.dll \
libsilc-1-1-2.dll \
- libsilcclient-1-1-2.dll \
+ libsilcclient-1-1-3.dll \
smime3.dll \
softokn3.dll \
sqlite3.dll \
@@ -99,6 +100,7 @@
cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
cp $(WIN32_DEV_TOP)/pidgin-inst-deps-20100315/exchndl.dll $(PIDGIN_INSTALL_DIR)
+ cp $(GCC_SSP_TOP)/bin/libssp-0.dll $(PIDGIN_INSTALL_DIR)
pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip:
pidgin/win32/nsis/generate_gtk_zip.sh `pwd`
@@ -137,13 +139,31 @@
find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \
-exec $(STRIP) --strip-unneeded {} ';'
+ $(MONO_SIGNCODE) \
+ -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
+ -a sha1 -$$ commercial \
+ -n "Pidgin $(PIDGIN_VERSION)" -i "https://pidgin.im" \
+ -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
+ $(STRIPPED_RELEASE_DIR)/pidgin.exe
installer: generate_installer_includes
$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+ $(MONO_SIGNCODE) \
+ -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
+ -a sha1 -$$ commercial \
+ -n "Pidgin Installer" -i "https://pidgin.im" \
+ -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
+ pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
installer_offline: generate_installer_includes
$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DOFFLINE_INSTALLER -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+ $(MONO_SIGNCODE) \
+ -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
+ -a sha1 -$$ commercial \
+ -n "Pidgin Installer" -i "https://pidgin.im" \
+ -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
+ pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./
installer_zip: create_release_install_dir
diff -r 3c88b0729083 -r bbd52f93184e README
--- a/README Mon May 07 18:06:01 2012 +0000
+++ b/README Tue Sep 25 22:58:51 2012 +0200
@@ -6,7 +6,7 @@
to write an IM client that connects to many IM networks. It supports
AIM, ICQ, XMPP, MSN and Yahoo!, among others.
-Pidgin is an graphical IM client written in C which uses the GTK+
+Pidgin is a graphical IM client written in C which uses the GTK+
toolkit.
Finch is a text-based IM client written in C which uses the ncurses
@@ -43,7 +43,7 @@
To get started, simply add a new account.
-If you come across a bug, please report it at: http://pidgin.im
+If you come across a bug, please report it at: http://developer.pidgin.im
PLUGINS
=======
diff -r 3c88b0729083 -r bbd52f93184e README.MTN
--- a/README.MTN Mon May 07 18:06:01 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-If you plan to use Pidgin, Finch and libpurple from our Monotone repository,
-PLEASE read this message in its entirety!
-
-Pidgin, Finch, and libpurple are a fast-moving project with a somewhat regular
-release schedule. Due to the rate of development, the code in our Monotone
-repository undergoes frequent bursts of massive changes, often leaving behind
-brokenness and partial functionality while the responsible developers rewrite
-some portion of code or seek to add new features.
-
-What this all boils down to is that the code in our Monotone repository _WILL_
-sometimes be broken. Because of this, we ask that users who are not interested
-in personally tracking down bugs and fixing them (without a lot of
-assistance from the developers!) use only released versions. Since releases
-will be made often, this should not prevent anyone from using the newest,
-shiniest features -- but it will prevent users from having to deal with ugly
-development bugs that we already know about but haven't gotten around to fixing.
-
-If you are interested in hacking on Pidgin, Finch, and/or libpurple, please
-check out the information available at: http://developer.pidgin.im
-
-By far the best documentation, however, is the documented code. If you have
-doxygen, you can run "make docs" in the toplevel directory to generate pretty
-documentation. Otherwise (or even if you do!), the header files for each
-subsystem contain documentation for the functions they contain. For instance,
-conversation.h contains documentation for the entire purple_conversation_*
-API, and account.h contains documentation for the purple_account_* API.
-
-If you have questions, please feel free to contact the Pidgin, Finch, and
-libpurple developers by email at devel at pidgin.im or on IRC at irc.freenode.net
-in #pidgin. Please do as much homework as you can before contacting us; the
-more you know about your question, the faster and more effectively we can help!
-
-Patches should be posted as Trac tickets at: http://developer.pidgin.im
diff -r 3c88b0729083 -r bbd52f93184e README.hg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.hg Tue Sep 25 22:58:51 2012 +0200
@@ -0,0 +1,33 @@
+If you plan to use Pidgin, Finch and libpurple from our Mercurial repository,
+PLEASE read this message in its entirety!
+
+Pidgin, Finch, and libpurple are a fast-moving project with a somewhat regular
+release schedule. Due to the rate of development, the code in our Mercurial
+repository undergoes frequent bursts of massive changes, often leaving behind
+brokenness and partial functionality while the responsible developers rewrite
+some portion of code or seek to add new features.
+
+What this all boils down to is that the code in our Mercurial repository _WILL_
+sometimes be broken. Because of this, we ask that users who are not interested
+in personally tracking down bugs and fixing them (without a lot of
+assistance from the developers!) use only released versions. Since releases
+will be made often, this should not prevent anyone from using the newest,
+shiniest features -- but it will prevent users from having to deal with ugly
+development bugs that we already know about but haven't gotten around to fixing.
+
+If you are interested in hacking on Pidgin, Finch, and/or libpurple, please
+check out the information available at: http://developer.pidgin.im
+
+By far the best documentation, however, is the documented code. If you have
+doxygen, you can run "make docs" in the toplevel directory to generate pretty
+documentation. Otherwise (or even if you do!), the header files for each
+subsystem contain documentation for the functions they contain. For instance,
+conversation.h contains documentation for the entire purple_conversation_*
+API, and account.h contains documentation for the purple_account_* API.
+
+If you have questions, please feel free to contact the Pidgin, Finch, and
+libpurple developers by email at devel at pidgin.im or on IRC at irc.freenode.net
+in #pidgin. Please do as much homework as you can before contacting us; the
+more you know about your question, the faster and more effectively we can help!
+
+Patches should be posted as Trac tickets at: http://developer.pidgin.im
diff -r 3c88b0729083 -r bbd52f93184e README.mingw
--- a/README.mingw Mon May 07 18:06:01 2012 +0000
+++ b/README.mingw Tue Sep 25 22:58:51 2012 +0200
@@ -1,5 +1,5 @@
How to build Pidgin for Windows using MinGW
-=============================
+===========================================
For the latest build instructions, please refer to:
diff -r 3c88b0729083 -r bbd52f93184e configure.ac
--- a/configure.ac Mon May 07 18:06:01 2012 +0000
+++ b/configure.ac Tue Sep 25 22:58:51 2012 +0200
@@ -46,7 +46,7 @@
m4_define([purple_lt_current], [10])
m4_define([purple_major_version], [2])
m4_define([purple_minor_version], [10])
-m4_define([purple_micro_version], [5])
+m4_define([purple_micro_version], [7])
m4_define([purple_version_suffix], [devel])
m4_define([purple_version],
[purple_major_version.purple_minor_version.purple_micro_version])
diff -r 3c88b0729083 -r bbd52f93184e doc/pidgin.1.in
--- a/doc/pidgin.1.in Mon May 07 18:06:01 2012 +0000
+++ b/doc/pidgin.1.in Tue Sep 25 22:58:51 2012 +0200
@@ -218,9 +218,7 @@
.TP
.B Notify buddies that you are typing to them
Some protocols allow clients to tell their buddies when they are typing.
-This option enables this feature for protocols that supports it. For XMPP,
-this also enables sending the "User has left the conversation" message
-when ending the conversation.
+This option enables this feature for protocols that supports it.
.TP
.B Default Formatting
diff -r 3c88b0729083 -r bbd52f93184e finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am Mon May 07 18:06:01 2012 +0000
+++ b/finch/libgnt/Makefile.am Tue Sep 25 22:58:51 2012 +0200
@@ -84,7 +84,7 @@
$(libgnt_la_headers)
libgnt_la_DEPENDENCIES =
-libgnt_la_LDFLAGS = -export-dynamic -version_info $(GNT_LT_VERSION_INFO) -no-undefined
+libgnt_la_LDFLAGS = -export-dynamic -version-info $(GNT_LT_VERSION_INFO) -no-undefined
libgnt_la_LIBADD = \
$(GLIB_LIBS) \
$(GNT_LIBS) \
diff -r 3c88b0729083 -r bbd52f93184e libpurple/media/enum-types.h
--- a/libpurple/media/enum-types.h Mon May 07 18:06:01 2012 +0000
+++ b/libpurple/media/enum-types.h Tue Sep 25 22:58:51 2012 +0200
@@ -44,7 +44,7 @@
PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
- PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
+ PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST
} PurpleMediaCandidateType;
/** Media caps */
@@ -56,14 +56,14 @@
PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
- PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6,
+ PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6
} PurpleMediaCaps;
/** Media component types */
typedef enum {
PURPLE_MEDIA_COMPONENT_NONE = 0,
PURPLE_MEDIA_COMPONENT_RTP = 1,
- PURPLE_MEDIA_COMPONENT_RTCP = 2,
+ PURPLE_MEDIA_COMPONENT_RTCP = 2
} PurpleMediaComponentType;
/** Media info types */
@@ -76,13 +76,13 @@
PURPLE_MEDIA_INFO_PAUSE,
PURPLE_MEDIA_INFO_UNPAUSE,
PURPLE_MEDIA_INFO_HOLD,
- PURPLE_MEDIA_INFO_UNHOLD,
+ PURPLE_MEDIA_INFO_UNHOLD
} PurpleMediaInfoType;
/** Media network protocols */
typedef enum {
PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
- PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+ PURPLE_MEDIA_NETWORK_PROTOCOL_TCP
} PurpleMediaNetworkProtocol;
/** Media session types */
@@ -100,7 +100,7 @@
typedef enum {
PURPLE_MEDIA_STATE_NEW = 0,
PURPLE_MEDIA_STATE_CONNECTED,
- PURPLE_MEDIA_STATE_END,
+ PURPLE_MEDIA_STATE_END
} PurpleMediaState;
/**
diff -r 3c88b0729083 -r bbd52f93184e libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw Mon May 07 18:06:01 2012 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw Tue Sep 25 22:58:51 2012 +0200
@@ -112,7 +112,7 @@
$(PERL) -MAutoSplit -e 'autosplit("lib/Purple.pm")'
$(TARGET).dll: $(PURPLE_DLL).a $(PURPLE_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
- $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll
+ $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
##
## CLEAN
diff -r 3c88b0729083 -r bbd52f93184e libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c Mon May 07 18:06:01 2012 +0000
+++ b/libpurple/protocols/gg/gg.c Tue Sep 25 22:58:51 2012 +0200
@@ -47,6 +47,8 @@
#include "buddylist.h"
#include "gg-utils.h"
+#define DISABLE_AVATARS 1
+
static PurplePlugin *my_protocol = NULL;
/* Prototypes */
@@ -903,6 +905,8 @@
/* ----- INTERNAL CALLBACKS --------------------------------------------- */
/* ---------------------------------------------------------------------- */
+#if !DISABLE_AVATARS
+
struct gg_fetch_avatar_data
{
PurpleConnection *gc;
@@ -1037,6 +1041,8 @@
g_free(bigavatar);
}
+#endif
+
/**
* Try to update avatar of the buddy.
*
@@ -1045,6 +1051,10 @@
*/
static void ggp_update_buddy_avatar(PurpleConnection *gc, uin_t uin)
{
+#if DISABLE_AVATARS
+ purple_debug_warning("gg", "ggp_update_buddy_avatar: disabled, please "
+ "update to 3.0.0, when available\n");
+#else
gchar *avatarurl;
PurpleUtilFetchUrlData *url_data;
@@ -1058,6 +1068,7 @@
gg_get_avatar_url_cb, gc);
g_free(avatarurl);
+#endif
}
/**
diff -r 3c88b0729083 -r bbd52f93184e libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c Mon May 07 18:06:01 2012 +0000
+++ b/libpurple/protocols/irc/irc.c Tue Sep 25 22:58:51 2012 +0200
@@ -155,6 +155,7 @@
char *tosend= g_strdup(buf);
purple_signal_emit(_irc_plugin, "irc-sending-text", purple_account_get_connection(irc->account), &tosend);
+
if (tosend == NULL)
return 0;
@@ -392,9 +393,17 @@
const char *username, *realname;
struct irc_conn *irc = gc->proto_data;
const char *pass = purple_connection_get_password(gc);
+#ifdef HAVE_CYRUS_SASL
+ const gboolean use_sasl = purple_account_get_bool(irc->account, "sasl", FALSE);
+#endif
if (pass && *pass) {
- buf = irc_format(irc, "v:", "PASS", pass);
+#ifdef HAVE_CYRUS_SASL
+ if (use_sasl)
+ buf = irc_format(irc, "vv:", "CAP", "REQ", "sasl");
+ else /* intended to fall through */
+#endif
+ buf = irc_format(irc, "v:", "PASS", pass);
if (irc_send(irc, buf) < 0) {
g_free(buf);
return FALSE;
@@ -526,6 +535,17 @@
g_free(irc->mode_chars);
g_free(irc->reqnick);
+#ifdef HAVE_CYRUS_SASL
+ if (irc->sasl_conn) {
+ sasl_dispose(&irc->sasl_conn);
+ irc->sasl_conn = NULL;
+ }
+ g_free(irc->sasl_cb);
+ if(irc->sasl_mechs)
+ g_string_free(irc->sasl_mechs, TRUE);
+#endif
+
+
g_free(irc);
}
@@ -1045,6 +1065,16 @@
option = purple_account_option_bool_new(_("Use SSL"), "ssl", FALSE);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#ifdef HAVE_CYRUS_SASL
+ option = purple_account_option_bool_new(_("Authenticate with SASL"), "sasl", FALSE);
+ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+ option = purple_account_option_bool_new(
+ _("Allow plaintext SASL auth over unencrypted connection"),
+ "auth_plain_in_clear", FALSE);
+ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#endif
+
_irc_plugin = plugin;
purple_prefs_remove("/plugins/prpl/irc/quitmsg");
diff -r 3c88b0729083 -r bbd52f93184e libpurple/protocols/irc/irc.h
--- a/libpurple/protocols/irc/irc.h Mon May 07 18:06:01 2012 +0000
+++ b/libpurple/protocols/irc/irc.h Tue Sep 25 22:58:51 2012 +0200
@@ -25,6 +25,10 @@
#include <glib.h>
+#ifdef HAVE_CYRUS_SASL
+#include <sasl/sasl.h>
+#endif
+
#include "circbuffer.h"
#include "ft.h"
#include "roomlist.h"
@@ -92,6 +96,13 @@
char *mode_chars;
char *reqnick;
gboolean nickused;
+#ifdef HAVE_CYRUS_SASL
+ sasl_conn_t *sasl_conn;
+ const char *current_mech;
+ GString *sasl_mechs;
+ gboolean mech_works;
+ sasl_callback_t *sasl_cb;
+#endif
};
struct irc_buddy {
@@ -167,6 +178,13 @@
void irc_msg_wallops(struct irc_conn *irc, const char *name, const char *from, char **args);
void irc_msg_whois(struct irc_conn *irc, const char *name, const char *from, char **args);
void irc_msg_who(struct irc_conn *irc, const char *name, const char *from, char **args);
+#ifdef HAVE_CYRUS_SASL
+void irc_msg_cap(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_auth(struct irc_conn *irc, char *arg);
+void irc_msg_authok(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_authtryagain(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_authfail(struct irc_conn *irc, const char *name, const char *from, char **args);
+#endif
void irc_msg_ignore(struct irc_conn *irc, const char *name, const char *from, char **args);
diff -r 3c88b0729083 -r bbd52f93184e libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c Mon May 07 18:06:01 2012 +0000
+++ b/libpurple/protocols/irc/msgs.c Tue Sep 25 22:58:51 2012 +0200
@@ -32,6 +32,10 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_CYRUS_SASL
+#include <sasl/sasl.h>
+#endif
+
static char *irc_mask_nick(const char *mask);
static char *irc_mask_userhost(const char *mask);
static void irc_chat_remove_buddy(PurpleConversation *convo, char *data[2]);
@@ -42,6 +46,10 @@
const char *from, const char *to,
const char *rawmsg, gboolean notice);
+#ifdef HAVE_CYRUS_SASL
+static void irc_sasl_finish(struct irc_conn *irc);
+#endif
+
static char *irc_mask_nick(const char *mask)
{
char *end, *buf;
@@ -1426,6 +1434,381 @@
g_free(msg);
}
+#ifdef HAVE_CYRUS_SASL
+static int
+irc_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret)
+{
+ struct irc_conn *irc = ctx;
+ const char *pw;
+ size_t len;
+
+ pw = purple_account_get_password(irc->account);
+
+ if (!conn || !secret || id != SASL_CB_PASS)
+ return SASL_BADPARAM;
+
+ len = strlen(pw);
+ /* Not an off-by-one because sasl_secret_t defines char data[1] */
+ /* TODO: This can probably be moved to glib's allocator */
+ sasl_secret_t *sasl_secret = malloc(sizeof(sasl_secret_t) + len);
+ if (!sasl_secret)
+ return SASL_NOMEM;
+
+ sasl_secret->len = len;
+ strcpy((char*)sasl_secret->data, pw);
+
+ *secret = sasl_secret;
+ return SASL_OK;
+}
+
+static int
+irc_sasl_cb_log(void *context, int level, const char *message)
+{
+ if(level <= SASL_LOG_TRACE)
+ purple_debug_info("sasl", "%s\n", message);
+
+ return SASL_OK;
+}
+
+static int
+irc_sasl_cb_simple(void *ctx, int id, const char **res, unsigned *len)
+{
+ struct irc_conn *irc = ctx;
+ PurpleConnection *gc = purple_account_get_connection(irc->account);
+
+ switch(id) {
+ case SASL_CB_AUTHNAME:
+ *res = purple_connection_get_display_name(gc);
+ break;
+ case SASL_CB_USER:
+ *res = "";
+ break;
+ default:
+ return SASL_BADPARAM;
+ }
+ if (len) *len = strlen((char *)*res);
+ return SASL_OK;
+}
+
+static void
+irc_auth_start_cyrus(struct irc_conn *irc)
+{
+ int ret = 0;
+ char *buf;
+ sasl_security_properties_t secprops;
+ PurpleAccount *account = irc->account;
+ PurpleConnection *gc = purple_account_get_connection(account);
+
+ gboolean plaintext;
+ gboolean again = FALSE;
+
+ /* Set up security properties and options */
+ secprops.min_ssf = 0;
+ secprops.security_flags = SASL_SEC_NOANONYMOUS;
+
+ if (!irc->gsc) {
+ secprops.max_ssf = -1;
+ secprops.maxbufsize = 4096;
+ plaintext = purple_account_get_bool(account, "auth_plain_in_clear", FALSE);
+ if (!plaintext)
+ secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
+ } else {
+ secprops.max_ssf = 0;
+ secprops.maxbufsize = 0;
+ plaintext = TRUE;
+ }
+
+ secprops.property_names = 0;
+ secprops.property_values = 0;
+
+ do {
+ gchar *tmp = NULL;
+ again = FALSE;
+
+ ret = sasl_client_new("irc", irc->server, NULL, NULL, irc->sasl_cb, 0, &irc->sasl_conn);
+
+ if (ret != SASL_OK) {
+ purple_debug_error("irc", "sasl_client_new failed: %d\n", ret);
+ tmp = g_strdup_printf(_("Failed to initialize SASL authentication: %s"),
+ sasl_errdetail(irc->sasl_conn));
+ purple_connection_error_reason (gc,
+ PURPLE_CONNECTION_ERROR_OTHER_ERROR, tmp);
+ g_free(tmp);
+ return;
+ }
+
+ sasl_setprop(irc->sasl_conn, SASL_AUTH_EXTERNAL, irc->account->username);
+ sasl_setprop(irc->sasl_conn, SASL_SEC_PROPS, &secprops);
+
+ ret = sasl_client_start(irc->sasl_conn, irc->sasl_mechs->str, NULL, NULL, NULL, &irc->current_mech);
+
+ switch (ret) {
+ case SASL_OK:
+ case SASL_CONTINUE:
+ irc->mech_works = FALSE;
+ break;
+ case SASL_NOMECH:
+ purple_connection_error_reason (gc,
+ PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+ _("SASL authentication failed: No worthy authentication mechanisms found."));
+
+ irc_sasl_finish(irc);
+ return;
+ case SASL_BADPARAM:
+ case SASL_NOMEM:
+ tmp = g_strdup_printf(_("SASL authentication failed: %s"), sasl_errdetail(irc->sasl_conn));
+ purple_connection_error_reason (gc,
+ PURPLE_CONNECTION_ERROR_OTHER_ERROR, tmp);
+ g_free(tmp);
+
+ irc_sasl_finish(irc);
+ return;
+ default:
+ purple_debug_error("irc", "sasl_client_start failed: %s\n", sasl_errdetail(irc->sasl_conn));
+
+ if (irc->current_mech && *irc->current_mech) {
+ char *pos;
+ if ((pos = strstr(irc->sasl_mechs->str, irc->current_mech))) {
+ size_t index = pos - irc->sasl_mechs->str;
+ g_string_erase(irc->sasl_mechs, index, strlen(irc->current_mech));
+
+ /* Remove space which separated this mech from the next */
+ if ((irc->sasl_mechs->str)[index] == ' ') {
+ g_string_erase(irc->sasl_mechs, index, 1);
+ }
More information about the commits
mailing list