rpms/jabberd/EL-5 .cvsignore, 1.5, 1.6 jabberd.spec, 1.15, 1.16 jabberd.sysconfig, 1.3, 1.4 sources, 1.5, 1.6
Adrian Reber
adrian at fedoraproject.org
Tue Feb 3 08:52:03 UTC 2009
Author: adrian
Update of /cvs/extras/rpms/jabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13606
Modified Files:
.cvsignore jabberd.spec jabberd.sysconfig sources
Log Message:
* Tue Feb 03 2009 Adrian Reber <adrian at lisas.de> - 2.2.5-1
- updated to 2.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/EL-5/.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 3 Feb 2009 08:51:32 -0000 1.6
@@ -1 +1 @@
-jabberd-2.0s11.tar.gz
+jabberd-2.2.5.tar.bz2
Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/EL-5/jabberd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jabberd.spec 12 Sep 2006 07:56:58 -0000 1.15
+++ jabberd.spec 3 Feb 2009 08:51:32 -0000 1.16
@@ -1,20 +1,24 @@
Summary: OpenSource server implementation of the Jabber protocols
Name: jabberd
-Version: 2.0
-Release: 0.s11.11%{?dist}
-License: GPL
+Version: 2.2.5
+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.2.5.tar.bz2
Source1: jabberd
Source2: jabberd.sysconfig
-URL: http://jabberd.jabberstudio.org/2/
+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 udns-devel
Requires(post): openssl chkconfig /sbin/service
Requires(pre): shadow-utils
Requires(preun): chkconfig shadow-utils /sbin/service
@@ -33,13 +37,16 @@
This packages defaults to use pam and the Berkeley DB.
%prep
-%setup -q -n %{name}-%{version}s11
+%setup -q
%build
%define _sysconfdir /etc/jabberd
%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} \
@@ -52,7 +59,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}
@@ -97,10 +108,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
@@ -117,7 +129,11 @@
%pre
#creating jabber user
-useradd -r -d %{_var}/lib/%{name} -m -c "Jabber Server" -s /bin/bash jabber >/dev/null 2>&1 ||:
+getent group jabber >/dev/null || groupadd -r jabber
+getent passwd jabber >/dev/null || \
+useradd -r -g jabber -d %{_var}/lib/%{name} -s /sbin/nologin \
+ -c "Jabber Server" jabber
+exit 0
%post
@@ -149,10 +165,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
@@ -162,21 +174,63 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README 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
%attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/templates/*xml*
%{_datadir}/man/man8/*
%{_datadir}/%{name}/
-%config %{_initrddir}/%{name}
+%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/jabberd
-%config(noreplace) %{_sysconfdir}/sysconfig/jabberd
-%attr(-,jabber,jabber) %{_var}/lib/jabberd
+%config %{_sysconfdir}/sysconfig/jabberd
+%attr(-, jabber, jabber) %{_var}/lib/jabberd
%ghost %{_sysconfdir}/jabberd/server.pem
%changelog
+* Tue Feb 03 2009 Adrian Reber <adrian at lisas.de> - 2.2.5-1
+- updated to 2.2.5
+
+* Fri Jan 23 2009 Bernie Innocenti <bernie at codewiz.org> - 2.2.4-2
+- Replace /etc/sysconfig/jabberd on upgrade to drop obsolete daemons
+- Rebuilt for new libmysqlclient
+
+* Tue Oct 07 2008 Adrian Reber <adrian at lisas.de> - 2.2.4-1
+- updated to 2.2.4
+ (this version and pidgin 2.5.1 finally work together)
+
+* Thu Feb 11 2008 Adrian Reber <adrian at lisas.de> - 2.1.23-1
+- updated to 2.1.23
+
+* Thu Jan 08 2008 Adrian Reber <adrian at lisas.de> - 2.1.21-1
+- updated to 2.1.21
+
+* 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
+
+* Mon Aug 27 2007 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.14
+- applied patch to fix bz #175219
+- removed config flag for startup script
+- updated License
+- added patch for new glibc open macro
+
+* Thu Jun 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis.info> - 2.0-0.s11.13
+- rebuilt on behalf of Adrian
+
+* Thu Dec 07 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.12
+- rebuilt
+
* Tue Sep 12 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.11
- rebuilt
Index: jabberd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/jabberd/EL-5/jabberd.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jabberd.sysconfig 30 Mar 2005 19:46:31 -0000 1.3
+++ jabberd.sysconfig 3 Feb 2009 08:51:32 -0000 1.4
@@ -3,16 +3,15 @@
#
# the following example shows a configuration for a startup of jabberd daemons
# necessary for a jabberd server running on one host
-# START_DAEMONS="router resolver sm c2s s2s"
+# START_DAEMONS="router sm c2s s2s"
#
# a jabberd server consists of:
# * router
-# * resolver
# * sm (Session Manager)
# * c2s (Client to Server)
# * s2s (Server to Server)
#
-START_DAEMONS="router resolver sm c2s s2s"
+START_DAEMONS="router sm c2s s2s"
# set C2S_AS_ROOT to "yes" to start c2s as root
# this can be necessary if c2s needs to authenticate against pam/shadow
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/EL-5/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 3 Feb 2009 08:51:32 -0000 1.6
@@ -1 +1 @@
-67d1663ed97a5ba707d5d145b1d19c55 jabberd-2.0s11.tar.gz
+6c9f752155645ddf6a917f597bb8370e jabberd-2.2.5.tar.bz2
More information about the fedora-extras-commits
mailing list