forked from pool/pidgin
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
26f808042c
commit
e2b1a9aee2
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de
|
||||
size 7829592
|
||||
3
pidgin-2.2.2.tar.bz2
Normal file
3
pidgin-2.2.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:610efaefb869cb9b16ca0bb9b92779c41584f8965988a61a81e593d0510377ac
|
||||
size 8901875
|
||||
@ -1,6 +1,8 @@
|
||||
--- pidgin-2.0.1/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
+++ pidgin-2.0.1/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
@@ -137,8 +137,6 @@
|
||||
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
|
||||
if(gnutls_data->handshake_handler)
|
||||
purple_input_remove(gnutls_data->handshake_handler);
|
||||
|
||||
@ -9,7 +11,7 @@
|
||||
gnutls_deinit(gnutls_data->session);
|
||||
|
||||
g_free(gnutls_data);
|
||||
@@ -173,6 +171,22 @@
|
||||
@@ -335,6 +333,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc
|
||||
}
|
||||
|
||||
static size_t
|
||||
@ -32,9 +34,9 @@
|
||||
ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len)
|
||||
{
|
||||
PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
|
||||
@@ -201,6 +215,23 @@
|
||||
return s;
|
||||
}
|
||||
@@ -928,6 +942,23 @@ static PurpleCertificateScheme x509_gnut
|
||||
|
||||
};
|
||||
|
||||
+static size_t
|
||||
+ssl_gnutls_write_nonblock(PurpleSslConnection *gsc, const void *data, size_t len)
|
||||
@ -56,29 +58,33 @@
|
||||
static PurpleSslOps ssl_ops =
|
||||
{
|
||||
ssl_gnutls_init,
|
||||
@@ -208,7 +239,9 @@
|
||||
@@ -935,7 +966,9 @@ static PurpleSslOps ssl_ops =
|
||||
ssl_gnutls_connect,
|
||||
ssl_gnutls_close,
|
||||
ssl_gnutls_read,
|
||||
+ ssl_gnutls_read_nonblock,
|
||||
ssl_gnutls_write,
|
||||
+ ssl_gnutls_write_nonblock,
|
||||
ssl_gnutls_get_peer_certificates,
|
||||
|
||||
/* padding */
|
||||
NULL,
|
||||
--- pidgin-2.0.1/libpurple/plugins/ssl/ssl-nss.c
|
||||
+++ pidgin-2.0.1/libpurple/plugins/ssl/ssl-nss.c
|
||||
@@ -359,6 +359,8 @@
|
||||
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 =
|
||||
ssl_nss_connect,
|
||||
ssl_nss_close,
|
||||
ssl_nss_read,
|
||||
+ ssl_nss_read,
|
||||
+ ssl_nss_write,
|
||||
ssl_nss_write,
|
||||
ssl_nss_peer_certs,
|
||||
|
||||
/* padding */
|
||||
--- pidgin-2.0.1/libpurple/purple-fifo.c
|
||||
+++ pidgin-2.0.1/libpurple/purple-fifo.c
|
||||
Index: pidgin-2.2.2/libpurple/purple-fifo.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-fifo.c
|
||||
@@ -0,0 +1,232 @@
|
||||
+/*
|
||||
+ * @file purple-fifo.c A FIFO byte queue.
|
||||
@ -312,8 +318,10 @@
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
--- pidgin-2.0.1/libpurple/purple-fifo.h
|
||||
+++ pidgin-2.0.1/libpurple/purple-fifo.h
|
||||
Index: pidgin-2.2.2/libpurple/purple-fifo.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-fifo.h
|
||||
@@ -0,0 +1,54 @@
|
||||
+/**
|
||||
+ * @file purple-fifo.h A FIFO byte queue.
|
||||
@ -369,8 +377,10 @@
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* _purple_fifo_H_ */
|
||||
--- pidgin-2.0.1/libpurple/purple-io.c
|
||||
+++ pidgin-2.0.1/libpurple/purple-io.c
|
||||
Index: pidgin-2.2.2/libpurple/purple-io.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-io.c
|
||||
@@ -0,0 +1,391 @@
|
||||
+/*
|
||||
+ * @file purple-io.c Buffering I/O layer.
|
||||
@ -763,8 +773,10 @@
|
||||
+{
|
||||
+ return purple_fifo_get_used (io->write_fifo);
|
||||
+}
|
||||
--- pidgin-2.0.1/libpurple/purple-io.h
|
||||
+++ pidgin-2.0.1/libpurple/purple-io.h
|
||||
Index: pidgin-2.2.2/libpurple/purple-io.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ pidgin-2.2.2/libpurple/purple-io.h
|
||||
@@ -0,0 +1,87 @@
|
||||
+/**
|
||||
+ * @file purple-io.h Buffering I/O layer.
|
||||
@ -853,9 +865,11 @@
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* _PURPLE_IO_H_ */
|
||||
--- pidgin-2.0.1/libpurple/sslconn.c
|
||||
+++ pidgin-2.0.1/libpurple/sslconn.c
|
||||
@@ -219,6 +219,27 @@
|
||||
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
|
||||
}
|
||||
|
||||
size_t
|
||||
@ -883,8 +897,8 @@
|
||||
purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len)
|
||||
{
|
||||
PurpleSslOps *ops;
|
||||
@@ -231,6 +252,27 @@
|
||||
return (ops->write)(gsc, data, len);
|
||||
@@ -280,6 +301,27 @@ purple_ssl_get_peer_certificates(PurpleS
|
||||
return (ops->get_peer_certificates)(gsc);
|
||||
}
|
||||
|
||||
+size_t
|
||||
@ -911,10 +925,12 @@
|
||||
void
|
||||
purple_ssl_set_ops(PurpleSslOps *ops)
|
||||
{
|
||||
--- pidgin-2.0.1/libpurple/sslconn.h
|
||||
+++ pidgin-2.0.1/libpurple/sslconn.h
|
||||
@@ -35,6 +35,12 @@
|
||||
PURPLE_SSL_CONNECT_FAILED = 2
|
||||
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
|
||||
PURPLE_SSL_CERTIFICATE_INVALID = 3
|
||||
} PurpleSslErrorType;
|
||||
|
||||
+typedef enum
|
||||
@ -926,7 +942,7 @@
|
||||
typedef struct _PurpleSslConnection PurpleSslConnection;
|
||||
|
||||
typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *,
|
||||
@@ -100,6 +106,7 @@
|
||||
@@ -106,6 +112,7 @@ typedef struct
|
||||
* @return Number of bytes actually written into the buffer, or <0 on error
|
||||
*/
|
||||
size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len);
|
||||
@ -934,15 +950,15 @@
|
||||
/** Writes data to a connection (like POSIX send())
|
||||
* @param gsc Connection context
|
||||
* @param data Data buffer to send data from
|
||||
@@ -107,6 +114,7 @@
|
||||
@@ -113,6 +120,7 @@ typedef struct
|
||||
* @return The number of bytes written (may be less than len) or <0 on error
|
||||
*/
|
||||
size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
|
||||
+ size_t (*write_nonblock)(PurpleSslConnection *gsc, const void *data, size_t len);
|
||||
|
||||
void (*_purple_reserved1)(void);
|
||||
void (*_purple_reserved2)(void);
|
||||
@@ -197,6 +205,17 @@
|
||||
/** Obtains the certificate chain provided by the peer
|
||||
*
|
||||
* @param gsc Connection context
|
||||
@@ -240,6 +248,17 @@ void purple_ssl_close(PurpleSslConnectio
|
||||
size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len);
|
||||
|
||||
/**
|
||||
@ -960,9 +976,9 @@
|
||||
* Writes data to an SSL connection.
|
||||
*
|
||||
* @param gsc The SSL connection handle.
|
||||
@@ -207,6 +226,17 @@
|
||||
@@ -260,6 +279,17 @@ size_t purple_ssl_write(PurpleSslConnect
|
||||
*/
|
||||
size_t purple_ssl_write(PurpleSslConnection *gsc, const void *buffer, size_t len);
|
||||
GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc);
|
||||
|
||||
+/**
|
||||
+ * Writes data to an SSL connection without blocking.
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- libpurple/protocols/oscar/oscar.c
|
||||
+++ libpurple/protocols/oscar/oscar.c
|
||||
@@ -1788,7 +1788,7 @@
|
||||
|
||||
if (have_status_message)
|
||||
{
|
||||
- if ((status_id == OSCAR_STATUS_ID_AVAILABLE) && (info->itmsurl != NULL))
|
||||
+ if (!strcmp(status_id,OSCAR_STATUS_ID_AVAILABLE) && (info->itmsurl != NULL))
|
||||
{
|
||||
char *itmsurl;
|
||||
itmsurl = oscar_encoding_to_utf8(info->itmsurl_encoding,
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 8 22:38:28 CET 2007 - maw@suse.de
|
||||
|
||||
- Update to version 2.2.2 (thanks to James, Ivan, and Michel for
|
||||
the good work in GNOME:Community!)
|
||||
+ New protocol plugins
|
||||
+ XMPP enhancements
|
||||
+ Certificate management
|
||||
+ Various and sundry fixes and UI improvements
|
||||
- Remove obsolete pidgin-stringcompare.patch
|
||||
- Update pidgin-nonblock-common.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 24 18:14:52 CEST 2007 - sbrabec@suse.cz
|
||||
|
||||
|
||||
25
pidgin.spec
25
pidgin.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package pidgin (Version 2.1.1)
|
||||
# spec file for package pidgin (Version 2.2.2)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -12,8 +12,8 @@
|
||||
|
||||
Name: pidgin
|
||||
Summary: GTK+-Based Multiprotocol Instant Messaging Client
|
||||
Version: 2.1.1
|
||||
Release: 31
|
||||
Version: 2.2.2
|
||||
Release: 1
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Url: http://www.pidgin.im/
|
||||
@ -26,7 +26,6 @@ Patch3: pidgin-nonblock-common.patch
|
||||
Patch4: pidgin-nonblock-gwim.patch
|
||||
Patch5: pidgin-nonblock-common2.patch
|
||||
Patch7: pidgin-check.patch
|
||||
Patch8: pidgin-stringcompare.patch
|
||||
Patch9: includes.patch
|
||||
Patch10: pidgin-64bit-buildhack.patch
|
||||
# Can use external libzephyr
|
||||
@ -684,13 +683,12 @@ Authors:
|
||||
#'
|
||||
%setup -q -a1 -a2
|
||||
%patch1 -p1
|
||||
# FIXME: Port this patch:
|
||||
# FIXME: Port this patch:
|
||||
#%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
# Change Myanmar/Myanmar to Myanmar:
|
||||
rename my_MM my po/my_MM.*
|
||||
@ -806,6 +804,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/purple-send-async
|
||||
%{_bindir}/purple-url-handler
|
||||
%{_datadir}/pixmaps/purple
|
||||
%{_datadir}/purple/ca-certs/Equifax_Secure_CA.pem
|
||||
%{_datadir}/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
|
||||
%{_datadir}/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
|
||||
%{_datadir}/purple/ca-certs/Verisign_Class3_Primary_CA.pem
|
||||
%{_datadir}/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
|
||||
%{_libdir}/libpurple.so.*
|
||||
%{_libdir}/libpurple-client.so.*
|
||||
%dir %{_libdir}/purple-2
|
||||
@ -845,8 +848,18 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_includedir}/gnt
|
||||
%{_libdir}/libgnt.so
|
||||
%{_libdir}/libgnt.*a
|
||||
%{_libdir}/pkgconfig/finch.pc
|
||||
%{_libdir}/pkgconfig/gnt.pc
|
||||
%changelog
|
||||
* Thu Nov 08 2007 - maw@suse.de
|
||||
- Update to version 2.2.2 (thanks to James, Ivan, and Michel for
|
||||
the good work in GNOME:Community!)
|
||||
+ New protocol plugins
|
||||
+ XMPP enhancements
|
||||
+ Certificate management
|
||||
+ Various and sundry fixes and UI improvements
|
||||
- Remove obsolete pidgin-stringcompare.patch
|
||||
- Update pidgin-nonblock-common.patch.
|
||||
* Wed Oct 24 2007 - sbrabec@suse.cz
|
||||
- Fixed build by providing of lang package in older products.
|
||||
* Tue Oct 23 2007 - sbrabec@suse.cz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user