From 28707520aad30ea150a53f1fe5efa6ade755c107 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 21 Oct 2016 08:09:18 +0200 Subject: [PATCH] www-apps/gitlab-ce: added ebuild for gitlab-8.12.7 and incorporated the following patches from Jakub: - 0002-default-configs.patch - 0005-fix-check-task.patch - 0006-replace-sys-filesystem.patch Package-Manager: portage-2.3.0 --- www-apps/gitlab-ce/ChangeLog | 17 ++++ www-apps/gitlab-ce/Manifest | 22 +++-- ...gitlab-ce-8.7.5-fix-sendmail-config.patch} | 0 ...lab-ce-8.11.0-fix-redis-config-path.patch} | 0 .../03-gitlab-ce-8.12.7-database.yml.patch | 92 +++++++++++++++++++ .../04-gitlab-ce-8.12.7-fix-check-task.patch | 27 ++++++ ...lab-ce-8.12.7-replace-sys-filesystem.patch | 77 ++++++++++++++++ .../files/gitlab-ce-8.12.4-database.yml.patch | 44 --------- www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild | 4 +- www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild | 4 +- .../gitlab-ce/gitlab-ce-8.12.0_rc6.ebuild | 4 +- ...-8.12.4.ebuild => gitlab-ce-8.12.7.ebuild} | 10 +- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 9 +- 13 files changed, 243 insertions(+), 67 deletions(-) rename www-apps/gitlab-ce/files/{gitlab-ce-8.7.5-fix-sendmail-config.patch => 01-gitlab-ce-8.7.5-fix-sendmail-config.patch} (100%) rename www-apps/gitlab-ce/files/{gitlab-ce-8.11.0-fix-redis-config-path.patch => 02-gitlab-ce-8.11.0-fix-redis-config-path.patch} (100%) create mode 100644 www-apps/gitlab-ce/files/03-gitlab-ce-8.12.7-database.yml.patch create mode 100644 www-apps/gitlab-ce/files/04-gitlab-ce-8.12.7-fix-check-task.patch create mode 100644 www-apps/gitlab-ce/files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch delete mode 100644 www-apps/gitlab-ce/files/gitlab-ce-8.12.4-database.yml.patch rename www-apps/gitlab-ce/{gitlab-ce-8.12.4.ebuild => gitlab-ce-8.12.7.ebuild} (97%) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index d280244..358f675 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,20 @@ +*gitlab-ce-8.12.7 (21 Oct 2016) + + 21 Oct 2016; Manuel Friedli + +files/01-gitlab-ce-8.7.5-fix-sendmail-config.patch, + +files/02-gitlab-ce-8.11.0-fix-redis-config-path.patch, + +files/03-gitlab-ce-8.12.7-database.yml.patch, + +files/04-gitlab-ce-8.12.7-fix-check-task.patch, + +files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch, + +gitlab-ce-8.12.7.ebuild, -files/gitlab-ce-8.11.0-fix-redis-config-path.patch, + -files/gitlab-ce-8.12.4-database.yml.patch, + -files/gitlab-ce-8.7.5-fix-sendmail-config.patch, -gitlab-ce-8.12.4.ebuild, + gitlab-ce-8.11.6.ebuild, gitlab-ce-8.12.0.ebuild, gitlab-ce-8.12.0_rc6.ebuild, + gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: added ebuild for gitlab-8.12.7 and incorporated the + following patches from Jakub: - 0002-default-configs.patch - 0005-fix-check- + task.patch - 0006-replace-sys-filesystem.patch + 23 Sep 2016; Manuel Friedli gitlab-ce-8.12.0.ebuild: www-apps/gitlab-ce: added missing keywords for version 8.12.0 diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index b450057..142f6e2 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -1,7 +1,9 @@ +AUX 01-gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0 +AUX 02-gitlab-ce-8.11.0-fix-redis-config-path.patch 423 SHA256 4878d37082c7e5c0aba239d4432ddec23c083230b816cf1ed6792bfd8f6c56fa SHA512 81a543af308bcd11a93a73368aedc89604078f60c0cacf4f614ff18dc5975b2c0d030ad6565fbb134188c8f6fceb74f2767f706d6f5701092252513f5e18de11 WHIRLPOOL 81f6258f03d234c6298b7bfe2982bdfd5f86dea3405ce03d4391b484a4802f7cbe33606ce4561ca67c16a5826dec131a185fa3189c2115b4a9ec8a3b87a2ee16 +AUX 03-gitlab-ce-8.12.7-database.yml.patch 2154 SHA256 6daf34a6be5038e0108169a1a23901d9f235e8d9e1e3dcc0d5113fa1b34b0698 SHA512 d43b6cf7b8c1729944482c4e8abf91ec326b38112de93caba67c37af7e9aa3b86e18d1080a92a4bac096f40c8e0c5e7d28926ed019ef052e186c3aa3ee72c9b7 WHIRLPOOL 93393c879eb120712a7ae0b50a35032752ba41ab65d20b86ff4e737fb6df8fefd4663dc171ded2bd771c1663e728d9cdc201fe4024671b9a2d5d0f01748ecd89 +AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51ae14d5c1f0364af759c77b6cb485079e0233e90f SHA512 226c3892768dc526dbc9f109aaecdee1eb27c0acb5060ba6db8222410c500336ebcf7184437228480da04ce5de149a14bbb5c1471aed853a280d7f371f271d88 WHIRLPOOL 3ec22dc4d12b5025bddfccdea27a816aca1f818d5138b3dc9a6362e56ec4cd14e5c38c76b64b468f3797e0d2718d38aad4f910abf3f3328a7983832babb7f231 +AUX 05-gitlab-ce-8.12.7-replace-sys-filesystem.patch 2387 SHA256 dd0e9987ed4bb3a9c73c6aee1d89434afc51ff663fef2ee4ac93adf1b73b944a SHA512 afa82fb8c8d57633c99373f31678760fa6ecca5e459a9059f5b460b458d1dbf3230108a6b4f394780c26a697881c9b2319f15804cb8d04ad3139127e7c0f4ff8 WHIRLPOOL 90ce708f8cde0a4bcaef9fc002ca00b97a1211559bcabf5481ec71c608bc5b772ecd518ff07a8d626a27e4b21c0f0f51fa37a65503e79664ececd78d5f19e87b AUX gitlab-8.10.6-sidekiq.service 1085 SHA256 de97287a5cb1d04dd4b6ac96e3569503cf797e605b325e13d4807d72cbcd7333 SHA512 9d5f3ee50f293ae0c9f353f7f9eeed00c57fd54e75a206bf7ec9b201453099222668e1d77dcfe6b35ee9a8722860551822897339c4741e0c612054a9423f132b WHIRLPOOL 5b5cb94db5c7a2c46b487821baba6fe31fa08ecc1cbae6f9b1655d32f95c57c7c8f1bede19d09a8c572512e40b0c8daf27d50ebfcbc8e4af449e21b01ad11441 -AUX gitlab-ce-8.11.0-fix-redis-config-path.patch 423 SHA256 4878d37082c7e5c0aba239d4432ddec23c083230b816cf1ed6792bfd8f6c56fa SHA512 81a543af308bcd11a93a73368aedc89604078f60c0cacf4f614ff18dc5975b2c0d030ad6565fbb134188c8f6fceb74f2767f706d6f5701092252513f5e18de11 WHIRLPOOL 81f6258f03d234c6298b7bfe2982bdfd5f86dea3405ce03d4391b484a4802f7cbe33606ce4561ca67c16a5826dec131a185fa3189c2115b4a9ec8a3b87a2ee16 -AUX gitlab-ce-8.12.4-database.yml.patch 1056 SHA256 fda1a49158a4ad2c0f7967fed3730061429612e0e952c59079b6dc037b552030 SHA512 2c6ff3f8d289e36ff6a3ce75828b29f403d11c45b3b4dc5eb174aa1fc03c154cd536afdcbabd29cabb512313b308441ed85de6fc9ab55559ff1e638f92500f46 WHIRLPOOL 8e5bae4b65e75b238bf309e226c4b1c79b5e443283524631df230d5642e7e2b55bb56606dda781f59dd05d1f589668cfbff340bc14bc11186923a4bab98e1f65 -AUX gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208 AUX gitlab-sidekiq.init 990 SHA256 cc996184ae4c1b64fc5ee9325bf3f4bc30753896f6608a2f04112d8552359c38 SHA512 9064b5a2fb1280c7fd674c613e19893b5b4f21cc48967cad1c3ff6caef2d4cdbf077359c453e5bb97226c26348475a97fb055df2bac991a7260811cb933361af WHIRLPOOL f2a298a91318ee067451e90f8b52b45c2dcf7e621bd7014917f8fadfd92949c967b45c59434eac3813fd1acd1dc96b8b481f9d9c324627580f29c0f438bf99db AUX gitlab-unicorn.init 3127 SHA256 de2f5861bec58eaac284e74baabe25288a520bc4f7da089a2c53a9494bbea884 SHA512 ae63cc6ef11eb1d3ed155c77dab413d8f7d281ac9c6362dfda12e0fafe23eb9a907a0275d14298c642ba7568119b483b1c520b322dc791f3a9ce64fbffb600f3 WHIRLPOOL de69ab338278e73637b6b1d346bb882d51c4468e71d89932718f394fb9f44725c79897eba8b0230069584ae7d8b92239bb2247c7ff8b46a99383739939a13088 @@ -11,11 +13,11 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1 DIST gitlab-ce-8.11.6.tar.gz 25705796 SHA256 354da5db4087ce80d9f43cbae87830ccd06c2c559f8dfb764dffd7420588a66b SHA512 5abda185bfbbad61060ac9b5e83101d88f0f6c8cc12580c71467c7bfdc380d60acc9a8a855ac448759c8be9a5297ba721d0e641ec144741a7c57dd038e13b269 WHIRLPOOL 046ecd777cebc8768c9cdefab7f782c7943403e0c5c6b963ee2359f10f446b5cbe6974d07e14a3089c79830722de6d1e965fa2a58316e75a280ddf09825a1fe6 DIST gitlab-ce-8.12.0.tar.gz 27105188 SHA256 373109c33ded8f14f3f21e675afa9de8a2a8dd6519309b51844a50f79c5337f4 SHA512 81129858de4a574e2c56958c8c7de8177ce15028993dcff77aa7aea18eb4eb0bbab247d02eca88ffa6da1353f7ea2961332fd4843fe402a35f733e0e9f1484ce WHIRLPOOL 72a70bd3248648f947cc39d7d2633a28e5d9da29adb33675f3fc1f15f6ab5ec181063f13cfc44b90f286ccf0b1214941aaefb41d8ab84f92b4a5868155bbffca DIST gitlab-ce-8.12.0_rc6.tar.gz 26786541 SHA256 41719da8de79093accae302c0cb7082e3e4248ed2413f6cda456051fead1f05c SHA512 e5c6ea64e3fc495c41dfe405325caf3fb34e58416d6cf284805f3e9666b085f4ef58b97e0de04ded4cf658421d8e4b716781f9ce58465410a7a715e72800feaf WHIRLPOOL b29ae1c37f71e4474077f18fe42f07bca213f7cf6faa2f942b615430aa68245a43a6223e430926c1b917debff548fd6d6b8c3f5c6e4e7ddd121878e2c390e9ba -DIST gitlab-ce-8.12.4.tar.gz 27108940 SHA256 7186c2f9efa18cccb4636e92ae5271d159234b5eb61e373689d15e98df2b0b7b SHA512 a0b2682996f485d40426b04fa471c50cd56b4956c21b347f82477d38ad24592bc21e55d21b670e73d592ab88e883afcc1a50e6652c7c738a08ed1c57466f39d7 WHIRLPOOL d68dbc5b3f3dbd1a5988f7d768ac6482cccea38db30f8f4f98f8a880746aa9491f2fbb7f7cd8525bdb9a01fe75f0ac1418cca5d3dae6b1a7697e919add413936 -EBUILD gitlab-ce-8.11.6.ebuild 11954 SHA256 2752b8057eac0cd77e74bc7f323a6ab0037c9d70559a637f15e30f11ba244b65 SHA512 a649871bc5594aac19ac816a53a164edde1c7a70933c777489ee45c98515099c2748dd2a65fb433481ecd69ed9fd1f386e2f137b8cb9761453252ceab362e4cd WHIRLPOOL b623e4a6ed638c42672f0f8cde252681c89b92831d8bfb687a8ab7bb374335552586b77bd7066a898ed6612715732f538b29acbe874bd31e72c63f49e54deb00 -EBUILD gitlab-ce-8.12.0.ebuild 11960 SHA256 c02ccd983fff15a89ec2e09724f1908f632e1128517ae3fd842c6c6f4751d1fe SHA512 6a262e1147476b0a5a7eacce17810fd5457787bf495217a4dadc5f51e262a10b88060e3aa164292a864ec5c7f7fa20f9c7735774e6478006eac54471abffa664 WHIRLPOOL 24fd204309bdb045abdde7708310bee18fb929c9828f51121f68e9439ce5ec9e18bf0265e68e825b7c0d028c84dbb8a7a2f112e7bf052209ea8bfd91c42bef21 -EBUILD gitlab-ce-8.12.0_rc6.ebuild 11937 SHA256 bfa85ccd3fa55a8950eb7ebc031440fcd9d3729cc722a8d353a1dc349e68f4b7 SHA512 2d5c6c8c01fc6e062a82507699bd796d2aca0fbbbd6ac900ab31eef5c8fd627eee62f5b49ea8dacdfbbefaa5675cece97067c0c9752fb4f06545935478c6b8c8 WHIRLPOOL 2940994a2d5905a96952a9f7a1f57007b5207d03a1511082d6381a76270ac4512867e54fdd26bb9216fa32ffc3cfbd2a672f875c19f423f5a3ef480159bb3fa4 -EBUILD gitlab-ce-8.12.4.ebuild 11987 SHA256 42729f789684cfad115de9d280b4aa4f7e63ed863f1d5af184e4f5a33e7ddcaa SHA512 929e2b1c359f058581e553f3beca2e4186902ef0ae5ef88c19a4411bcf1fd6c7e0e884d1eb1d8c8930f4464dc8102a2a4152fcc57fcd6a2d87e55250b655478d WHIRLPOOL b19f1bb7c01dcceea3a0039a1103d3c30969a4c0ca0b4de972182ad0061a2ed70aa2629838e3ab33c07bdc47d57ea32e1dec6b0bbe177c3dfd9a7248b6ce15d2 -EBUILD gitlab-ce-9999.ebuild 11892 SHA256 b6620aa1ec2f68e6c9941604c084b3bcdce9b1186ba026833c2adb456f64f31e SHA512 098f275db05cb96f96e53e9dca1b50c3d16607d807482650269d92ac8428c5a96f51facbb9f9d85450ea06bba6e169da82c02b440a7fec0608ee684c9b892a16 WHIRLPOOL 99163d4084f3561219c90cce5123d7028e4e2b4211e0bc70c43ec4e622270d1aa67f5fe0c0e0af7bdcbf1491566ebf93b042b3061ddc626a23b22e68662c237c -MISC ChangeLog 8028 SHA256 37aefa1dd66abe6cbd23092847e2b1fdb622a0c5546aad12d73c67f4369af3ae SHA512 d436930343a16a91484adaf23cfb2f94f939c7804e844f1f3514bf414da8fa2c7f772fedcab858c56b4ef18f01d42f00793cac108c5bff36e6f6187af6fef1f9 WHIRLPOOL 49b752988384306ad831e7ce4f2a3ebc8cae3b068dbd2c199de23c3bc58e2df82ed555df36e3eca69f5cc54bf3ec31d0a861af4f559f97f7c666614ed98a8433 +DIST gitlab-ce-8.12.7.tar.gz 27110532 SHA256 003e497e23f730f4990bdb4b431109f2956b5bbf1d202a4003f5af65424157d4 SHA512 7ad53f5fe0c88cfcf5688de5d55489964a4b5e8dd763fbf7d832c199432b9532f0a75e6d803f1d03387c86b3ba0b47b1b75b97e783f7661662b656c7f9aea216 WHIRLPOOL 026d11a8adcde5312b46d626bebc6ed33bfea344042deb1fab0a40a52cfd7deccfe78ef2a544293456f08bf7acbd917233533898b54c3b9dcee9121520607ff2 +EBUILD gitlab-ce-8.11.6.ebuild 11960 SHA256 ca2f5ea26710ac36289b0fa6335183714d7ea1a22fa9691067fa54e2785bf48b SHA512 7e1bf0b52d6f10c4a4c26d31c359e8a36fb8429fd5537a86c03867186bd9c554cb4fea6d9de04a21b8a81a7e394e19586b03a493f284425a8547ca4561954150 WHIRLPOOL bcea3b44707d466c548f0b02a5c69464d102f6ff4a4b8e3d51bf1b78ae2321a1512df9e504c540dbb7a5abd718671a9f2c498d13274b905e501fba147184a372 +EBUILD gitlab-ce-8.12.0.ebuild 11966 SHA256 5f747862a230aae8b904fd64d781a6a2ea3fa24fd9dba53794a671c2b9d298e7 SHA512 6ed88a63c68decf4807e1e520b45d955cc1f11a89ca00025eb6e9491f380eac408efa2b508889bee3beb12b3b933bd73ae280e30e72f974f5ac803a818d6c710 WHIRLPOOL 20c958f6e10050272afece916ffbad1b1b88a52777836d059451ac886c2f658043d6637b9cabf3da4f0761d5853c5dd4df7a154e4677788515b69b2f4ab99d86 +EBUILD gitlab-ce-8.12.0_rc6.ebuild 11943 SHA256 62bcdc0b04fd791be8ecb48529d0c09705a6c843f245dce58f4780b3782f8195 SHA512 8f1cf916b29cc8d8b078ba19658ebd39585eb6d95ed106e8beb64ccdb17bfbe22fcf5af10baa13cc941d0d733cd0ea8f2ee4a9b960459e96c41744a35d6f2c74 WHIRLPOOL 48ce3279bf1f0c5658e726935c01020555f9d1705623ed8e12dd73670a32fa9b316a26aa7ed41786662e363e61f448ef523bb3ea0e65ed2d7653a3cf6ef67fe7 +EBUILD gitlab-ce-8.12.7.ebuild 12068 SHA256 5acdce0ee5f3c6cf20a120758ad0c60ec70574d38cc2ee56037b3789d812edfd SHA512 7daf877280f4a8242fa83e1b70d5cabe99aa8bd547d0b4f9a4921c60c44228f508e39a8a4f751b987078c4d680aaff374a055c8ca5882b12f110b232c0006f4e WHIRLPOOL be51f8c53ac45db3c13f179d447665b536df4848a4c63cf5619d2620fbca7bd2701b861f636235d7e746ee7f560eb084e949288f11dceaaef826c138be321625 +EBUILD gitlab-ce-9999.ebuild 12028 SHA256 f3cd5c8a9f8cd80396f81f34689dc1b204e1e84bd98c7f202765b30a366a8d1f SHA512 a64a6c395a67f9b1bd8018cf487620f1d16ef6309ef38530c9470101bddf671abf23c00cc20c8fd5695761244fbc25ac0080e52d47023cd12308abd7430833a5 WHIRLPOOL 8753ee153fc0c73818eeef540921f602008b080f8b273eb466a95f72b34d3bcbb80849bf42146b65602b0ff02c8c7eebe11b717ea585cf993471206698405aed +MISC ChangeLog 8899 SHA256 ea96cff5da871cc200cf1fe220d9879b0b58af928b8a231d7b40472cccef701c SHA512 defd64dd057305dec3775cdc3b27b01e33c17de0c1ac0109807ea0480ae7f7ab144d0a5f1719be5b465c1f58a916c7f88436e43551bcf749660cc11113afd95f WHIRLPOOL 54a5ddbc652d9d7124ed363fadf59ffa7c5d89b9927bd93c3aa5d06adec6f0c33ac04b2399c674f202558af2c5ab0bbd44f9251c589cf30abf2f82bf3c5e4ff4 MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3 diff --git a/www-apps/gitlab-ce/files/gitlab-ce-8.7.5-fix-sendmail-config.patch b/www-apps/gitlab-ce/files/01-gitlab-ce-8.7.5-fix-sendmail-config.patch similarity index 100% rename from www-apps/gitlab-ce/files/gitlab-ce-8.7.5-fix-sendmail-config.patch rename to www-apps/gitlab-ce/files/01-gitlab-ce-8.7.5-fix-sendmail-config.patch diff --git a/www-apps/gitlab-ce/files/gitlab-ce-8.11.0-fix-redis-config-path.patch b/www-apps/gitlab-ce/files/02-gitlab-ce-8.11.0-fix-redis-config-path.patch similarity index 100% rename from www-apps/gitlab-ce/files/gitlab-ce-8.11.0-fix-redis-config-path.patch rename to www-apps/gitlab-ce/files/02-gitlab-ce-8.11.0-fix-redis-config-path.patch diff --git a/www-apps/gitlab-ce/files/03-gitlab-ce-8.12.7-database.yml.patch b/www-apps/gitlab-ce/files/03-gitlab-ce-8.12.7-database.yml.patch new file mode 100644 index 0000000..3dc1ee6 --- /dev/null +++ b/www-apps/gitlab-ce/files/03-gitlab-ce-8.12.7-database.yml.patch @@ -0,0 +1,92 @@ +diff --git a/config/database.yml.mysql b/config/database.yml.mysql +index a99c507..0f081c8 100644 +--- a/config/database.yml.mysql ++++ b/config/database.yml.mysql +@@ -6,37 +6,9 @@ production: + encoding: utf8 + collation: utf8_general_ci + reconnect: false +- database: gitlabhq_production ++ database: gitlab + pool: 10 + username: git + password: "secure password" + # host: localhost +- # socket: /tmp/mysql.sock +- +-# +-# Development specific +-# +-development: +- adapter: mysql2 +- encoding: utf8 +- collation: utf8_general_ci +- reconnect: false +- database: gitlabhq_development +- pool: 5 +- username: root +- password: "secure password" +- # socket: /tmp/mysql.sock +- +-# Warning: The database defined as "test" will be erased and +-# re-generated from your development database when you run "rake". +-# Do not set this db to the same as development or production. +-test: &test +- adapter: mysql2 +- encoding: utf8 +- collation: utf8_general_ci +- reconnect: false +- database: gitlabhq_test +- pool: 5 +- username: root +- password: +- # socket: /tmp/mysql.sock ++ # socket: /run/mysqld/mysqld.sock +diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql +index 7067e0f..74af7df 100644 +--- a/config/database.yml.postgresql ++++ b/config/database.yml.postgresql +@@ -4,42 +4,9 @@ + production: + adapter: postgresql + encoding: unicode +- database: gitlabhq_production ++ database: gitlab + pool: 10 + # username: git + # password: + # host: localhost + # port: 5432 +- +-# +-# Development specific +-# +-development: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_development +- pool: 5 +- username: postgres +- password: +- +-# +-# Staging specific +-# +-staging: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_staging +- pool: 5 +- username: postgres +- password: +- +-# Warning: The database defined as "test" will be erased and +-# re-generated from your development database when you run "rake". +-# Do not set this db to the same as development or production. +-test: &test +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_test +- pool: 5 +- username: postgres +- password: diff --git a/www-apps/gitlab-ce/files/04-gitlab-ce-8.12.7-fix-check-task.patch b/www-apps/gitlab-ce/files/04-gitlab-ce-8.12.7-fix-check-task.patch new file mode 100644 index 0000000..26180c1 --- /dev/null +++ b/www-apps/gitlab-ce/files/04-gitlab-ce-8.12.7-fix-check-task.patch @@ -0,0 +1,27 @@ +diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake +index 5f4a6bb..8f75d2b 100644 +--- a/lib/tasks/gitlab/check.rake ++++ b/lib/tasks/gitlab/check.rake +@@ -24,7 +24,7 @@ namespace :gitlab do + check_tmp_writable + check_uploads + check_init_script_exists +- check_init_script_up_to_date ++ #check_init_script_up_to_date Gentoo uses a different init script + check_projects_have_namespace + check_redis_version + check_ruby_version +@@ -590,13 +590,6 @@ namespace :gitlab do + puts "yes".color(:green) + else + puts "no".color(:red) +- try_fixing_it( +- sudo_gitlab("RAILS_ENV=production bin/background_jobs start") +- ) +- for_more_information( +- see_installation_guide_section("Install Init Script"), +- "see log/sidekiq.log for possible errors" +- ) + fix_and_rerun + end + end diff --git a/www-apps/gitlab-ce/files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch b/www-apps/gitlab-ce/files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch new file mode 100644 index 0000000..84f714f --- /dev/null +++ b/www-apps/gitlab-ce/files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch @@ -0,0 +1,77 @@ +diff --git a/Gemfile b/Gemfile +index 4a517b2..ed6fc2e 100644 +--- a/Gemfile ++++ b/Gemfile +@@ -352,4 +352,4 @@ gem 'health_check', '~> 2.1.0' + + # System information + gem 'vmstat', '~> 2.2' +-gem 'sys-filesystem', '~> 1.1.6' ++gem 'sys-filesystem', '~> 1.1.6', group: :exclude +diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb +index ca04a17..0e36b12 100644 +--- a/app/controllers/admin/system_info_controller.rb ++++ b/app/controllers/admin/system_info_controller.rb +@@ -1,3 +1,5 @@ ++require 'open3' ++ + class Admin::SystemInfoController < Admin::ApplicationController + EXCLUDED_MOUNT_OPTIONS = [ + 'nobrowse', +@@ -28,10 +30,14 @@ class Admin::SystemInfoController < Admin::ApplicationController + 'vfat' + ] + ++ MOUNT_REGEX = /(\S+) on (\S+) type (\S+) \(([^)]+)\)/ ++ ++ Mount = Struct.new('Mount', :name, :mount_point, :mount_type, :options) ++ FsStat = Struct.new('FsStats', :path, :bytes_total, :bytes_used) ++ + def show + @cpus = Vmstat.cpu rescue nil + @memory = Vmstat.memory rescue nil +- mounts = Sys::Filesystem.mounts + + @disks = [] + mounts.each do |mount| +@@ -41,15 +47,38 @@ class Admin::SystemInfoController < Admin::ApplicationController + next if (EXCLUDED_MOUNT_TYPES & [mount.mount_type]).any? + + begin +- disk = Sys::Filesystem.stat(mount.mount_point) ++ disk = fs_stat(mount.mount_point) + @disks.push({ + bytes_total: disk.bytes_total, + bytes_used: disk.bytes_used, + disk_name: mount.name, + mount_path: disk.path + }) +- rescue Sys::Filesystem::Error ++ rescue IOError + end + end + end ++ ++ def mounts ++ stdout, stderr, status = Open3.capture3('mount') ++ fail IOError, stderr unless status.success? ++ ++ stdout.lines ++ .map { |line| MOUNT_REGEX.match(line) } ++ .compact ++ .map { |match| Mount.new(*match.captures) } ++ end ++ ++ def fs_stat(mount_point) ++ stdout, status = Open3.capture2('stat', '-c', '%s %b %a', '-f', mount_point) ++ fail IOError unless status.success? ++ ++ block_size, blocks_total, blocks_free = stdout.split(' ').map(&:to_i) ++ ++ bytes_total = blocks_total * block_size ++ bytes_free = blocks_free * block_size ++ bytes_used = bytes_total - bytes_free ++ ++ FsStat.new(mount_point, bytes_total, bytes_used) ++ end + end diff --git a/www-apps/gitlab-ce/files/gitlab-ce-8.12.4-database.yml.patch b/www-apps/gitlab-ce/files/gitlab-ce-8.12.4-database.yml.patch deleted file mode 100644 index 400986b..0000000 --- a/www-apps/gitlab-ce/files/gitlab-ce-8.12.4-database.yml.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/database.yml b/database.yml -index a99c507..0f081c8 100644 ---- a/database.yml -+++ b/database.yml -@@ -6,37 +6,9 @@ production: - encoding: utf8 - collation: utf8_general_ci - reconnect: false -- database: gitlabhq_production -+ database: gitlab - pool: 10 - username: git - password: "secure password" - # host: localhost -- # socket: /tmp/mysql.sock -- --# --# Development specific --# --development: -- adapter: mysql2 -- encoding: utf8 -- collation: utf8_general_ci -- reconnect: false -- database: gitlabhq_development -- pool: 5 -- username: root -- password: "secure password" -- # socket: /tmp/mysql.sock -- --# Warning: The database defined as "test" will be erased and --# re-generated from your development database when you run "rake". --# Do not set this db to the same as development or production. --test: &test -- adapter: mysql2 -- encoding: utf8 -- collation: utf8_general_ci -- reconnect: false -- database: gitlabhq_test -- pool: 5 -- username: root -- password: -- # socket: /tmp/mysql.sock -+ # socket: /run/mysqld/mysqld.sock diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild index 73addee..13302a1 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild @@ -78,8 +78,8 @@ ruby_add_bdepend " # Point to the absolute location of redis_config.rb # RUBY_PATCHES=( - "${PN}-8.7.5-fix-sendmail-config.patch" - "${PN}-8.11.0-fix-redis-config-path.patch" + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-8.11.0-fix-redis-config-path.patch" ) MY_NAME="gitlab" diff --git a/www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild index 297fede..949ff5a 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild @@ -78,8 +78,8 @@ ruby_add_bdepend " # Point to the absolute location of redis_config.rb # RUBY_PATCHES=( - "${PN}-8.7.5-fix-sendmail-config.patch" - "${PN}-8.11.0-fix-redis-config-path.patch" + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-8.11.0-fix-redis-config-path.patch" ) MY_NAME="gitlab" diff --git a/www-apps/gitlab-ce/gitlab-ce-8.12.0_rc6.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.12.0_rc6.ebuild index 8ab9d70..90237e3 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.12.0_rc6.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.12.0_rc6.ebuild @@ -78,8 +78,8 @@ ruby_add_bdepend " # Point to the absolute location of redis_config.rb # RUBY_PATCHES=( - "${PN}-8.7.5-fix-sendmail-config.patch" - "${PN}-8.11.0-fix-redis-config-path.patch" + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-8.11.0-fix-redis-config-path.patch" ) MY_NAME="gitlab" diff --git a/www-apps/gitlab-ce/gitlab-ce-8.12.4.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.12.7.ebuild similarity index 97% rename from www-apps/gitlab-ce/gitlab-ce-8.12.4.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.12.7.ebuild index 24e5028..c346608 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.12.4.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.12.7.ebuild @@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="ba8aeb7c14e2dc956b96ae01f6e78ac52e993395" +MY_GIT_COMMIT="7429b21d3260edb25e9d3f98713d163f97b23e28" DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" @@ -78,9 +78,11 @@ ruby_add_bdepend " # Point to the absolute location of redis_config.rb # RUBY_PATCHES=( - "${PN}-8.7.5-fix-sendmail-config.patch" - "${PN}-8.11.0-fix-redis-config-path.patch" - "${P}-database.yml.patch" + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-8.11.0-fix-redis-config-path.patch" + "03-${P}-database.yml.patch" + "04-${P}-fix-check-task.patch" + "05-${P}-replace-sys-filesystem.patch" ) MY_NAME="gitlab" diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index cc636e7..5749e75 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -52,7 +52,7 @@ CDEPEND=" virtual/pkgconfig" COMMON_DEPEND=" ${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-3.6.0 + >=dev-vcs/gitlab-shell-3.6.1 >=dev-vcs/git-2.7.4 >=dev-vcs/gitlab-workhorse-0.8.2 kerberos? ( !app-crypt/heimdal ) @@ -76,8 +76,11 @@ ruby_add_bdepend " # Point to the absolute location of redis_config.rb # RUBY_PATCHES=( - "${PN}-8.7.5-fix-sendmail-config.patch" - "${PN}-8.11.0-fix-redis-config-path.patch" + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-8.11.0-fix-redis-config-path.patch" + "03-${PN}-8.12.7-fix-database.yml.patch" + "04-${PN}-8.12.7-fix-check-task.patch" + "05-${PN}-8.12.7-replace-sys-filesystem.patch" ) MY_NAME="gitlab"