[arch-commits] Commit in ejabberd/trunk (PKGBUILD ejabberd.service)

[Sergej Pupykin]

    Date: Monday, October 29, 2018 @ 09:22:07
  Author: spupykin
Revision: 399396

upgpkg: ejabberd 18.09-2

Modified:
  ejabberd/trunk/PKGBUILD
Deleted:
  ejabberd/trunk/ejabberd.service

------------------+
 PKGBUILD         |   15 +++++++++------
 ejabberd.service |   15 ---------------
 2 files changed, 9 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-29 08:14:21 UTC (rev 399395)
+++ PKGBUILD	2018-10-29 09:22:07 UTC (rev 399396)
@@ -4,7 +4,7 @@
 
 pkgname=ejabberd
 pkgver=18.09
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64')
 url="http://www.ejabberd.im/"
@@ -25,7 +25,7 @@
 	"eredis::git://github.com/wooga/eredis#commit=cbc013f516e464706493c01662e5e9dd82d1db01"
 	"esip::git://github.com/processone/esip#commit=89fc10d749b2a205a2a099b10f886018dd2c053f"
 	"ezlib::git://github.com/processone/ezlib#commit=ccfb3b25c6476894c3e8d835d35ff258f64e9e14"
-	"fast_tls::git://github.com/processone/fast_tls#commit=6ec157bcbcb016bb32f7e568094ab22498b56c70"
+	"fast_tls::git://github.com/processone/fast_tls#commit=9b25543cf1200e3b216996598771962461ea51c8"
 	"fast_xml::git://github.com/processone/fast_xml#commit=0e5b0b3d6f1a83f646fa4e01fddda71c3f8f3b8d"
 	"fast_yaml::git://github.com/processone/fast_yaml#commit=697dc776316c4ad48a5a962cf8af13230cb9c1f9"
 	"goldrush::git://github.com/DeadZen/goldrush.git#commit=8f1b715d36b650ec1e1f5612c00e28af6ab0de82"
@@ -48,7 +48,6 @@
 	"stun::git://github.com/processone/stun#commit=b5987b787d79dee6b501e209fd5cd61e03d2d6e7"
 	"xmpp::git://github.com/processone/xmpp#commit=0f8042e5d10c325e0043b1c22ba9557888266258"
 	"$pkgname.logrotate"
-	"ejabberd.service"
 	"sysuser.conf")
 sha256sums=('85c57ba9784f7346f94236c3d1b1dae676f5bb2ee65c6d2204fb4bbcd7582769'
             'SKIP'
@@ -82,7 +81,6 @@
             'SKIP'
             'SKIP'
             '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2'
-            '94582b1df76f6d86abfcc78bf4c4ac79276761c75483dd40a45b7ff2b19dc8a8'
             '68de8fd4df6e4f0e21a241dcd2b7075bdff495876646dd726c7054bf5780e3c6')
 
 prepare() {
@@ -94,7 +92,6 @@
     rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
     mv "$srcdir"/$i "$srcdir/$pkgname-$pkgver/deps"
   done
-
   sed -i "s|git describe --tags 2>/dev/null|echo $pkgver|" configure.ac
 }
 
@@ -114,6 +111,13 @@
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
+  sed -i \
+    -e "s|$pkgdir||g" \
+    -e "s|Group=.*|Group=jabber|g" \
+    -e "s|User=.*|User=jabber|g" \
+    ejabberd.service
+  install -Dm0644 ejabberd.service "$pkgdir"/usr/lib/systemd/system/ejabberd.service
+
   install -Dm04750 deps/epam/priv/bin/epam "$pkgdir"/usr/lib/ejabberd-$pkgver/priv/bin/epam
   install -d "$pkgdir/var/lib/$pkgname"
   install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
@@ -120,7 +124,6 @@
   chmod ug+r "$pkgdir/etc/$pkgname/"*
   chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd-$pkgver/priv/bin/captcha.sh"
   rm -rf "$pkgdir/var/lock"
-  install -Dm0644 "$srcdir"/ejabberd.service "$pkgdir"/usr/lib/systemd/system/ejabberd.service
   install -Dm644 "$srcdir"/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
   install -Dm644 tools/ejabberdctl.bc "$pkgdir"/usr/share/bash-completion/completions/ejabberdctl
 

Deleted: ejabberd.service
===================================================================
--- ejabberd.service	2018-10-29 08:14:21 UTC (rev 399395)
+++ ejabberd.service	2018-10-29 09:22:07 UTC (rev 399396)
@@ -1,15 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=jabber
-Environment=HOME=/var/lib/ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/ejabberdctl start
-ExecStop=/usr/bin/ejabberdctl stop
-
-[Install]
-WantedBy=multi-user.target