[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Amadeusz Piotr Żołnowski" <aidecoe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
Date: Sun,  9 Jul 2017 20:14:10 +0000 (UTC)	[thread overview]
Message-ID: <1499631245.e1c95311742e366e46a8e91cc6fcfa140caa263a.aidecoe@gentoo> (raw)

commit:     e1c95311742e366e46a8e91cc6fcfa140caa263a
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 12:09:09 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 20:14:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c95311

net-im/ejabberd: Correct paths and user/group in unit service file

Gentoo-Bug: 621780

 net-im/ejabberd/ejabberd-17.01-r1.ebuild                  |  5 +++--
 ...{ejabberd-17.01-r1.ebuild => ejabberd-17.01-r2.ebuild} |  5 +++--
 .../{ejabberd-17.04.ebuild => ejabberd-17.04-r1.ebuild}   |  5 +++--
 net-im/ejabberd/ejabberd-17.04.ebuild                     |  5 +++--
 .../ejabberd-17.01-0001-Dont-overwrite-service-file.patch | 15 +++++++++++++++
 .../ejabberd-17.04-0002-Dont-overwrite-service-file.patch | 15 +++++++++++++++
 6 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
index 7c2e9586ebd..7bada46b7dc 100644
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
 	captcha? ( media-gfx/imagemagick[truetype,png] )"
 
 DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+	"${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" )
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!' \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
 		-e 's!(User|Group)=(.*)!\1=jabber!' \
 		"${PN}.service.template" >"${PN}.service" \
 		|| die 'failed to make ejabberd.service'

diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
similarity index 98%
copy from net-im/ejabberd/ejabberd-17.01-r1.ebuild
copy to net-im/ejabberd/ejabberd-17.01-r2.ebuild
index 7c2e9586ebd..7bada46b7dc 100644
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
 	captcha? ( media-gfx/imagemagick[truetype,png] )"
 
 DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+	"${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" )
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!' \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
 		-e 's!(User|Group)=(.*)!\1=jabber!' \
 		"${PN}.service.template" >"${PN}.service" \
 		|| die 'failed to make ejabberd.service'

diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
similarity index 98%
copy from net-im/ejabberd/ejabberd-17.04.ebuild
copy to net-im/ejabberd/ejabberd-17.04-r1.ebuild
index 1cec62f2eba..729fae6076e 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
 
 DOCS=( README )
 PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
-	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
+	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
+	"${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!' \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
 		-e 's!(User|Group)=(.*)!\1=jabber!' \
 		"${PN}.service.template" >"${PN}.service" \
 		|| die 'failed to make ejabberd.service'

diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild b/net-im/ejabberd/ejabberd-17.04.ebuild
index 1cec62f2eba..729fae6076e 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
 
 DOCS=( README )
 PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
-	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
+	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
+	"${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
 
 EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
 # Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
 # Make ejabberd.service for systemd from upstream provided template.
 make_ejabberd_service() {
 	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!' \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
 		-e 's!(User|Group)=(.*)!\1=jabber!' \
 		"${PN}.service.template" >"${PN}.service" \
 		|| die 'failed to make ejabberd.service'

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

next             reply	other threads:[~2017-07-09 20:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-09 20:14 Amadeusz Piotr Żołnowski [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-05-17 20:02 [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/ Florian Schmaus
2022-03-23  8:33 Florian Schmaus
2020-08-23 10:42 Hanno Böck
2016-11-13 10:08 Amadeusz Piotr Żołnowski
2016-08-27 13:12 Amadeusz Piotr Żołnowski
2016-06-13 21:55 Amadeusz Piotr Żołnowski
2016-06-07 22:24 Amadeusz Piotr Żołnowski
2016-02-21 14:25 Amadeusz Piotr Żołnowski

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7c2e9586eb dfblob:7bada46b7d dfblob:7c2e9586eb
dfblob:7bada46b7d dfblob:1cec62f2eb dfblob:729fae6076 dfblob:1cec62f2eb
dfblob:729fae6076 dfblob:92b7b02330 dfblob:2bea750ef0 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1499631245.e1c95311742e366e46a8e91cc6fcfa140caa263a.aidecoe@gentoo \
    --to=aidecoe@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox