diff options
| author |   Amadeusz Żołnowski <aidecoe@gentoo.org> | 2016-02-15 21:15:19 +0000 |
|---|---|---|
| committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2016-02-15 21:49:01 +0000 |
| commit | 2235a555a140fa024b657bb57ee8fac5832ab58b (patch) | |
| tree | 04580ef93085fdf8e6072d8474767f156ed8c651 /net-im/ejabberd/files | |
| parent | games-roguelike/dwarf-fortress: Version bump (diff) | |
| download | gentoo-2235a555a140fa024b657bb57ee8fac5832ab58b.tar.gz gentoo-2235a555a140fa024b657bb57ee8fac5832ab58b.tar.bz2 gentoo-2235a555a140fa024b657bb57ee8fac5832ab58b.zip | |
net-im/ejabberd: Bump version
Commit on behalf of Vadim Efimov <evadim@evadim.ru>. Clean up a bit the
ebuild attached to the bug report. Rebase ejabberdctl patch from
previous version over the new version.
Gentoo-Bug: 549724
Package-Manager: portage-2.2.27
Diffstat (limited to 'net-im/ejabberd/files')
| -rw-r--r-- | net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch new file mode 100644 index 000000000000..7a1c9e650fa5 --- /dev/null +++ b/net-im/ejabberd/files/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. + +--- ejabberdctl.template 2016-01-12 11:07:58.000000000 +0000 ++++ 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() + { |