Merge branch 'master' into 129-gitlab-10-5

This commit is contained in:
Manuel Friedli 2018-03-10 00:12:33 +01:00
commit 9116c80b3f
4 changed files with 8 additions and 5 deletions

View File

@ -3,6 +3,9 @@
09 Mar 2018; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-10.5.4.ebuild:
www-apps/gitlab-ce: Add ebuild for version 10.5.4
09 Mar 2018; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-10.4.5.ebuild:
www-apps/gitlab-ce: Fix dependency on nodejs: >=6.0.0
*gitlab-ce-10.4.5 (09 Mar 2018)
09 Mar 2018; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-10.4.5.ebuild,

View File

@ -8,7 +8,7 @@ AUX 06-gitlab-ce-8.17.0-fix-webpack-config.patch 614 SHA256 0c1cdc25032322eff6c2
AUX 07-gitlab-ce-10.0.7-yarn.patch 36442 SHA256 b45cfd739ca94058987c55458c89dba4cdbb1b9b9fc2e486d02e67e275044855 SHA512 931edab62e1218f84f08db72cc2f4ff95e53c6f88d755224de5e9dd19c230bb4b4c808accebd14c7bb06e6c57e4f101f7b4fb1843abb9a908d7f9f2b901d4e5f WHIRLPOOL 0f0ba8a1dfb38355bedebb17a8d174fa33a695be9da364bfebf3ffc5629eff5f462a9b66af65ad0fcc3b35f93c67c4b15a93e1962ae32225dbed45c87b30c5b1
AUX 08-gitlab-ce-10.4.4-general-config.patch 4069 SHA256 d4b8c0f35fb695e193eb211e1f24938169c7e1e5de5f9191e69fef0b8d2a285f SHA512 c9e7e2456c43b9b3494adacd980a07e4f75ce07259622e2215a9a2f3cd7f4173473e5e0044f978ee8b84042a42eb49156cb1d9f258e4c32b1284beb1f5ac9524 WHIRLPOOL 368cb32ae93cd62b444d9124806d20dc80a18a64480fdbb765eeffc552da42a557e4fa3c06a0f5650d98a9948ce46e90a38c335ac07c7ff0f1ec4f7d16caf399
AUX gitlab-10.4.4-sidekiq.init 1461 SHA256 99fd95716abde96f9a031cb22e04371c7dfe6bf53440154dcf94be9477d1a6f8 SHA512 8d536a3db5af3bdf04b92e0c1e9e9d65aacb3dff244729d32f28b8dd66f586cbd5a2e60b3e2f58c2be96c0c09708dc21275adca3f89fbdfa20e000e9563ee880 WHIRLPOOL e47f69b06fd0d60837fc7cab03eb4c4cf9111597b7b3e81c3c35b7fc83be12f85ac26ad6693ff30c95b91a998b0685128b303df5aa97ab7835f575ce199f141b
AUX gitlab-10.4.4-unicorn.init 4068 SHA256 a29c2741626fae15156117786d7ab63f4c68c5357d28c257a9da8e6d92ce71d7 SHA512 0dce3a14f113776bacb86eac602726a70ba3f71ee1a9310c7a2f427a658622b94e0550564360339b044a58c2db52ed6782de7675aa622b2ab9016ed93261b22a WHIRLPOOL 58a4c3328665dffcf9f96a2eeee495b9dcd550a41c26d8e256b44ca6ad247a84c909838e31f8de8673f94d767c077bb253c20f3a4321abe7d5de937f680ec215
AUX gitlab-10.4.4-unicorn.init 4068 SHA256 bf81c741f34d6d01473e7150bd27e4beec154a438b71f3651b09fc58b1e78d24 SHA512 a00a81a43a23e3d54b5a71609d3c82a0a47c9c0bc681302032d1aed925d498e5ebb7a84c65e95d6927c65b690f43e9ec00ed7e7114e350e53336b79746d244df WHIRLPOOL 2a7285b106c60209f9e80f5546028ec978932ea81236c0c1bcba499cb11451812ec843ac5ecfb23f1de3d0b09274154f8b5d2c8cb70fad3f93969fd95a5772d4
AUX gitlab-8.13.0-sidekiq.service 990 SHA256 183ccbdb19a3dcc74cf1f1f865bf396466e06f7408ff7d3e92359b2a0e83f24c SHA512 c356baf65337739b08a0a4bfe24d3b68f557e9d6d95f479b39ec954ee6c2077e380f99d1e9e9390f5b038e093c0a46562f651512a6578dfa86977580159470a2 WHIRLPOOL 81d9ea9febf47d5fdb9c49a54bbc499bd796fc56bc1c16404fe4c74d00c4bb9fa9631e4cd4cf88d3c30a44c04b74b35a61cd4da9f2139a4abf61e758b4e5949a
AUX gitlab-9.3.5-sidekiq.init 1464 SHA256 dc1d9a58845a699d5b797f476597e7d7a7171eb842b05639cd2e235c70a26edf SHA512 fe00243c815b0e4f826aada4f02c70659872673a36fe92ea1b72a94a21bacfb097260ac1623cc1fc9c74566fe5c6068a456c9dc6e1e1c02f42e86fd162573713 WHIRLPOOL 6d8618e1e0a14030c73840f58d6dd5f7ef221f448799c92978c42d6bd71bfd072f15508df931f408ede91158079cef7039e9e725cb217629a8b7e19f6c706978
AUX gitlab-9.3.5-unicorn.init 3748 SHA256 2fb8d62e52b2e59bed92de55834421b3858ca385c20ed7532f78a3c4cd6ba2c9 SHA512 6f7a6cded598f3f8174a4d39f06f1994aa77b22cb90fa7f1bb6f82919c9856c3eae1623f57636f2ee564b2bf6c660c82dd104e3c59455946db42e6cf44079ccb WHIRLPOOL f39d37b2f83046234616d056d046c844e24ccf434c96bc298acd0f53fcf0be57fc64352bfd66e45083f87e6be0ed817c89630309deee5f142c9343a46014a166
@ -25,8 +25,8 @@ EBUILD gitlab-ce-10.0.7.ebuild 13568 SHA256 c164db3f0af93824bb97992b20b0bc5415bb
EBUILD gitlab-ce-10.1.7.ebuild 13679 SHA256 9c1bec7e86d46422f87baecaece80197c506b758eab28fd85fc214512ff67e3c SHA512 6958f3f67b7d8729519175337b5e411b9d32fa3e7348105870d5f35c938e905cc60e7af23802b1b5835610c72e9a76ca50c229f5d862403ffd5065e82ee39d25 WHIRLPOOL 6caf644203291c7903f7c67a93e3f11a3f8d632e01384390742bc8b1fc4068e494f750c44817f0143a0f6eeaadbb4a7243c4194397fded59956363b49bd32ae4
EBUILD gitlab-ce-10.2.8.ebuild 13681 SHA256 0e02e1a51f335872facce2751aa23d8ff5b9cd8aa7359fed1cd0f5a3ed5bd1e7 SHA512 805d6a717b0dcdc6551f549722abb8322a51d6cee1eb807dabac1fe4b98ffd32fcf3667d1de7f845a08e9dfb72afa257c51c6382cbc48f5f23fe15b027724dde WHIRLPOOL 1c48b8ea54d65d1d2ea001c6af45c0a76f0587d815353675ce36245c721f4b2d9c5b48c608fe632743863f5db859c5ee0c96b95fe6b429fcdd7053d4e8fb86e8
EBUILD gitlab-ce-10.3.7.ebuild 14085 SHA256 cbff8442516b815e386974191d48464202b3b4f93e5d4688a71de08fadaeb89c SHA512 311e256f675c6cbb8e374448858e0adcfecd6a5432c4384a5d9c302a3c82dcab0aab0eb9a79d90f8f770dba0d1d984f0b7e3d53ce1e3b2c4c915aaa2facdbdd7 WHIRLPOOL 29674dc1a54311518047df70ecd21971b642bc7b8511d8c6ba3f754b7beae3de10c289704dcd214c7c5cf76f60772117c2649daac4d691b13387d758d2fb3f36
EBUILD gitlab-ce-10.4.5.ebuild 13152 SHA256 69e512b9a7bad02d6d9b848c08f070914ab59c74444c93185bfc05ea08decf18 SHA512 ac8d91aa7b4e8bebc4fbca44d413ff7c8f9549d340de730341ee026328dc25220d6e34b31dac86383d48c8b6cc465eb01a0fb601e944c20966e2016adc7d0024 WHIRLPOOL 6f14b737b117cb43b8551fc5f5fcfb79910db8496ef60b26dff758ce669fc47d910c003222f595e0635c22c16a4d05df0b39d2628ea20f9a46a5bdc3039ebaea
EBUILD gitlab-ce-10.4.5.ebuild 13152 SHA256 73452b395a5cba8ff05ff6de514d2ab019a1bab1fbc66c8a8739c958e1be6aac SHA512 7472484a4d1f6050de4e649a11fa00d01a93dcd6a03dd41519a6c9e7673b923bb6621c2515786c016d05adcef1b130d17b8a132a0aa9b1c60aea955610892c9d WHIRLPOOL ecc40685b6fd5104dd24e7ccb7214f53309133e95c3c3fb063017e80bea22f0ed97a017424fd360395e7d21c7838698d5dd2e9964281d08296de0e04052c739d
EBUILD gitlab-ce-10.5.4.ebuild 13151 SHA256 e1724882844511b0c8c08f5a107a3c2d07523fa4f8048db82054729da74a8b83 SHA512 f183a12556bd1725dee258c1cab48dae81d4b4b5a709c2500177baf948537875a488c826fbf779db76ef5692253ac7189d6d3f8e8b38082e821df7e68bb812ee WHIRLPOOL d30f3a3071adc297198f7ed762741e45bd0a8ba2d0a8e96ca8a6ab1d0f6311dfec81ac316730907e3c79a96a60b25f27c6f9379508d34e3f246e64781aa614e7
EBUILD gitlab-ce-9.5.10.ebuild 13526 SHA256 6e7c361f31989dd608eff4c8dd01b7301b142b4d38acdf38e61e2eecb2d4b285 SHA512 e33e56c8e49bd2ef03dd9af508b186f7908b8502960cbdb95ca9166631b84d5357c4965c0919e432ee5de9b9eeb33f68773ac405c24430568f9abb0d8e7354a6 WHIRLPOOL 3e866d785e8018096a92a223a2f6cedf4398cc07726a183d805005b3cd718fed2296edd63f5bc9d2b8849fe2298e9a61bf998a2241de2cd5ab4527f8ddaed325
MISC ChangeLog 27270 SHA256 d4ee055a78ca09005d0d9ebe5a26c6dc210e5398b4508335154820da2b9a500d SHA512 25c80ba0e6269583cbc1d3815eff9faf2d0f58c566b9dd683ee87b6908f3ef9ece6834a0815da450d16c9ee22bf77d04e7a6b349e9e0aebef65e8f2c587e03e6 WHIRLPOOL 0dd92f0533ef0e5bdbc22cfc30acaf0501551c7ccf1b4aa34bacce4229fce3a1a7a55094c739b01c0f48d68a2b73e2f2944954f0b70f9a5e5ad1ce851c10fbd1
MISC ChangeLog 27404 SHA256 ce31f4dadba57b46eae37d95e47ea459c062f28abc32232681f2a2b9ad44459d SHA512 b0c5713621ad2a88d70651ef9bbac78685dfdda4501d0786591883fddbeeddb7089b0637200fe318549d6409ad9fb22bc33fbadc12fb4a4650aa1b2158d9b8a1 WHIRLPOOL 3e16bb4604e6cdd09c7550b1825ea69ca07b9b07fb933b8fafc27faaeda0c72236c4d9c9d87e1a9c02ce31a8a732b93f9b0bbf9e2ce41426e521ed37697f63b0
MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e

View File

@ -38,7 +38,7 @@ check_command="sudo -u ${gitlab_user} -H /usr/bin/bundle"
check_command_args1="exec rake gitlab:env:info RAILS_ENV=${rails_env}"
check_command_args2="exec rake gitlab:check RAILS_ENV=${rails_env}"
backup_command="sudo -u ${gitlab:user} -H /usr/bin/bundle"
backup_command="sudo -u ${gitlab_user} -H /usr/bin/bundle"
backup_args=" exec rake gitlab:backup:create RAILS_ENV=${rails_env}"
depend() {

View File

@ -49,7 +49,7 @@ GEMS_DEPEND="
dev-libs/libxslt
dev-libs/re2
dev-util/ragel
>=net-libs/nodejs-4.3.0
>=net-libs/nodejs-6.0.0
>=sys-apps/yarn-0.17.0
postgres? ( >=dev-db/postgresql-9.6:* )
mysql? ( virtual/mysql )