summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2016-08-21 11:49:14 +0100
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2016-08-21 11:49:14 +0100
commitc8542b3bce05ec947f3c3b0a1718624acb54791e (patch)
treea5b1872a0b8083dea57b96a926f1b8e572f8c940 /net-im/ejabberd/files
parentnet-im/ejabberd: Remove old, vulnerable ejabberd version (diff)
downloadgentoo-c8542b3bce05ec947f3c3b0a1718624acb54791e.tar.gz
gentoo-c8542b3bce05ec947f3c3b0a1718624acb54791e.tar.bz2
gentoo-c8542b3bce05ec947f3c3b0a1718624acb54791e.zip
net-im/ejabberd: Remove older, bundled version of ejabberd
Clean up unused flags in metadata.xml. Package-Manager: portage-2.3.0
Diffstat (limited to 'net-im/ejabberd/files')
-rw-r--r--net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch
deleted file mode 100644
index 7a1c9e650fa..00000000000
--- a/net-im/ejabberd/files/ejabberd-16.01-ejabberdctl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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()
- {