mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
testing/ejabberd: upgrade to 17.09
This commit is contained in:
Natanael Copa
parent
1884aad7f8
commit
2d0124b988
@ -2,8 +2,8 @@
|
||||
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
|
||||
# Maintainer: John Regan <john@jrjrtech.com>
|
||||
pkgname=ejabberd
|
||||
pkgver=16.12
|
||||
pkgrel=2
|
||||
pkgver=17.09
|
||||
pkgrel=0
|
||||
pkgdesc="An erlang jabber server"
|
||||
url="http://www.ejabberd.im"
|
||||
arch="all"
|
||||
@ -14,7 +14,8 @@ _erl_deps="erlang-asn1 erlang-crypto erlang-eldap erlang-mnesia
|
||||
_erl_make_deps="erlang-eunit erlang-parsetools"
|
||||
depends="erlang util-linux yaml $_erl_deps"
|
||||
depends_dev="erlang-dev expat-dev libressl-dev zlib-dev heimdal-dev yaml-dev git"
|
||||
makedepends="$depends_dev $_erl_deps $_erl_make_deps automake autoconf"
|
||||
makedepends="$depends_dev $_erl_deps $_erl_make_deps automake autoconf gd-dev
|
||||
libjpeg-turbo-dev libpng-dev libwebp-dev"
|
||||
pkgusers="ejabberd"
|
||||
pkggroups="ejabberd"
|
||||
install="$pkgname.pre-install"
|
||||
@ -24,7 +25,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/processone/$pkgname/archive/
|
||||
ejabberd.initd
|
||||
ejabberd.logrotate
|
||||
ejabberd.confd
|
||||
ejabberd-16.01-ejabberdctl.patch
|
||||
makefile.patch
|
||||
libressl.patch
|
||||
"
|
||||
@ -67,27 +67,10 @@ package() {
|
||||
"$pkgdir"/etc/ejabberd/ejabberdctl.cfg "$pkgdir"/etc/ejabberd
|
||||
}
|
||||
|
||||
md5sums="0a3c6e43cf258e84db214dbc250b8ba3 ejabberd-16.12.tar.gz
|
||||
20d7727afc4fda08b04bc3f81cfe7907 1.0.7.tar.gz
|
||||
62242441aaed1025587dcc3b40d08e68 ejabberd.initd
|
||||
f97c8a96160f30e0aecc9526c12e6606 ejabberd.logrotate
|
||||
fa61d30731cb4d818187d2e5e2fd766a ejabberd.confd
|
||||
583d01f6b6ac7f3cd1118462eaba1c39 ejabberd-16.01-ejabberdctl.patch
|
||||
4fb22399211c3a8f259de57fdbfefa0f makefile.patch
|
||||
6b540035f94b22b25af481a07eb3d49f libressl.patch"
|
||||
sha256sums="a7eeb9fe49ef141daab1be01838a7612dff9194a28c3dfc922cc691bb8c9b532 ejabberd-16.12.tar.gz
|
||||
35da558d86aec4abe571740f5f229cd03dbb3abffaf16991fe88304a3a5f72e2 1.0.7.tar.gz
|
||||
aed527edf2008becaa950eddffecdb1d9cb8a9a50e38cee9e51853c1189887cb ejabberd.initd
|
||||
31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2 ejabberd.logrotate
|
||||
e1f690788cd1b5ecb334582af8e019602d297ef8b914a030de69bce2cc20fffd ejabberd.confd
|
||||
fc971f9eba50c82013f20c78d3ba7f48bb4f70945e41951808b53ef9dbf0b898 ejabberd-16.01-ejabberdctl.patch
|
||||
4c939a05bc353a90a585143a5d981069aa7767563979595cef8637f7ab782fa7 makefile.patch
|
||||
cb9e030f5df4c989f0e569f0569245b509139dff7c8fc2bb023beb4b9938e209 libressl.patch"
|
||||
sha512sums="6e6f35aa266eea055d94fddc3edebf814bd53514a82c4544413bd88397d0372a05bbe9e922f1d8b808f3da9f8a0a14bdbfcfc052dbf6053d697252086306f71f ejabberd-16.12.tar.gz
|
||||
sha512sums="3eb253642d6688bbe93d0a1234ac29725ed02ed929a1b87a8424e9d01b2200eb174192cd164ba2c31fb8082e92b2886e4068effa504f66025809685867ba90f0 ejabberd-17.09.tar.gz
|
||||
46a3ebab09ec5e18b086c8c3e2a87a5d6a35e406e8988c48979d94c3e303d5f9a8bcdb1e8ce74266ba8c59fbb4a4310e445f5ad65f072d28a7b44a0bdec50b62 1.0.7.tar.gz
|
||||
e2310e1b5b471e5c27ce2ec5d5fc6549656f9f49ba1d65a515ebc3af6d3237a461894c6c4c55c8c6eb1b9be0b01573057591ead51eb9014f5cf1258d387c9fc8 ejabberd.initd
|
||||
47fd2cfd9177c4e978a9799a153ba74392a9891822221af8194686a40f6bf01f38644833e1e1f5416c6357e0bfb7ca3dae96f55a4fcd7cd629ec798d85a72807 ejabberd.logrotate
|
||||
96a571c0ab2be366e931bda423a61ef920cbaba2107e61ddbc501472ce3efe2804418cc6579c99310b902a9a99aaecb9284cf2420c071dbca2f670efb4034135 ejabberd.confd
|
||||
aeb1f4fc299691751fd687a07bf35dc77f43cb1d14f9ba59e7de050e6953a0051f1827bbd0e21fc84dd4cb745b5603b915ffdf6de2151d6e34b4a4720a0a77ab ejabberd-16.01-ejabberdctl.patch
|
||||
36eacec7780ed95ffc310db30e34f9d5ba8ead65f8fc44fb06c7d825f7252effad83e07c4a010e65b80a63f4a1d985290e8a489906a8c225c306f5b5b642ce36 makefile.patch
|
||||
2579f21ab6428a8450399bea4d0c6f0967606d4cba73432942b34cf5445d037bed436f418e3c5aadec9a3525191824af1195f9e342ec7cbe20f99147445e4e6d libressl.patch"
|
||||
|
||||
@ -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.
|
||||
|
||||
--- 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()
|
||||
{
|
||||
Loading…
Reference in New Issue
Block a user