radhermit 15/04/12 05:27:09 Added: ejabberd-15.03-ejabberdctl.patch Log: Version bump (bug #487994). (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Revision Changes Path 1.1 net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch?rev=1.1&content-type=text/plain Index: ejabberd-15.03-ejabberdctl.patch =================================================================== Set SHELL since the generic jabber user used on Gentoo for jabber servers doesn't have a valid shell set by default and fix EXEC_CMD otherwise it fails with "This account is currently not available" again due to jabber not having a valid shell. Also, workaround the assumption that jabber's $HOME is a directory when instead it defaults to /dev/null on Gentoo. --- ejabberd-15.03/ejabberdctl.template +++ ejabberd-15.03/ejabberdctl.template @@ -15,6 +15,7 @@ IEX={{bindir}}/iex EPMD={{bindir}}/epmd INSTALLUSER={{installuser}} +SHELL=/bin/sh # Compatibility in ZSH #setopt shwordsplit 2>/dev/null @@ -25,11 +26,11 @@ for GID in `id -G`; do if [ $GID -eq 0 ] ; then INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6) - if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then + if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then mkdir -p "$INSTALLUSER_HOME" chown "$INSTALLUSER" "$INSTALLUSER_HOME" fi - EXEC_CMD="su $INSTALLUSER -c" + EXEC_CMD="su $INSTALLUSER -p -c" fi done if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then @@ -111,6 +112,7 @@ DATETIME=`date "+%Y%m%d-%H%M%S"` ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump ERL_INETRC=$ETC_DIR/inetrc +HOME=$SPOOL_DIR # define erl parameters ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g') @@ -167,6 +169,8 @@ export ERL_INETRC export ERL_MAX_PORTS export ERL_MAX_ETS_TABLES +export HOME +export SHELL # start server start()
