diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2016-03-08 13:05:15 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2016-03-08 13:05:15 +0000 |
| commit | ff6077a1aadbd77723d97a5dc1f83b7d76e6818c (patch) | |
| tree | ab64eab1143b36e785ee65af7e4dbbe5999a74ad /testing/ejabberd/ejabberd-16.01-ejabberdctl.patch | |
| parent | 298cee7c98ed2fc57e1353c7faf261926b556791 (diff) | |
| download | aports-ff6077a1aadbd77723d97a5dc1f83b7d76e6818c.tar.bz2 aports-ff6077a1aadbd77723d97a5dc1f83b7d76e6818c.tar.xz | |
testing/ejabberd: upgrade to 16.02
Diffstat (limited to 'testing/ejabberd/ejabberd-16.01-ejabberdctl.patch')
| -rw-r--r-- | testing/ejabberd/ejabberd-16.01-ejabberdctl.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/testing/ejabberd/ejabberd-16.01-ejabberdctl.patch b/testing/ejabberd/ejabberd-16.01-ejabberdctl.patch new file mode 100644 index 0000000000..85580179ee --- /dev/null +++ b/testing/ejabberd/ejabberd-16.01-ejabberdctl.patch @@ -0,0 +1,49 @@ +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. + +--- a/ejabberdctl.template 2016-01-12 11:07:58.000000000 +0000 ++++ b/ejabberdctl.template.new 2016-02-15 21:36:27.508297627 +0000 +@@ -16,6 +16,7 @@ + EPMD={{bindir}}/epmd + INSTALLUSER={{installuser}} + ERL_LIBS={{libdir}} ++SHELL=/bin/sh + + # check the proper system user is used if defined + if [ "$INSTALLUSER" != "" ] ; then +@@ -23,11 +24,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 +@@ -100,6 +101,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 mnesia options + MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS" +@@ -159,6 +161,8 @@ + export CONTRIB_MODULES_PATH + export CONTRIB_MODULES_CONF_DIR + export ERL_LIBS ++export HOME ++export SHELL + + shell_escape() + { |