rpms/ejabberd/devel .cvsignore, 1.9, 1.10 ejabberd-ejabberdctl_fix.diff, 1.2, 1.3 ejabberd.spec, 1.25, 1.26 import.log, 1.2, 1.3 sources, 1.11, 1.12
Peter Lemenkov (peter)
fedora-extras-commits at redhat.com
Sat Aug 9 15:30:39 UTC 2008
Author: peter
Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3763/devel
Modified Files:
.cvsignore ejabberd-ejabberdctl_fix.diff ejabberd.spec
import.log sources
Log Message:
Ver. 2.0.2-beta1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 24 May 2008 18:16:55 -0000 1.9
+++ .cvsignore 9 Aug 2008 15:30:09 -0000 1.10
@@ -1 +1 @@
-ejabberd-2.0.1_2.tar.gz
+ejabberd-2.0.2-beta1.tar.gz
ejabberd-ejabberdctl_fix.diff:
Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejabberd-ejabberdctl_fix.diff 22 Jun 2008 18:56:07 -0000 1.2
+++ ejabberd-ejabberdctl_fix.diff 9 Aug 2008 15:30:09 -0000 1.3
@@ -1,12 +1,13 @@
---- src/ejabberdctl.template 2008-05-20 14:22:03.000000000 +0400
-+++ src/ejabberdctl.template 2008-06-22 19:41:03.000000000 +0400
-@@ -9,12 +9,13 @@
+--- src/ejabberdctl.template.fix_user 2008-08-01 16:34:28.000000000 +0400
++++ src/ejabberdctl.template 2008-08-09 16:04:56.000000000 +0400
+@@ -9,13 +9,14 @@
# define default environment variables
NODE=ejabberd
-HOST=localhost
-+HOST=`hostname -s`
++HOST=HOST=`hostname -s`
ERLANG_NODE=$NODE@$HOST
+ ERL=@erl@
-ROOTDIR=@rootdir@
+ROOTDIR=
+MAINDIR=
@@ -17,7 +18,7 @@
# read custom configuration
CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
-@@ -42,10 +43,10 @@
+@@ -43,10 +44,10 @@
ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES"
# define additional environment variables
@@ -32,18 +33,19 @@
EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
SASL_LOG_PATH=$LOGS_DIR/sasl.log
DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -139,11 +140,13 @@
+@@ -139,11 +140,14 @@
# common control function
ctl ()
{
-+ /sbin/runuser -s /bin/bash - ejabberd -c " \
- erl \
++ $ERL_COMMAND=" \
+ $ERL \
$NAME ejabberdctl \
-noinput \
-pa $EJABBERD_EBIN \
- -s ejabberd_ctl -extra $ERLANG_NODE $@
+ -s ejabberd_ctl -extra $ERLANG_NODE $@ \
+ "
++ /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND"
result=$?
case $result in
0) :;;
Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ejabberd.spec 22 Jun 2008 18:56:07 -0000 1.25
+++ ejabberd.spec 9 Aug 2008 15:30:09 -0000 1.26
@@ -1,12 +1,12 @@
Name: ejabberd
-Version: 2.0.1
-Release: 4%{?dist}
+Version: 2.0.2
+Release: 0.1.beta1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
License: GPLv2+
URL: http://www.ejabberd.im/
-Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}_2.tar.gz
+Source0: http://www.process-one.net/downloads/%{name}/%{name}-%{version}-beta1.tar.gz
Source1: ejabberd.init
Source2: ejabberd.logrotate
@@ -71,6 +71,26 @@
%post
/sbin/chkconfig --add ejabberd
+(cd /etc/ejabberd
+if [ ! -f ejabberd.pem ]
+then
+ echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
+ HOSTNAME=$(hostname -s)
+ DOMAINNAME=$(hostname -d)
+ openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
+ -keyout ejabberd.pem > /dev/null 2>&1 <<+++
+.
+.
+.
+$DOMAINNAME
+$HOSTNAME
+ejabberd
+root@$HOSTNAME.$DOMAINNAME
++++
+chown ejabberd:ejabberd ejabberd.pem
+chmod 600 ejabberd.pem
+fi)
+
%preun
if [ $1 = 0 ]; then
/sbin/service ejabberd stop >/dev/null 2>&1
@@ -83,7 +103,7 @@
fi
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-beta1
%patch1 -p0 -b .fix_paths
%patch2 -p0 -b .fix_user
dos2unix src/odbc/mssql.sql
@@ -183,6 +203,11 @@
%endif
%changelog
+* Sat Aug 9 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-0.1.beta1
+- Version 2.0.2-beta1
+- Fixed BZ# 452326
+- Fixed BZ# 227270
+
* Sun Jun 22 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
- Last minute fix (issue with shortnames/fqdn)
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 22 Jun 2008 18:56:07 -0000 1.2
+++ import.log 9 Aug 2008 15:30:09 -0000 1.3
@@ -1,2 +1,3 @@
ejabberd-2_0_1-3_fc9:HEAD:ejabberd-2.0.1-3.fc9.src.rpm:1214150816
ejabberd-2_0_1-4_fc9:HEAD:ejabberd-2.0.1-4.fc9.src.rpm:1214160895
+ejabberd-2_0_2-0_1_beta1_fc9:HEAD:ejabberd-2.0.2-0.1.beta1.fc9.src.rpm:1218295749
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 24 May 2008 18:16:55 -0000 1.11
+++ sources 9 Aug 2008 15:30:09 -0000 1.12
@@ -1 +1 @@
-9c9417ab8dc334094ec7a611016c726e ejabberd-2.0.1_2.tar.gz
+1c1fb0b0287ba4547b1683f7c94b63bc ejabberd-2.0.2-beta1.tar.gz
More information about the fedora-extras-commits
mailing list