commit: 9478d3bfc2d3fd51d4388a699ef1592d5e227e2d Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Sep 24 09:58:04 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sat Sep 24 10:34:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9478d3bf
net-im/ejabberd: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15 Closes: https://github.com/gentoo/gentoo/pull/27424 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../files/ejabberd-19.08-ejabberdctl.patch | 38 --------------- net-im/ejabberd/files/ejabberd.initd | 54 ---------------------- net-im/ejabberd/files/ejabberd.logrotate | 13 ------ 3 files changed, 105 deletions(-) diff --git a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch deleted file mode 100644 index 0fb1f5ce602e..000000000000 --- a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup - -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 /root is a directory when -instead it defaults to /dev/null on Gentoo. ---- - -diff --git a/ejabberdctl.template b/ejabberdctl.template -index 571b90b..71336c0 100755 ---- a/ejabberdctl.template -+++ b/ejabberdctl.template -@@ -82,6 +82,7 @@ fi - ERL_LIBS={{libdir}} - ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump - ERL_INETRC="$ETC_DIR"/inetrc -+HOME=$SPOOL_DIR - - # define ejabberd parameters - EJABBERD_OPTS="$EJABBERD_OPTS\ -@@ -105,12 +106,13 @@ export ERL_MAX_ETS_TABLES - export CONTRIB_MODULES_PATH - export CONTRIB_MODULES_CONF_DIR - export ERL_LIBS -+export HOME - - # run command either directly or via su $INSTALLUSER - exec_cmd() - { - case $EXEC_CMD in -- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; -+ as_install_user) su -p -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; - as_current_user) "$@" ;; - esac - } diff --git a/net-im/ejabberd/files/ejabberd.initd b/net-im/ejabberd/files/ejabberd.initd deleted file mode 100644 index 94ac2ae8e465..000000000000 --- a/net-im/ejabberd/files/ejabberd.initd +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - use dns - need epmd net - provide jabber-server -} - -start() { - if ejabberdctl status >/dev/null 2>&1; then - ewarn "ejabberd is already started (manually?)." - return 0 - fi - ebegin "Starting ejabberd" - /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start - eend $? -} - -reload() { - ebegin "Reloading ejabberd configuration" - /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config - eend $? -} - -stop() { - ejabberdctl status >/dev/null 2>&1 - if test $? = 3; then - ewarn "ejabberd is already stopped (manually?)." - return 0 - fi - ebegin "Stopping ejabberd" - if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then - cnt=0 - sleep 1 - while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do - echo -n . - cnt=`expr $cnt + 1` - if [ $cnt -ge 60 ] ; then - eend 1 - break - fi - sleep 1 - done - eend 0 - else - eend 1 - einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on." - fi - eend 0 -} diff --git a/net-im/ejabberd/files/ejabberd.logrotate b/net-im/ejabberd/files/ejabberd.logrotate deleted file mode 100644 index 4f324729dba8..000000000000 --- a/net-im/ejabberd/files/ejabberd.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/jabber/*.log { - su jabber jabber - weekly - rotate 4 - missingok - nocreate - sharedscripts - notifempty - compress - postrotate - /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true - endscript -}
