forked from pool/pidgin
This commit is contained in:
parent
dec68e4954
commit
9071b18fe6
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c6bebef97b8b337cd2bc8107b3714dedf60d02db70487d0aafdd8b5b7ada1b63
|
||||
size 8398610
|
3
pidgin-2.5.5.tar.bz2
Normal file
3
pidgin-2.5.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cb5a13b99c2868b61d7f790678e1b3d3055eb9bf56c369a0eab90aa3fa7723e8
|
||||
size 8357209
|
@ -1,8 +1,8 @@
|
||||
Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
===================================================================
|
||||
--- pidgin-2.2.2.orig/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
+++ pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
@@ -299,8 +299,6 @@ ssl_gnutls_close(PurpleSslConnection *gs
|
||||
================================================================================
|
||||
--- pidgin-2.5.5/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
+++ pidgin-2.5.5/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
@@ -303,8 +303,6 @@
|
||||
if(gnutls_data->handshake_handler)
|
||||
purple_input_remove(gnutls_data->handshake_handler);
|
||||
|
||||
@ -11,7 +11,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
gnutls_deinit(gnutls_data->session);
|
||||
|
||||
g_free(gnutls_data);
|
||||
@@ -335,6 +333,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc
|
||||
@@ -339,6 +337,22 @@
|
||||
}
|
||||
|
||||
static size_t
|
||||
@ -34,7 +34,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len)
|
||||
{
|
||||
PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
|
||||
@@ -928,6 +942,23 @@ static PurpleCertificateScheme x509_gnut
|
||||
@@ -931,6 +945,23 @@
|
||||
|
||||
};
|
||||
|
||||
@ -58,7 +58,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
static PurpleSslOps ssl_ops =
|
||||
{
|
||||
ssl_gnutls_init,
|
||||
@@ -935,7 +966,9 @@ static PurpleSslOps ssl_ops =
|
||||
@@ -938,7 +969,9 @@
|
||||
ssl_gnutls_connect,
|
||||
ssl_gnutls_close,
|
||||
ssl_gnutls_read,
|
||||
@ -68,11 +68,9 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
ssl_gnutls_get_peer_certificates,
|
||||
|
||||
/* padding */
|
||||
Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-nss.c
|
||||
===================================================================
|
||||
--- pidgin-2.2.2.orig/libpurple/plugins/ssl/ssl-nss.c
|
||||
+++ pidgin-2.2.2/libpurple/plugins/ssl/ssl-nss.c
|
||||
@@ -754,6 +754,8 @@ static PurpleSslOps ssl_ops =
|
||||
--- pidgin-2.5.5/libpurple/plugins/ssl/ssl-nss.c
|
||||
+++ pidgin-2.5.5/libpurple/plugins/ssl/ssl-nss.c
|
||||
@@ -880,6 +880,8 @@
|
||||
ssl_nss_connect,
|
||||
ssl_nss_close,
|
||||
ssl_nss_read,
|
||||
@ -81,10 +79,8 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-nss.c
|
||||
ssl_nss_write,
|
||||
ssl_nss_peer_certs,
|
||||
|
||||
Index: pidgin-2.2.2/libpurple/purple-fifo.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-fifo.c
|
||||
--- pidgin-2.5.5/libpurple/purple-fifo.c
|
||||
+++ pidgin-2.5.5/libpurple/purple-fifo.c
|
||||
@@ -0,0 +1,232 @@
|
||||
+/*
|
||||
+ * @file purple-fifo.c A FIFO byte queue.
|
||||
@ -318,10 +314,8 @@ Index: pidgin-2.2.2/libpurple/purple-fifo.c
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
Index: pidgin-2.2.2/libpurple/purple-fifo.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-fifo.h
|
||||
--- pidgin-2.5.5/libpurple/purple-fifo.h
|
||||
+++ pidgin-2.5.5/libpurple/purple-fifo.h
|
||||
@@ -0,0 +1,54 @@
|
||||
+/**
|
||||
+ * @file purple-fifo.h A FIFO byte queue.
|
||||
@ -377,10 +371,8 @@ Index: pidgin-2.2.2/libpurple/purple-fifo.h
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* _purple_fifo_H_ */
|
||||
Index: pidgin-2.2.2/libpurple/purple-io.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-io.c
|
||||
--- pidgin-2.5.5/libpurple/purple-io.c
|
||||
+++ pidgin-2.5.5/libpurple/purple-io.c
|
||||
@@ -0,0 +1,391 @@
|
||||
+/*
|
||||
+ * @file purple-io.c Buffering I/O layer.
|
||||
@ -773,10 +765,8 @@ Index: pidgin-2.2.2/libpurple/purple-io.c
|
||||
+{
|
||||
+ return purple_fifo_get_used (io->write_fifo);
|
||||
+}
|
||||
Index: pidgin-2.2.2/libpurple/purple-io.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-io.h
|
||||
--- pidgin-2.5.5/libpurple/purple-io.h
|
||||
+++ pidgin-2.5.5/libpurple/purple-io.h
|
||||
@@ -0,0 +1,87 @@
|
||||
+/**
|
||||
+ * @file purple-io.h Buffering I/O layer.
|
||||
@ -865,11 +855,9 @@ Index: pidgin-2.2.2/libpurple/purple-io.h
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* _PURPLE_IO_H_ */
|
||||
Index: pidgin-2.2.2/libpurple/sslconn.c
|
||||
===================================================================
|
||||
--- pidgin-2.2.2.orig/libpurple/sslconn.c
|
||||
+++ pidgin-2.2.2/libpurple/sslconn.c
|
||||
@@ -257,6 +257,27 @@ purple_ssl_read(PurpleSslConnection *gsc
|
||||
--- pidgin-2.5.5/libpurple/sslconn.c
|
||||
+++ pidgin-2.5.5/libpurple/sslconn.c
|
||||
@@ -263,6 +263,27 @@
|
||||
}
|
||||
|
||||
size_t
|
||||
@ -897,7 +885,7 @@ Index: pidgin-2.2.2/libpurple/sslconn.c
|
||||
purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len)
|
||||
{
|
||||
PurpleSslOps *ops;
|
||||
@@ -280,6 +301,27 @@ purple_ssl_get_peer_certificates(PurpleS
|
||||
@@ -286,6 +307,27 @@
|
||||
return (ops->get_peer_certificates)(gsc);
|
||||
}
|
||||
|
||||
@ -925,11 +913,9 @@ Index: pidgin-2.2.2/libpurple/sslconn.c
|
||||
void
|
||||
purple_ssl_set_ops(PurpleSslOps *ops)
|
||||
{
|
||||
Index: pidgin-2.2.2/libpurple/sslconn.h
|
||||
===================================================================
|
||||
--- pidgin-2.2.2.orig/libpurple/sslconn.h
|
||||
+++ pidgin-2.2.2/libpurple/sslconn.h
|
||||
@@ -38,6 +38,12 @@ typedef enum
|
||||
--- pidgin-2.5.5/libpurple/sslconn.h
|
||||
+++ pidgin-2.5.5/libpurple/sslconn.h
|
||||
@@ -34,6 +34,12 @@
|
||||
PURPLE_SSL_CERTIFICATE_INVALID = 3
|
||||
} PurpleSslErrorType;
|
||||
|
||||
@ -939,26 +925,26 @@ Index: pidgin-2.2.2/libpurple/sslconn.h
|
||||
+ PURPLE_SSL_IO_AGAIN = -2
|
||||
+} PurpleSslIOErrorType;
|
||||
+
|
||||
typedef struct _PurpleSslConnection PurpleSslConnection;
|
||||
#include "certificate.h"
|
||||
#include "proxy.h"
|
||||
|
||||
typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *,
|
||||
@@ -106,6 +112,7 @@ typedef struct
|
||||
* @return Number of bytes actually written into the buffer, or <0 on error
|
||||
@@ -115,6 +121,7 @@
|
||||
* @see purple_ssl_read
|
||||
*/
|
||||
size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len);
|
||||
+ size_t (*read_nonblock)(PurpleSslConnection *gsc, void *data, size_t len);
|
||||
/** Writes data to a connection (like POSIX send())
|
||||
* @param gsc Connection context
|
||||
* @param data Data buffer to send data from
|
||||
@@ -113,6 +120,7 @@ typedef struct
|
||||
* @return The number of bytes written (may be less than len) or <0 on error
|
||||
* @param gsc Connection context
|
||||
* @param data Data buffer to send data from
|
||||
@@ -124,6 +131,7 @@
|
||||
* @see purple_ssl_write
|
||||
*/
|
||||
size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
|
||||
+ size_t (*write_nonblock)(PurpleSslConnection *gsc, const void *data, size_t len);
|
||||
/** Obtains the certificate chain provided by the peer
|
||||
*
|
||||
* @param gsc Connection context
|
||||
@@ -240,6 +248,17 @@ void purple_ssl_close(PurpleSslConnectio
|
||||
@@ -256,6 +264,17 @@
|
||||
size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len);
|
||||
|
||||
/**
|
||||
@ -976,7 +962,7 @@ Index: pidgin-2.2.2/libpurple/sslconn.h
|
||||
* Writes data to an SSL connection.
|
||||
*
|
||||
* @param gsc The SSL connection handle.
|
||||
@@ -260,6 +279,17 @@ size_t purple_ssl_write(PurpleSslConnect
|
||||
@@ -278,6 +297,17 @@
|
||||
*/
|
||||
GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc);
|
||||
|
||||
|
@ -1,3 +1,72 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 12 19:33:41 CET 2009 - sbrabec@suse.cz
|
||||
|
||||
- Updated to version 2.5.5:
|
||||
libpurple:
|
||||
* Fix a crash when removing an account with an unknown protocol id.
|
||||
* Beta support for SSL connections for AIM and ICQ accounts. To
|
||||
enable, check the "Use SSL" option from the Advanced tab when
|
||||
editing your AIM or ICQ account. (Paul Aurich)
|
||||
* Fix a memory leak in SILC. (Luke Petre)
|
||||
* Fix some string handling in the SIMPLE prpl, which fixes some buddy name
|
||||
handling and other issues. (Paul Aurich, Marcus Sundberg)
|
||||
* Implement support for resolving DNS via the SOCKS4 proxy (SOCKS4a).
|
||||
ICQ:
|
||||
* Fix retrieval of status messages from users of ICQ 6.x, Miranda, and
|
||||
other libpurple clients. (Daniel Ljungborg)
|
||||
* Change client ID to match ICQ Basic 14.34.3096. This fixes publishing
|
||||
of buddy icons and available messages.
|
||||
* Properly publish status messages for statuses other than Available.
|
||||
ICQ 6.x users can now see these status messages. (Daniel Ljungborg)
|
||||
* Fix receipt of messages from the mobile client Slick. (David Jedelsky)
|
||||
MSN:
|
||||
* Fix transfer of buddy icons, custom smileys, and files from the
|
||||
latest Windows Live Messenger 9 official client. (Thomas
|
||||
Gibson-Robinson)
|
||||
* Large (multi-part) messages are now correctly re-combined.
|
||||
* Federated/Yahoo! buddies should now stop creating sync issues at
|
||||
every signin. You may need to remove duplicates in the Address
|
||||
Book. See the FAQ for more information. Thanks to Jason Lingohr
|
||||
for lots of debugging and testing.
|
||||
* Messages from Yahoo! buddies are no longer silently dropped.
|
||||
* We now save and use the CacheKey for ABCH SOAP requests.
|
||||
* Don't try to parse Personal Status Messages or Current Media if they
|
||||
don't exist.
|
||||
* Convert from ISO-8859-1 encoding to UTF-8 when no charset is specified
|
||||
on incoming messages. This should fix some issues with messages from
|
||||
older clients.
|
||||
* Force sending the font "Segoe UI" if outgoing formatting doesn't specify
|
||||
a font already.
|
||||
* Queue callbacks when token updates are in progress to prevent two token
|
||||
update attempts from trampling each other.
|
||||
* Fixed a crash on Windows when removing a buddy's alias.
|
||||
* Update the Address Book when buddies' friendly names change. This
|
||||
prevents seeing an outdated alias or not seeing an alias at all for
|
||||
buddies who are offline when you sign in.
|
||||
* Update tokens for FindMembership and ABFindAll SOAP requests.
|
||||
* We no longer try to send empty messages. This could happen when a
|
||||
message contained only formatting and that formatting was not supported
|
||||
on MSN.
|
||||
* Buddies on both the Allow and Block list are now automatically
|
||||
removed from the Allow list. Users with this problem will now no
|
||||
longer receive an ADL 241 error. The problematic buddy should now
|
||||
appear on the buddy list and can be removed or unblocked as desired.
|
||||
XMPP:
|
||||
* Resources using __HOSTNAME__ substitution will now grab only the short
|
||||
hostname instead of the FQDN on systems which put the FQDN in the
|
||||
hostname. (Matěj Cepl)
|
||||
* No longer send a 'to' attribute on an outgoing stanza when we haven't
|
||||
received one. This fixes a registration bug as described in ticket
|
||||
#6635.
|
||||
Pidgin:
|
||||
* Tooltip windows now appear below the mouse cursor. (Kosta Arvanitis)
|
||||
* Tooltip windows now disappear on keypress events. (Kosta Arvanitis)
|
||||
* Tooltip windows no longer linger when scrolling the buddy list. (Kosta
|
||||
Arvanitis)
|
||||
Finch:
|
||||
* Allow rebinding keys to change the focused widget (details in the
|
||||
man-page, look for GntBox::binding)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 19 16:45:49 CET 2009 - sbrabec@suse.cz
|
||||
|
||||
|
82
pidgin.spec
82
pidgin.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package pidgin (Version 2.5.4)
|
||||
# spec file for package pidgin (Version 2.5.5)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -20,8 +20,8 @@
|
||||
|
||||
Name: pidgin
|
||||
Summary: GTK+-Based Multiprotocol Instant Messaging Client
|
||||
Version: 2.5.4
|
||||
Release: 3
|
||||
Version: 2.5.5
|
||||
Release: 1
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Url: http://www.pidgin.im/
|
||||
@ -754,11 +754,13 @@ intltoolize --force
|
||||
--enable-nm=yes\
|
||||
--enable-dbus=yes\
|
||||
--enable-devhelp\
|
||||
--with-perl-lib=%{_prefix}\
|
||||
--with-tclconfig=%{_libdir}\
|
||||
--with-tkconfig=%{_libdir}\
|
||||
--with-perl-lib=%{_prefix}\
|
||||
--with-tclconfig=%{_libdir}\
|
||||
--with-tkconfig=%{_libdir}\
|
||||
--with-system-ssl-certs=/etc/ssl/certs
|
||||
%{__make} %{?jobs:-j%jobs}
|
||||
# Mono bindings sometimes fail with parallel build enabled in pidgin-2.5.5:
|
||||
#%{__make} %{?jobs:-j%jobs}
|
||||
%{__make}
|
||||
|
||||
%install
|
||||
%{makeinstall}
|
||||
@ -878,6 +880,72 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \
|
||||
%{_libdir}/pkgconfig/gnt.pc
|
||||
|
||||
%changelog
|
||||
* Thu Mar 12 2009 sbrabec@suse.cz
|
||||
- Updated to version 2.5.5:
|
||||
libpurple:
|
||||
* Fix a crash when removing an account with an unknown protocol id.
|
||||
* Beta support for SSL connections for AIM and ICQ accounts. To
|
||||
enable, check the "Use SSL" option from the Advanced tab when
|
||||
editing your AIM or ICQ account. (Paul Aurich)
|
||||
* Fix a memory leak in SILC. (Luke Petre)
|
||||
* Fix some string handling in the SIMPLE prpl, which fixes some buddy name
|
||||
handling and other issues. (Paul Aurich, Marcus Sundberg)
|
||||
* Implement support for resolving DNS via the SOCKS4 proxy (SOCKS4a).
|
||||
ICQ:
|
||||
* Fix retrieval of status messages from users of ICQ 6.x, Miranda, and
|
||||
other libpurple clients. (Daniel Ljungborg)
|
||||
* Change client ID to match ICQ Basic 14.34.3096. This fixes publishing
|
||||
of buddy icons and available messages.
|
||||
* Properly publish status messages for statuses other than Available.
|
||||
ICQ 6.x users can now see these status messages. (Daniel Ljungborg)
|
||||
* Fix receipt of messages from the mobile client Slick. (David Jedelsky)
|
||||
MSN:
|
||||
* Fix transfer of buddy icons, custom smileys, and files from the
|
||||
latest Windows Live Messenger 9 official client. (Thomas
|
||||
Gibson-Robinson)
|
||||
* Large (multi-part) messages are now correctly re-combined.
|
||||
* Federated/Yahoo! buddies should now stop creating sync issues at
|
||||
every signin. You may need to remove duplicates in the Address
|
||||
Book. See the FAQ for more information. Thanks to Jason Lingohr
|
||||
for lots of debugging and testing.
|
||||
* Messages from Yahoo! buddies are no longer silently dropped.
|
||||
* We now save and use the CacheKey for ABCH SOAP requests.
|
||||
* Don't try to parse Personal Status Messages or Current Media if they
|
||||
don't exist.
|
||||
* Convert from ISO-8859-1 encoding to UTF-8 when no charset is specified
|
||||
on incoming messages. This should fix some issues with messages from
|
||||
older clients.
|
||||
* Force sending the font "Segoe UI" if outgoing formatting doesn't specify
|
||||
a font already.
|
||||
* Queue callbacks when token updates are in progress to prevent two token
|
||||
update attempts from trampling each other.
|
||||
* Fixed a crash on Windows when removing a buddy's alias.
|
||||
* Update the Address Book when buddies' friendly names change. This
|
||||
prevents seeing an outdated alias or not seeing an alias at all for
|
||||
buddies who are offline when you sign in.
|
||||
* Update tokens for FindMembership and ABFindAll SOAP requests.
|
||||
* We no longer try to send empty messages. This could happen when a
|
||||
message contained only formatting and that formatting was not supported
|
||||
on MSN.
|
||||
* Buddies on both the Allow and Block list are now automatically
|
||||
removed from the Allow list. Users with this problem will now no
|
||||
longer receive an ADL 241 error. The problematic buddy should now
|
||||
appear on the buddy list and can be removed or unblocked as desired.
|
||||
XMPP:
|
||||
* Resources using __HOSTNAME__ substitution will now grab only the short
|
||||
hostname instead of the FQDN on systems which put the FQDN in the
|
||||
hostname. (Matěj Cepl)
|
||||
* No longer send a 'to' attribute on an outgoing stanza when we haven't
|
||||
received one. This fixes a registration bug as described in ticket
|
||||
[#6635].
|
||||
Pidgin:
|
||||
* Tooltip windows now appear below the mouse cursor. (Kosta Arvanitis)
|
||||
* Tooltip windows now disappear on keypress events. (Kosta Arvanitis)
|
||||
* Tooltip windows no longer linger when scrolling the buddy list. (Kosta
|
||||
Arvanitis)
|
||||
Finch:
|
||||
* Allow rebinding keys to change the focused widget (details in the
|
||||
man-page, look for GntBox::binding)
|
||||
* Thu Feb 19 2009 sbrabec@suse.cz
|
||||
- Default browser is xdg-open, not mozilla (bnc#472219).
|
||||
- libpurple: Requires openssl-certs.
|
||||
|
Loading…
Reference in New Issue
Block a user