| 1 |
commit: e1c95311742e366e46a8e91cc6fcfa140caa263a |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 9 12:09:09 2017 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 9 20:14:05 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c95311 |
| 7 |
|
| 8 |
net-im/ejabberd: Correct paths and user/group in unit service file |
| 9 |
|
| 10 |
Gentoo-Bug: 621780 |
| 11 |
|
| 12 |
net-im/ejabberd/ejabberd-17.01-r1.ebuild | 5 +++-- |
| 13 |
...{ejabberd-17.01-r1.ebuild => ejabberd-17.01-r2.ebuild} | 5 +++-- |
| 14 |
.../{ejabberd-17.04.ebuild => ejabberd-17.04-r1.ebuild} | 5 +++-- |
| 15 |
net-im/ejabberd/ejabberd-17.04.ebuild | 5 +++-- |
| 16 |
.../ejabberd-17.01-0001-Dont-overwrite-service-file.patch | 15 +++++++++++++++ |
| 17 |
.../ejabberd-17.04-0002-Dont-overwrite-service-file.patch | 15 +++++++++++++++ |
| 18 |
6 files changed, 42 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild b/net-im/ejabberd/ejabberd-17.01-r1.ebuild |
| 21 |
index 7c2e9586ebd..7bada46b7dc 100644 |
| 22 |
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild |
| 23 |
+++ b/net-im/ejabberd/ejabberd-17.01-r1.ebuild |
| 24 |
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND} |
| 25 |
captcha? ( media-gfx/imagemagick[truetype,png] )" |
| 26 |
|
| 27 |
DOCS=( README ) |
| 28 |
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" ) |
| 29 |
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" |
| 30 |
+ "${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" ) |
| 31 |
|
| 32 |
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
| 33 |
# Paths in net-im/jabber-base |
| 34 |
@@ -157,7 +158,7 @@ is_mod_irc_enabled() { |
| 35 |
# Make ejabberd.service for systemd from upstream provided template. |
| 36 |
make_ejabberd_service() { |
| 37 |
sed -r \ |
| 38 |
- -e 's!@ctlscriptpath@!/usr/sbin!' \ |
| 39 |
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \ |
| 40 |
-e 's!(User|Group)=(.*)!\1=jabber!' \ |
| 41 |
"${PN}.service.template" >"${PN}.service" \ |
| 42 |
|| die 'failed to make ejabberd.service' |
| 43 |
|
| 44 |
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild |
| 45 |
similarity index 98% |
| 46 |
copy from net-im/ejabberd/ejabberd-17.01-r1.ebuild |
| 47 |
copy to net-im/ejabberd/ejabberd-17.01-r2.ebuild |
| 48 |
index 7c2e9586ebd..7bada46b7dc 100644 |
| 49 |
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild |
| 50 |
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild |
| 51 |
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND} |
| 52 |
captcha? ( media-gfx/imagemagick[truetype,png] )" |
| 53 |
|
| 54 |
DOCS=( README ) |
| 55 |
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" ) |
| 56 |
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" |
| 57 |
+ "${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" ) |
| 58 |
|
| 59 |
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
| 60 |
# Paths in net-im/jabber-base |
| 61 |
@@ -157,7 +158,7 @@ is_mod_irc_enabled() { |
| 62 |
# Make ejabberd.service for systemd from upstream provided template. |
| 63 |
make_ejabberd_service() { |
| 64 |
sed -r \ |
| 65 |
- -e 's!@ctlscriptpath@!/usr/sbin!' \ |
| 66 |
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \ |
| 67 |
-e 's!(User|Group)=(.*)!\1=jabber!' \ |
| 68 |
"${PN}.service.template" >"${PN}.service" \ |
| 69 |
|| die 'failed to make ejabberd.service' |
| 70 |
|
| 71 |
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild |
| 72 |
similarity index 98% |
| 73 |
copy from net-im/ejabberd/ejabberd-17.04.ebuild |
| 74 |
copy to net-im/ejabberd/ejabberd-17.04-r1.ebuild |
| 75 |
index 1cec62f2eba..729fae6076e 100644 |
| 76 |
--- a/net-im/ejabberd/ejabberd-17.04.ebuild |
| 77 |
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild |
| 78 |
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND} |
| 79 |
|
| 80 |
DOCS=( README ) |
| 81 |
PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" |
| 82 |
- "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" ) |
| 83 |
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" |
| 84 |
+ "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" ) |
| 85 |
|
| 86 |
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
| 87 |
# Paths in net-im/jabber-base |
| 88 |
@@ -157,7 +158,7 @@ is_mod_irc_enabled() { |
| 89 |
# Make ejabberd.service for systemd from upstream provided template. |
| 90 |
make_ejabberd_service() { |
| 91 |
sed -r \ |
| 92 |
- -e 's!@ctlscriptpath@!/usr/sbin!' \ |
| 93 |
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \ |
| 94 |
-e 's!(User|Group)=(.*)!\1=jabber!' \ |
| 95 |
"${PN}.service.template" >"${PN}.service" \ |
| 96 |
|| die 'failed to make ejabberd.service' |
| 97 |
|
| 98 |
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild b/net-im/ejabberd/ejabberd-17.04.ebuild |
| 99 |
index 1cec62f2eba..729fae6076e 100644 |
| 100 |
--- a/net-im/ejabberd/ejabberd-17.04.ebuild |
| 101 |
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild |
| 102 |
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND} |
| 103 |
|
| 104 |
DOCS=( README ) |
| 105 |
PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" |
| 106 |
- "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" ) |
| 107 |
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" |
| 108 |
+ "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" ) |
| 109 |
|
| 110 |
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
| 111 |
# Paths in net-im/jabber-base |
| 112 |
@@ -157,7 +158,7 @@ is_mod_irc_enabled() { |
| 113 |
# Make ejabberd.service for systemd from upstream provided template. |
| 114 |
make_ejabberd_service() { |
| 115 |
sed -r \ |
| 116 |
- -e 's!@ctlscriptpath@!/usr/sbin!' \ |
| 117 |
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \ |
| 118 |
-e 's!(User|Group)=(.*)!\1=jabber!' \ |
| 119 |
"${PN}.service.template" >"${PN}.service" \ |
| 120 |
|| die 'failed to make ejabberd.service' |
| 121 |
|
| 122 |
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 |
| 123 |
new file mode 100644 |
| 124 |
index 00000000000..92b7b023309 |
| 125 |
--- /dev/null |
| 126 |
+++ b/net-im/ejabberd/files/ejabberd-17.01-0001-Dont-overwrite-service-file.patch |
| 127 |
@@ -0,0 +1,15 @@ |
| 128 |
+diff --git a/Makefile.in b/Makefile.in |
| 129 |
+index 5ff3efe0..644ed713 100644 |
| 130 |
+--- a/Makefile.in |
| 131 |
++++ b/Makefile.in |
| 132 |
+@@ -204,8 +204,8 @@ install: all copy-files |
| 133 |
+ chmod 755 ejabberd.init |
| 134 |
+ # |
| 135 |
+ # Service script |
| 136 |
+- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \ |
| 137 |
+- > ejabberd.service |
| 138 |
++ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \ |
| 139 |
++ ejabberd.service.template > ejabberd.service |
| 140 |
+ chmod 644 ejabberd.service |
| 141 |
+ # |
| 142 |
+ # Spool directory |
| 143 |
|
| 144 |
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 |
| 145 |
new file mode 100644 |
| 146 |
index 00000000000..2bea750ef04 |
| 147 |
--- /dev/null |
| 148 |
+++ b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch |
| 149 |
@@ -0,0 +1,15 @@ |
| 150 |
+diff --git a/Makefile.in b/Makefile.in |
| 151 |
+index a0b4553d..4675b88a 100644 |
| 152 |
+--- a/Makefile.in |
| 153 |
++++ b/Makefile.in |
| 154 |
+@@ -204,8 +204,8 @@ install: all copy-files |
| 155 |
+ chmod 755 ejabberd.init |
| 156 |
+ # |
| 157 |
+ # Service script |
| 158 |
+- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \ |
| 159 |
+- > ejabberd.service |
| 160 |
++ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \ |
| 161 |
++ ejabberd.service.template > ejabberd.service |
| 162 |
+ chmod 644 ejabberd.service |
| 163 |
+ # |
| 164 |
+ # Spool directory |
Archives