From 40a69ba916becf64b28bd3b7008d7fc233a24414 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <peter@fedoraproject.org>
Date: Aug 09 2008 15:30:09 +0000
Subject: Ver. 2.0.2-beta1


---

diff --git a/.cvsignore b/.cvsignore
index acb8e0d..613122b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ejabberd-2.0.1_2.tar.gz
+ejabberd-2.0.2-beta1.tar.gz
diff --git a/ejabberd-ejabberdctl_fix.diff b/ejabberd-ejabberdctl_fix.diff
index cde410f..aca693a 100644
--- a/ejabberd-ejabberdctl_fix.diff
+++ b/ejabberd-ejabberdctl_fix.diff
@@ -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) :;;
diff --git a/ejabberd.spec b/ejabberd.spec
index 40ca073..f2074ce 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -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 @@ Documentation for ejabberd.
 %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 @@ if [ "$1" -ge "1" ]; then
 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 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Aug  9 2008 Peter Lemenkov <lemenkov@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@gmail.com> 2.0.1-4
 - Last minute fix (issue with shortnames/fqdn)
 
diff --git a/import.log b/import.log
index 95482f4..aa9e2f9 100644
--- a/import.log
+++ b/import.log
@@ -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
diff --git a/sources b/sources
index 305ab9e..0dcfbd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c9417ab8dc334094ec7a611016c726e  ejabberd-2.0.1_2.tar.gz
+1c1fb0b0287ba4547b1683f7c94b63bc  ejabberd-2.0.2-beta1.tar.gz