Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irker/, net-irc/irker/files/
Date: Sun, 03 Jul 2022 18:13:03
Message-Id: 1656871975.906cdff29ce89248d6c00805c16f36cee0c032c9.arthurzam@gentoo
1 commit: 906cdff29ce89248d6c00805c16f36cee0c032c9
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 17:55:15 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 18:12:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906cdff2
7
8 net-irc/irker: update systemd service file
9
10 - fix the User by also setting DynamicUser (no need for new system
11 user, and also much better security)
12 - Better EPREFIX placeholder
13 - Some more security options for less capabilities
14
15 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
16 Closes: https://github.com/gentoo/gentoo/pull/26212
17 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
18
19 net-irc/irker/files/irkerd.service | 21 +++++++++++++++++++++
20 .../{irker-2.22-r1.ebuild => irker-2.22-r2.ebuild} | 8 +++-----
21 2 files changed, 24 insertions(+), 5 deletions(-)
22
23 diff --git a/net-irc/irker/files/irkerd.service b/net-irc/irker/files/irkerd.service
24 new file mode 100644
25 index 000000000000..232a8d5811a5
26 --- /dev/null
27 +++ b/net-irc/irker/files/irkerd.service
28 @@ -0,0 +1,21 @@
29 +# Copyright 2012 Wulf C. Krueger <philantrop@×××××××.org>
30 +# Copyright 2022 Arthur Zamarin <arthurzam@g.o>
31 +# Distributed under the terms of the BSD LICENSE
32 +
33 +[Unit]
34 +Description=Internet Relay Chat (IRC) notification daemon
35 +Requires=network.target
36 +Documentation=man:irkerd(8) man:irkerhook(1) man:irk(1)
37 +
38 +[Service]
39 +ExecStart=@EPREFIX@/usr/bin/irkerd
40 +User=irker
41 +DynamicUser=yes
42 +NoNewPrivileges=yes
43 +CapabilityBoundingSet=
44 +PrivateDevices=yes
45 +ProtectHome=yes
46 +
47 +[Install]
48 +WantedBy=multi-user.target
49 +Alias=irker.service
50
51 diff --git a/net-irc/irker/irker-2.22-r1.ebuild b/net-irc/irker/irker-2.22-r2.ebuild
52 similarity index 86%
53 rename from net-irc/irker/irker-2.22-r1.ebuild
54 rename to net-irc/irker/irker-2.22-r2.ebuild
55 index e2bf844a14f6..085be79ae727 100644
56 --- a/net-irc/irker/irker-2.22-r1.ebuild
57 +++ b/net-irc/irker/irker-2.22-r2.ebuild
58 @@ -39,12 +39,10 @@ src_prepare() {
59 default
60
61 # Rely on systemd eclass for systemd service install
62 - sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
63 - || die "sed failed"
64 + sed -e "/^SYSTEMDSYSTEMUNITDIR/d" -i Makefile || die "sed failed"
65
66 # Prefix support
67 - sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \
68 - || die "sed failed"
69 + sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed"
70 }
71
72 src_install() {
73 @@ -57,7 +55,7 @@ src_install() {
74 newinitd "${FILESDIR}"/irkerd.initd irkerd
75 newconfd "${FILESDIR}"/irkerd.confd irkerd
76
77 - systemd_dounit irkerd.service
78 + systemd_dounit "${WORKDIR}"/irkerd.service
79
80 docinto examples
81 dodoc filter-example.py filter-test.py