rpms/jabberd/EL-5 jabberd-size_t.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 jabberd, 1.8, 1.9 jabberd.spec, 1.17, 1.18 sources, 1.6, 1.7

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/jabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2812

Modified Files:
	.cvsignore jabberd jabberd.spec sources 
Added Files:
	jabberd-size_t.patch 
Log Message:
update jabberd to same as fedora.  it fixes issues that have been seen on spacewalk


jabberd-size_t.patch:
 sasl_gsasl.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE jabberd-size_t.patch ---
diff -uNr jabberd-2.2.7.1.orig/sx/sasl_gsasl.c jabberd-2.2.7.1/sx/sasl_gsasl.c
--- jabberd-2.2.7.1.orig/sx/sasl_gsasl.c	2009-02-24 23:28:33.000000000 +0100
+++ jabberd-2.2.7.1/sx/sasl_gsasl.c	2009-06-18 16:57:29.681574813 +0200
@@ -210,7 +210,8 @@
 
 static int _sx_sasl_wio(sx_t s, sx_plugin_t p, sx_buf_t buf) {
     sx_error_t sxe;
-    int len, ret;
+    size_t len;
+    int ret;
     char *out;
     Gsasl_session *sd = (Gsasl_session *) s->plugin_data[p->index];
 
@@ -237,7 +238,8 @@
 
 static int _sx_sasl_rio(sx_t s, sx_plugin_t p, sx_buf_t buf) {
     sx_error_t sxe;
-    int len, ret;
+    size_t len;
+    int ret;
     char *out;
     Gsasl_session *sd = (Gsasl_session *) s->plugin_data[p->index];
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	3 Feb 2009 08:51:32 -0000	1.6
+++ .cvsignore	22 Jul 2009 16:38:08 -0000	1.7
@@ -1 +1 @@
-jabberd-2.2.5.tar.bz2
+jabberd-2.2.8.tar.bz2


Index: jabberd
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/EL-5/jabberd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- jabberd	7 Aug 2006 09:45:11 -0000	1.8
+++ jabberd	22 Jul 2009 16:38:08 -0000	1.9
@@ -73,12 +73,12 @@ Start ( ) {
 		args="-c ${confPath}/${prog}.xml"
 		if [ ${prog} == "c2s" -a ! -z "$C2S_AS_ROOT" ]; then
 			if [ $C2S_AS_ROOT == "yes" ]; then
-				daemon --user root "${progsPath}/${prog} ${args} & 2> /dev/null"
+				daemon --user root "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
 			else
-				daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+				daemon --user jabber "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
 			fi
 		else
-			daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+			daemon --user jabber "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
 		fi
 		retval=$?
 		echo


Index: jabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/EL-5/jabberd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- jabberd.spec	4 Jul 2009 20:43:10 -0000	1.17
+++ jabberd.spec	22 Jul 2009 16:38:08 -0000	1.18
@@ -1,12 +1,13 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
-Version: 2.2.5
+Version: 2.2.8
 Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
-Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.5.tar.bz2
+Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.8.tar.bz2
 Source1: jabberd
 Source2: jabberd.sysconfig
+Patch0: jabberd-size_t.patch
 URL: http://jabberd2.xiaoka.com/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel libidn-devel expat-devel
@@ -38,6 +39,7 @@ This packages defaults to use pam and th
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -190,8 +192,25 @@ fi
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
-* Sat Jul 04 2009 Adrian Reber <adrian at lisas.de> - 2.2.5-2
-- rebuilt in hope to fix "undefined symbol: ser_string_set" (#508182)
+* Fri Jun 19 2009 Adrian Reber <adrian at lisas.de> - 2.2.8-2
+- updated to 2.2.8
+- added patch to fix "router segfaults" (rhbz#497671)
+
+* Tue Mar 31 2009 Bernie Innocenti <bernie at codewiz.org> - 2.2.7.1-2
+- fix rhbz#349714: jabberd does not close its stdin/stdout/stderr
+
+* Thu Feb 26 2009 Adrian Reber <adrian at lisas.de> - 2.2.7.1-1
+- updated to 2.2.7.1
+- "Workaround for buggy Java TLS implementation (affecting OpenFire and GTalk)"
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 17 2009 Adrian Reber <adrian at lisas.de> - 2.2.7-1
+- updated to 2.2.7
+
+* Mon Feb 16 2009 Adrian Reber <adrian at lisas.de> - 2.2.6-1
+- updated to 2.2.6
 
 * Tue Feb 03 2009 Adrian Reber <adrian at lisas.de> - 2.2.5-1
 - updated to 2.2.5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	3 Feb 2009 08:51:32 -0000	1.6
+++ sources	22 Jul 2009 16:38:08 -0000	1.7
@@ -1 +1 @@
-6c9f752155645ddf6a917f597bb8370e  jabberd-2.2.5.tar.bz2
+7ef574635950880615cbb21a5fe9fb5a  jabberd-2.2.8.tar.bz2