diff options
author | Hanno Böck <hanno@gentoo.org> | 2020-04-30 10:16:32 +0200 |
---|---|---|
committer | Hanno Böck <hanno@gentoo.org> | 2020-04-30 10:16:32 +0200 |
commit | 2d8c03f7f20c016978f58edf112225d52ea17dd8 (patch) | |
tree | 473ea18e030bce45cba49377b5a43e9c42d7b863 /net-im/ejabberd/files | |
parent | net-im/gajim: Remove old versions (diff) | |
download | gentoo-2d8c03f7f20c016978f58edf112225d52ea17dd8.tar.gz gentoo-2d8c03f7f20c016978f58edf112225d52ea17dd8.tar.bz2 gentoo-2d8c03f7f20c016978f58edf112225d52ea17dd8.zip |
net-im/ejabberd: Version bump.
Based on ebuild from Vampik's overlay with small changes.
Remove old postinst warnings, add warning for needed config changes
for updates from 17.x.
Closes: https://bugs.gentoo.org/626260
Signed-off-by: Hanno Böck <hanno@gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Diffstat (limited to 'net-im/ejabberd/files')
-rw-r--r-- | net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch | 15 | ||||
-rw-r--r-- | net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch | 38 |
2 files changed, 53 insertions, 0 deletions
diff --git a/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch new file mode 100644 index 000000000000..2bea750ef04e --- /dev/null +++ b/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile.in b/Makefile.in +index a0b4553d..4675b88a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -204,8 +204,8 @@ install: all copy-files + chmod 755 ejabberd.init + # + # Service script +- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \ +- > ejabberd.service ++ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \ ++ ejabberd.service.template > ejabberd.service + chmod 644 ejabberd.service + # + # Spool directory diff --git a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch new file mode 100644 index 000000000000..0fb1f5ce602e --- /dev/null +++ b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch @@ -0,0 +1,38 @@ +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 + } |