| 1 |
commit: 6f0c4602e9576233e24bc7da1eaca379421c6aee |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 6 08:55:08 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 6 09:01:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0c4602 |
| 7 |
|
| 8 |
dev-vcs/git: Improve OpenRC script git-daemon |
| 9 |
|
| 10 |
Thanks-to: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
Closes: https://bugs.gentoo.org/828098 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-vcs/git/files/git-daemon-r2.initd | 14 ++++++++++++++ |
| 15 |
dev-vcs/git/{git-9999-r1.ebuild => git-2.34.1-r1.ebuild} | 2 +- |
| 16 |
dev-vcs/git/git-9999-r1.ebuild | 2 +- |
| 17 |
dev-vcs/git/git-9999-r2.ebuild | 2 +- |
| 18 |
dev-vcs/git/git-9999-r3.ebuild | 2 +- |
| 19 |
dev-vcs/git/git-9999.ebuild | 2 +- |
| 20 |
6 files changed, 19 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-vcs/git/files/git-daemon-r2.initd b/dev-vcs/git/files/git-daemon-r2.initd |
| 23 |
new file mode 100644 |
| 24 |
index 000000000000..177458b27366 |
| 25 |
--- /dev/null |
| 26 |
+++ b/dev-vcs/git/files/git-daemon-r2.initd |
| 27 |
@@ -0,0 +1,14 @@ |
| 28 |
+#!/sbin/openrc-run |
| 29 |
+# Copyright 1999-2021 Gentoo Authors |
| 30 |
+# Distributed under the terms of the GNU General Public License v2 |
| 31 |
+ |
| 32 |
+pidfile="/var/run/git-daemon.pid" |
| 33 |
+command="/usr/bin/git" |
| 34 |
+command_args="daemon ${GITDAEMON_OPTS}" |
| 35 |
+command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}" |
| 36 |
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME=" |
| 37 |
+command_background="yes" |
| 38 |
+ |
| 39 |
+depend() { |
| 40 |
+ use logger |
| 41 |
+} |
| 42 |
|
| 43 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild |
| 44 |
similarity index 99% |
| 45 |
copy from dev-vcs/git/git-9999-r1.ebuild |
| 46 |
copy to dev-vcs/git/git-2.34.1-r1.ebuild |
| 47 |
index 6fd30df80506..74e58d7f357a 100644 |
| 48 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 49 |
+++ b/dev-vcs/git/git-2.34.1-r1.ebuild |
| 50 |
@@ -513,7 +513,7 @@ src_install() { |
| 51 |
fi |
| 52 |
|
| 53 |
if ! use prefix ; then |
| 54 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 55 |
+ newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon |
| 56 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 57 |
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ |
| 58 |
"git-daemon@.service" |
| 59 |
|
| 60 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 61 |
index 6fd30df80506..74e58d7f357a 100644 |
| 62 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 63 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 64 |
@@ -513,7 +513,7 @@ src_install() { |
| 65 |
fi |
| 66 |
|
| 67 |
if ! use prefix ; then |
| 68 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 69 |
+ newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon |
| 70 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 71 |
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ |
| 72 |
"git-daemon@.service" |
| 73 |
|
| 74 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 75 |
index 6fd30df80506..74e58d7f357a 100644 |
| 76 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 77 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 78 |
@@ -513,7 +513,7 @@ src_install() { |
| 79 |
fi |
| 80 |
|
| 81 |
if ! use prefix ; then |
| 82 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 83 |
+ newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon |
| 84 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 85 |
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ |
| 86 |
"git-daemon@.service" |
| 87 |
|
| 88 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 89 |
index 6fd30df80506..74e58d7f357a 100644 |
| 90 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 91 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 92 |
@@ -513,7 +513,7 @@ src_install() { |
| 93 |
fi |
| 94 |
|
| 95 |
if ! use prefix ; then |
| 96 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 97 |
+ newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon |
| 98 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 99 |
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ |
| 100 |
"git-daemon@.service" |
| 101 |
|
| 102 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 103 |
index 6fd30df80506..74e58d7f357a 100644 |
| 104 |
--- a/dev-vcs/git/git-9999.ebuild |
| 105 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 106 |
@@ -513,7 +513,7 @@ src_install() { |
| 107 |
fi |
| 108 |
|
| 109 |
if ! use prefix ; then |
| 110 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 111 |
+ newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon |
| 112 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 113 |
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ |
| 114 |
"git-daemon@.service" |
Archives