From 8efa7d7d6fab78bbd3fac27bdfe1b754c96c3287 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 8 Jul 2017 17:26:02 +0200 Subject: [PATCH] www-servers/gitlab-gitaly: Update ebuild for gitlab-gitaly-0.11.2 in preparation of the addition of gitlab-ce-9.3.5 Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- www-servers/gitlab-gitaly/ChangeLog | 7 +++++++ www-servers/gitlab-gitaly/Manifest | 8 ++++--- ...italy-0.11.2-fix-config.toml.example.patch | 21 +++++++++++++++++++ .../files/gitlab-gitaly-0.11.2.conf | 8 +++++++ ...11.2-r1.init => gitlab-gitaly-0.11.2.init} | 2 +- .../gitlab-gitaly-0.11.2-r1.ebuild | 6 +++--- 6 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch create mode 100644 www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.conf rename www-servers/gitlab-gitaly/files/{gitlab-gitaly-0.11.2-r1.init => gitlab-gitaly-0.11.2.init} (89%) diff --git a/www-servers/gitlab-gitaly/ChangeLog b/www-servers/gitlab-gitaly/ChangeLog index bc3b298..3893e66 100644 --- a/www-servers/gitlab-gitaly/ChangeLog +++ b/www-servers/gitlab-gitaly/ChangeLog @@ -1,3 +1,10 @@ + 08 Jul 2017; Manuel Friedli + +files/0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch, + +files/gitlab-gitaly-0.11.2.conf, +files/gitlab-gitaly-0.11.2.init, + -files/gitlab-gitaly-0.11.2-r1.init, gitlab-gitaly-0.11.2-r1.ebuild: + www-servers/gitlab-gitaly: Update ebuild for gitlab-gitaly-0.11.2 in + preparation of the addition of gitlab-ce-9.3.5 + 08 Jul 2017; Manuel Friedli files/gitlab-gitaly-0.11.2-r1.init: www-servers/gitlab-gitaly: Fix silly, *silly* typo. diff --git a/www-servers/gitlab-gitaly/Manifest b/www-servers/gitlab-gitaly/Manifest index a446b23..ef2c976 100644 --- a/www-servers/gitlab-gitaly/Manifest +++ b/www-servers/gitlab-gitaly/Manifest @@ -1,16 +1,18 @@ AUX 0001-gitlab-gitaly-0.10.0-fix-Makefile.patch 248 SHA256 03b4315da76b4409e990a53edce0cb21828a4c505f11266ca3f77e70e7c9857e SHA512 7aa509cf79a538398e9dc09cf92e34d6a8877da13ad1184e37f5e7ba4c24eb88251f692ebefddd07e3bf157a143d93dffb72ccbdfdd5ab4d52bbcd111e6e9380 WHIRLPOOL a03702f7d744239869249f53c49cfb3f62cbb58f75bc624079aced8219fa3d818d6eee9233953483c48a2138399442b7a89ca4ef1d93b96767e8d471dc5db00e AUX 0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch 692 SHA256 5f9eda6f748a7622671a41632614e035267520388af90b9c9bddefa2731652f6 SHA512 942c2e012d013d5eca80a679a1ecaf035c1d6b93251c827cf75b31edc5c9e211edf78d41a1148b84142338ae3f19fdd5673b207f18659acfc78982a0a6d4f253 WHIRLPOOL ff414bbfcb1fb6eaae5bc8e5d41cc27e0e93a1b216842d47570f8725988b594ad236c2d33ed8075ecd24f2939c46a2bdb5f77744ed26ab5bd2afcd0a9a93201d +AUX 0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch 700 SHA256 7f5c3f840581c2c2e98741ad6fcb9b486948dbcd80f52f4c45538b9fe9009087 SHA512 e89636c4e38697fad62553e8b07677fdc0fef5b83249ce79f748e1da7300c28514cdbf7a182232ced95222c9578cc9028de5e039b82f31175c22d840c83c0286 WHIRLPOOL 2b9c2b2b96da648b5f71a4ee8940c2a0a148e9005178e012afc73dd7709a5c407e04240adfb96a4ea3d2384248a23682a8d5727c967ddd5368f0d2d3b38d24e5 AUX gitlab-gitaly-0.10.0.conf 281 SHA256 54a309ecd95a0c907951a36db5542678f9e68c7e354dcc3278882512a82c5a99 SHA512 23875632a1c523eea855c10b03dab4a2aa38cc8de6be070df4ba8c85360edf8c5c2a636601f05004f62792c9e4304822c679841180b9a23c963de76a7c770873 WHIRLPOOL fac7949ddc161d2df6d4f0168029c405a0b68f64fee9cedf167bdab9ea55de1e52735476402e878f67339f969e40bd341cd21f31c99dd86d997df08a3ce8f217 AUX gitlab-gitaly-0.10.0.init 592 SHA256 31889dd48b19bd84aaeb64f943ea9ff173b7a2291b3f0dd465c08256d2aee9ee SHA512 81db4434946691a714945e2fab06e302c0994805b4b285e916363461160b30c919e9373d10e293eb2163dc46f132d1c6f4a5c9ab50cad3933827833d48a2832b WHIRLPOOL 1d7287c5dd41a8c63070467640bcf6f5c5fd66a03e7a75ddc000ab67860dd1f76098a78edc36af64ebd34deda103f2284bebcb153906a79310ac9808cfe75a76 -AUX gitlab-gitaly-0.11.2-r1.init 631 SHA256 98c1b8db2fd54d968b58a1c5a766090e85010b2da3af22232adcb16743f46207 SHA512 b018e11b2177f4869aa5bc87c92669d312a25d1619addd134f022a33afba7867bfd21096dec74d435bf41c0eefa5d539d39d6b6ad3322125b9f4ec72be70b07c WHIRLPOOL 42f42c9d37eb5ea9dc0fd5116caec9ca6b7d4389a42a5ca5cc8399e4b9e02c80b4bd97462fb0b4dc5f26b9733a8f3cab4d6c6ef7a9dfba5121b8f8191322e9cd +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 DIST gitlab-gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455 DIST gitlab-gitaly-0.11.0.tar.bz2 1446943 SHA256 fe4b57fbc05038eb297fa650dd41c1ae6049fc974f43aa7b4993f500627d9e5c SHA512 396d680b66812a7be1dfb9d54d24c0b06c5b70b7bc94c9cc4de8c5e7ccc875682efafa063370d1b2e352458e8bc24db77ca7ad127e4c5af37e5e6c415ce3a7ac WHIRLPOOL 6050a67cb97c9f4072ae81a5c5364bd910c15f54853e974e7f62fee8a95ca9c38ed1fc550f4df71fbecd8b314aacad77cf24b67fcd6bf340c68a3db3fe74854c 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 EBUILD gitlab-gitaly-0.10.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fafebffd88f7ab12399c12076ee67632a SHA512 ed5e46fa20bfeb81da16f8fb0b702b7d8f71ca5d35f81456fd2ee31eec781cae75e14081b2eeaae3959d6b5db7eb5ed84398c90c6f687b0a3dbf9e602b7cb8f6 WHIRLPOOL 7c6cbdd81e2da6f659482db204433430e2bb947175a56b85addd688dc511cae7dea45a99796c14c6cb2d352fb868752bafc14af34f100d538b5b40bebe2a0846 EBUILD gitlab-gitaly-0.11.0.ebuild 1613 SHA256 6a93e81f94c7af310e4076fa7c81d93d5b4ed3a8c0a2812a58fab96bd6c318ce SHA512 0e2732f634de08a243b57b3766a3b1f3c7d7eafafbf40f72d87dfdbb51aad963aec45899d14a9114f43415dd5dde6734f5619613127485fbc64440b17734db8f WHIRLPOOL 750c4bd7349bd9ced835b3315e31d25ddc0e7fd7ba523ebe31feee86c19b1e0ef7f8e9f1c8fb483fb6b7b246db76ba195a3f48f4b834ff727ce3c2a7512f218e -EBUILD gitlab-gitaly-0.11.2-r1.ebuild 928 SHA256 d0cc04e832356a9a55a0ea5b52ddf971a97c601b9e81b68608ca4505f7ca338f SHA512 25d40a8f201c6732fef0789bd1cf5cf249385dfdc9fcb71d9cd86a0c704e409876895082d1e8ef40abdffb8abb61ded7eb7e025aaabdc6c09b4c414e4f430acc WHIRLPOOL 8cea0bc66ae32692e2e12793f9919e96a424e1d6ba98e4d543c47bc5a4f5d1ca5cb31b0416e10c1bb3cf4ee9d7023f978f5a871fbade4751682ba4f47614c4ff +EBUILD gitlab-gitaly-0.11.2-r1.ebuild 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059 EBUILD gitlab-gitaly-0.3.0.ebuild 1611 SHA256 d4a80bcc6b9f1f6de0308e02fce0927e10c83620bc546ccc5b2ac8166b7cd5f0 SHA512 28ddef1dd80ce57a978e81048e7f07598dd83c83e0fdf4b6dbf01ff543d4abb4de437e658b07b3d60757163ed30e970327403ffd057e1d737d3dd8e23a534d38 WHIRLPOOL 3f42b071f5acaff80072a5708e50fcd8b4a397a6f2e5772f7234fbba3f606c89664433328495f59a84f5f5468503c11961b2d455878e2f445142778c7645397d EBUILD gitlab-gitaly-0.6.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fafebffd88f7ab12399c12076ee67632a SHA512 ed5e46fa20bfeb81da16f8fb0b702b7d8f71ca5d35f81456fd2ee31eec781cae75e14081b2eeaae3959d6b5db7eb5ed84398c90c6f687b0a3dbf9e602b7cb8f6 WHIRLPOOL 7c6cbdd81e2da6f659482db204433430e2bb947175a56b85addd688dc511cae7dea45a99796c14c6cb2d352fb868752bafc14af34f100d538b5b40bebe2a0846 -MISC ChangeLog 1165 SHA256 00b2944d5fa641f9a0d89e98532d73a73c966b8b5ceac1f7ef3dd203647cc03e SHA512 f1c63e3da739b211f1dd51b34dc6b430b41bce0ff0a97f8c8b3f5daa8f1e7cd4fc71ce0615a97a694d40a6f8907efe569dce10efae4fa185411bfa022364446c WHIRLPOOL 0f66fd439a16fb17e2087cc00b20b52dff2a5618912ff2f729d25c53923235b41336127b48535f82ffac884aea27365c2f974504b813d01f14a7d92ba59ef4d4 +MISC ChangeLog 1545 SHA256 564ba53f13b6525862eadb30b9eca08dae900582f165fbf251c3a25738a476fd SHA512 48a2c9cbc0546c8fd6fdd1d3582002efa44b1ae6a1d89947a1a8bf64c42a5016bce77b9bbb5fa08e1eab8f6a653915eb3f22ab2724a3f644a7bdf4f94694b75f WHIRLPOOL 415e4c103b83dfb0dcf84f01faa45685faea9601e261a2ce280537a10dc63d68f83374d0a65b17f93bac409aa2ea20ec77e7c13f16702df4a4b0a0e65d3671f6 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch new file mode 100644 index 0000000..2dd2708 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.11.2-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/sockets/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/gitlab-gitaly/files/gitlab-gitaly-0.11.2.conf b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.conf new file mode 100644 index 0000000..26c2331 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.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/sockets diff --git a/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2-r1.init b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.init similarity index 89% rename from www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2-r1.init rename to www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.init index 094d176..0f82d6a 100644 --- a/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2-r1.init +++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.init @@ -4,7 +4,7 @@ start() { ebegin "Starting gitlab-gitaly" checkpath -f -m 640 -o ${RUNAS_USER}:${RUNAS_GROUP} ${LOGFILE} - [ -z "${SOCKETDIR}" ] || checkpath -d -m 755 -o ${RUNAS_USER}:${RUNAS_GROUP} ${SOCKETDIR} + [ -z "${SOCKETDIR}" ] || checkpath -d -m 700 -o ${RUNAS_USER}:${RUNAS_GROUP} ${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}" \ diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild index fbb9465..f5b3267 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild @@ -20,15 +20,15 @@ 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" + epatch "${FILESDIR}/0002-${PN}-0.11.2-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.11.2-r1.init" "gitlab-gitaly" + newconfd "${FILESDIR}/${PN}-0.11.2.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.11.2.init" "gitlab-gitaly" into "/usr" newbin "gitaly" "gitlab-gitaly" }