--- a/ChangeLog Tue Apr 08 00:31:25 2014 -0700
+++ b/ChangeLog Sat Apr 12 22:28:05 2014 -0700
@@ -5,6 +5,8 @@
* Don't allow overwriting arbitrary files on the file system when the
user installs a smiley theme via drag-and-drop. (Discovered by Yves
Younan of Sourcefire VRT)
+ * Updates to dependencies: + * NSS 3.16 and NSPR 4.10.4 * Fix build against Python 3. (Ed Catmur) (#15969)
--- a/libpurple/internal.h Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/internal.h Sat Apr 12 22:28:05 2014 -0700
@@ -47,6 +47,9 @@
# define _(String) ((const char *)dgettext(PACKAGE, String))
--- a/libpurple/protocols/gg/lib/events.c Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/gg/lib/events.c Sat Apr 12 22:28:05 2014 -0700
@@ -588,6 +588,7 @@
res = gg_resolver_recv(sess->fd, buf, sizeof(buf));
@@ -622,8 +623,10 @@
/* Sprawdź, czy mamy listę zakończoną INADDR_NONE */
+ addrs = (struct in_addr *)(void *)sess->recv_buf; for (i = 0; i < sess->recv_done / sizeof(struct in_addr); i++) {
- if (((struct in_addr*) sess->recv_buf)[i].s_addr == INADDR_NONE) {+ if (addrs[i].s_addr == INADDR_NONE) { @@ -661,7 +664,7 @@
- len += strlen(inet_ntoa(((struct in_addr*) sess->recv_buf)[i]));+ len += strlen(inet_ntoa(addrs[i])); @@ -675,7 +678,7 @@
- strcat(list, inet_ntoa(((struct in_addr*) sess->recv_buf)[i]));+ strcat(list, inet_ntoa(addrs[i])); gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_watch_fd() resolved: %s\n", list);
@@ -687,7 +690,7 @@
sess->state = next_state;
- sess->resolver_result = (struct in_addr*) sess->recv_buf;+ sess->resolver_result = addrs; sess->resolver_count = count;
sess->resolver_index = 0;
--- a/libpurple/protocols/gg/lib/internal.h Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/gg/lib/internal.h Sat Apr 12 22:28:05 2014 -0700
@@ -28,17 +28,23 @@
# define GG_SIZE_FMT "Iu"
+# define _GG_INT64_MODIFIER "I64" +# define GG_SIZE_FMT "zu" +# define _GG_INT64_MODIFIER "l" # define GG_SIZE_FMT "zu"
+# define _GG_INT64_MODIFIER "ll"
+# define PRIu64 _GG_INT64_MODIFIER "u"
+# define PRIx64 _GG_INT64_MODIFIER "x"
+# define PRId64 _GG_INT64_MODIFIER "d" #define GG_LOGIN_PARAMS_HAS_FIELD(glp, member) \
--- a/libpurple/protocols/gg/lib/libgadu.h Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/gg/lib/libgadu.h Sat Apr 12 22:28:05 2014 -0700
@@ -283,7 +283,7 @@
int initial_status; /**< Początkowy status */
int status; /**< Aktualny status */
- char *recv_buf; /**< Bufor na odbierany pakiety */+ char *recv_buf; /**< Bufor na odbierane pakiety. Wskaźnik zawsze maksymalnie wyrównany, tak jak w wyniku działania \c malloc(). */ int recv_done; /**< Liczba wczytanych bajtów pakietu */
int recv_left; /**< Liczba pozostałych do wczytania bajtów pakietu */
--- a/libpurple/protocols/gg/lib/network.h Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/gg/lib/network.h Sat Apr 12 22:28:05 2014 -0700
@@ -31,6 +31,8 @@
/* Obecnie na Win32 tylko MSVC definiuje te typy błędów. Na wypadek, gdyby
* jednak Cygwin bądź MinGW zaczęły je definiować, używamy bardziej ogólnych
--- a/libpurple/protocols/gg/lib/protobuf-c.c Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/gg/lib/protobuf-c.c Sat Apr 12 22:28:05 2014 -0700
@@ -919,7 +919,7 @@
- char *array = * (char * const *) member;+ void *array = * (char * const *) member; @@ -1024,7 +1024,7 @@
for (i = 0; i < count; i++)
rv += required_field_pack (field, array, out + rv);
+ array = ((char*)array) + siz; @@ -1902,7 +1902,7 @@
const ProtobufCFieldDescriptor *field = scanned_member->field;
size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
size_t siz = sizeof_elt_in_repeated_array (field->type);
- char *array = *(char**)member + siz * (*p_n);+ void *array = *(char**)member + siz * (*p_n); const uint8_t *at = scanned_member->data + scanned_member->length_prefix_len;
size_t rem = scanned_member->len - scanned_member->length_prefix_len;
--- a/libpurple/protocols/gg/lib/sha1.c Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/gg/lib/sha1.c Sat Apr 12 22:28:05 2014 -0700
@@ -88,13 +88,13 @@
/* blk0() and blk() perform the initial expand. */
/* I got the idea of expanding during the round function from SSLeay */
#ifndef GG_CONFIG_BIGENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) \- |(rol(block->l[i], 8) & 0x00FF00FF))+#define blk0(i) (block.l[i] = (rol(block.l[i], 24) & 0xFF00FF00) \ + |(rol(block.l[i], 8) & 0x00FF00FF)) -#define blk0(i) block->l[i]+#define blk0(i) block.l[i] -#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \- ^block->l[(i+2)&15]^block->l[i&15], 1))+#define blk(i) (block.l[i&15] = rol(block.l[(i+13)&15]^block.l[(i+8)&15] \ + ^block.l[(i+2)&15]^block.l[i&15], 1)) /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
/* style:comma:start-ignore */
@@ -115,10 +115,8 @@
-static unsigned char workspace[64];- block = (CHAR64LONG16*)workspace;- memcpy(block, buffer, 64);+ memcpy(&block, buffer, sizeof(block)); /* Copy context->state[] to working vars */
--- a/libpurple/protocols/yahoo/libymsg.c Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/yahoo/libymsg.c Sat Apr 12 22:28:05 2014 -0700
@@ -4560,7 +4560,7 @@
fields = purple_request_fields_new();
group = purple_request_field_group_new(NULL);
purple_request_fields_add_group(fields, group);
- field = purple_request_field_choice_new("id", "Activate which ID?", 0);+ field = purple_request_field_choice_new("id", _("Activate which ID?"), 0); purple_request_field_group_add_field(group, field);
for (iter = 0; yd->profiles[iter]; iter++) {
--- a/libpurple/protocols/yahoo/libymsg.h Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/protocols/yahoo/libymsg.h Sat Apr 12 22:28:05 2014 -0700
@@ -30,7 +30,7 @@
-#define YAHOO_PAGER_HOST_REQ_URL "http://vcs1.msg.yahoo.com/capacity"+#define YAHOO_PAGER_HOST_REQ_URL "http://vcs2.msg.yahoo.com/capacity" #define YAHOO_PAGER_HOST_FALLBACK "scsa.msg.yahoo.com"
#define YAHOO_PAGER_PORT 5050
#define YAHOO_PAGER_PORT_P2P 5101
--- a/libpurple/win32/global.mak Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/win32/global.mak Sat Apr 12 22:28:05 2014 -0700
@@ -17,7 +17,7 @@
BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.4-nspr-4.10.2+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.16-nspr-4.10.4 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
--- a/libpurple/win32/wpurpleerror.h Tue Apr 08 00:31:25 2014 -0700
+++ b/libpurple/win32/wpurpleerror.h Sat Apr 12 22:28:05 2014 -0700
@@ -27,32 +27,57 @@
/* Here we define unix socket errors as windows socket errors */
#define ENETDOWN WSAENETDOWN
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#define EINPROGRESS WSAEINPROGRESS
#define ENOBUFS WSAENOBUFS
#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
#define EPROTOTYPE WSAEPROTOTYPE
#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
#define EADDRINUSE WSAEADDRINUSE
#define EINPROGRESS WSAEINPROGRESS
#define EALREADY WSAEALREADY
#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
#define ECONNREFUSED WSAECONNREFUSED
#define EISCONN WSAEISCONN
#define ENETUNREACH WSAENETUNREACH
#define ENOTSOCK WSAENOTSOCK
#define ETIMEDOUT WSAETIMEDOUT
#define EWOULDBLOCK WSAEWOULDBLOCK
#define ENOTCONN WSAENOTCONN
#define ENETRESET WSAENETRESET
#define EOPNOTSUPP WSAEOPNOTSUPP
#define ESHUTDOWN WSAESHUTDOWN
#define EMSGSIZE WSAEMSGSIZE
#define ECONNABORTED WSAECONNABORTED
#define ECONNRESET WSAECONNRESET
#define EHOSTUNREACH WSAEHOSTUNREACH
#endif /* end _WPURPLEERROR_H */
--- a/pidgin/gtkdialogs.c Tue Apr 08 00:31:25 2014 -0700
+++ b/pidgin/gtkdialogs.c Sat Apr 12 22:28:05 2014 -0700
@@ -171,7 +171,7 @@
{N_("Dzongkha"), "dz", "Wangmo Sherpa", "rinwanshe@yahoo.com"},
{N_("Greek"), "el", "Katsaloulis Panayotis", "panayotis@panayotis.com"},
{N_("Greek"), "el", "Panos Bouklis", "panos@echidna-band.com"},
- {N_("Australian English"), "en_AU", "Peter Lawler", "trans@six-by-nine.com.au"},+ {N_("Australian English"), "en_AU", "Michael Findlay", "keltoiboy@gmail.com"}, {N_("British English"), "en_GB", "Phil Hannent", "phil@hannent.co.uk"},
{N_("Canadian English"), "en_CA", "Adam Weinberger", "adamw@gnome.org"},
{N_("Esperanto"), "eo", "Stéphane Fillod", "fillods@users.sourceforge.net"},
@@ -273,6 +273,7 @@
{N_("Danish"), "da", "Morten Brix Pedersen", "morten@wtf.dk"},
{N_("German"), "de", "Daniel Seifert, Karsten Weiss", NULL},
{N_("German"), "de", "Jochen Kemnade", "jochenkemnade@web.de"},
+ {N_("Australian English"), "en_AU", "Peter Lawler", "trans@six-by-nine.com.au"}, {N_("British English"), "en_GB", "Luke Ross", "luke@lukeross.name"},
{N_("Spanish"), "es", "JM Pérez Cáncer", NULL},
{N_("Spanish"), "es", "Nicolás Lichtmaier", NULL},
--- a/po/de.po Tue Apr 08 00:31:25 2014 -0700
+++ b/po/de.po Sat Apr 12 22:28:05 2014 -0700
@@ -12,8 +12,8 @@
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 10:38-0800\n"-"PO-Revision-Date: 2014-01-28 22:25+0100\n"+"POT-Creation-Date: 2014-04-01 00:00+0200\n" +"PO-Revision-Date: 2014-03-31 23:50+0200\n" "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -10046,6 +10046,9 @@
msgstr "Anfangen zu malen"
+msgid "Activate which ID?" +msgstr "Aktiviere welche ID?" msgid "Select the ID you want to activate"
msgstr "Wählen Sie die ID die Sie aktivieren möchten"
@@ -11929,9 +11932,6 @@
@@ -11947,6 +11947,9 @@
msgid "Ubuntu Georgian Translators"
msgstr "Ubuntu-Georgisch-Übersetzer"
@@ -11962,12 +11965,12 @@
@@ -11986,9 +11989,6 @@
@@ -12064,6 +12064,9 @@
@@ -12085,6 +12088,15 @@
