# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1372610650 -7200
# Node ID 70baf26f10880835dceb5d5a992ca4365ae17259
# Parent  3ee660c5bc4fdb4d5ed20e9cbee20c424e05d36d
Update vendor software version and solve g_async_queue_push SIGSEGV.

diff -r 3ee660c5bc4f -r 70baf26f1088 jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Tue Apr 02 20:44:50 2013 +0200
+++ b/jabberd/jabberd.patch	Sun Jun 30 18:44:10 2013 +0200
@@ -204,3 +204,33 @@
  
  #include <expat.h>
  
+diff -Nau mu-conference-0.8.81/src/main.c.orig mu-conference-0.8.81/src/main.c
+Index: mu-conference-0.8.81/src/main.c
+--- mu-conference-0.8.81/src/main.c.orig	2013-07-01 00:12:58.147291969 +0200
++++ mu-conference-0.8.81/src/main.c	2013-06-30 23:15:28.653657696 +0200
+@@ -51,7 +51,7 @@
+ 
+   jcr = (jcr_instance)calloc(1, sizeof(_jcr_instance));
+ 
+-  g_thread_init(NULL);
++  g_thread_init_glib(NULL);
+   fprintf(stderr, "%s -- %s\n%s\n\n", _JCOMP_NAME, _JCOMP_VERS, _JCOMP_COPY);
+ 
+   while ((c = getopt(argc, argv, "Bshd:c:")) != EOF)
+diff -Nau mu-conference-0.8.81/src/jcomp/jcr_deliver.c.orig mu-conference-0.8.81/src/jcomp/jcr_deliver.c
+Index: mu-conference-0.8.81/src/jcomp/jcr_deliver.c
+--- mu-conference-0.8.81/src/jcomp/jcr_deliver.c.orig	2013-06-14 21:42:45.000000000 +0200
++++ mu-conference-0.8.81/src/jcomp/jcr_deliver.c	2013-07-01 03:13:46.888580626 +0200
+@@ -33,11 +33,11 @@
+     sleep(1);
+   }
+ 
+-  g_async_queue_push(jcr->dqueue, d);
+   log_debug(JDBG, "queued %lu bytes now %lu msgs : >>> %s <<<",
+ 	    strlen(xmlnode2str(d->x)),
+ 	    g_async_queue_length(jcr->dqueue),
+ 	    xmlnode2str(d->x));
++  g_async_queue_push(jcr->dqueue, d);
+ }
+ 
+ void jcr_queue_deliver(void *a) {
diff -r 3ee660c5bc4f -r 70baf26f1088 jabberd/jabberd.spec
--- a/jabberd/jabberd.spec	Tue Apr 02 20:44:50 2013 +0200
+++ b/jabberd/jabberd.spec	Sun Jun 30 18:44:10 2013 +0200
@@ -24,7 +24,7 @@
 #   package version
 %define       V_major 2.2
 %define       V_minor 17
-%define       V_mucon 0.8
+%define       V_mucon 0.8.81
 
 #   package information
 Name:         jabberd
@@ -37,7 +37,7 @@
 Group:        InstantMessaging
 License:      JOSL/GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20120800
+Release:      20130000
 
 #   package options
 %option       with_sqlite yes
@@ -48,7 +48,7 @@
 
 #   list of sources
 Source0:      http://www.github.com/downloads/Jabberd2/jabberd2/jabberd-%{version}.tar.xz
-Source1:      http://download.gna.org/mu-conference/mu-conference_%{V_mucon}.tar.gz
+Source1:      http://download.gna.org/mu-conference/mu-conference-%{V_mucon}.tar.gz
 Source1:      rc.jabberd
 Patch0:       jabberd.patch
 
@@ -83,7 +83,7 @@
     messaging platform. JabberD 2 is the next generation of the JabberD
     server. It has been rewritten from the ground up to be scalable,
     architecturally sound, and to support the latest protocol extensions
-    coming out of the JSF.
+    coming out of the XSF.
 
 %track
     prog jabberd = {
@@ -94,7 +94,7 @@
     prog jabberd:mucon = {
         version   = %{V_mucon}
         url       = http://download.gna.org/mu-conference/
-        regex     = mu-conference_(__VER__)\.tar\.gz
+        regex     = mu-conference-(__VER__)\.tar\.gz
     }
 
 %prep
@@ -111,10 +111,10 @@
     %{l_shtool} subst \
         -e 's;^\(CFLAGS\ *:=.*pkg-config --cflags glib-2.0\);\1 libidn;' \
         -e 's;^\(LIBS\ *:=.*\);\1 $(LOCLIBS);' \
-        mu-conference_%{V_mucon}/src/Makefile
+        mu-conference-%{V_mucon}/src/Makefile
     %{l_shtool} subst \
         -e 's;mu-conference.log;muc.log;g' \
-        mu-conference_%{V_mucon}/src/jcomp/jcr_log.c
+        mu-conference-%{V_mucon}/src/jcomp/jcr_log.c
     %{l_shtool} subst \
         -e 's;<port>[0-9][0-9]*</port>;<port>5347</port>;' \
         -e 's;<spool>.*</spool>;<spool>%{l_prefix}/var/jabberd/spool/rooms</spool>;' \
@@ -123,7 +123,7 @@
         -e 's;<pidfile>.*</pidfile>;<pidfile>%{l_prefix}/var/jabberd/pid/muc.pid</pidfile>;' \
         -e 's;<URL>.*</URL>;<URL>http://name.host.tld/</URL>;' \
         -e 's;<stylesheet>.*</stylesheet>;<stylesheet>%{l_prefix}/share/jabberd/style.css</stylesheet>;' \
-        mu-conference_%{V_mucon}/muc-default.xml
+        mu-conference-%{V_mucon}/muc-default.xml
     echo \
         'muc         @sysconfdir@/muc.xml' \
         >>etc/jabberd.cfg.dist.in
@@ -188,15 +188,15 @@
     #   build program
     %{l_make} %{l_mflags -O}
 
+#http://www.suramya.com/linux/tutorials/JabberSetup/
 %if "%{with_mucon}" == "yes"
-#http://www.suramya.com/linux/tutorials/JabberSetup/
     loclibs=''
     case "%{l_platform -t}" in
         *-sunos* )
             loclibs='-lsocket -lnsl'
             ;;
     esac
-    ( cd mu-conference_%{V_mucon}
+    ( cd mu-conference-%{V_mucon}
       %{l_make} %{l_mflags -O} LOCLIBS=$loclibs
     ) || exit $?
 %endif
@@ -222,13 +222,13 @@
         $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/logs \
         $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/rooms
     %{l_shtool} install -c -m 644 \
-        mu-conference_%{V_mucon}/muc-default.xml \
+        mu-conference-%{V_mucon}/muc-default.xml \
         $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/muc.xml
     %{l_shtool} install -c \
-        mu-conference_%{V_mucon}/src/mu-conference \
+        mu-conference-%{V_mucon}/src/mu-conference \
         $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_shtool} install -c \
-        mu-conference_%{V_mucon}/style.css \
+        mu-conference-%{V_mucon}/style.css \
         $RPM_BUILD_ROOT%{l_prefix}/share/jabberd
 %endif