diff --git a/ejabberd-ejabberdctl_fix.diff b/ejabberd-ejabberdctl_fix.diff index 3dc8b69..4fd5087 100644 --- a/ejabberd-ejabberdctl_fix.diff +++ b/ejabberd-ejabberdctl_fix.diff @@ -1,5 +1,5 @@ ---- src/ejabberdctl.template.fix_user 2008-08-01 16:34:28.000000000 +0400 -+++ src/ejabberdctl.template 2008-08-09 16:04:56.000000000 +0400 +--- src/ejabberdctl.template.fix_user 2008-08-27 13:37:52.000000000 +0400 ++++ src/ejabberdctl.template 2008-10-02 09:24:52.000000000 +0400 @@ -9,13 +9,14 @@ # define default environment variables @@ -33,12 +33,12 @@ 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,14 @@ +@@ -139,11 +140,13 @@ # common control function ctl () { -+ $ERL_COMMAND=" \ - $ERL \ +- $ERL \ ++ ERL_COMMAND="$ERL \ $NAME ejabberdctl \ -noinput \ -pa $EJABBERD_EBIN \ diff --git a/ejabberd.spec b/ejabberd.spec index 8a3db6f..3538fa1 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -1,12 +1,12 @@ Name: ejabberd Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?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}.tar.gz +Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: ejabberd.init Source2: ejabberd.logrotate @@ -18,13 +18,15 @@ Source4: mod_ctlextra.erl Source5: ejabberd_auth_ad.erl Source6: mod_shared_roster_ad.erl Source7: mod_vcard_ad.erl + +# PAM support Source9: ejabberdctl.pam Source10: ejabberdctl.apps Source11: ejabberd.pam # Fedora-specific stuff - fixing paths Patch1: ejabberd-build.patch -# BZ# 439583, 452326, 451554 +# BZ# 439583, 452326, 451554, 465196 Patch2: ejabberd-ejabberdctl_fix.diff # Use ejabberd as an example for PAM service name Patch3: ejabberd-ejabberd_cfg_pam_name.diff @@ -209,6 +211,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Oct 2 2008 Peter Lemenkov 2.0.2-3 +- Fixed broken ejabberdctl (BZ# 465196) + * Sat Aug 30 2008 Peter Lemenkov 2.0.2-2 - Added missing Requires diff --git a/import.log b/import.log index 3a13615..200d602 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ 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 ejabberd-2_0_2-0_3_beta1_fc9:HEAD:ejabberd-2.0.2-0.3.beta1.fc9.src.rpm:1218350775 ejabberd-2_0_2-1_fc9:HEAD:ejabberd-2.0.2-1.fc9.src.rpm:1220040866 +ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272