aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2016-04-01 00:10:04 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2016-04-01 00:33:20 +0200
commitef745b4cb4eb7163ad3ef16c0b38ac9b2f8e5716 (patch)
tree285d05f9a47e9a6e6ca90be5ea908b1964789117 /main
parent4610df1f94759fea8fc86fe13f86fae977033aa0 (diff)
downloadaports-ef745b4cb4eb7163ad3ef16c0b38ac9b2f8e5716.tar.bz2
aports-ef745b4cb4eb7163ad3ef16c0b38ac9b2f8e5716.tar.xz
main/git: update OpenRC service files from Gentoo
Diffstat (limited to 'main')
-rw-r--r--main/git/APKBUILD15
-rw-r--r--main/git/git-daemon.confd5
-rw-r--r--main/git/git-daemon.initd31
3 files changed, 16 insertions, 35 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index d4de3bf556..6e354ceef2 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=git
pkgver=2.8.0
-pkgrel=0
+pkgrel=1
pkgdesc="A distributed version control system"
url="https://www.git-scm.com/"
arch="all"
@@ -98,7 +98,6 @@ email() {
mv "$pkgdir"/$_gitcoredir/*email* "$subpkgdir"/$_gitcoredir
}
-
svn() {
depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion
perl-term-readkey"
@@ -229,13 +228,13 @@ _git_perl() {
md5sums="01477f0b97ccab20b986f2808f4d7a97 git-2.8.0.tar.xz
0549894076c2081d886fa5ee44c20e23 bb-tar.patch
-75b9d8f33fbec38a8e0e06baf5165b19 git-daemon.initd
-2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd"
+14315949509d12efee80285f8a3bc41e git-daemon.initd
+33427921f86acc26d1578d8b308e5baa git-daemon.confd"
sha256sums="9a099a4f1e68c0446800f0c538ce7d5d24bd5b4ee5d559317600cd407a59e74c git-2.8.0.tar.xz
968e996a306dab643970c5ce1ac40926146b01b9c38a8fe81c74340a0302dbc7 bb-tar.patch
-7918837f77b4cebce70b600b2f6da00e4c0df6b946f4ff5671c797c37b2ffc4f git-daemon.initd
-aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e git-daemon.confd"
+069878aba8d7c7f229b6049f679d1f93873bdada1107b77fc9a9b2bd8be94516 git-daemon.initd
+4703ba2372c661fb674a29fea7f64983f8b1b3136d971663509249655bca6e21 git-daemon.confd"
sha512sums="1b1f786d540efc96f89fdb5d6cc85db5ccc36fa03b066093e149ff491c349501806832279c09ed85afe7f248c6f183834b343e28ea8a9117499032569479c5fd git-2.8.0.tar.xz
85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch
-1e707250d133d56100f0311e7c2610920d6d81809c425ebf3e6acb4a289b958707a90dc38e1c17720da6dc2758dd84bf957fe6aed3854eacea79226eb616e885 git-daemon.initd
-9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509 git-daemon.confd"
+e32e57652a99243e8a3f2cfcfa641215eec27c463d5dbcbb8f9213474526ba3e4a23c188b5653a5100bb56857f0785e35e799b0c6336ec0b596b9b8e62af9d30 git-daemon.initd
+fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"
diff --git a/main/git/git-daemon.confd b/main/git/git-daemon.confd
index 6369053fc9..69b209ff18 100644
--- a/main/git/git-daemon.confd
+++ b/main/git/git-daemon.confd
@@ -10,11 +10,10 @@
# --export-all --- Exports all repositories
# --port=XXXX --- Starts in port XXXX instead of 9418
#
-GITDAEMON_REPO="/var/git"
-GITDAEMON_OPTS="--syslog --base-path=${GITDAEMON_REPO} ${GITDAEMON_REPO}"
+GITDAEMON_OPTS="--syslog --base-path=/var/git"
# To run an anonymous git safely, the following user should be able to only
-# read your Git repositories. It should not able able to write to anywhere on
+# read your Git repositories. It should not be able to write to anywhere on
# your system, esp. not the repositories.
GIT_USER="nobody"
GIT_GROUP="nobody"
diff --git a/main/git/git-daemon.initd b/main/git/git-daemon.initd
index cb765bdf2b..b6ecfd9c50 100644
--- a/main/git/git-daemon.initd
+++ b/main/git/git-daemon.initd
@@ -1,30 +1,13 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
+# $Id$
-PIDFILE=/var/run/git-daemon.pid
+pidfile="/var/run/git-daemon.pid"
+command="/usr/bin/git"
+command_args="daemon ${GITDAEMON_OPTS}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
depend() {
- need net
use logger
}
-
-start() {
- ebegin "Starting git-daemon"
- start-stop-daemon --start --quiet --background \
- --env HOME=${GIT_HOME:-/var/git} \
- --pidfile ${PIDFILE} \
- --exec /usr/bin/git -- daemon \
- --pid-file=${PIDFILE} \
- --user=${GIT_USER} --group=${GIT_GROUP} \
- ${GITDAEMON_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping git-daemon"
- start-stop-daemon --stop --quiet \
- --pidfile ${PIDFILE}
- eend $?
-}