commit:     6f0c4602e9576233e24bc7da1eaca379421c6aee
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 08:55:08 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 09:01:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0c4602

dev-vcs/git: Improve OpenRC script git-daemon

Thanks-to: Brian Evans <grknight <AT> gentoo.org>
Closes: https://bugs.gentoo.org/828098
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/files/git-daemon-r2.initd                    | 14 ++++++++++++++
 dev-vcs/git/{git-9999-r1.ebuild => git-2.34.1-r1.ebuild} |  2 +-
 dev-vcs/git/git-9999-r1.ebuild                           |  2 +-
 dev-vcs/git/git-9999-r2.ebuild                           |  2 +-
 dev-vcs/git/git-9999-r3.ebuild                           |  2 +-
 dev-vcs/git/git-9999.ebuild                              |  2 +-
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dev-vcs/git/files/git-daemon-r2.initd 
b/dev-vcs/git/files/git-daemon-r2.initd
new file mode 100644
index 000000000000..177458b27366
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon-r2.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/git-daemon.pid"
+command="/usr/bin/git"
+command_args="daemon ${GITDAEMON_OPTS}"
+command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME="
+command_background="yes"
+
+depend() {
+       use logger
+}

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild
similarity index 99%
copy from dev-vcs/git/git-9999-r1.ebuild
copy to dev-vcs/git/git-2.34.1-r1.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-2.34.1-r1.ebuild
@@ -513,7 +513,7 @@ src_install() {
        fi
 
        if ! use prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+               newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
                newconfd "${FILESDIR}"/git-daemon.confd git-daemon
                systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
                        "[email protected]"

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -513,7 +513,7 @@ src_install() {
        fi
 
        if ! use prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+               newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
                newconfd "${FILESDIR}"/git-daemon.confd git-daemon
                systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
                        "[email protected]"

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -513,7 +513,7 @@ src_install() {
        fi
 
        if ! use prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+               newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
                newconfd "${FILESDIR}"/git-daemon.confd git-daemon
                systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
                        "[email protected]"

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -513,7 +513,7 @@ src_install() {
        fi
 
        if ! use prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+               newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
                newconfd "${FILESDIR}"/git-daemon.confd git-daemon
                systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
                        "[email protected]"

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -513,7 +513,7 @@ src_install() {
        fi
 
        if ! use prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+               newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
                newconfd "${FILESDIR}"/git-daemon.confd git-daemon
                systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
                        "[email protected]"

Reply via email to