summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2017-07-09 13:09:09 +0100
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2017-07-09 21:14:05 +0100
commite1c95311742e366e46a8e91cc6fcfa140caa263a (patch)
tree989d955fef014054701b672b48994a2f6157bed1 /net-im/ejabberd/files
parentdev-util/bazel: remove old versions (diff)
downloadgentoo-e1c95311742e366e46a8e91cc6fcfa140caa263a.tar.gz
gentoo-e1c95311742e366e46a8e91cc6fcfa140caa263a.tar.bz2
gentoo-e1c95311742e366e46a8e91cc6fcfa140caa263a.zip
net-im/ejabberd: Correct paths and user/group in unit service file
Gentoo-Bug: 621780
Diffstat (limited to 'net-im/ejabberd/files')
-rw-r--r--net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch15
-rw-r--r--net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch15
2 files changed, 30 insertions, 0 deletions
diff --git a/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch
new file mode 100644
index 00000000000..92b7b023309
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index 5ff3efe0..644ed713 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-17.04-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch
new file mode 100644
index 00000000000..2bea750ef04
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.04-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