From beb10999180343905564fc873b451e1e7a3a8153 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 30 May 2017 02:38:12 +0200 Subject: [PATCH] www-servers/gitaly: Add real ebuild for gitaly-0.10.0, base off the one from the gitlab overlay (v0.6.0) Package-Manager: Portage-2.3.5, Repoman-2.3.1 --- www-servers/gitaly/Manifest | 5 +++ .../0001-gitaly-0.10.0-fix-Makefile.patch | 10 ++++++ ...italy-0.10.0-fix-config.toml.example.patch | 21 ++++++++++++ www-servers/gitaly/files/gitaly-0.10.0.conf | 8 +++++ www-servers/gitaly/files/gitaly-0.10.0.init | 19 +++++++++++ www-servers/gitaly/gitaly-0.10.0-r1.ebuild | 34 +++++++++++++++++++ 6 files changed, 97 insertions(+) create mode 100644 www-servers/gitaly/files/0001-gitaly-0.10.0-fix-Makefile.patch create mode 100644 www-servers/gitaly/files/0002-gitaly-0.10.0-fix-config.toml.example.patch create mode 100644 www-servers/gitaly/files/gitaly-0.10.0.conf create mode 100644 www-servers/gitaly/files/gitaly-0.10.0.init create mode 100644 www-servers/gitaly/gitaly-0.10.0-r1.ebuild diff --git a/www-servers/gitaly/Manifest b/www-servers/gitaly/Manifest index ae31b80..ef89918 100644 --- a/www-servers/gitaly/Manifest +++ b/www-servers/gitaly/Manifest @@ -1,6 +1,11 @@ +AUX 0001-gitaly-0.10.0-fix-Makefile.patch 248 SHA256 03b4315da76b4409e990a53edce0cb21828a4c505f11266ca3f77e70e7c9857e SHA512 7aa509cf79a538398e9dc09cf92e34d6a8877da13ad1184e37f5e7ba4c24eb88251f692ebefddd07e3bf157a143d93dffb72ccbdfdd5ab4d52bbcd111e6e9380 WHIRLPOOL a03702f7d744239869249f53c49cfb3f62cbb58f75bc624079aced8219fa3d818d6eee9233953483c48a2138399442b7a89ca4ef1d93b96767e8d471dc5db00e +AUX 0002-gitaly-0.10.0-fix-config.toml.example.patch 692 SHA256 5f9eda6f748a7622671a41632614e035267520388af90b9c9bddefa2731652f6 SHA512 942c2e012d013d5eca80a679a1ecaf035c1d6b93251c827cf75b31edc5c9e211edf78d41a1148b84142338ae3f19fdd5673b207f18659acfc78982a0a6d4f253 WHIRLPOOL ff414bbfcb1fb6eaae5bc8e5d41cc27e0e93a1b216842d47570f8725988b594ad236c2d33ed8075ecd24f2939c46a2bdb5f77744ed26ab5bd2afcd0a9a93201d +AUX gitaly-0.10.0.conf 281 SHA256 54a309ecd95a0c907951a36db5542678f9e68c7e354dcc3278882512a82c5a99 SHA512 23875632a1c523eea855c10b03dab4a2aa38cc8de6be070df4ba8c85360edf8c5c2a636601f05004f62792c9e4304822c679841180b9a23c963de76a7c770873 WHIRLPOOL fac7949ddc161d2df6d4f0168029c405a0b68f64fee9cedf167bdab9ea55de1e52735476402e878f67339f969e40bd341cd21f31c99dd86d997df08a3ce8f217 +AUX gitaly-0.10.0.init 592 SHA256 31889dd48b19bd84aaeb64f943ea9ff173b7a2291b3f0dd465c08256d2aee9ee SHA512 81db4434946691a714945e2fab06e302c0994805b4b285e916363461160b30c919e9373d10e293eb2163dc46f132d1c6f4a5c9ab50cad3933827833d48a2832b WHIRLPOOL 1d7287c5dd41a8c63070467640bcf6f5c5fd66a03e7a75ddc000ab67860dd1f76098a78edc36af64ebd34deda103f2284bebcb153906a79310ac9808cfe75a76 DIST gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455 DIST gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8 DIST gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34 +EBUILD gitaly-0.10.0-r1.ebuild 925 SHA256 76ab8c1eacd6c99b8f6e6b1456698e886e103cc94c80a3a294adb9b6377ab55e SHA512 b24404dbc5ddaec4582bc4860a8f98387ab2633d58401296d95fcf8965a3f19d2f8c7739e51106b6d87e8926f1fa3c7f5b79a319d255724550b03c34d1a36bdf WHIRLPOOL fe3121a0d18b6183a8d545fcf4afbd93ead65c0150863d2342e08c6f60cdfa583f3427e49aa76cadcdda121409ba164981ef04f3f0dc1f69394492814aedc45b EBUILD gitaly-0.10.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e EBUILD gitaly-0.3.0.ebuild 1593 SHA256 f07387ac6ec3c68d2c4aa8894804caf5a456b8e12e15937d82fda4d2ed864185 SHA512 95d19b0e799195fa5e3d8cc2879c1017503f68aa586a074119441fbbcff28d2cd9d538830a3a2b40a542bdbfa99518f9afd09232907ac7e763d500cf00abe32f WHIRLPOOL 1e3c778ac33e385865a610dfef5ee07841e9a7b91800b94a3a88714caf38084584524b2f120553a9f13ee2df57309fbd8e9b1e119cdbfd2f6cc1749e25f14bcf EBUILD gitaly-0.6.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e diff --git a/www-servers/gitaly/files/0001-gitaly-0.10.0-fix-Makefile.patch b/www-servers/gitaly/files/0001-gitaly-0.10.0-fix-Makefile.patch new file mode 100644 index 0000000..9ca129f --- /dev/null +++ b/www-servers/gitaly/files/0001-gitaly-0.10.0-fix-Makefile.patch @@ -0,0 +1,10 @@ +diff --git a/Makefile b/Makefile +index c822059..342da88 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-PREFIX=/usr/local ++PREFIX=${DESTDIR}/usr + PKG=gitlab.com/gitlab-org/gitaly + BUILD_DIR=$(shell pwd) + BIN_BUILD_DIR=${BUILD_DIR}/_build/bin diff --git a/www-servers/gitaly/files/0002-gitaly-0.10.0-fix-config.toml.example.patch b/www-servers/gitaly/files/0002-gitaly-0.10.0-fix-config.toml.example.patch new file mode 100644 index 0000000..fab79f9 --- /dev/null +++ b/www-servers/gitaly/files/0002-gitaly-0.10.0-fix-config.toml.example.patch @@ -0,0 +1,21 @@ +diff --git a/config.toml.example b/config.toml.example +index 3a987f9..801d192 100644 +--- a/config.toml.example ++++ b/config.toml.example +@@ -1,6 +1,6 @@ + # Example Gitaly configuration file + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitaly.socket" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr = "localhost:9999" +@@ -12,7 +12,7 @@ socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" + + [[storage]] + name = "default" +-path = "/home/git/repositories" ++path = "/var/lib/git/repositories" + + # # You can optionally configure more storages for this Gitaly instance to serve up + # diff --git a/www-servers/gitaly/files/gitaly-0.10.0.conf b/www-servers/gitaly/files/gitaly-0.10.0.conf new file mode 100644 index 0000000..647272d --- /dev/null +++ b/www-servers/gitaly/files/gitaly-0.10.0.conf @@ -0,0 +1,8 @@ +CONFIGFILE=/etc/gitlab/gitaly-config.toml +RUNAS_USER=git +RUNAS_GROUP=${RUNAS_USER} +LOGFILE=/var/log/gitlab/gitlab-gitaly.log + +# This must match the setting in /etc/gitlab/gitaly-config.toml +# If not using a socket, simply comment out or delete the next line. +SOCKETDIR=/run/gitlab diff --git a/www-servers/gitaly/files/gitaly-0.10.0.init b/www-servers/gitaly/files/gitaly-0.10.0.init new file mode 100644 index 0000000..5e107a3 --- /dev/null +++ b/www-servers/gitaly/files/gitaly-0.10.0.init @@ -0,0 +1,19 @@ +#!/sbin/openrc-run + +start() { + ebegin "Starting gitlab-gitaly" + + checkpath -f -m 640 -o ${RUNAS_USER}:${RUNAS_GROUP} ${LOFGILE} + [ -z "${SOCKETDIR}" ] || checkpath -d ${SOCKETDIR} + + start-stop-daemon --start --exec /usr/bin/gitlab-gitaly --pidfile /run/gitlab-gitaly.pid \ + --make-pidfile --background --user ${RUNAS_USER}:${RUNAS_GROUP} --stdout "${LOGFILE}" --stderr "${LOGFILE}" \ + -- ${CONFIGFILE} + eend $? +} + +stop() { + ebegin "Stopping gitlab-gitaly" + start-stop-daemon --stop --exec /usr/bin/gitlab-gitaly --pidfile /run/gitlab-gitaly.pid --user ${RUNAS_USER}:${RUNAS_GROUP} + eend $? +} diff --git a/www-servers/gitaly/gitaly-0.10.0-r1.ebuild b/www-servers/gitaly/gitaly-0.10.0-r1.ebuild new file mode 100644 index 0000000..906b070 --- /dev/null +++ b/www-servers/gitaly/gitaly-0.10.0-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git" +EGIT_COMMIT="v${PV}" + +inherit eutils git-2 user + +DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." +HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" + +DEPEND=">=dev-lang/go-1.5.1" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.patch" + epatch "${FILESDIR}/0002-${PN}-0.10.0-fix-config.toml.example.patch" +} + +src_install() { + # TODO fowners, fperms on config.toml.example + insinto "/etc/gitlab" + newins "config.toml.example" "gitaly-config.toml" + newconfd "${FILESDIR}/${PN}-0.10.0.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.10.0.init" "gitlab-gitaly" + into "/usr" + newbin "gitaly" "gitlab-gitaly" +}