rpms/jabberd/devel jabberd-host_verify_mode.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 jabberd.spec, 1.20, 1.21 sources, 1.5, 1.6

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/jabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13725

Modified Files:
	.cvsignore jabberd.spec sources 
Added Files:
	jabberd-host_verify_mode.patch 
Log Message:
* Thu Jan 08 2008 Adrian Reber <adrian at lisas.de> - 2.1.20-1
- updated to 2.1.20


jabberd-host_verify_mode.patch:

--- NEW FILE jabberd-host_verify_mode.patch ---
--- jabberd-2.1.20/c2s/main.c	2007-12-27 18:52:04.000000000 +0100
+++ /tmp/main.c	2008-01-08 11:11:24.433818914 +0100
@@ -241,9 +242,11 @@
 
         host->host_pemfile = j_attr((const char **) elem->attrs[i], "pemfile");
 
+        host->host_verify_mode = j_atoi(j_attr((const char **) elem->attrs[i], "verify-mode"), 0);
+
 #ifdef HAVE_SSL
         if(c2s->sx_ssl == NULL && host->host_pemfile != NULL) {
-            c2s->sx_ssl = sx_env_plugin(c2s->sx_env, sx_ssl_init, host->host_pemfile, NULL, c2s->local_verify_mode);
+            c2s->sx_ssl = sx_env_plugin(c2s->sx_env, sx_ssl_init, host->host_pemfile, NULL, host->host_verify_mode);
             if(c2s->sx_ssl == NULL) {
                 log_write(c2s->log, LOG_ERR, "failed to load %s SSL pemfile", host->realm);
                 host->host_pemfile = NULL;
@@ -253,8 +256,6 @@
 
         host->host_require_starttls = (j_attr((const char **) elem->attrs[i], "require-starttls") != NULL);
 
-        host->host_verify_mode = j_atoi(j_attr((const char **) elem->attrs[i], "verify-mode"), 0);
-
         host->ar_register_enable = (j_attr((const char **) elem->attrs[i], "register-enable") != NULL);
         host->ar_register_oob = j_attr((const char **) elem->attrs[i], "register-oob");
         if(host->ar_register_enable || host->ar_register_oob) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Apr 2006 07:11:12 -0000	1.5
+++ .cvsignore	8 Jan 2008 10:54:00 -0000	1.6
@@ -1 +1 @@
-jabberd-2.0s11.tar.gz
+jabberd-2.1.20.tar.bz2


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jabberd.spec	5 Dec 2007 10:46:57 -0000	1.20
+++ jabberd.spec	8 Jan 2008 10:54:00 -0000	1.21
@@ -1,21 +1,25 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
-Version: 2.0
-Release: 0.s11.15%{?dist}
+Version: 2.1.20
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
+Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.1.20.tar.bz2 
 Source1: jabberd
 Source2: jabberd.sysconfig
-Patch: jabberd.glibc.open.patch
-URL: http://jabberd.jabberstudio.org/2/
+Patch: jabberd-host_verify_mode.patch
+URL: http://jabberd2.xiaoka.com/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel libidn-devel
+BuildRequires: openssl-devel libidn-devel expat-devel
+# jabberd is a leaky beast ;-)
+BuildRequires: gc-devel
 %{!?_without_pam:BuildRequires: pam-devel}
+%{!?_without_sqlite:BuildRequires: sqlite-devel}
 %{!?_without_db4:BuildRequires: db4-devel}
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{!?_without_mysql:BuildRequires: mysql-devel}
 %{!?_without_postgresql:BuildRequires: postgresql-devel}
+BuildRequires: libgsasl-devel
 Requires(post): openssl chkconfig /sbin/service
 Requires(pre): shadow-utils
 Requires(preun): chkconfig shadow-utils /sbin/service
@@ -34,7 +38,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s11
+%setup -q
 %patch -p1
 
 %build
@@ -42,6 +46,9 @@
 %define sysconfdir /etc/jabberd
 %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#&,g" configure
 
+# GC plug (see http://jabberd2.xiaoka.com/wiki/Hints)
+export LIBS='-lgc'
+
 %configure \
 	%{!?_without_pam:--enable-pam} \
 	%{?_without_pam:--disable-pam} \
@@ -54,7 +61,11 @@
 	%{?_without_ldap:--disable-ldap} \
 	%{!?_without_postgresql:--enable-pgsql} \
 	%{?_without_postgresql:--disable-pgsql} \
-	--localstatedir=%{_var}/lib
+	%{!?_without_sqlite:--enable-sqlite} \
+	%{?_without_sqlite:--disable-sqlite} \
+	--localstatedir=%{_var}/lib \
+	--enable-fs --enable-anon --enable-pipe --enable-ssl \
+	--enable-debug
 
 %{__make} %{?_smp_mflags}
 
@@ -99,10 +110,11 @@
 #default authentication backend
 #enable SSL certificate
 #clients must do STARTTLS
+#disable account registrations by default, because the default installation uses PAM
+#set the realm to '' for a working authentication against PAM
 %{__sed} -i -e ':a;N;$!ba' \
             -e 's,<module>mysql</module>,<module>pam</module>,g' \
-            -e 's,<!--\n    <pemfile>/etc/jabberd/server.pem</pemfile>\n    -->,<pemfile>/etc/jabberd/server.pem</pemfile>,g' \
-            -e 's,<!--\n    <require-starttls/>\n    -->,<require-starttls/>,g' \
+            -e "s,register-enable='true'>,realm='' require-starttls='true' pemfile='/etc/jabberd/server.pem'>,g" \
 		$RPM_BUILD_ROOT%{sysconfdir}/c2s.xml
 
 #ghost file
@@ -155,10 +167,6 @@
 if [ "$1" -eq "0" ]; then
 	/sbin/service %{name} stop > /dev/null 2>&1
 	/sbin/chkconfig --del %{name}
-	#jabber user is not deleted to avoid unowned files
-	#userdel jabber
-	#should %{_var}/lib/jabberd be deleted???
-	#%{__rm} -rf %{_var}/lib/jabberd
 fi
 
 %postun
@@ -170,6 +178,7 @@
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
 %{_bindir}/*
+%{_libdir}/%{name}/
 %attr(750, jabber, jabber) %dir %{sysconfdir}/
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*xml*
 %attr(750, jabber, jabber) %dir %{sysconfdir}/templates
@@ -183,6 +192,15 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Thu Jan 08 2008 Adrian Reber <adrian at lisas.de> - 2.1.20-1
+- updated to 2.1.20
+
+* Thu Dec 06 2007 Adrian Reber <adrian at lisas.de> - 2.1.19-1
+- updated to 2.1.19
+- this version might be config file incompatible to 2.0
+  in certain cases
+- for details please refer to the UPGRADE file
+
 * Wed Dec 05 2007 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.15
 - rebuilt for new openssl and openldap
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Apr 2006 07:11:12 -0000	1.5
+++ sources	8 Jan 2008 10:54:00 -0000	1.6
@@ -1 +1 @@
-67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz
+61b8323a437c85ec1338fcf6934b0c1b  jabberd-2.1.20.tar.bz2