From e233c14c0fa45410d7294b536665ca6f23703df3 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 19 Feb 2018 01:17:56 +0100 Subject: [PATCH] www-servers/gitlab-gitaly: Add ebuild for version 0.66.0 Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- www-servers/gitlab-gitaly/ChangeLog | 8 ++++ www-servers/gitlab-gitaly/Manifest | 6 ++- ...italy-0.66.0-fix-config.toml.example.patch | 43 +++++++++++++++++++ .../files/gitlab-gitaly-0.66.0.conf | 9 ++++ .../files/gitlab-gitaly-0.66.0.init | 20 +++++++++ .../gitlab-gitaly/gitlab-gitaly-0.66.0.ebuild | 40 +++++++++++++++++ 6 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.66.0-fix-config.toml.example.patch create mode 100644 www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.conf create mode 100644 www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.init create mode 100644 www-servers/gitlab-gitaly/gitlab-gitaly-0.66.0.ebuild diff --git a/www-servers/gitlab-gitaly/ChangeLog b/www-servers/gitlab-gitaly/ChangeLog index a9e3ca9..54f7e45 100644 --- a/www-servers/gitlab-gitaly/ChangeLog +++ b/www-servers/gitlab-gitaly/ChangeLog @@ -1,3 +1,11 @@ +*gitlab-gitaly-0.66.0 (19 Feb 2018) + + 19 Feb 2018; Manuel Friedli + +files/0002-gitlab-gitaly-0.66.0-fix-config.toml.example.patch, + +files/gitlab-gitaly-0.66.0.conf, +files/gitlab-gitaly-0.66.0.init, + +gitlab-gitaly-0.66.0.ebuild: + www-servers/gitlab-gitaly: Add ebuild for version 0.66.0 + *gitlab-gitaly-0.59.2 (17 Feb 2018) 17 Feb 2018; Manuel Friedli diff --git a/www-servers/gitlab-gitaly/Manifest b/www-servers/gitlab-gitaly/Manifest index 30ec059..9ed2186 100644 --- a/www-servers/gitlab-gitaly/Manifest +++ b/www-servers/gitlab-gitaly/Manifest @@ -4,8 +4,11 @@ AUX 0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch 700 SHA256 7f5c3f840 AUX 0002-gitlab-gitaly-0.35.0-fix-config.toml.example.patch 1015 SHA256 44cd87bb35224634ef9832f2d1e79de2ab27580101665a049eaf20f5ffae590d SHA512 9110e6f42babac04c98227ecfff3a961ec35fe6c487559e5a638676f409dbf6b0b133524b092322085cb7c7c41c5fc729c7b6be80bae10931efd5785172f01b2 WHIRLPOOL 8b0f1aa8c8c9c2ea4a8a5dbfd1e5a00603d587209b0967be82a9d78d0eabe4d350ac44fce80bfc9dac77ea2c0ff5d0f954e8cb4fb50ee778fb636599b1d8456f AUX 0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch 1095 SHA256 3e9558a127675bca052a9219265572504729380087665f2cd681c44d5545f101 SHA512 1ee6b6a127a6f7e82970c2e4270b42427a88bfbca5ba9d979d6667381d2a6cf934c77cc6e2f47af24a2810e0427285565bc42a0d26c36649a9177b917ac5a424 WHIRLPOOL f96a7dd2952d5a8d7652d5e6966c4e2d85c3a9785e824108068fab158f5871cd1a0ca0f88f563478c4f937ba2d9e3df489611d07c092ff0c4c9b6668f0abb5fb AUX 0002-gitlab-gitaly-0.59.2-fix-config.toml.example.patch 1183 SHA256 edd4dc6f1d1b56bfc902d79c0abb2d3b85b69cfe3b90e4250b804fafe00f49c3 SHA512 4a9bf3222e442fcd76cf62921a7f184e67784532c2c4706f3f7d3d1b7a13c874520dba6ef629d93aa1514ce3483827d1a11cf7a04ae530fb4ed67844be1e9353 WHIRLPOOL a93af879b93415470e41449390388f908dba17dc1ea5f4e47e5bbe80fcac11f85c64ce18899aa2ee084438598e24e2ddc72076c0d63bd8fc61de4f2ee8ee2cc0 +AUX 0002-gitlab-gitaly-0.66.0-fix-config.toml.example.patch 1309 SHA256 1fd8a1d8b15b713a53f9d5fc34be9a3c7bc081724f9e3fde582213fbdfe047cd SHA512 33ae00c2fadf085e5a1e12e48155144369fdf9db0fb7547a1d0695e903eb17859985d48af5765a544c68fa9186de23c7228348a38c431202e65deee26c3d3953 WHIRLPOOL 28c85bc36d3c42460dc2044245b71181ec6fa72737d2f2ccb565fc5b3a7e8e51f3315e166cc3067709f90ffd0ad489fe1745790036bb18be4dc8c8bc3377098c AUX gitlab-gitaly-0.11.2.conf 289 SHA256 da2640e0ac6a3f356d68f2825c78a1965703df292cd6631b2e884e1a9c7ecc87 SHA512 86f2b4dd283de117c3a371a98a1472d248a21a2c931be6644bec2406249e000fe2e55d031b523d6e64fa2eaa3addad27704f338f65cad6b559680c5c327b9614 WHIRLPOOL 18cb38b35c9a79c6eaaa15ed9bbbeb6dc502a0291f3bff2bf1f59a950556c4c3fd3742a4097ab784c1e9a12d2209b336f2bf688b0888e13bb1b7f78219bb6d87 AUX gitlab-gitaly-0.11.2.init 631 SHA256 32257b9e72c2ee201e5104f6eafc134920237f0f5465110edda4778dd92c17a2 SHA512 a0bf57f392a75b1a2875837ec1ad47b61317c6ae530d12e60ae3f62f69b0fb8ef48499b31751fab788df1a6ab842926a73443795a5888258f62e473e2953299a WHIRLPOOL 8185d1927c021be4b3de7c4e0228c68cba558b35c0894c6b17de7f24ebc42dd771593b2d9169f27c5a1ada90e14b2fdb651521ddf39660a77dece586c7f1d348 +AUX gitlab-gitaly-0.66.0.conf 319 SHA256 a5c264800874973e62abd163e5e9144ab698192fc5aaf62aa06488e4727bc54b SHA512 5c0548ba52cfac02388d45f1b88c7bd43df1fef103ba8be1000c0e48438fbe6c1c4cfd6e6c26c1afe0f9ccbfe05b10e2dd4f13c9615ecde32cd23b496a9bb8ca WHIRLPOOL 5eb849c3b24e1e4ec0b7eba8366143f36f4ba3243f02c17102bda15bde05dc8d77ba97768b9cd0dfe9bec18d5b0eaae948622e071c30b590207ce7dac2e026df +AUX gitlab-gitaly-0.66.0.init 692 SHA256 bb5e4bc7b2e1a8ac16aa0d2a548ce924d12f5eb8e0a6cc1bc7cff331d1ca8737 SHA512 5a760d58c4f96db585d2008964e3407393ce6547ded05d92d0ffa4ea62c691caf1c261543f3004bb45c14288603858768fcae9a817a4293e0454d2319e303975 WHIRLPOOL d87fef85569ba648d6713104f259276b2a377cb5657c7350c96fbb83f63d0ccc5d94c4a5a41cab4e0c01702fec9b9e52aae420d7a22abbb63c090072e603a518 DIST gitlab-gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455 DIST gitlab-gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8 DIST gitlab-gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34 @@ -19,5 +22,6 @@ EBUILD gitlab-gitaly-0.43.1.ebuild 1073 SHA256 594e68b869e53fe6fbdcf8fdade3889f5 EBUILD gitlab-gitaly-0.52.1.ebuild 1073 SHA256 594e68b869e53fe6fbdcf8fdade3889f55883b8b4ab17a2b064b3fd12a1ef739 SHA512 e3e7f045aa0565267bb516f685685c704841b5186dcca1282274ddd9392b734ac7808cb99d587ced3c87a357dc5af02bca99056386f0db0f9ecd07bba9e6e18e WHIRLPOOL 1329e9b461fe5c7386aa127a815602c655f8411a030537de9a247ea033723cfd60eb00a38e39cb775c985607b90b0e30fe55a9ef6856b49204a2ddc8427afa1c EBUILD gitlab-gitaly-0.59.2.ebuild 1073 SHA256 a9899ddb752550e82510d101a93286cb6b872b8faa53d008e55af3ddc2d2e685 SHA512 da7ba77fe0a9234c5e4f5994a3c7fa9c11a93cdd6f9cff3ab5a658f6a9385a0bea8f00cee878a43c9580632c9837c305b293e8609f3e284b958f7b514ef10c81 WHIRLPOOL e4b12a160c2cfc08da4fd36fcbde8dcd1f383acbd5211c50dfcea1610e4e5105ca9720f9f8c34a7ab41fe2c33a77d3129ae527fd94f3b8d0259e9c2e4ec9a027 EBUILD gitlab-gitaly-0.6.0.ebuild 769 SHA256 601ca500d12250325bf6f924d53b28cb120cc75da9b9e1d83cd4c9317aa1ee91 SHA512 1263c919fb3c126a0ba5dda2b9da45b0a16b6bb703ec4260b11b40463fcfedd1249389272ab638d25ced351a63c0812c0cbc7ea035f9c2250d2eb79786424c2d WHIRLPOOL 261dfdd551dad839d687b2092027de33e95142e1ed7336fd6513742044ff219353743988aefad8e5da6850a8e1c8d5b44baf08c6702960a829673cfc5580e152 -MISC ChangeLog 5020 SHA256 198eaa93db9ce37a1cb442811ad6c54c72faf6c41d730bc6d88c9d59b04644a4 SHA512 26202dbd0a5907dd6bc236551023bbdb2ee75e431b52e0309a1af85cb1ac80f59a5d68f4fe86f639276224b27582acf78ff3e8bc62387086b225b1a77ded61e8 WHIRLPOOL 88a7573a71b0ee89b1d5197c8c1fd3e8dfbff55cd8858aa1ab004e3ee860a1748f3981c19d1cce7322ae80d7c06caa1cbbb49658ab18d8f3bb5e5ec26d1e3187 +EBUILD gitlab-gitaly-0.66.0.ebuild 1086 SHA256 bd5b1734d6354c2e7bbf6e815700b38c81f7325bf1d222b9c74576852529dcd3 SHA512 4fe2be263fbf16ab7f9f24f06f82d1a60b3b30322f3f72fc6ddd5a13763f137da3ce122b81d747bb8b4c733e0bb6fa7e53a51f5ce186f1690ae256b8712c41a6 WHIRLPOOL c3e34cda3ef250cefeb761e8b1b1c53fea6e22d7f21269000081f18a7858b8153256c770e01f5df1dfd43ba219172d4f74992f6244fef8ca166fb35fa6a21fc5 +MISC ChangeLog 5337 SHA256 3d8fe1b846d569b7c302b225182694bb49ac10b51f7799075232a0736c5b50d7 SHA512 6eb14e233c9064948f3ed80b0d5e4b683e27f3e5d393691c06cf581224751da19f180af253055eb6c1a2248142a165609e3230e257625d715af7818b164cf2c7 WHIRLPOOL 6862a5df874bd897d95f55b606cafaa6ea7d3ae6bf1483ea71af8e245b14e5b6740a9fa814a99b6a021e2a3feec1dfd057d4fb001cc33a47513642ec878db902 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.66.0-fix-config.toml.example.patch b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.66.0-fix-config.toml.example.patch new file mode 100644 index 0000000..3b2ca91 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.66.0-fix-config.toml.example.patch @@ -0,0 +1,43 @@ +diff --git a/config.toml.example b/config.toml.example +index 10f8cce..f65b5b9 100644 +--- a/config.toml.example ++++ b/config.toml.example +@@ -1,9 +1,9 @@ + # Example Gitaly configuration file + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/gitaly.socket" + + # The directory where Gitaly's executables are stored +-bin_dir = "/home/git/gitaly" ++bin_dir = "/usr/bin" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr = "localhost:9999" +@@ -19,7 +19,7 @@ bin_dir = "/home/git/gitaly" + + [[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 + # +@@ -40,7 +40,7 @@ path = "/home/git/repositories" + + [gitaly-ruby] + # The directory where gitaly-ruby is installed +-dir = "/home/git/gitaly/ruby" ++dir = "/var/lib/gitlab-gitaly/ruby" + + # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) + # max_rss = 300000000 +@@ -53,7 +53,7 @@ dir = "/home/git/gitaly/ruby" + + [gitlab-shell] + # The directory where gitlab-shell is installed +-dir = "/home/git/gitlab-shell" ++dir = "/usr/share/gitlab-shell" + + # # You can adjust the concurrency of each RPC endpoint + # [[concurrency]] diff --git a/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.conf b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.conf new file mode 100644 index 0000000..0377216 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.conf @@ -0,0 +1,9 @@ +CONFIGFILE=/etc/gitlab/gitaly-config.toml +RUNAS_USER=git +RUNAS_GROUP=${RUNAS_USER} +LOGFILE=/var/log/gitlab/gitlab-gitaly.log +PIDFILE=/run/gitlab/gitlab-gitaly.pid + +# 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/gitlab-gitaly/files/gitlab-gitaly-0.66.0.init b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.init new file mode 100644 index 0000000..1828380 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.66.0.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run + +start() { + ebegin "Starting gitlab-gitaly" + + checkpath -f -m 640 -o ${RUNAS_USER}:${RUNAS_GROUP} "${LOGFILE}" + checkpath -d -m 700 -o ${RUNAS_USER}:${RUNAS_GROUP} "$(dirname ${PIDFILE})" + [ -z "${SOCKETDIR}" ] || checkpath -d -m 700 -o ${RUNAS_USER}:${RUNAS_GROUP} "${SOCKETDIR}" + + start-stop-daemon --start --exec /usr/bin/gitlab-gitaly --pidfile "${PIDFILE}" \ + --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 "${PIDFILE}" --user ${RUNAS_USER}:${RUNAS_GROUP} + eend $? +} diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.66.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.66.0.ebuild new file mode 100644 index 0000000..42c751f --- /dev/null +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.66.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git" +EGIT_COMMIT="v${PV}" + +inherit eutils git-r3 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.8.3 + dev-ruby/bundler" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/0001-${PN}-0.23.0-fix-Makefile.patch" + epatch "${FILESDIR}/0002-${PN}-0.66.0-fix-config.toml.example.patch" + eapply_user +} + +src_install() { + # TODO fowners, fperms on config.toml.example + insinto "/etc/gitlab" + newins "config.toml.example" "gitaly-config.toml" + newconfd "${FILESDIR}/${PN}-0.66.0.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.66.0.init" "gitlab-gitaly" + into "/usr" + newbin "gitaly" "gitlab-gitaly" + + # install gitaly-ruby + insinto "/var/lib/gitlab-gitaly" + doins -r "ruby" + fperms 0755 /var/lib/gitlab-gitaly/ruby/bin/{gitaly-ruby,ruby-cd} +}