commit 98875c4b18253a2deb1eaea73acc91257244cda1
Author: Marcin Krol <[email protected]>
Date: Wed Jul 24 06:50:38 2013 +0000
- upstream fixes (note: diff-trunk_src-from-r714-to-r716.diff replaced
with git.patch)
diff-trunk_src-from-r714-to-r716.diff | 28 ------------
jggtrans-git.patch | 86 +++++++++++++++++++++++++++++++++++
jggtrans.spec | 4 +-
3 files changed, 88 insertions(+), 30 deletions(-)
---
diff --git a/jggtrans.spec b/jggtrans.spec
index f42a1e9..60ee3b2 100644
--- a/jggtrans.spec
+++ b/jggtrans.spec
@@ -4,7 +4,7 @@ Summary: GaduGadu transport module for Jabber
Summary(pl.UTF-8): ModuĊ transportowy GaduGadu dla systemu Jabber
Name: jggtrans
Version: 2.2.4
-Release: 5
+Release: 6
License: GPL
Group: Applications/Communications
Source0: http://jggtrans.jajcus.net/downloads/jggtrans-%{version}.tar.gz
@@ -13,7 +13,7 @@ Source1: jggtrans.init
Source2: jggtrans.sysconfig
Patch0: %{name}-pidfile.patch
Patch1: %{name}-spooldir.patch
-Patch2: diff-trunk_src-from-r714-to-r716.diff
+Patch2: %{name}-git.patch
Patch3: %{name}-format-security.patch
URL: http://jggtrans.jajcus.net/
BuildRequires: autoconf
diff --git a/diff-trunk_src-from-r714-to-r716.diff
b/diff-trunk_src-from-r714-to-r716.diff
deleted file mode 100644
index c23dd0c..0000000
--- a/diff-trunk_src-from-r714-to-r716.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: trunk/src/presence.c
-===================================================================
---- trunk/src/presence.c (revision 714)
-+++ trunk/src/presence.c (revision 716)
-@@ -428,6 +428,12 @@
- return 0;
- }
-- else presence_send_unsubscribed(stream,NULL,from);
-- return -1;
-+ else if (user_get_by_jid(from)) {
-+ presence_send(stream, to, from, 0,
-+ NULL, "Not logged in", 0);
-+ }
-+ else {
-+ presence_send_unsubscribed(stream, NULL, from);
-+ }
-+ return 0;
- }
-
-@@ -447,5 +453,7 @@
- uin=jid_get_uin(to);
-
-- c=user_get_contact(u,uin,FALSE);
-+ /* create the contact: if we got 'prope' the user has it on his
-+ * contact list, do not change that */
-+ c = user_get_contact(u, uin, TRUE);
- if (!c) {
- return -1;
diff --git a/jggtrans-git.patch b/jggtrans-git.patch
new file mode 100644
index 0000000..8308f1f
--- /dev/null
+++ b/jggtrans-git.patch
@@ -0,0 +1,86 @@
+diff -ur jggtrans-2.2.4/src/message.c jggtrans-master/src/message.c
+--- jggtrans-2.2.4/src/message.c 2010-04-10 14:23:06.000000000 +0000
++++ jggtrans-master/src/message.c 2013-06-20 20:35:30.000000000 +0000
+@@ -208,7 +208,7 @@
+ xmlnode_put_attrib(msg,"to",s->user->jid);
+ n=xmlnode_insert_tag(msg,"body");
+ roster=xmlnode_insert_tag(msg,"x");
+- xmlnode_put_attrib(roster,"xmlns","jabber:x:roster");
++ xmlnode_put_attrib(roster,"xmlns","http://jabber.org/protocol/rosterx";);
+
+ body=g_strdup("");
+ results=g_strsplit(e->event.userlist.reply,"\r\n",0);
+@@ -281,6 +281,7 @@
+ }
+
+ jid=jid_build(uin);
++ xmlnode_put_attrib(item,"action", "add");
+ xmlnode_put_attrib(item,"jid",jid);
+ g_free(jid);
+ if (name==NULL) name=g_strdup_printf("%u",uin);
+diff -ur jggtrans-2.2.4/src/presence.c jggtrans-master/src/presence.c
+--- jggtrans-2.2.4/src/presence.c 2010-04-10 14:23:06.000000000 +0000
++++ jggtrans-master/src/presence.c 2013-06-20 20:35:30.000000000 +0000
+@@ -427,8 +427,14 @@
+ }
+ return 0;
+ }
+- else presence_send_unsubscribed(stream,NULL,from);
+- return -1;
++ else if (user_get_by_jid(from)) {
++ presence_send(stream, to, from, 0,
++ NULL, "Not logged in", 0);
++ }
++ else {
++ presence_send_unsubscribed(stream, NULL, from);
++ }
++ return 0;
+ }
+
+ if (!jid_is_my(to)){
+@@ -446,7 +452,9 @@
+
+ uin=jid_get_uin(to);
+
+- c=user_get_contact(u,uin,FALSE);
++ /* create the contact: if we got 'prope' the user has it on his
++ * contact list, do not change that */
++ c = user_get_contact(u, uin, TRUE);
+ if (!c) {
+ return -1;
+ }
+diff -ur jggtrans-2.2.4/src/sessions.c jggtrans-master/src/sessions.c
+--- jggtrans-2.2.4/src/sessions.c 2010-04-10 14:23:06.000000000 +0000
++++ jggtrans-master/src/sessions.c 2013-06-20 20:35:30.000000000 +0000
+@@ -583,8 +583,9 @@
+ break;
+ }
+ jid=jid_build_full(event->event.msg.sender);
+- if
((event->event.msg.msgclass&GG_CLASS_CHAT)!=0) chat=1;
+- else chat=0;
++ /*if
((event->event.msg.msgclass&GG_CLASS_CHAT)!=0) chat=1;
++ else chat=0;*/
++ chat = 1;
+ }
+ if ((event->event.msg.msgclass&GG_CLASS_QUEUED)!=0){
+ timestamp=event->event.msg.time;
+@@ -773,6 +774,7 @@
+ login_params.async=1;
+ login_params.last_sysmsg=s->user->last_sys_msg;
+ login_params.protocol_version=GG_DEFAULT_PROTOCOL_VERSION;
++ login_params.protocol_features = GG_FEATURE_DND_FFC;
+ login_params.status=GG_STATUS_INVISIBLE;
+ login_params.encoding = GG_ENCODING_UTF8;
+ if(s->user->status)
+diff -ur jggtrans-2.2.4/src/status.c jggtrans-master/src/status.c
+--- jggtrans-2.2.4/src/status.c 2010-04-10 14:23:06.000000000 +0000
++++ jggtrans-master/src/status.c 2013-06-20 20:35:30.000000000 +0000
+@@ -49,7 +49,7 @@
+ int status_gg_to_jabber(int ggstatus,char **show,char **status){
+ int available;
+
+- switch(ggstatus){
++ switch(GG_S(ggstatus)){
+ case GG_STATUS_NOT_AVAIL:
+ case GG_STATUS_NOT_AVAIL_DESCR:
+ available=0;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jggtrans.git/commitdiff/98875c4b18253a2deb1eaea73acc91257244cda1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
