diff --git a/dev-vcs/gitlab-shell/ChangeLog b/dev-vcs/gitlab-shell/ChangeLog index ab2a7e3..4fa9c37 100644 --- a/dev-vcs/gitlab-shell/ChangeLog +++ b/dev-vcs/gitlab-shell/ChangeLog @@ -1,3 +1,24 @@ + 09 Jul 2017; Manuel Friedli -gitlab-shell-4.1.1.ebuild, + -gitlab-shell-5.0.3.ebuild: + dev-vcs/gitlab-shell: Purge obsolete versions + + 08 Jul 2017; Manuel Friedli + +files/0001-gitlab-shell-4.1.1-config-paths.patch, + +files/0002-gitlab-shell-5.1.1-Makefile.patch, gitlab-shell-5.1.1.ebuild: + dev-vcs/gitlab-shell: Fix ebuild for gitlab-shell-5.1.1; it requires some + more love than the previous versions. + +*gitlab-shell-5.1.1 (08 Jul 2017) + + 08 Jul 2017; Manuel Friedli +gitlab-shell-5.1.1.ebuild: + dev-vcs/gitlab-shell: Add ebuild for gitlab-shell-5.1.1; dependency of + gitlab-ce-9.3.5 + +*gitlab-shell-5.0.5 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli +gitlab-shell-5.0.5.ebuild: + dev-vcs/gitlab-shell: Add version 5.0.5 + *gitlab-shell-5.0.0 (13 Mar 2017) 13 Mar 2017; Manuel Friedli +gitlab-shell-5.0.0.ebuild: diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest index 709c446..ee8d72e 100644 --- a/dev-vcs/gitlab-shell/Manifest +++ b/dev-vcs/gitlab-shell/Manifest @@ -1,13 +1,15 @@ +AUX 0001-gitlab-shell-4.1.1-config-paths.patch 2152 SHA256 e789f0c8a8b7ec8a840ce26dd63d6e5386a149f619d7ad5a6788577d897c4826 SHA512 6ae5af0c364061af4c9675804e2f6d6b662ed4891ed4c80bc1be39e9da6343db372e58bf04a0d3c8a4fc218daeb8cda45636e0da0c67ec801168e84004d05b86 WHIRLPOOL b8136b81ef943c15feeca303d1d7f0d55c85ff7f7ec82bfceea026ce334ca24fce0dfb599946562bd0aceb89a2216bcfaa894235c43f41e3031a305f85e756b4 +AUX 0002-gitlab-shell-5.1.1-Makefile.patch 252 SHA256 cb45d73d9a2b5a30d2c457d6ddef9953b4a907e4929575709997a3edcb416cc2 SHA512 ce185a66e746e7791ca7ace15757d24a6fe426a986837a3b41c18771c0e3395baa05488735273171d41f764a9cee2517dc64e629f4d9b2aedc0bd57650350d9f WHIRLPOOL d6c6562a9d6efb904580732c43538b86b7ea8fb9dab538ede162018f86974a2e330403b385f636734b67be894063671e17814865de0ae36b8e8eb9ef1199aa3d AUX gitlab-shell-4.1.1-config-paths.patch 2152 SHA256 e789f0c8a8b7ec8a840ce26dd63d6e5386a149f619d7ad5a6788577d897c4826 SHA512 6ae5af0c364061af4c9675804e2f6d6b662ed4891ed4c80bc1be39e9da6343db372e58bf04a0d3c8a4fc218daeb8cda45636e0da0c67ec801168e84004d05b86 WHIRLPOOL b8136b81ef943c15feeca303d1d7f0d55c85ff7f7ec82bfceea026ce334ca24fce0dfb599946562bd0aceb89a2216bcfaa894235c43f41e3031a305f85e756b4 -DIST gitlab-shell-4.1.1.tar.gz 78829 SHA256 61f684b4528b0b789aad80efbfd8f9870d113f6e2794e589e0db9e74e6737e1d SHA512 17b929da1c6148a9af2787ca4a18081e3108622a40c6fb3f02f36f4ba41f2a1d61cf83509ace849093334af8f4ad74d8a36393bf9fca7ab21163d2f48b499879 WHIRLPOOL cfd258e93abeae4a33c1578114d56186c81a7c5894a3ccb9b690dd9a78051746916f3bac2b7146b8378534d5e177ba4cacb4c2011b64011328b056d4d397967e DIST gitlab-shell-5.0.0.tar.gz 78585 SHA256 7611fdf0b64592365bdb6ba442a4263d129b05c280d5105ea641baec7a0b45ab SHA512 84c86c42e0ff6029ddcdd9a93410b261f4f5a1e8cdb0fd114db2eab56b1fc63f4f8ed6d0cc0c6016d0f02413d6d213aab7a995adadb186c0dfe49e49b762e904 WHIRLPOOL ddaf25f837dbbdbfd6578062b89a8102ffbe0dc88f51890a38f59add61653368b0ad0ea146a8a7eac52fa482f7316aae712f53075f750db02fa8e8ce370f76e6 DIST gitlab-shell-5.0.2.tar.gz 79009 SHA256 bb5125f12f2f3fbbb93aa78f6810cd62f97bda564d01112a831bf41d4e42ef34 SHA512 c960e1e2c3c9f35927255442f4e20b82af8881d123c3edeffe7ebdc6523fe2456ae1e7149527255eb5e3d2d369b4f70b7c902314d881a20b893fea9fac968f73 WHIRLPOOL dc5be75f111074c8e9f018533ddcef64edcded4c5f3003a3f7297d9153469894f4c8a3e387419055a3e51732daa9db8a3b936984a24f3b4d1a9e0cbc968a7119 -DIST gitlab-shell-5.0.3.tar.gz 625499 SHA256 41d78fa416170dbf052c59223ae7c6a3b882f789c36ca932d2e36b610e8b0161 SHA512 55354926c4504d196ccf0f269ec93484a18f4915bfbe292c9dcfa43c33ff8310cf5c1d126943d6c7e54f3f77317d9229666887fb825de404b7be0dea24f49a64 WHIRLPOOL 80fe5dcbc00fc2460731dbf3c604ca1646e9be61d1d53c88a53d48d16f97e6ee032fe210bc7a04c4bac1b726542f0eb645c15ec186a1de16256605ff320fdc0b DIST gitlab-shell-5.0.4.tar.gz 626142 SHA256 9947c9cf7e7f2e1c2af696cf4610c6e2ad256dcae42e95cc0c8dc387ad5d07e3 SHA512 2718e99a43ad934dfb6d8b3df47bab0b957fa362c84510434fdd07ed994bf53ab059569ff0da106c8bd5ebc49cc460694ad5fb2fec57f0fb0cbb297609a00d97 WHIRLPOOL 6666d2dcb06c156686080b6a0f489ef03d331bc8f20eeb996fe5ce51aeb25d2f334002c15e235c1ad21d808eee8617aa178a5ad974ea99ec8f89bd2478f7f9eb -EBUILD gitlab-shell-4.1.1.ebuild 3653 SHA256 06702f4658b8ac1bada6b322b833f65270656730417d8c9bb000ab1fb23af8f0 SHA512 dc63160d98dabfcbaa9982fe841fd581a1b1b2a968e7c7bd1ee336e449214fa89da33477f0d4744941ee3ecb8688386883a5923e78025bdcfd1556e68ea7371c WHIRLPOOL cd59e133d1d02f082f10312b358c6c8718898aa008a967fc85934656500ceefc44a6affae286123c481aa902fa51cdb7e7f98788057fdd08304ed99f643ef27c +DIST gitlab-shell-5.0.5.tar.gz 682091 SHA256 c1583e931280e93d59f86a571a628e697d8d073dbfbfd58fa957617581c4edae SHA512 8e22a2bed622c81976b827fac81ca94de7023d710160cb6daa24d24269b068292ee2e36a5917bb5399340661a28f6480ac40c0a5253f71bd36b8bd78a56c7380 WHIRLPOOL 76503debe3baeded25067b6fcc1c9b5f103a7fb21035521bc3ab8b89547a566b557f38c073deb7d8a0867f1225edfe4d5587d14570ca2889812d3da73b4bf5c9 +DIST gitlab-shell-5.1.1.tar.gz 688960 SHA256 33a4b79b0b06ad935a4bcf1ad41ab88882eb31b349cca007f1e60f3eb5826a06 SHA512 a247e37bfd7b8fe28fe68f3b9d401ccfe534bd4221bce2cda092f6a72a6926f49944f4a008c71636426ca1f7ae6033f53035bc10a8d8121c8093e09abfc675f4 WHIRLPOOL 29aaa30c73997a28cdb68485087a36c6c8109b9f909e2776899f1094a17dcbc6189ed759f9acc81caa6cda516b44f89ad36567bd9f96ec6802e4553182607e20 EBUILD gitlab-shell-5.0.0.ebuild 3653 SHA256 47e19d88939c146c5a7826ca538dba2caee3bc32944eab5b80d54ddbd4c196fc SHA512 1765624d95c14e2888f3e12be05ee727bae036265fc3c9bcfe17b509c0656de72728dcb580952d2a666b3fc99c3640f43862a9ea449599aeaa7cdb2509406347 WHIRLPOOL 2b935404098f288e729c3957007cc663afc3e76a4e04f536d5c7373cbae6857abb5a5cbd2d226355777e4af954a032e9b17211657d83a71bd2eef847028aea64 EBUILD gitlab-shell-5.0.2.ebuild 3653 SHA256 9ed7d4b6dc1ca2d6ee0c928cfd9f33da45a09a070f781d33f217a4dc80296c5a SHA512 571e8c8cd6782f7d955d8d7ff481424c8aa2bea6ab2d702036f991065f75d8e08f26b1004a91a88e2a6add8d64018cec3bb7de131635b264ad7990c392467e1c WHIRLPOOL 491af5dd4248e2728048e51d21a12768966201a93731df7743baa24ccde12228c15c9288be7cefb9b29f3ed83f27729a6f1146506365ef14d3d516b7acaf6862 -EBUILD gitlab-shell-5.0.3.ebuild 3653 SHA256 e2c2cfb805378a6cd7e87d536a43c1d96ae489ce66b8168e6cbc42b703736c0e SHA512 65093fb42096002f2f715b18561f11cfb8afbc36188514a2d95023be53025946928e4e712d03d470d0bf52e6d0ecf8d0438b29cd5c55e162d85a15963e430b48 WHIRLPOOL 3278d0eea3f614f726d0df8d0e6a2f49c1e9d4341829f65fc29aa94544470b5b36ee7ce0d464af2b3b535f3f2f10c16c11d3c39dc87c34f9fbb693f61e9ffa3b EBUILD gitlab-shell-5.0.4.ebuild 3653 SHA256 c3e2b2dbb4c6b29bf46442791caee2116be2c698a9cbec9d91ac58b1a5d98adb SHA512 035508013085da402a5926faa5da6b6ac6ac726169122766e381096b316b13e887e99f178a8980d831d0a788549e26b07bdae284bc3a90b3a21b534071239581 WHIRLPOOL 807caff4227ea9fdb853a0e5622dea4d4e8b66c3c8dd86d98aedc14f20f00eeabdc1620ffded43cdb4c6b4009e96528bf1dae784256e40f034cd78d6460348b5 -MISC ChangeLog 2968 SHA256 d1febc13ae1f441766c488effc41cb4d3434d2c8874ce6f8665c71f3f7a94f55 SHA512 e67b8f8785660a0b9d9fb6849f0b14880ca90532b6b22a1ab7efc1be70ca166918364f938b3b1ad8efcb12e544ab9cdac7e0f279df9651dd51ba729ad435f233 WHIRLPOOL fb16d2699a95323ef28c2f97fd67f1882172688b11d1a63c29e5d8e01737b2af0dcf02d96122e0d2a0a751cf5acfa9ca5f0e487a2b2fa8ad4f4ff8f333c5093b +EBUILD gitlab-shell-5.0.5.ebuild 3646 SHA256 aad0fca138202ef4f5e7885bf3edbe78fb0e524b263b7e770d4051b28e1cd5b1 SHA512 280fd3dc3da459882344eeebf8937fec8eedf50580b1a1fd1759d9e61e85b418407d6a7264acca8926201e1b29dc401f1226d7dd0496a26783c6ec09b7a97e68 WHIRLPOOL 1590459dfce361c2d049f431fee9b6cff435ac06ba1a126fb76688c4d4e7100b848e9e1875d18620ff0036b58afe78a743ac55793f79ca9c6bb1dca231ba7b03 +EBUILD gitlab-shell-5.1.1.ebuild 3888 SHA256 c62a4f22fb2b27377f8b1f8ab721c48c3fbb1ded13a618b01dff0ed881505ca1 SHA512 6768c7021dc1cf08d03d92abfe0f03b3b741cdee4d2b98b64591548beff1e1ffd2b9d347a0bce19a6ab41975de18487aa8ebb6655f2f7e6c4f878e1183672544 WHIRLPOOL 338ece7de253f88123be40ca35a4164a09380489177dcbe2e714d342ca60221d31c621b4f061f28f348bd96dfbb0ab4515e33a75ae17e857a6e3767672d1f88c +MISC ChangeLog 3790 SHA256 71ab99f1e1167390c21a537556dca047f0c723611855da4c4736626769972d3f SHA512 ae07426e448715013fb0f73644751a9d34713ca4712b3bfbc76368b7666b4fdf51a56e1deabfe5d359bc01515b6ca2b58106fe773b2b0d6d7d5edf20e00159f3 WHIRLPOOL 517ccd582928da0d26fa75b3b116fec7675ebd520dec0b02e845d3d51ac0114aa054cced0dce3636f121cbfe2b17346994851cd2656bd80dc4abc450825f046f MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-shell/files/0001-gitlab-shell-4.1.1-config-paths.patch b/dev-vcs/gitlab-shell/files/0001-gitlab-shell-4.1.1-config-paths.patch new file mode 100644 index 0000000..11c4a4d --- /dev/null +++ b/dev-vcs/gitlab-shell/files/0001-gitlab-shell-4.1.1-config-paths.patch @@ -0,0 +1,69 @@ +diff --git a/config.yml.example b/config.yml.example +index cf6c91b..7e144fe 100644 +--- a/config.yml.example ++++ b/config.yml.example +@@ -25,15 +25,15 @@ http_settings: + self_signed_cert: false + + # File used as authorized_keys for gitlab user +-auth_file: "/home/git/.ssh/authorized_keys" ++auth_file: "/var/lib/git/.ssh/authorized_keys" + + # File that contains the secret key for verifying access to GitLab. +-# Default is .gitlab_shell_secret in the gitlab-shell directory. +-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret" ++# Default is /opt/gitlab/.gitlab_shell_secret. ++# secret_file: "/opt/gitlab/.gitlab_shell_secret" + + # Parent directory for global custom hook directories (pre-receive.d, update.d, post-receive.d) + # Default is hooks in the gitlab-shell directory. +-# custom_hooks_dir: "/home/git/gitlab-shell/hooks" ++# custom_hooks_dir: "/usr/share/gitlab-shell/hooks" + + # Redis settings used for pushing commit notices to gitlab + redis: +@@ -55,7 +55,7 @@ redis: + + # Log file. + # Default is gitlab-shell.log in the root directory. +-# log_file: "/home/git/gitlab-shell/gitlab-shell.log" ++log_file: "/var/log/gitlab/gitlab-shell.log" + + # Log level. INFO by default + log_level: INFO +diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb +index a51a32c..7763802 100644 +--- a/lib/gitlab_config.rb ++++ b/lib/gitlab_config.rb +@@ -4,11 +4,11 @@ class GitlabConfig + attr_reader :config + + def initialize +- @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml')) ++ @config = YAML.load_file('/etc/gitlab-shell.yml') + end + + def home +- ENV['HOME'] ++ "/var/lib/git" + end + + def auth_file +@@ -16,7 +16,7 @@ class GitlabConfig + end + + def secret_file +- @config['secret_file'] ||= File.join(ROOT_PATH, '.gitlab_shell_secret') ++ @config['secret_file'] ||= "/opt/gitlab/.gitlab_shell_secret" + end + + # Pass a default value because this is called from a repo's context; in which +@@ -43,7 +43,7 @@ class GitlabConfig + end + + def log_file +- @config['log_file'] ||= File.join(ROOT_PATH, 'gitlab-shell.log') ++ @config['log_file'] ||= "/var/log/gitlab/gitlab-shell.log" + end + + def log_level diff --git a/dev-vcs/gitlab-shell/files/0002-gitlab-shell-5.1.1-Makefile.patch b/dev-vcs/gitlab-shell/files/0002-gitlab-shell-5.1.1-Makefile.patch new file mode 100644 index 0000000..49c78b9 --- /dev/null +++ b/dev-vcs/gitlab-shell/files/0002-gitlab-shell-5.1.1-Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 2a78178..3b2780a 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,6 +3,8 @@ REDIS_RB_VENDOR_DIR=lib/vendor/redis + PWD=`pwd` + + all: ++ bin/compile ++ strip -s bin/gitaly-* + + update-redis: + rm -rf $(REDIS_RB_VENDOR_DIR) diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.0.3.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.0.5.ebuild similarity index 97% rename from dev-vcs/gitlab-shell/gitlab-shell-5.0.3.ebuild rename to dev-vcs/gitlab-shell/gitlab-shell-5.0.5.ebuild index 63b1a12..0d18dad 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.3.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.5.ebuild @@ -4,12 +4,12 @@ EAPI="5" -USE_RUBY="ruby21 ruby23" +USE_RUBY="ruby23" inherit eutils ruby-ng user MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="158b424f9aec0e4ce439f56cb193e369b36e0e46" +MY_GIT_COMMIT="e1e347070e94cf139738166171cc35b21b278dda" DESCRIPTION="SSH access and repository management for GitLab" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell" diff --git a/dev-vcs/gitlab-shell/gitlab-shell-4.1.1.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild similarity index 88% rename from dev-vcs/gitlab-shell/gitlab-shell-4.1.1.ebuild rename to dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild index 2f0e4f7..d393b38 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-4.1.1.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -USE_RUBY="ruby21 ruby23" +USE_RUBY="ruby23" inherit eutils ruby-ng user MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="a3712cc18de8283b25c3a8a034ecc8c9b7feca48" +MY_GIT_COMMIT="0a64624152735766c428d1532e434dd0bf5a9748" DESCRIPTION="SSH access and repository management for GitLab" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell" @@ -21,6 +21,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~arm ~arm64" IUSE="" +CDEPEND=">=dev-lang/go-1.8.3" DEPEND="" RDEPEND=" >=dev-vcs/git-2.7.4 @@ -32,7 +33,8 @@ ruby_add_bdepend " MERGE_TYPE="binary" RUBY_PATCHES=( - "${PN}-4.1.1-config-paths.patch" + "0001-${PN}-4.1.1-config-paths.patch" + "0002-${PN}-5.1.1-Makefile.patch" ) GIT_USER="git" @@ -67,6 +69,10 @@ all_ruby_prepare() { lib/gitlab_config.rb || die "failed to filter gitlab_config.rb" } +all_ruby_compile() { + emake all +} + all_ruby_install() { # install lib insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION @@ -87,7 +93,11 @@ all_ruby_install() { # create symlink for .gitlab_shell_secret einfo "creating symlink for .gitlab_shell_secret" TOKEN_FILE="${DEST_DIR}/.gitlab_shell_secret" - dosym /opt/gitlab/.gitlab_shell_secret "$TOKEN_FILE" + dosym /opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}" + + # Gitaly stupidly hardcodes the path to config.yml :( + MY_CONF_FILE="${DEST_DIR}/config.yml" + dosym "${CONF_FILE}" "${MY_CONF_FILE}" # prepare directories diropts -m750; dodir ${DATA_DIR} diff --git a/profiles/updates/3Q-2017 b/profiles/updates/3Q-2017 new file mode 100644 index 0000000..33016c7 --- /dev/null +++ b/profiles/updates/3Q-2017 @@ -0,0 +1 @@ +move www-servers/gitaly www-servers/gitlab-gitaly diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index bf0cac6..9da8a1c 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,66 @@ + 09 Jul 2017; Manuel Friedli gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: Update ebuild for gitlab-ce-9999 + + 09 Jul 2017; Manuel Friedli + -files/02-gitlab-ce-8.11.0-fix-redis-config-path.patch, + -files/03-gitlab-ce-8.14.0-database.yml.patch, + -files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch, + -files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch, + -gitlab-ce-8.15.8.ebuild, -gitlab-ce-8.16.9.ebuild, -gitlab-ce-8.17.6.ebuild: + www-apps/gitlab-ce: Purge versions <9.0.0. + + 09 Jul 2017; Manuel Friedli gitlab-ce-9.3.5.ebuild: + www-apps/gitlab-ce: Fix last bug in the ebuild. + + 09 Jul 2017; Manuel Friedli gitlab-ce-9.3.5.ebuild: + www-apps/gitlab-ce: Fix some bugs in the ebuild. + +*gitlab-ce-9.3.5 (08 Jul 2017) + + 08 Jul 2017; Manuel Friedli + +files/gitlab-9.3.5-sidekiq.init, +files/gitlab-9.3.5-unicorn.init, + +gitlab-ce-9.3.5.ebuild: + www-apps/gitlab-ce: Add ebuild for gitlab-ce-9.3.5 + +*gitlab-ce-9.2.7 (08 Jul 2017) + + 08 Jul 2017; Manuel Friedli +gitlab-ce-9.2.7.ebuild, + -gitlab-ce-9.2.6.ebuild: + www-apps/gitlab-ce: Add ebuild for GitLab 9.2.7 + + 08 Jul 2017; Manuel Friedli gitlab-ce-9.0.10.ebuild, + gitlab-ce-9.1.7.ebuild, gitlab-ce-9.2.6.ebuild, gitlab-ce-9.3.0_rc2.ebuild, + gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: Follow rename of gitaly -> gitlab-gitaly + + 17 Jun 2017; Manuel Friedli gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: Update version 9999 + +*gitlab-ce-9.3.0_rc2 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli + +files/04-gitlab-ce-9.3.0-fix-check-task.patch, +gitlab-ce-9.3.0_rc2.ebuild, + -gitlab-ce-9.2.0_rc7.ebuild: + www-apps/gitlab-ce: Update 9.2.0_rc7 -> 9.3.0_rc2 + +*gitlab-ce-9.2.6 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli +gitlab-ce-9.2.6.ebuild, + -gitlab-ce-9.2.2.ebuild: + www-apps/gitlab-ce: Update 9.2.2 -> 9.2.6 + +*gitlab-ce-9.1.7 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli +gitlab-ce-9.1.7.ebuild, + -gitlab-ce-9.1.4-r1.ebuild: + www-apps/gitlab-ce: Update 9.1.4-r1 -> 9.1.7 + +*gitlab-ce-9.0.10 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli +gitlab-ce-9.0.10.ebuild, + -gitlab-ce-9.0.7.ebuild: + www-apps/gitlab-ce: Update 9.0.7 -> 9.0.10 + *gitlab-ce-9.0.7 (25 May 2017) 25 May 2017; Manuel Friedli +gitlab-ce-9.0.7.ebuild: diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 2e42d76..e561d8b 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -1,35 +1,30 @@ 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 02-gitlab-ce-9.0.0-fix-redis-config-path.patch 423 SHA256 9de3711c1f06a0561001166f2a44b4c1dc5fa3fa57a5230eb1dcc2b5d394449c SHA512 ae89fa3c6fde777e844e777862415450787ebf83653435cea329d66810c5805d2126d41cb1ce40b15c42371543bc182a59305b8b1b6a7433121340a625300370 WHIRLPOOL d97962907bb1fc610ebc52665a6ce51f40ee932e7ac715279f3c0554f2880a7b220ecbac2c4c97bd4d3dac22b9a025aa729805221ed5e6d15f04f6cd8e210d22 -AUX 03-gitlab-ce-8.14.0-database.yml.patch 2172 SHA256 8435bf632aab03057342d5d6d75f016b006da00157c0cce2661416b752f8b75d SHA512 048aa5877ef30e702727b917cf7fb6bd534c497a7c24ab55640635598af293b0567bb9f356c4b91d55291341ced50847909f117f46d3fc9962c2f7a0f7b6bfb9 WHIRLPOOL 87b62f5e326211c2ff9001742a04b71bd94b21f4851778a513f7e1981da193dc16718559be42a0ba21aaa0c2f5b65a2571bc20174c063aa13e6436f0b422f057 AUX 03-gitlab-ce-8.17.0-database.yml.patch 2238 SHA256 c5ec9e8a11fb60a7749b9f8cf553949e78aacf9a8233b39c4986980851196c8e SHA512 1668e2c1d00ef485d2bc5af8d343c9be19f291a627d0041d42b268ec1ad8aedecba99336998e6b1b3ac2f4cd617556d17ab5f1f11f95d696205e3d10d6b74e1c WHIRLPOOL c91a6604f050113c9f584d7bf34ebe660263beb88879382873952d6b1b136ad5b576b813bf9f2f66ee49d6656fb1d24437dca395c2574bd7dab07cd1a3a36a99 AUX 03-gitlab-ce-9.2.2-database.yml.patch 2342 SHA256 870cddca799897d249773d0b0e58d30b1290475e3c313faa6bbc307c73f80d4b SHA512 257ff2cf3bd090dd08a8f03baa6c06d130313bf46b21ac61a606aaa0f0cf1eaacd3ad231761989448e4dc28aeda01b03192290314582db002c32c65eed4134aa WHIRLPOOL 94d95a9e6d15d48c6e786521b04eb43b12a003feae0a464122f51cdf2a5215b2c025134373842a6633d0adf73ceea1db9fb32e36236391bdf9e750565f908591 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 05-gitlab-ce-8.16.0-replace-sys-filesystem.patch 2379 SHA256 cf5e0ea55c99996744422312a46914a8e54b6ab68ac5e67abda444e1170bcd4b SHA512 eb5ea3a9f040c3df64bd8ebb20ed873fb6af17322867c0f5714e3d9ad5ac26b79e9ffaaa4720617513123b651ceccedeb992b64c87b9b945338614c9eeec1468 WHIRLPOOL 2591c1d439447f3e08fe413ab8127b9945f8e4813480093af1da796675903bbb2b8a2205bd1480d383402ef861c348cfa0bd45305e7c1fa20458bfd6b6b327a5 +AUX 04-gitlab-ce-9.3.0-fix-check-task.patch 1090 SHA256 51ade91e5e7ef67e6d3c0e6e1f708156755ad44d42dbc3ccdd4356b259e46846 SHA512 2eacb47df7f9782172ae4f71d8e5fb07f2a830da7733e2ec84b95259a9ee5d454f9c68f93b40251050cedd502761800ec56fe7f502309364e61e9e4431e2b112 WHIRLPOOL 0f7b6a7281eb8dd736b6f329e8511b9145a48450361264465f37aa852bf9d0e4ed265c0292272e75000216ddbd4c285b496aef86a4cfd2944f6819b7a3cc3982 AUX 05-gitlab-ce-9.0.0-replace-sys-filesystem.patch 2436 SHA256 53fcd9fc123a0fcb671a8cbcb3b2dc61765e32be6836206ae0edea8cf0ae8203 SHA512 21636f298df7e762f59595f39fb50266f8737311f37aa2b9ba96bc29190b8a67eea01b09e3b589d0885da6b27beaa136fa66c7d98408a8e3ecb3ac6baf20d891 WHIRLPOOL e0c709dfc5f72e33207fd7d62a7db5a85c0ed4b6064d5d6a13bcce7d660d9ba144fe09d0985c16c313f06a4e02911729be132086735eac47ddff981874f31acc AUX 06-gitlab-ce-8.17.0-fix-webpack-config.patch 614 SHA256 0c1cdc25032322eff6c279435ba5f3fc349b30de0d55d86fad2616bd2bb7fef4 SHA512 f5ccb4d1849ab395ba4ec3c80735a1fedd9fa7f790c8b114d8dc8d1fc2c431d7b9e5645247485f0b8c1061a00ed61c21a5e50f49af0d76e232182c68868a163f WHIRLPOOL 6968ddefed74607c36cc66dc133dbf4942979d2ae867f819cf2e7e5c9701fe8dd86b266d923e6343971e6904f0ad1f35200971660df139edabcc9e0790fc107c AUX gitlab-8.13.0-sidekiq.service 990 SHA256 183ccbdb19a3dcc74cf1f1f865bf396466e06f7408ff7d3e92359b2a0e83f24c SHA512 c356baf65337739b08a0a4bfe24d3b68f557e9d6d95f479b39ec954ee6c2077e380f99d1e9e9390f5b038e093c0a46562f651512a6578dfa86977580159470a2 WHIRLPOOL 81d9ea9febf47d5fdb9c49a54bbc499bd796fc56bc1c16404fe4c74d00c4bb9fa9631e4cd4cf88d3c30a44c04b74b35a61cd4da9f2139a4abf61e758b4e5949a AUX gitlab-8.13.3-sidekiq.init 1459 SHA256 fdf808f9c0a92d7a77ae8be27c8fc11cec571ec6b5b94e31639028eec19546f1 SHA512 ec2130483b603f2be423c288fd0d55615c831ce995a8a5509f0240f149b3464d8f0a75cade1c736d085fb5f898d109368af62d8fdfb280aa00c4df8c06abb1e9 WHIRLPOOL d3493ac268257386e22c677337c8f9b1050212fce4aa855119b2ccd5f56850a5288d0cdd74e3c2f34552f59f9431c9ab5080e372766b88de003cad5dab015100 AUX gitlab-8.13.3-unicorn.init 3562 SHA256 f4ae5b785d61fb2c463b2405533d5e9a2209bbff7a085106b463f59505123287 SHA512 4af87415da7e482725a6f97f5e2ffafe0d16784cdcf3f877c99b5f646832c14dd1b3e875ec00e57560060bf3c049dd7fd0aeb7452db1100740e6b17dc29fdfb6 WHIRLPOOL a63d236a76bcbbd6e39268c76a7fbb75f4b9e5488d0cbc0bb2973ae09753f11d1863e477fe88f6c652370c19c3a0f037f99cc681b91679eb4da992db5e2eff20 +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 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208 AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792 AUX gitlab-workhorse.service 930 SHA256 09348a52fec333b4b19828752e0484400c1efa9dfb644723fcf8e80537e294b6 SHA512 6332024fe0049287899cf482b6e4439e9dd90da14e489d08aa8e5e79cb7872efcc517d99b69fa23b011b382acb1e5926496a78f08af5d2d64daa515b869a0c6a WHIRLPOOL 3749c6719b2a35c7de29763cd616e1e9cc30a85aa1630ffc46440334459b5922503d52629556c125a6dd6574bdc5f23f1b2a7f2a85e2270a415b22246e0b6bae AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 -DIST gitlab-ce-8.15.8.tar.gz 20035995 SHA256 9fafd6478a6d165ab6acd6f89f169fe72d46df547efe1bf3ac8d3a5bc4ffec11 SHA512 db287ea59d94eacd3c1219f458a403239f7aa39bea0d5e82fac80afc7216b96ac394740ab717c3ed26068617e1234105144820e41b0825511e1adc29e8891bfb WHIRLPOOL b03faf4b30b5c82535c0e148edec7fb5ff26405cfa8587b4bd287e834bb5f3eb6ddabd0b5f1472672b4108bdcb6066d63eb1a117e35fedf2c94d63348186afd6 -DIST gitlab-ce-8.16.9.tar.gz 20906220 SHA256 63e36f3af71ac3f6e45c09f443f5c4ca606c0f401754d3f846a2f54707b1d3b4 SHA512 c947f813a595904808d75286c097274733d05aa70a2dd2cce9d222057253bdaa1482e271d4c73be1e3ba070480f9b130daef90aa44af90a743218c1207edbb30 WHIRLPOOL 48475ee9f7a3e9f15703487170cf069af887b7e41637e3df1bd594aac78f68de88b6df695842084a25ad4505ab5d1a016de162a6ee31b89d2d629df126ecc080 -DIST gitlab-ce-8.17.6.tar.gz 22828733 SHA256 dd5086431f2d362afa6bb29b5465112276b6ca8d6196f90b614c1c407a3d2131 SHA512 05c33b67d8febdb320e8c5483793d364b62056086749573bb4e92703ca1001d1c1cc236940ae20f1eac9d5a4159d1aaed97192040d40a4d5e0ba036c188a58db WHIRLPOOL c30b1604f616deed930c065e038fddbdf6866339438f46a66c09c342a368c521ad721dfcaf7e2ae37789b82729718370c6718a2d77c74a286923670a6ef7bf90 -DIST gitlab-ce-9.0.7.tar.gz 26358937 SHA256 e70d1f3926f3b7e872353da2d21a7a6b44ed51a3b145e237f4768f8190eaeb08 SHA512 c3f28ef81eb546727f895d92a120e1e459b8eceb1c1068888ec9972444355c02d441bd8d85c360e684f0389b0c6f2ffae57a69a220639fa9ffe7f8c63730daad WHIRLPOOL 04380783f5074fcfe905b129e6e457da44e9dbd1d6d43d70309ea0f55fa8f916af28f52460dc68b1b588feb8d99b8ba543e52bffdee93f3115efa3473c8728ce -DIST gitlab-ce-9.1.4.tar.gz 30512187 SHA256 36e5e41c89e215ec4b25c4129a9a47878b1e4e6104c54b0cdf8981d3f39f070a SHA512 d29f2d805c14cc98f0851c4877e91ab6785bbe487341b2bf3392ee293bc683bf00dd455e400d2c3a27b8dc0a6ffa020768cbd11ec9ee029b5f0f2ccfcbfb3a4e WHIRLPOOL a05f4c66c20df274d42ea3c76491fd7ba28561ffe4f7fc97c542bd79c54bbea09646be3f7a8d5b896023e6cd1e4e13ad40915f58e91519e04dedc8939f2a405e -DIST gitlab-ce-9.2.0_rc7.tar.gz 30112868 SHA256 8dd30e975416ea8e6701592cd56bdbd7a607e05ea115596728f5eb6219d275df SHA512 3ac2f3d4dd1c18f49a92e97217b5afea511a4e0ffac9bc0f303a819d0c0c6212b57fe1fdb13f1d049acf54a3c767b919dd4517ccd2e317a41b734f0660f1e276 WHIRLPOOL 624769196fad0537bf772533f3e696abc957811b0f929e68d0efa8d871915510bb6f823c0f22c3f09aeea4a46e5908d9f235e9dba2a2f115c99d3298fc83d3c4 -DIST gitlab-ce-9.2.2.tar.gz 30969181 SHA256 6d8a1ab6c808c53bccc2c3f3b4dc052cf9e8e7d1a47d5c83ef799afad5304815 SHA512 c047d8f471e360abe913bccde07a8604153dbe064df69a5797ab5f82f4aa7f7191f5ba26444d846364518a8575a48c5be6111df4516f961b714257d58c5ca730 WHIRLPOOL 246b24d44b8654ff9ad1750c930f8a885c0db1c579b28944e71f6aa9c081b940b8f3fa418d0bb7c42fcf517b1837e4782ea5388000be262d29aa703b086316c2 -EBUILD gitlab-ce-8.15.8.ebuild 11986 SHA256 6c86e66d4b568b88dd44ec52401e25c33b2d5e61d9a76e77180320d40ef57132 SHA512 91e1dc1cd8b9b77ea039e7e194b06c44900511b9e7787a714faec14746f96da6d00aa66bd16763732c468d8a46815e29fe761349a0a0d712db21bd4a12d31e06 WHIRLPOOL 50923df1fdda85abf7c7984a49d73d6486628439612de18ec3914274f3a053ce98ffbffec0f6ca9f2f9ba1ca9491467de0762d2d4a31ea480f32eb68222c79f9 -EBUILD gitlab-ce-8.16.9.ebuild 11986 SHA256 21a0d7336a0a022db75ded6f29fe12d64012bd20a46e538ce0940a3c7e402a11 SHA512 c8e3ff6de9d97e25300315e967b7bcfc7d4aa5bc3e78aa45564e12bb673fbf79c9ba454174fe4f362d9d58575611debf797b52685b2061ac3053113390401a5c WHIRLPOOL 4644465cfcaf81184c62acf888ced3f16ccffc9de84fac7774a5463a778684c051580dd1f273546b9be8a0ace83243abc06e1e5ba042b18a10f7d352783a995f -EBUILD gitlab-ce-8.17.6.ebuild 12932 SHA256 e5f7cc94653a6c55627264e02116d43febdcc58bd60ccf9f7c5fecf9476d1b0a SHA512 65fc18401842e1c1176d8178acff3ca48f1fe80ee8869b7263cd1819ced46bb8d1c2771226d9f7c9c5507ef120d69d66114605d8ed7b3923e5f9a61e2cc0125d WHIRLPOOL 3c979ba2e30fbb3c628063f71e3a8b12183632413f4342b81298e4fd4847e8a583adab16c202340d89fde010097f140005ae564c0d52fefb0fcb57b67ede398d -EBUILD gitlab-ce-9.0.7.ebuild 13087 SHA256 68f0d2d7c8cde9b07bb280bb2f6b6d3fea4de6791571f27aaf619853940d2d30 SHA512 21545e878a2f60d082b132256fb09c72a5cc1d252115f448770432fd98becc5aeef42281f00fa55642a1a0866f41f107903b33160e52c61bc4c6d7811f5a06fe WHIRLPOOL 6ad81da17812721b94e8fcfc2328a24355a1f777d067ff2f557f0928ea2f4af55f0edb8587b8fe004f5481254cd72a520a7a77a6a601afc12315d8d37773f5c8 -EBUILD gitlab-ce-9.1.4-r1.ebuild 13243 SHA256 ab673fa216da6c964b7c1a49bdc4b0225f437f0e9635022c165694ef9cdb3be3 SHA512 c664cca08eb02d069878dc0d9bb03a6470164cb85e6f0f47bde566eba1ee3c829d255851f4703016415b311595257d8b4da7e22eee2a96b33a7436a8a55776d8 WHIRLPOOL a564ed0ef3c3faba21bdbe29dd7e6a0a13384a26de1addf2292e7c9069b8c19c2e573d8940603f598088b5ea44d4af38b0e9527dcfdbfb0c575dfc5919487e1b -EBUILD gitlab-ce-9.2.0_rc7.ebuild 12970 SHA256 e0a935dbc638799ae3c9f0032fc88665a22c2f3f4077638678ed88271abd4e01 SHA512 f2ef406fd513d5944579199774a5553c5416886d01c82e7e90884ffc29b20da33e3dc1211277c745e66d4c86fab57ca8cec64079c90087a4234fde2056c9a357 WHIRLPOOL 7710f6d7cc5b9b1797b28c4b706accf9ead024fa30e83534ff34c44ebfca2c674f6e04b6b1c05e31fefa02625973ca2f31d3118c71c8ee8a63db1780b4eb6abc -EBUILD gitlab-ce-9.2.2.ebuild 12988 SHA256 a1ec15fafbe7031dbb71859497f3d334d9b062d75126b4ff5e6ab4f911e816ef SHA512 ac3fb3d10dc34f07d43a700e9dc4453138e11284d5f26a93e0e1cc59160faca75fa979390f9ac293538172c97523a8fe6f99812084bc94ac5181a17fd9110483 WHIRLPOOL e1a8afacad18607af2cc2a1abf9222657d85b3694a37280c05904ded91226fdcba3c7df6a705dde8ace85bebfd6dc8e07e547469dc6616c94e12b5d21d4efb9e -EBUILD gitlab-ce-9999.ebuild 12936 SHA256 577fb46481f157ac44e97c70c318dcf29aaa300b25d902e5129eac19f9ab18d1 SHA512 fde643225335f33e4b7aa01c33a570670aea8780d2789e15fc356cede52b87fafb5714ce0bb0b03020e7e3e673382aeb06e94e3afa1fe82e289cfbe38cbb6f0e WHIRLPOOL 49e50d7c1a2d4c426b751f6ffb7d9917481c5da804c0af0c17a3367f5d0a456925add5ccd9730938482b4ac5ce84483e3c013d3e38d14302d5be7e01f36e14bf -MISC ChangeLog 17848 SHA256 d57ce2fbafb6a62a30a4bf02feff9c37f33b94f8158f6b50c87053d8422307b2 SHA512 3b83ca4c32949ff08d1d59131388f3f59497c7831c5b09d1fd10a36445f1c383dbf04e91ddeff6c9b6c5131578450afb354b03819ddba80f7249b0ddd0b4f2e9 WHIRLPOOL d5ab8749e2c7d6a18adf2d63a7c7a69b40d93357d3e5714f131ec7cacca6008ca41f23a2c2bb8ece1ba10aaebf47b5f1363a2c4a29bbbe45672d06904e82f614 +DIST gitlab-ce-9.0.10.tar.gz 26364880 SHA256 4034125e6be2bd43bfab5e5d16074f6df0f499b081a28cee23da1e77eb9f3b06 SHA512 f5c0c1eea402fe058f301b5c3bbbe6b0f74e76ee1853dc3b4b89cd665a7e8092d147b13ff39e9f8f9155edea22ab1d2ee4c97bc6ba52cca0147117fac2dacde0 WHIRLPOOL 4f2d74b2fc2abc89f294fe0d78bea54512fbc5f95b9aaba97b9c5d3d02a75e5cb3ac8738b9142033f196d1fa6494b0e12b4f0256fe0a7c769449ec772e47d34f +DIST gitlab-ce-9.1.7.tar.gz 30517778 SHA256 24506445bb484fe568b357d8d8ac32f54f54f543ae623609bb720381d96e6358 SHA512 454e0afcde9a613d780e2031632d424bb316e68472329303080eecf1876fe7b5bd964ecd623bb5ed2e2be4666ebb90f17e790406a5622f81e8c52e320e4e5c81 WHIRLPOOL e0e5b89754a86bdf7cc472cfbe7ec91a5f752f836f5de34b6db4bb4315ddd2a337768b7af7a3e0b86f1a2bd8b9bd95692fab434b8aa98ca96b962a3bfffe82be +DIST gitlab-ce-9.2.7.tar.gz 30988513 SHA256 c9a7beeb63569f9e22e330418772464179f734b201e44114851407e552705527 SHA512 2dc3a09baeff0ef3e9a2103c1eb468ae3936e2858b9c7462b95ced1f705ee8f00e3d4996298df0b14bc51f1c3c002b1da56ea6b636821c4e5916077dd3a9cb0a WHIRLPOOL 3f6ddba36a8b99227df8c3519ef306b8338956bf14adba5c08d06bd1df689966739f4a03eaaaf9d69076a636085ee829e2fd0f0c6b6ee90bc2a6e7e8db5ccb6b +DIST gitlab-ce-9.3.0_rc2.tar.gz 31567867 SHA256 fbd93af8281b2460a9600a84b24b007e4557da49f8d118387724c8166236220c SHA512 942e3e1ec856b0ff3dedcfcb7b8cdee51e7d44779024acaa69ce7d415d08bb1ee785bcd265d1f9f08790c8e9508779b7f9cc8a40acf417cbc0e94f3a98f1fb64 WHIRLPOOL 1f210495ac3632f88c663ae9dd936bea5e556012a5b5dfe598425046f845d0467c17b92abd24924dc720c3877f8b6ef65e6b551ad9b2c3486dc27eee430a6a0e +DIST gitlab-ce-9.3.5.tar.gz 31759466 SHA256 fbc19d97602ceb819364f72af61ed93524df9d2cafabf5a0b44072c656a51809 SHA512 c2d44f6eabc9d4083ffbdf07380b506a258ae484698637cb448f4ede5a22881b3bef3d91cd13db63fc28f2672edd059e31dca06b67f9077704d6b37b9bb15332 WHIRLPOOL f4f224c3ae26030d3d1f776771a0e78262b9b7e321c696d53b75c4ae93d16de30b296253399dd0ed2a9c58bf397ff7422e9d38b25519458556669d7f18cbe000 +EBUILD gitlab-ce-9.0.10.ebuild 13094 SHA256 3095dbce78328f513eaf599486af63ae383635b305f24293a4cde3c3fe2ef55e SHA512 f8f500dcb2192c3b80423bf609bd1d0628471f75bdcd9e991489d0560ec34e1c0cc2362cdb6954014ac5e2e3ebed1d7f8df384cb655be73c50c6f54fa5ea62b9 WHIRLPOOL b0107dae53175d047b036fe98ea5b330fa521eb025a86f0dc011654e6aaaa7ee956c789de7a045854df72cddd96d558fadded069cf023111e6dfc7407490d469 +EBUILD gitlab-ce-9.1.7.ebuild 13250 SHA256 be342467f79215ec736c6d1f4d9d26bb679116f422585cceeac90bdf15dedfec SHA512 eca7584067d438b1feeeb56d7ef765af1f96f3fce8098d32e70e4f706c9572a52ffd7d4594c949234a1d25e9f52b220892d656afce4b30ca32ebe51665d0326c WHIRLPOOL 27d89d8d86c583da924bdac4f6db7216be151a55d5b14f7a78dd77417cd643c506c1c2ec652e234df7763472a0cad21794645dd85cfb404276179721649d4077 +EBUILD gitlab-ce-9.2.7.ebuild 12995 SHA256 93cb032967c0388d706be2dda0cfca2ca4765c0774e283ab0d61769cf43ddea6 SHA512 b8ecb0a4cc893786d4cd2dd94d53a21c6a8fbec5d181843286584914363f1160361dccfe2f61487f6744f7fb4d42a5efc4085e64bca7b29dea7e4672788c49cf WHIRLPOOL 2d8ada573da9e209e7a0bf3f05aef83e2419c18f4406b3abdbb24a90b488acdbdf7d4406b665a92356b457d100dd46c2a39084f87ba90b23da87392f2f98beb4 +EBUILD gitlab-ce-9.3.0_rc2.ebuild 12829 SHA256 6951949f8d98f867746a0128e99ce3baabddecdaa45952565f38a913b2868058 SHA512 3337e413db8680d0d177099425a71c2410afdec9130d57f9c910770aeb12dd7a13c410782f41f8a0cd24d243534d513b66ec4d93eb09c7e15896716863682eb0 WHIRLPOOL 6b9d03912224808065b3bc301f9ce7b82925293db2916cdeb3184b28c0d58fc034b06dda6b43109b251c942d3b4bebd0c4e6bde7c644630baaece585c35ae6d3 +EBUILD gitlab-ce-9.3.5.ebuild 13625 SHA256 dc6861e35fc5808e65da7c956276c7fd86f705a64c72d97db1feb6a938912497 SHA512 7e2e11e3fe21cadbe490cba14bc1b1dc117239a1293b31befe52d26d98877d22191454f2c36cab150b3adf5f741f7281ce61cdbd26eed44d44c75b1bda703c36 WHIRLPOOL 8851ba2c369a7e36f2b99340f80ff46bba63944fb3e0362ec7161c20a5bbc26ca7c5e7a96660035158758454b558c40faa39ca8490fcf39664a54188bb3f9b08 +EBUILD gitlab-ce-9999.ebuild 13567 SHA256 e95e726378e2a0d973269468e005b8e6acfd98aab8778866bb65edab422cd468 SHA512 7553b727503842ab765e162f587a89ebf5f41d796d66987c21219fbd4168a99a4d8d93c0db60cb867fd49b0151e81ba56088f75572f4219df77a6f127aac5004 WHIRLPOOL 46c304600e438ba8bf03a79f84dcb6e23a32fe96c980db9c70684a065c740276fcf3c0ce0be0ac3714b77cc0f2356ecd92b154215df5a6484b6938979255f993 +MISC ChangeLog 20224 SHA256 d0a532924a67f4db71e659333d4318cb9728e342940232d8f8015753ecde9a40 SHA512 7e385226053afa4b6254f88ab37efdbf749d227965de1edcd9a12eb411b4b50dbd6ef09eee01aed0eb67e37122e46af5c4bbb98d06015fe83281a98a23854b11 WHIRLPOOL 8a2b2419bb904ae023a126bfdcdf5d30e2c465829ef85d56f4fca74da4d5bdbf181a31262a71419501d4791331edaad1a4b8d4e1f4ce7db9fa649e28b4de37d8 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6 diff --git a/www-apps/gitlab-ce/files/02-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 deleted file mode 100644 index b6a6868..0000000 --- a/www-apps/gitlab-ce/files/02-gitlab-ce-8.11.0-fix-redis-config-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config/mail_room.yml b/config/mail_room.yml -index c639f82..860e78d 100644 ---- a/config/mail_room.yml -+++ b/config/mail_room.yml -@@ -3,7 +3,7 @@ - # - :mailboxes: - <% -- require_relative "lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) -+ require_relative "/opt/gitlab/lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) - config = Gitlab::MailRoom.config - - if Gitlab::MailRoom.enabled? diff --git a/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch b/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch deleted file mode 100644 index 023641e..0000000 --- a/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/config/database.yml.mysql b/config/database.yml.mysql -index d970287..a3b5ecc 100644 ---- a/config/database.yml.mysql -+++ b/config/database.yml.mysql -@@ -6,37 +6,9 @@ production: - encoding: utf8mb4 - collation: utf8mb4_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: utf8mb4 -- collation: utf8mb4_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: utf8mb4 -- collation: utf8mb4_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-9.3.0-fix-check-task.patch b/www-apps/gitlab-ce/files/04-gitlab-ce-9.3.0-fix-check-task.patch new file mode 100644 index 0000000..bea733b --- /dev/null +++ b/www-apps/gitlab-ce/files/04-gitlab-ce-9.3.0-fix-check-task.patch @@ -0,0 +1,27 @@ +diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake +index 63c5e9b..2ffa8ed 100644 +--- a/lib/tasks/gitlab/check.rake ++++ b/lib/tasks/gitlab/check.rake +@@ -28,7 +28,7 @@ namespace :gitlab do + SystemCheck::App::UploadsPathPermissionCheck, + SystemCheck::App::UploadsPathTmpPermissionCheck, + SystemCheck::App::InitScriptExistsCheck, +- SystemCheck::App::InitScriptUpToDateCheck, ++ # SystemCheck::App::InitScriptUpToDateCheck, Gentoo uses a different init script + SystemCheck::App::ProjectsHaveNamespaceCheck, + SystemCheck::App::RedisVersionCheck, + SystemCheck::App::RubyVersionCheck, +@@ -272,13 +272,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 deleted file mode 100644 index 84f714f..0000000 --- a/www-apps/gitlab-ce/files/05-gitlab-ce-8.12.7-replace-sys-filesystem.patch +++ /dev/null @@ -1,77 +0,0 @@ -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/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch b/www-apps/gitlab-ce/files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch deleted file mode 100644 index 3a507b4..0000000 --- a/www-apps/gitlab-ce/files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/Gemfile b/Gemfile -index 07ff500..1352dd4 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -350,4 +350,4 @@ gem 'health_check', '~> 2.2.0' - - # System information - gem 'vmstat', '~> 2.3.0' --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..1efb29e 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-9.3.5-sidekiq.init b/www-apps/gitlab-ce/files/gitlab-9.3.5-sidekiq.init new file mode 100644 index 0000000..f399a1f --- /dev/null +++ b/www-apps/gitlab-ce/files/gitlab-9.3.5-sidekiq.init @@ -0,0 +1,64 @@ +#!/sbin/openrc-run + +extra_started_commands="check" + +name="GitLab Sidekiq" +description="Sidekiq for GitLab" +description_check="Runs sanity checks" + +: ${gitlab_user:=@USER@} +: ${gitlab_base:="@GITLAB_BASE@"} +: ${rails_env:=production} + +: ${sidekiq_pidfile:="/run/gitlab/pids/sidekiq.pid"} +: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"} +: ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"} + +sidekiq_command="/usr/bin/bundle" +sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}" + +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}" + +depend() { + need redis gitlab-workhorse + use net +} + +start() { + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")" + + ebegin "Starting ${name} - Sidekiq" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${sidekiq_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${sidekiq_command} -- ${sidekiq_command_args} + eend $? +} + +stop() { + ebegin "Stopping ${name} - Sidekiq" + start-stop-daemon --stop \ + --pidfile=${sidekiq_pidfile} \ + --exec ${sidekiq_command} + eend $? +} + +check() { + ebegin "Running sanity checks for ${name}" + + cd /opt/gitlab + + ${check_command} ${check_command_args1} + + eend $? + + ${check_command} ${check_command_args2} + + eend $? +} diff --git a/www-apps/gitlab-ce/files/gitlab-9.3.5-unicorn.init b/www-apps/gitlab-ce/files/gitlab-9.3.5-unicorn.init new file mode 100644 index 0000000..dea992f --- /dev/null +++ b/www-apps/gitlab-ce/files/gitlab-9.3.5-unicorn.init @@ -0,0 +1,145 @@ +#!/sbin/openrc-run + +extra_started_commands="restartsidekiq check" + +name="GitLab" +description="GitLab on Unicorns" +description_restartsidekiq="Restarts Sidekiq only" +description_check="Runs sanity checks" + +: ${gitlab_user:=@USER@} +: ${gitlab_base:="@GITLAB_BASE@"} +: ${rails_env:=production} + +: ${server_pidfile:="/run/gitlab/pids/unicorn.pid"} + +: ${sidekiq_pidfile:="/run/gitlab/pids/sidekiq.pid"} +: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"} +: ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"} + +: ${mail_room_pidfile:="/run/gitlab/pids/mail_room.pid"} +: ${mail_room_logfile:="@LOGS_DIR@/mail_room.log"} +: ${mail_room_config:="/etc/gitlab/mail_room.yml"} + +socket_dir="/run/gitlab/sockets" + +server_command="/usr/bin/bundle" +server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D" + +sidekiq_command="/usr/bin/bundle" +sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}" + +mail_room_command="/usr/bin/bundle" +mail_room_command_args="exec mail_room -q -c ${mail_room_config} >> ${mail_room_logfile} 2>&1" + +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}" + +depend() { + provide gitlab + need redis gitlab-workhorse gitlab-gitaly + use net +} + +start() { + ebegin "Starting ${name} - Unicorn servers" + + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")" + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")" + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${mail_room_pidfile}")" + checkpath -d -o ${gitlab_user} -m700 "${socket_dir}" + + start-stop-daemon --start \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${server_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${server_command} -- ${server_command_args} + eend $? + + ebegin "Starting ${name} - Sidekiq" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${sidekiq_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${sidekiq_command} -- ${sidekiq_command_args} + eend $? + + if [ -e /etc/default/gitlab ]; then + . /etc/default/gitlab + if [ "${mail_room_enabled}" == "true" ]; then + ebegin "Starting ${name} - mail_room" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${mail_room_pidfile}" -m \ + --env RAILS_ENV=${rails_env} \ + --exec ${mail_room_command} -- ${mail_room_command_args} + eend $? + fi + fi +} + +stop() { + ebegin "Stopping ${name} - mail_room" + start-stop-daemon --stop \ + --signal QUIT \ + --pidfile=${mail_room_pidfile} \ + --exec ${mail_room_command} + eend $? + + ebegin "Stopping ${name} - Sidekiq" + start-stop-daemon --stop \ + --pidfile=${sidekiq_pidfile} \ + --exec ${sidekiq_command} + eend $? + + ebegin "Stopping ${name} - Unicorn servers" + start-stop-daemon --stop \ + --signal QUIT \ + --pidfile=${server_pidfile} \ + --exec ${server_command} + eend $? +} + +restartsidekiq() { + ebegin "Restarting ${name} - Sidekiq: Stopping" + start-stop-daemon --stop \ + --pidfile=${sidekiq_pidfile} \ + --exec ${sidekiq_command} \ + --progress \ + --retry 180 + + eend $? + + ebegin "Starting ${name} - Sidekiq" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${sidekiq_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${sidekiq_command} -- ${sidekiq_command_args} + eend $? +} + +check() { + ebegin "Running sanity checks for ${name}" + + cd /opt/gitlab + + ${check_command} ${check_command_args1} + + eend $? + + ${check_command} ${check_command_args2} + + eend $? +} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.15.8.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.15.8.ebuild deleted file mode 100644 index 4d78549..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.15.8.ebuild +++ /dev/null @@ -1,391 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21 ruby23" - -inherit eutils ruby-ng user systemd - -MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="03782f78e91005a7ce818d6e3225d36143acec62" - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://about.gitlab.com/" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" -RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm ~arm64" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -COMMON_DEPEND=" - ${GEMS_DEPEND} - ~dev-vcs/gitlab-shell-4.1.1 - >=dev-vcs/git-2.8.4 - ~www-servers/gitlab-workhorse-1.2.1 - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" -DEPEND=" - ${CDEPEND} - ${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} - >=dev-db/redis-2.8 - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.13.6" - -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# fix-redis-config-path: -# Point to the absolute location of redis_config.rb -# -RUBY_PATCHES=( - "01-${PN}-8.7.5-fix-sendmail-config.patch" - "02-${PN}-8.11.0-fix-redis-config-path.patch" - "03-${PN}-8.14.0-database.yml.patch" - "04-${PN}-8.12.7-fix-check-task.patch" - "05-${PN}-8.12.7-replace-sys-filesystem.patch" -) - -MY_NAME="gitlab" -MY_USER="git" # should be same as in gitlab-shell - -DEST_DIR="/opt/${MY_NAME}" -CONF_DIR="/etc/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - einfo "Cleaning old gems ..." - ${RUBY} /usr/bin/bundle clean - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-workhorse.service" - systemd_dounit "${FILESDIR}/gitlab-mailroom.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-8.13.3-sidekiq.init - use unicorn && rcscript=gitlab-8.13.3-unicorn.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} -} - -pkg_postinst() { - elog "If this is an update from a previous version, stop your GitLab" - elog "instance and issue the following command to perform all required" - elog "migrations:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" - elog "before running the config phase. Run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" - elog - elog "If this was a fresh install, follow these steps:" - elog - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." - elog - elog "2. Configure your database settings in ${CONF_DIR}/database.yml" - elog " for \"production\" environment." - elog - elog "3. Then you should create a database for your GitLab instance, if you" - elog " haven't done so already." - elog - if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" - elog " Note: You should change your password to something more random..." - elog - fi - elog "4. Finally execute the following command to initialize the environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" - elog "you can't login after the upgrade, be sure to read the section about the" - elog "verification of the CSRF token in GitLab's trouble-shooting guide at" - elog "http://goo.gl/5XGRGv." - if use postgres; then - elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" - elog "`pg_trgm` extension by running the following command as a PostgreSQL" - elog "super user for *every* GitLab database:" - elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" - elog "For details, see the documentation at the GitLab website." - fi -} - -pkg_config() { - einfo "Checking configuration files" - - if [ ! -r "${CONF_DIR}/database.yml" ]; then - eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" - eerror "database settings for \"production\" environment."; die - fi - - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" - local git_home="$(egethome ${MY_USER})" - - # configure Git global settings - if [ ! -e "${git_home}/.gitconfig" ]; then - einfo "Setting git user" - su -l ${MY_USER} -c " - git config --global user.email '${email_from}'; - git config --global user.name 'GitLab'" \ - || die "failed to setup git name and email" - fi - - su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" - - # determine whether this is an update or a fresh install. we do this by - # checking whether the ${DEST_DIR}/.git directory exists or not - # - if [ -d "${DEST_DIR}/.git" ]; then - local update=true - else - local update=false - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - # FIXME: this line existed in older ebuilds, but the variable is - # never used. what was it for!? - # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ "${update}" = 'true' ]; then - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - # create dummy git repo as workaround for - # https://github.com/bundler/bundler/issues/2039 - einfo "Initializing dummy git repository to avoid false errors from bundler" - su -l ${MY_USER} -c " - cd ${DEST_DIR} - git init - git add README.md - git commit -m 'Dummy repository'" >/dev/null - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi - elog - elog "If you want to make sure that the install/upgrade was successful, start" - elog "Gitlab now and then run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" - elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" - elog - if ! use systemd ; then - elog "You may also run" - elog " /etc/init.d/gitlab check" - elog " for convenience." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.16.9.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.16.9.ebuild deleted file mode 100644 index b0fa870..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.16.9.ebuild +++ /dev/null @@ -1,391 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21 ruby23" - -inherit eutils ruby-ng user systemd - -MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="385dbfb50d691a7a7bb94c4fb3a97dd61a0c6e41" - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://about.gitlab.com/" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" -RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm ~arm64" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -COMMON_DEPEND=" - ${GEMS_DEPEND} - ~dev-vcs/gitlab-shell-4.1.1 - >=dev-vcs/git-2.8.4 - ~www-servers/gitlab-workhorse-1.3.0 - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" -DEPEND=" - ${CDEPEND} - ${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} - >=dev-db/redis-2.8 - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.13.7" - -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# fix-redis-config-path: -# Point to the absolute location of redis_config.rb -# -RUBY_PATCHES=( - "01-${PN}-8.7.5-fix-sendmail-config.patch" - "02-${PN}-8.11.0-fix-redis-config-path.patch" - "03-${PN}-8.14.0-database.yml.patch" - "04-${PN}-8.12.7-fix-check-task.patch" - "05-${PN}-8.16.0-replace-sys-filesystem.patch" -) - -MY_NAME="gitlab" -MY_USER="git" # should be same as in gitlab-shell - -DEST_DIR="/opt/${MY_NAME}" -CONF_DIR="/etc/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - einfo "Cleaning old gems ..." - ${RUBY} /usr/bin/bundle clean - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-workhorse.service" - systemd_dounit "${FILESDIR}/gitlab-mailroom.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-8.13.3-sidekiq.init - use unicorn && rcscript=gitlab-8.13.3-unicorn.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} -} - -pkg_postinst() { - elog "If this is an update from a previous version, stop your GitLab" - elog "instance and issue the following command to perform all required" - elog "migrations:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" - elog "before running the config phase. Run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" - elog - elog "If this was a fresh install, follow these steps:" - elog - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." - elog - elog "2. Configure your database settings in ${CONF_DIR}/database.yml" - elog " for \"production\" environment." - elog - elog "3. Then you should create a database for your GitLab instance, if you" - elog " haven't done so already." - elog - if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" - elog " Note: You should change your password to something more random..." - elog - fi - elog "4. Finally execute the following command to initialize the environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" - elog "you can't login after the upgrade, be sure to read the section about the" - elog "verification of the CSRF token in GitLab's trouble-shooting guide at" - elog "http://goo.gl/5XGRGv." - if use postgres; then - elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" - elog "`pg_trgm` extension by running the following command as a PostgreSQL" - elog "super user for *every* GitLab database:" - elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" - elog "For details, see the documentation at the GitLab website." - fi -} - -pkg_config() { - einfo "Checking configuration files" - - if [ ! -r "${CONF_DIR}/database.yml" ]; then - eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" - eerror "database settings for \"production\" environment."; die - fi - - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" - local git_home="$(egethome ${MY_USER})" - - # configure Git global settings - if [ ! -e "${git_home}/.gitconfig" ]; then - einfo "Setting git user" - su -l ${MY_USER} -c " - git config --global user.email '${email_from}'; - git config --global user.name 'GitLab'" \ - || die "failed to setup git name and email" - fi - - su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" - - # determine whether this is an update or a fresh install. we do this by - # checking whether the ${DEST_DIR}/.git directory exists or not - # - if [ -d "${DEST_DIR}/.git" ]; then - local update=true - else - local update=false - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - # FIXME: this line existed in older ebuilds, but the variable is - # never used. what was it for!? - # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ "${update}" = 'true' ]; then - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - # create dummy git repo as workaround for - # https://github.com/bundler/bundler/issues/2039 - einfo "Initializing dummy git repository to avoid false errors from bundler" - su -l ${MY_USER} -c " - cd ${DEST_DIR} - git init - git add README.md - git commit -m 'Dummy repository'" >/dev/null - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi - elog - elog "If you want to make sure that the install/upgrade was successful, start" - elog "Gitlab now and then run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" - elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" - elog - if ! use systemd ; then - elog "You may also run" - elog " /etc/init.d/gitlab check" - elog " for convenience." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.17.6.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.17.6.ebuild deleted file mode 100644 index 63dc25e..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.17.6.ebuild +++ /dev/null @@ -1,420 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21 ruby23" - -inherit eutils ruby-ng user systemd - -MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="7dd5ec18d1b5563061857dc8a332ba42050f3a0e" - -GITLAB_PAGES_VERSION="0.3.2" -GITLAB_SHELL_VERSION="4.1.1" -GITLAB_WORKHORSE_VERSION="1.3.0" - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://about.gitlab.com/" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" -RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm ~arm64" -IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -COMMON_DEPEND=" - ${GEMS_DEPEND} - ~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} - >=dev-vcs/git-2.8.4 - ~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} - >=net-libs/nodejs-4.3.0 - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) - pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )" -DEPEND=" - ${CDEPEND} - ${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} - >=dev-db/redis-2.8 - virtual/mta - systemd? ( sys-apps/systemd:0= )" -# required bundler >= 1.14.2 -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.13.7" - -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# fix-redis-config-path: -# Point to the absolute location of redis_config.rb -# -RUBY_PATCHES=( - "01-${PN}-8.7.5-fix-sendmail-config.patch" - "02-${PN}-8.11.0-fix-redis-config-path.patch" - "03-${PN}-8.17.0-database.yml.patch" - "04-${PN}-8.12.7-fix-check-task.patch" - "05-${PN}-8.16.0-replace-sys-filesystem.patch" - "06-${PN}-8.17.0-fix-webpack-config.patch" -) - -MY_NAME="gitlab" -MY_USER="git" # should be same as in gitlab-shell - -DEST_DIR="/opt/${MY_NAME}" -CONF_DIR="/etc/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - einfo "Cleaning old gems ..." - ${RUBY} /usr/bin/bundle clean - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-workhorse.service" - systemd_dounit "${FILESDIR}/gitlab-mailroom.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-8.13.3-sidekiq.init - use unicorn && rcscript=gitlab-8.13.3-unicorn.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} -} - -pkg_postinst() { - elog "If this is an update from a previous version, stop your GitLab" - elog "instance and issue the following command to perform all required" - elog "migrations:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" - elog "before running the config phase. Run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" - elog - elog "If this was a fresh install, follow these steps:" - elog - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." - elog - elog "2. Configure your database settings in ${CONF_DIR}/database.yml" - elog " for \"production\" environment." - elog - elog "3. Then you should create a database for your GitLab instance, if you" - elog " haven't done so already." - elog - if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" - elog " Note: You should change your password to something more random..." - elog - fi - elog "4. Finally execute the following command to initialize the environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" - elog "you can't login after the upgrade, be sure to read the section about the" - elog "verification of the CSRF token in GitLab's trouble-shooting guide at" - elog "http://goo.gl/5XGRGv." - if use postgres; then - elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" - elog "`pg_trgm` extension by running the following command as a PostgreSQL" - elog "super user for *every* GitLab database:" - elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" - elog "For details, see the documentation at the GitLab website." - fi -} - -pkg_config() { - einfo "Checking configuration files" - - if [ ! -r "${CONF_DIR}/database.yml" ]; then - eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" - eerror "database settings for \"production\" environment."; die - fi - - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" - local git_home="$(egethome ${MY_USER})" - - # configure Git global settings - if [ ! -e "${git_home}/.gitconfig" ]; then - einfo "Setting git user" - su -l ${MY_USER} -c " - git config --global user.email '${email_from}'; - git config --global user.name 'GitLab'" \ - || die "failed to setup git name and email" - fi - - su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" - - # determine whether this is an update or a fresh install. we do this by - # checking whether the ${DEST_DIR}/.git directory exists or not - # - if [ -d "${DEST_DIR}/.git" ]; then - local update=true - else - local update=false - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - # FIXME: this line existed in older ebuilds, but the variable is - # never used. what was it for!? - # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ "${update}" = 'true' ]; then - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Installing npm modules ..." - exec_npm install - - einfo "Cleaning old precompiled assets ..." - exec_rake gitlab:assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - # create dummy git repo as workaround for - # https://github.com/bundler/bundler/issues/2039 - einfo "Initializing dummy git repository to avoid false errors from bundler" - su -l ${MY_USER} -c " - cd ${DEST_DIR} - git init - git add README.md - git commit -m 'Dummy repository'" >/dev/null - - einfo "Initializing database ..." - exec_rake gitlab:setup - - einfo "Installing npm modules ..." - exec_npm install - fi - - einfo "Precompiling assests ..." - exec_rake gitlab:assets:compile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - if use mysql ; then - ewarn "PLEASE also read this document about needed migrations on MySQL:" - ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" - fi - fi - elog - elog "If you want to make sure that the install/upgrade was successful, start" - elog "Gitlab now and then run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" - elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" - elog - if ! use systemd ; then - elog "You may also run" - elog " /etc/init.d/gitlab check" - elog " for convenience." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV} NODE_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} - -exec_npm() { - local command="npm $@ --${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules - cd ${DEST_DIR} - ${command}" \ - || die "failed to run npm $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.7.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild similarity index 99% rename from www-apps/gitlab-ce/gitlab-ce-9.0.7.ebuild rename to www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild index 6d1c2f0..c6a7337 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9.0.7.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild @@ -16,7 +16,7 @@ USE_RUBY="ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="810cc51be37e03ebbe99711a53663956e4ffde8c" +MY_GIT_COMMIT="c538b4ff8ead7ab2a24faf2bafce0c93a32c8ec8" GITALY_VERSION="0.3.0" GITLAB_PAGES_VERSION="0.4.0" @@ -66,7 +66,7 @@ COMMON_DEPEND=" kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) - gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )" + gitaly? ( ~www-servers/gitlab-gitaly-${GITALY_VERSION} )" DEPEND=" ${CDEPEND} ${COMMON_DEPEND}" diff --git a/www-apps/gitlab-ce/gitlab-ce-9.1.4-r1.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild similarity index 99% rename from www-apps/gitlab-ce/gitlab-ce-9.1.4-r1.ebuild rename to www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild index c20faf0..d751da2 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9.1.4-r1.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild @@ -16,7 +16,7 @@ USE_RUBY="ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="fed799ae87ba5a95cf46d8426e96ad621940d0a7" +MY_GIT_COMMIT="92faf2ad098697a28f56cb5881e3351498a838bf" # Gitaly is optional in Gitlab 9.1, and it is not yet supported by this # ebuild. But the version declaration is already here. @@ -68,7 +68,7 @@ COMMON_DEPEND=" kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) - gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )" + gitaly? ( ~www-servers/gitlab-gitaly-${GITALY_VERSION} )" DEPEND=" ${CDEPEND} ${COMMON_DEPEND}" diff --git a/www-apps/gitlab-ce/gitlab-ce-9.2.2.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild similarity index 99% rename from www-apps/gitlab-ce/gitlab-ce-9.2.2.ebuild rename to www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild index 30fba84..f127e5b 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9.2.2.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild @@ -16,7 +16,7 @@ USE_RUBY="ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="cbde95c281af5cdd6b4dee3bdb1bdb360eb71d2c" +MY_GIT_COMMIT="84feda4bbe8b6990927bb44435f181be4344c846" # Gitaly is optional in Gitlab 9.2, and it is not yet supported by this # ebuild. But the version declaration is already here. @@ -68,7 +68,7 @@ COMMON_DEPEND=" kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) - gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )" + gitaly? ( ~www-servers/gitlab-gitaly-${GITALY_VERSION} )" DEPEND=" ${CDEPEND} ${COMMON_DEPEND}" diff --git a/www-apps/gitlab-ce/gitlab-ce-9.2.0_rc7.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild similarity index 96% rename from www-apps/gitlab-ce/gitlab-ce-9.2.0_rc7.ebuild rename to www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild index f46d37d..850fd04 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9.2.0_rc7.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild @@ -16,13 +16,11 @@ USE_RUBY="ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="add9abadbdfac7e4c03b06b47d3afc296e00ac97" +MY_GIT_COMMIT="fcd47b1a510a0dd78e9f8435191a0c7ddbf59755" -# Gitaly is optional in Gitlab 9.2, and it is not yet supported by this -# ebuild. But the version declaration is already here. -GITALY_VERSION="0.10.0" -GITLAB_PAGES_VERSION="0.4.2" -GITLAB_SHELL_VERSION="5.0.3" +GITALY_VERSION="0.11.0" +GITLAB_PAGES_VERSION="0.4.3" +GITLAB_SHELL_VERSION="5.0.5" GITLAB_WORKHORSE_VERSION="2.0.0" DESCRIPTION="GitLab is a free project and repository management application" @@ -35,7 +33,7 @@ RESTRICT="mirror" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="kerberos mysql +postgres +unicorn systemd pages -gitaly rugged_use_system_libraries" +IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries" ## Gems dependencies: # charlock_holmes dev-libs/icu @@ -68,7 +66,7 @@ COMMON_DEPEND=" kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) - gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )" + ~www-servers/gitlab-gitaly-${GITALY_VERSION}" DEPEND=" ${CDEPEND} ${COMMON_DEPEND}" @@ -92,7 +90,7 @@ RUBY_PATCHES=( "01-${PN}-8.7.5-fix-sendmail-config.patch" "02-${PN}-9.0.0-fix-redis-config-path.patch" "03-${PN}-9.2.2-database.yml.patch" - "04-${PN}-8.12.7-fix-check-task.patch" + "04-${PN}-9.3.0-fix-check-task.patch" "05-${PN}-9.0.0-replace-sys-filesystem.patch" "06-${PN}-8.17.0-fix-webpack-config.patch" ) diff --git a/www-apps/gitlab-ce/gitlab-ce-9.3.5.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.3.5.ebuild new file mode 100644 index 0000000..41efcf5 --- /dev/null +++ b/www-apps/gitlab-ce/gitlab-ce-9.3.5.ebuild @@ -0,0 +1,433 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Maintainer notes: +# - This ebuild uses Bundler to download and install all gems in deployment mode +# (i.e. into isolated directory inside application). That's not Gentoo way how +# it should be done, but GitLab has too many dependencies that it will be too +# difficult to maintain them via ebuilds. +# + +USE_RUBY="ruby23" + +inherit eutils ruby-ng user systemd + +MY_PV="v${PV/_/-}" +MY_GIT_COMMIT="0c9ceb3fd6094077cc5068970dedd4435db80000" + +GITALY_VERSION="0.11.2" +GITLAB_PAGES_VERSION="0.4.3" +GITLAB_SHELL_VERSION="5.1.1" +GITLAB_WORKHORSE_VERSION="2.1.1" + +DESCRIPTION="GitLab is a free project and repository management application" +HOMEPAGE="https://about.gitlab.com/" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" +RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" + +RESTRICT="mirror" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm64" +IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries" + +## Gems dependencies: +# charlock_holmes dev-libs/icu +# grape, capybara dev-libs/libxml2, dev-libs/libxslt +# rugged dev-util/cmake, virtual/pkgconfig +# json dev-util/ragel +# pygments.rb python 2.7+ +# execjs net-libs/nodejs, or any other JS runtime +# pg dev-db/postgresql +# mysql virtual/mysql +# +GEMS_DEPEND=" + dev-libs/icu + dev-libs/libxml2 + dev-libs/libxslt + dev-util/ragel + >=net-libs/nodejs-4.3.0 + >=sys-apps/yarn-0.17.0 + postgres? ( >=dev-db/postgresql-9.1:* ) + mysql? ( virtual/mysql ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake + virtual/pkgconfig" +COMMON_DEPEND=" + ${GEMS_DEPEND} + ~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} + >=dev-vcs/git-2.8.4 + ~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} + kerberos? ( !app-crypt/heimdal ) + rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) + pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) + ~www-servers/gitlab-gitaly-${GITALY_VERSION}" +DEPEND=" + ${CDEPEND} + ${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + >=dev-db/redis-2.8 + virtual/mta + systemd? ( sys-apps/systemd:0= )" +# required bundler >= 1.15.0 +ruby_add_bdepend " + virtual/rubygems + >=dev-ruby/bundler-1.13.7" + +# +# fix-sendmail-config: +# Fix default settings to work with ssmtp that doesn't know '-t' argument. +# fix-redis-config-path: +# Point to the absolute location of redis_config.rb +# +RUBY_PATCHES=( + "01-${PN}-8.7.5-fix-sendmail-config.patch" + "02-${PN}-9.0.0-fix-redis-config-path.patch" + "03-${PN}-9.2.2-database.yml.patch" + "04-${PN}-9.3.0-fix-check-task.patch" + "05-${PN}-9.0.0-replace-sys-filesystem.patch" + "06-${PN}-8.17.0-fix-webpack-config.patch" +) + +MY_NAME="gitlab" +MY_USER="git" # should be same as in gitlab-shell + +DEST_DIR="/opt/${MY_NAME}" +CONF_DIR="/etc/${MY_NAME}" +LOGS_DIR="/var/log/${MY_NAME}" +TEMP_DIR="/var/tmp/${MY_NAME}" + +all_ruby_prepare() { + # fix paths + local satellites_path="${TEMP_DIR}/repo_satellites" + local repos_path=/var/lib/git/repositories + local shell_path=/usr/share/gitlab-shell + local run_path=/run/${MY_NAME} + + sed -i -E \ + -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ + -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ + -e "/path: \\/home\\/git\\/repositories\\/$/ s|/home/git/repositories/|/var/lib/git/repositories/|" \ + -e "/gitaly_address:/ s|/home/git/gitlab/tmp/sockets/private/|${run_path}/sockets/|" \ + config/gitlab.yml.example || die "failed to filter gitlab.yml.example" + + sed -i -E \ + -e "s|/home/git/gitlab/tmp|${run_path}|g" \ + -e "s|/home/git/gitlab/log|${LOGS_DIR}|g" \ + -e "s|/home/git/gitlab|${DEST_DIR}|g" \ + config/unicorn.rb.example || die "failed to filter unicorn.rb.example" + + sed -i \ + -e "s|/home/git/gitlab/tmp|${run_path}|g" \ + lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" + + # modify default database settings for PostgreSQL + sed -i -E \ + -e 's|(username:).*|\1 gitlab|' \ + -e 's|(password:).*|\1 gitlab|' \ + -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ + config/database.yml.postgresql \ + || die "failed to filter database.yml.postgresql" + + # rename config files + mv config/gitlab.yml.example config/gitlab.yml + mv config/unicorn.rb.example config/unicorn.rb + + local dbconf=config/database.yml + if use postgres && ! use mysql; then + mv ${dbconf}.postgresql ${dbconf} + rm ${dbconf}.mysql + elif use mysql && ! use postgres; then + mv ${dbconf}.mysql ${dbconf} + rm ${dbconf}.postgresql + fi + + # remove useless files + rm -r lib/support/{deploy,init.d} + use unicorn || rm config/unicorn.rb +} + +all_ruby_install() { + local dest=${DEST_DIR} + local conf=${CONF_DIR} + local logs=${LOGS_DIR} + local temp=${TEMP_DIR} + + # prepare directories + diropts -m750 + dodir ${logs} ${temp} + + diropts -m755 + dodir ${conf} ${dest}/public/uploads + + dosym ${temp} ${dest}/tmp + dosym ${logs} ${dest}/log + + # install configs + insinto ${conf} + doins -r config/* + dosym ${conf} ${dest}/config + + echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" + + # remove needless dirs + rm -Rf config tmp log + + # install the rest files + # using cp 'cause doins is slow + cp -Rl * "${D}/${dest}"/ + cp -Rl .??* "${D}/${dest}"/ + + # install logrotate config + dodir /etc/logrotate.d + cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF + ${logs}/*.log { + missingok + delaycompress + compress + copytruncate + } + EOF + + ## Install gems via bundler ## + + cd "${D}/${dest}" + + local without="development test aws" + local flag; for flag in mysql postgres unicorn kerberos; do + without+="$(use $flag || echo ' '$flag)" + done + local bundle_args="--deployment ${without:+--without ${without}}" + + use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" + + einfo "Running bundle install ${bundle_args} ..." + ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" + + einfo "Cleaning old gems ..." + ${RUBY} /usr/bin/bundle clean + + # clean gems cache + rm -Rf vendor/bundle/ruby/*/cache + rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git + + ## RC script ## + + if use systemd ; then + ewarn "Beware: systemd support has not been tested, use at your own risk!" + systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" + systemd_dounit "${FILESDIR}/gitlab-unicorn.service" + systemd_dounit "${FILESDIR}/gitlab-workhorse.service" + systemd_dounit "${FILESDIR}/gitlab-mailroom.service" + systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" + else + local rcscript=gitlab-9.3.5-sidekiq.init + use unicorn && rcscript=gitlab-9.3.5-unicorn.init + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|g" \ + -e "s|@GITLAB_BASE@|${dest}|g" \ + -e "s|@LOGS_DIR@|${logs}|g" \ + "${T}/${rcscript}" \ + || die "failed to filter ${rcscript}" + + newinitd "${T}/${rcscript}" "${MY_NAME}" + fi + + # fix permissions + fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} +} + +pkg_postinst() { + elog "If this is an update from a previous version, stop your GitLab" + elog "instance and issue the following command to perform all required" + elog "migrations:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" + elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" + elog "before running the config phase. Run these commands (as root):" + elog + elog " cd /opt/gitlab" + elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" + elog + elog "If this was a fresh install, follow these steps:" + elog + elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." + elog + elog "2. Configure your database settings in ${CONF_DIR}/database.yml" + elog " for \"production\" environment." + elog + elog "3. Then you should create a database for your GitLab instance, if you" + elog " haven't done so already." + elog + if use postgres; then + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab gitlabhq_production" + elog " Note: You should change your password to something more random..." + elog + fi + elog "4. Finally execute the following command to initialize the environment:" + elog " emerge --config \"=${CATEGORY}/${PF}\"" + elog " Note: Do not forget to start Redis server first!" + elog + elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" + elog "you can't login after the upgrade, be sure to read the section about the" + elog "verification of the CSRF token in GitLab's trouble-shooting guide at" + elog "http://goo.gl/5XGRGv." + if use postgres; then + elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" + elog "`pg_trgm` extension by running the following command as a PostgreSQL" + elog "super user for *every* GitLab database:" + elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" + elog "For details, see the documentation at the GitLab website." + fi + if use mysql ; then + ewarn "You must grant the GitLab user permissions the following on the database:" + ewarn " mysql -u root -p -e \\" + ewarn " \"GRANT TRIGGER ON \`gitlab\`.* TO 'gitlab'@'localhost';\"" + ewarn "PLEASE also read this document about needed migrations on MySQL:" + ewarn + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + ewarn + ewarn "Failing to follow those instructions may make the config phase fail!" + fi +} + +pkg_config() { + einfo "Checking configuration files" + + if [ ! -r "${CONF_DIR}/database.yml" ]; then + eerror "Copy ${CONF_DIR}/database.yml.* to" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "database settings for \"production\" environment." + die + fi + + local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" + local git_home="$(egethome ${MY_USER})" + + # configure Git global settings + if [ ! -e "${git_home}/.gitconfig" ]; then + einfo "Setting git user" + su -l ${MY_USER} -c " + git config --global user.email '${email_from}'; + git config --global user.name 'GitLab'" \ + || die "failed to setup git name and email" + fi + + su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" + + # determine whether this is an update or a fresh install. we do this by + # checking whether the ${DEST_DIR}/.git directory exists or not + # + if [ -d "${DEST_DIR}/.git" ]; then + local update=true + else + local update=false + fi + + if use mysql ; then + ewarn "Please only proceed if you've read and understood the following page:" + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + if [ "${update}" = 'true' ]; then + ewarn "Failing to follow those instructions may cause the upgrade to fail" + fi + ewarn + ewarn "Press any key to continue, or abort with Ctrl+C" + read + fi + + ## Initialize app ## + + local RAILS_ENV="production" + local RUBY=${RUBY:-/usr/bin/ruby} + local BUNDLE="${RUBY} /usr/bin/bundle" + + # FIXME: this line existed in older ebuilds, but the variable is + # never used. what was it for!? + # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" + + if [ "${update}" = 'true' ]; then + einfo "Migrating database ..." + exec_rake db:migrate + + # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 + einfo "Migrating iids ..." + exec_rake migrate_iids + + einfo "Installing npm modules ..." + exec_rake yarn:install + + einfo "Cleaning old precompiled assets ..." + exec_rake gitlab:assets:clean + + einfo "Cleaning cache ..." + exec_rake cache:clear + else + # create dummy git repo as workaround for + # https://github.com/bundler/bundler/issues/2039 + einfo "Initializing dummy git repository to avoid false errors from bundler" + su -l ${MY_USER} -c " + cd ${DEST_DIR} + git init + git add README.md + git commit -m 'Dummy repository'" >/dev/null + + einfo "Initializing database ..." + exec_rake gitlab:setup + + einfo "Installing npm modules ..." + exec_rake yarn:install + fi + + einfo "Precompiling assests ..." + exec_rake gitlab:assets:compile + + if [ "${update}" = 'true' ]; then + ewarn + ewarn "This configuration script runs only common migration tasks." + ewarn "Please read guides on" + ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" + ewarn "for any additional migration tasks specific to your previous GitLab" + ewarn "version." + fi + elog + elog "If you want to make sure that the install/upgrade was successful, start" + elog "Gitlab now and then run these commands (as root):" + elog + elog " cd /opt/gitlab" + elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" + elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" + elog + if ! use systemd ; then + elog "You may also run" + elog " /etc/init.d/gitlab check" + elog " for convenience." + fi +} + +ryaml() { + ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" +} + +exec_rake() { + local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV} NODE_ENV=${RAILS_ENV}" + + echo " ${command}" + su -l ${MY_USER} -c " + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules + cd ${DEST_DIR} + ${command}" \ + || die "failed to run rake $@" +} diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index a7ccf4e..6347e9c 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -19,12 +19,10 @@ EGIT_REPO_URI="https://gitlab.com/gitlab-org/${PN}.git" EGIT_BRANCH="master" EGIT_CHECKOUT_DIR="${WORKDIR}/all" -# Gitaly is optional in Gitlab as of yet, and it is not yet supported by -# this ebuild. But the version declaration is already here. -GITALY_VERSION="0.10.0" -GITLAB_PAGES_VERSION="0.4.2" -GITLAB_SHELL_VERSION="5.0.4" -GITLAB_WORKHORSE_VERSION="2.0.0" +GITALY_VERSION="0.16.0" +GITLAB_PAGES_VERSION="0.5.0" +GITLAB_SHELL_VERSION="5.1.1" +GITLAB_WORKHORSE_VERSION="2.3.0" DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" @@ -34,7 +32,7 @@ RESTRICT="mirror" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="kerberos mysql +postgres +unicorn systemd pages -gitaly rugged_use_system_libraries" +IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries" ## Gems dependencies: # charlock_holmes dev-libs/icu @@ -67,7 +65,7 @@ COMMON_DEPEND=" kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 ) pages? ( >=www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) - gitaly? ( >=www-servers/gitaly-${GITALY_VERSION} )" + >=www-servers/gitlab-gitaly-${GITALY_VERSION}" DEPEND=" ${CDEPEND} ${COMMON_DEPEND}" @@ -76,7 +74,7 @@ RDEPEND=" >=dev-db/redis-2.8 virtual/mta systemd? ( sys-apps/systemd:0= )" -# required bundler >= 1.14.2 +# required bundler >= 1.15.0 ruby_add_bdepend " virtual/rubygems >=dev-ruby/bundler-1.13.7" @@ -91,7 +89,7 @@ RUBY_PATCHES=( "01-${PN}-8.7.5-fix-sendmail-config.patch" "02-${PN}-9.0.0-fix-redis-config-path.patch" "03-${PN}-9.2.2-database.yml.patch" - "04-${PN}-8.12.7-fix-check-task.patch" + "04-${PN}-9.3.0-fix-check-task.patch" "05-${PN}-9.0.0-replace-sys-filesystem.patch" "06-${PN}-8.17.0-fix-webpack-config.patch" ) @@ -114,22 +112,25 @@ all_ruby_prepare() { local satellites_path="${TEMP_DIR}/repo_satellites" local repos_path=/var/lib/git/repositories local shell_path=/usr/share/gitlab-shell + local run_path=/run/${MY_NAME} + sed -i -E \ -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ + -e "/path: \\/home\\/git\\/repositories\\/$/ s|/home/git/repositories/|/var/lib/git/repositories/|" \ + -e "/gitaly_address:/ s|/home/git/gitlab/tmp/sockets/private/|${run_path}/sockets/|" \ config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - local run_path=/run/${MY_NAME} sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ + -e "s|/home/git/gitlab/tmp|${run_path}|g" \ + -e "s|/home/git/gitlab/log|${LOGS_DIR}|g" \ + -e "s|/home/git/gitlab|${DEST_DIR}|g" \ config/unicorn.rb.example || die "failed to filter unicorn.rb.example" sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ + -e "s|/home/git/gitlab/tmp|${run_path}|g" \ lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" # modify default database settings for PostgreSQL @@ -232,14 +233,14 @@ all_ruby_install() { systemd_dounit "${FILESDIR}/gitlab-mailroom.service" systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" else - local rcscript=gitlab-8.13.3-sidekiq.init - use unicorn && rcscript=gitlab-8.13.3-unicorn.init + local rcscript=gitlab-9.3.5-sidekiq.init + use unicorn && rcscript=gitlab-9.3.5-unicorn.init cp "${FILESDIR}/${rcscript}" "${T}" || die sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ + -e "s|@USER@|${MY_USER}|g" \ + -e "s|@GITLAB_BASE@|${dest}|g" \ + -e "s|@LOGS_DIR@|${logs}|g" \ "${T}/${rcscript}" \ || die "failed to filter ${rcscript}" @@ -296,8 +297,13 @@ pkg_postinst() { elog "For details, see the documentation at the GitLab website." fi if use mysql ; then + ewarn "You must grant the GitLab user permissions the following on the database:" + ewarn " mysql -u root -p -e \\" + ewarn " \"GRANT TRIGGER ON \`gitlab\`.* TO 'gitlab'@'localhost';\"" ewarn "PLEASE also read this document about needed migrations on MySQL:" + ewarn ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + ewarn ewarn "Failing to follow those instructions may make the config phase fail!" fi } @@ -308,7 +314,8 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" - eerror "database settings for \"production\" environment."; die + eerror "database settings for \"production\" environment." + die fi local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" @@ -334,6 +341,17 @@ pkg_config() { local update=false fi + if use mysql ; then + ewarn "Please only proceed if you've read and understood the following page:" + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + if [ "${update}" = 'true' ]; then + ewarn "Failing to follow those instructions may cause the upgrade to fail" + fi + ewarn + ewarn "Press any key to continue, or abort with Ctrl+C" + read + fi + ## Initialize app ## local RAILS_ENV="production" diff --git a/www-servers/gitaly/ChangeLog b/www-servers/gitaly/ChangeLog deleted file mode 100644 index 8b9ab32..0000000 --- a/www-servers/gitaly/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -*gitaly-0.3.0 (29 Mar 2017) - - 29 Mar 2017; Manuel Friedli +gitaly-0.3.0.ebuild, - +metadata.xml: - www-servers/gitaly: Added dummy-ebuild for gitaly-0.3.0. This will not build, - but instead just show an error message upon installation. It is a mere - placeholder for the future. It is needed so that the gitaly USE-flag could be - added to the gitlab-ce-9.0.1 ebuild. diff --git a/www-servers/gitaly/Manifest b/www-servers/gitaly/Manifest deleted file mode 100644 index ae31b80..0000000 --- a/www-servers/gitaly/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -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.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 -MISC ChangeLog 392 SHA256 c85d6fb8a93d47762d1a6279f7523138234a5951a71700a0abb5bd6c69405704 SHA512 ff7a8dc6e0457f88e22c93ae062fb7c4da834cf679e0742f276465060164dbb510573b55bab7471ae851e5380cc60fece093ef973d4c0da4413ce0f8f3c99263 WHIRLPOOL d3b4cf6e3182e5be74aa8689b2ea5b3baf53bbf2ff2ad56bc60429d89627aad8d148877c285cc1ed0e8960ad5e02344901c3554e7e78c2e2a3a1fca9c5533825 -MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-gitaly/ChangeLog b/www-servers/gitlab-gitaly/ChangeLog new file mode 100644 index 0000000..fc6ef95 --- /dev/null +++ b/www-servers/gitlab-gitaly/ChangeLog @@ -0,0 +1,42 @@ +*gitlab-gitaly-0.16.0 (09 Jul 2017) + + 09 Jul 2017; Manuel Friedli +gitlab-gitaly-0.16.0.ebuild: + www-servers/gitlab-gitaly: Add ebuild for gitlab-gitaly-0.16.0 + + 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. + +*gitlab-gitaly-0.11.2-r1 (08 Jul 2017) + + 08 Jul 2017; Manuel Friedli + +files/gitlab-gitaly-0.11.2-r1.init, +gitlab-gitaly-0.11.2-r1.ebuild, + -gitlab-gitaly-0.11.2.ebuild: + www-servers/gitlab-gitaly: Fix bug in checkpath in init script + + 08 Jul 2017; Manuel Friedli -gitaly-0.10.0-r1.ebuild, + gitaly-0.11.2.ebuild: + www-servers/gitaly: Add ebuid for gitaly-0.11.2 + +*gitaly-0.11.0 (17 Jun 2017) +*gitaly-0.11.2 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli +gitaly-0.11.0.ebuild, + +gitaly-0.11.2.ebuild: + www-servers/gitaly: Add versions 0.11.0 and 0.11.2 + +*gitaly-0.3.0 (29 Mar 2017) + + 29 Mar 2017; Manuel Friedli +gitaly-0.3.0.ebuild, + +metadata.xml: + www-servers/gitaly: Added dummy-ebuild for gitaly-0.3.0. This will not build, + but instead just show an error message upon installation. It is a mere + placeholder for the future. It is needed so that the gitaly USE-flag could be + added to the gitlab-ce-9.0.1 ebuild. diff --git a/www-servers/gitlab-gitaly/Manifest b/www-servers/gitlab-gitaly/Manifest new file mode 100644 index 0000000..9c3fe2e --- /dev/null +++ b/www-servers/gitlab-gitaly/Manifest @@ -0,0 +1,19 @@ +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.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 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059 +EBUILD gitlab-gitaly-0.16.0.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 1730 SHA256 c12ce313e917e3b58a7f319fb372fad1fe166e2a6a6bf6f19c57d837c6bf0b58 SHA512 ed07d9198bf9311efd1cd359a83c1dc2767efd464839a4f84f48f90047e474cc6e3bc0f1f12b40cb894ffc480dff7ed066140eb67a8c5943aeb387f16ee0b21d WHIRLPOOL 71fd8e729c3edc7330638f3396bb40e3c6d1fb8cea903899133193649c7f96df24301b5266baf1fc66a724e9b9459a72dcfe9ab3daa5a3516ef9fc73b5025781 +MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.10.0-fix-Makefile.patch b/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.10.0-fix-Makefile.patch new file mode 100644 index 0000000..9ca129f --- /dev/null +++ b/www-servers/gitlab-gitaly/files/0001-gitlab-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/gitlab-gitaly/files/0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch new file mode 100644 index 0000000..fab79f9 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/0002-gitlab-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/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.10.0.conf b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.conf new file mode 100644 index 0000000..647272d --- /dev/null +++ b/www-servers/gitlab-gitaly/files/gitlab-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/gitlab-gitaly/files/gitlab-gitaly-0.10.0.init b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.init new file mode 100644 index 0000000..5e107a3 --- /dev/null +++ b/www-servers/gitlab-gitaly/files/gitlab-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/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.init b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.init new file mode 100644 index 0000000..0f82d6a --- /dev/null +++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2.init @@ -0,0 +1,19 @@ +#!/sbin/openrc-run + +start() { + ebegin "Starting gitlab-gitaly" + + checkpath -f -m 640 -o ${RUNAS_USER}:${RUNAS_GROUP} ${LOGFILE} + [ -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}" \ + -- ${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.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild similarity index 92% rename from www-servers/gitaly/gitaly-0.10.0.ebuild rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild index c798874..2079356 100644 --- a/www-servers/gitaly/gitaly-0.10.0.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild @@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." +MY_PN="gitaly" MY_PV="v${PV/_/-}" MY_GIT_HASH="661135a" DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" +SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" KEYWORDS="~amd64 ~x86 ~arm ~arm64" LICENSE="MIT" diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.0.ebuild new file mode 100644 index 0000000..f576735 --- /dev/null +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils golang-build golang-vcs-snapshot user + +EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." + +MY_PN="gitaly" +MY_PV="v${PV/_/-}" +MY_GIT_HASH="c8bc0ce" + +DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching." +HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" +SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" + +KEYWORDS="~amd64 ~x86 ~arm ~arm64" +LICENSE="MIT" +SLOT="0/${PVR}" + +DEPEND=">=dev-lang/go-1.8.3" + +RESTRICT="test mirror" + +#MY_USER="gitlab_pages" + +pkg_setup() { + eerror "This ebuild is but a dummy placeholder. Gitaly is not yet supported." + die "Gitaly is not yet supported." +} + +#pkg_setup() { +# enewgroup ${MY_USER} +# enewuser ${MY_USER} -1 -1 -1 ${MY_USER} +#} + +#src_prepare() { +# epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch" +# +# sed -i -E \ +# -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ +# src/gitlab.com/gitlab-org/${PN}/Makefile +# +# eapply_user +#} + +#src_compile() { +# emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all +#} + +#src_install() { +# golang-build_src_install +# dobin bin/* +# dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG +# +# # rc script +# local rcscript="${PN}-0.3.2.init" +# +# cp "${FILESDIR}/${rcscript}" "${T}" || die +# sed -i \ +# -e "s|@USER@|${MY_USER}|g" \ +# "${T}/${rcscript}" \ +# || die "failed to filter ${rcscript}" +# +# newinitd "${T}/${rcscript}" "${PN}" +# newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}" +#} 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 new file mode 100644 index 0000000..f5b3267 --- /dev/null +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-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.8.3" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.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.11.2.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.11.2.init" "gitlab-gitaly" + into "/usr" + newbin "gitaly" "gitlab-gitaly" +} diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.16.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.16.0.ebuild new file mode 100644 index 0000000..f5b3267 --- /dev/null +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.16.0.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.8.3" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.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.11.2.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.11.2.init" "gitlab-gitaly" + into "/usr" + newbin "gitaly" "gitlab-gitaly" +} diff --git a/www-servers/gitaly/gitaly-0.3.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild similarity index 92% rename from www-servers/gitaly/gitaly-0.3.0.ebuild rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild index 5cce79d..16f383a 100644 --- a/www-servers/gitaly/gitaly-0.3.0.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild @@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." +MY_PN="gitaly" MY_PV="v${PV/_/-}" MY_GIT_HASH="fdcb2c9" DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" +SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" KEYWORDS="~amd64 ~x86 ~arm ~arm64" LICENSE="MIT" diff --git a/www-servers/gitaly/gitaly-0.6.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild similarity index 92% rename from www-servers/gitaly/gitaly-0.6.0.ebuild rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild index c798874..2079356 100644 --- a/www-servers/gitaly/gitaly-0.6.0.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild @@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." +MY_PN="gitaly" MY_PV="v${PV/_/-}" MY_GIT_HASH="661135a" DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" +SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" KEYWORDS="~amd64 ~x86 ~arm ~arm64" LICENSE="MIT" diff --git a/www-servers/gitaly/metadata.xml b/www-servers/gitlab-gitaly/metadata.xml similarity index 100% rename from www-servers/gitaly/metadata.xml rename to www-servers/gitlab-gitaly/metadata.xml diff --git a/www-servers/gitlab-pages/ChangeLog b/www-servers/gitlab-pages/ChangeLog index f6a26eb..ab72e57 100644 --- a/www-servers/gitlab-pages/ChangeLog +++ b/www-servers/gitlab-pages/ChangeLog @@ -1,3 +1,17 @@ +*gitlab-pages-0.5.0 (09 Jul 2017) + + 09 Jul 2017; Manuel Friedli +gitlab-pages-0.5.0.ebuild: + www-servers/gitlab-pages: Add ebuild for gitlab-pages-0.5.0 + + 09 Jul 2017; Manuel Friedli + -gitlab-pages-0.3.2-r1.ebuild: + www-servers/gitlab-pages: Purge obsolete versions + +*gitlab-pages-0.4.3 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli +gitlab-pages-0.4.3.ebuild: + www-servers/gitlab-pages: Add version 0.4.3 + *gitlab-pages-0.4.0 (13 Mar 2017) 13 Mar 2017; Manuel Friedli diff --git a/www-servers/gitlab-pages/Manifest b/www-servers/gitlab-pages/Manifest index 2ed3845..19452fc 100644 --- a/www-servers/gitlab-pages/Manifest +++ b/www-servers/gitlab-pages/Manifest @@ -2,13 +2,15 @@ AUX 0001-fix-Makefile-0.3.2.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f AUX 0001-fix-Makefile-0.4.0.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3 AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7159683ebf42f3a28d41a473 SHA512 57ff7ef4f3c5f221e39f8cfd29ab58ccb126d672260ee983d6f1221bfe2cfe5553b4f0187ce384f05fc6694ad31c2f7ae02155d0c21247eccd1d7dbf1632ffba WHIRLPOOL 1cb70bb5a9e6876a58e7cf78a68e9a08a0ae947237a537f7cf93b727cdb69482114cd2c1ccd17e27b80590be11e9904bae81e06afab83066c0d10926d22dd301 AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0 -DIST gitlab-pages-0.3.2.tar.bz2 205531 SHA256 392b0620871ab36a362f8b8b9008c266eda465e6f32611ccbdbe640cd77ae7b5 SHA512 e452af8a9d2032ccba827a7a165abf324008c585369f74d14a47524eaaa3255a92c38f102e8cf63a86012650da6265aa1a28f0ade5131ebb1df51e6202be0edc WHIRLPOOL d47459d214d1ed9818de534885ea806f092fe2fb02b2aa08b00b95fb9c3f2693b7c9b8d3e5723be55535888e1276ba4dbc24ead2f659677a43d326dcff9f3925 DIST gitlab-pages-0.4.0.tar.bz2 205924 SHA256 b26a00050d3558e793c070cda2fe50dc1bd76ea305902e4885746280755c3ea0 SHA512 9ff1d51655c0af93eca0b3a7e5cf250ce9a6787b3bc5eabcb59207ca3af13b6972bbebbc9c4a05bc1056cd12d6ad4c4bc30700efb656a2b9cfedf71ef57666e2 WHIRLPOOL 064625dfbfd428da5ecbf7ceb0532ff16e61ef9fbdbe1f4f72824e06ca21a93266a3d5eeec730f6423cb9d5d26d99fc6dbb568f30a79c4a691a0fdb08301c1cf DIST gitlab-pages-0.4.1.tar.bz2 206039 SHA256 ed856e1d549597b5f1b7aa5d006538aa4def240206b4756728aaeeefa49734c7 SHA512 e6dc7c73ec0601ebe53c54aa8d0978954c24450e488776bef1bb2483efd2db14d23188ee10660f6833f44bbbb50f462f8b9568a77cd4ff970300c604856319a0 WHIRLPOOL c8abfaf677f935b752be24c7ce703c49dcc23061a24f2137ea18df33a96d42233e7e00de120a812df58b84bf3db0739e97a1e37fc04367d370ef2558986d73fa DIST gitlab-pages-0.4.2.tar.bz2 209079 SHA256 391301c4f5cc288ed1a6a451e5273899518b83529c787c0a5f724161005ca786 SHA512 74e4cd810712d1506b927f75b63dc4fca09802097579d456cfada94f06c59b05f5e11309dc6fbd0f4c701243933688afa89ef8c1cf921f15536f505c7dec99f4 WHIRLPOOL 0f352db3977565b7c41609dcbed9161fcc99398fc56aa535255a69d12169b75b985410964a9adce60ed9eb8b88a68128dac9a9528f85ec62bae468fb8907e182 -EBUILD gitlab-pages-0.3.2-r1.ebuild 1968 SHA256 947c1a842bf512d712a73c723adc9db7651041e740a575050ea636b43948d294 SHA512 c7330aaee4252d6c0bde0440d4dace061e59802459efb3da71148c100e71fe6231bb694a5aaf57e8372d5c8fca2ca84a3d359ce86dcb8c918e12fca92ca22757 WHIRLPOOL 68762bc267f336c0ac866c8e782f878d1ad5dd7066fd85bb0d5ed506b8ea9b57f28a801d6e2535869912b93fa2143f13b0155771b3ee0a31cedd3b64a01169bd +DIST gitlab-pages-0.4.3.tar.bz2 209161 SHA256 d79fd61ac54945596e708ee5b38b35d8cf2ab07f53525af6cec3192e59d7ac98 SHA512 cb1902661f8eba65e8f330d7a57c57fec565db9b046d34af66909920d4f772a418b331f74038a506780d9a4ae6bb2158bbdba684a26020b253bf709b996bbeda WHIRLPOOL 5f0f60ea22071ac740745c60db62041e0ee75a5c68385b2ff5b24ed266fbcaf9a89481b456768159d551525d52b31b25469b9f7c023409b5a2ce05d7026cb327 +DIST gitlab-pages-0.5.0.tar.bz2 224094 SHA256 b6fe0baec3f1cf7c3dbdce1aa8d732a1510a9d45ffab1b5946c397a95acb8ece SHA512 8f8b4006e44c87f79addc3b87c392e596d286d3d96eb2aa50f0e2a90e3a4e0e5fc2258fdb7c623e743323c88b22e61df9c06015fbc384a8d75369fc9bb64b98d WHIRLPOOL c6d10c0c6dc674d931536daaac35953c792c6e47d9b92033e6c29d2dcbb82e7ad6345b519207ccd6fddbf061b0f0800c8908915854e028302a8357cd45cefb2f EBUILD gitlab-pages-0.4.0.ebuild 1944 SHA256 9ea918e126d4edc0fb785eae43f618a7744bd0fb4bd342f09725633b3cbd9f3d SHA512 7b7364e999fbabe7ef48da010ed6b799c9b4af8ee83f32d4b138cc6ac16acdcd5ed980bf217ff405c03a9ef9bf589ce95c3cad64a101d8b0f6eb0d869e0ef014 WHIRLPOOL 2ce6e870eaaf8b7522c1ec7bbf91a843a94a278de77d44bbbe4d74f8ff36aa56dd912eae2e520bac82550a4352c5366098749d7cf1893e5e50be6b708ad1aaa3 EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c02498846e90e22de23a3126d4cc9e883d SHA512 18391744f540507bbaee676854ca6b264eb08dcc93fe0a0c6f3bdcc34f3ee505ecb4db7f45f98a7ac2efa722f42f0aab3f174024f5c6a6f7e206fa0e08b6ebee WHIRLPOOL 182e67c00c30485fcb69d1061c397e16e18bfa62a82d729647fd795b36a5ae486a93c5d28f86ceed1b7230f3807732b241bf37532ccae0f789e90fa89ecbfc53 EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039 -MISC ChangeLog 1198 SHA256 20adea92aa197d2774657be760b12b92a18a668e73adb7bebaf909bd34c9745e SHA512 13c40fd3574847af8c92b7a8758fc91001e9b82ac53c2a0f6259f494676e7dfc6a0e87c4717a0b287676164562dbe5abd61c62bfbceb1067da9a02c265d7c619 WHIRLPOOL 3778bbfd3436fca31f4a802ecc9893e31657e633720180d2f295a7e6b2616beba0e21a29ecb48c65b8da93ac83b256380bcff51aa84f76bb9041562950165efa +EBUILD gitlab-pages-0.4.3.ebuild 1436 SHA256 5ac00230fb3166541549c0f75cc6cceefba1dc4cdbad00151902f7f5e4d70d94 SHA512 1b764061cdf5c52ad7681e92c330b91a99eee44128fc56c43bdbce291546ee9796ddb2b14ee9deb2dc61c80c4192223cb67c36c2b70833db05ff241d007b870c WHIRLPOOL 168f97a975a81a8413b92a7bd1c8d7420a3f45571ec668600468b43a375e4ea27ef6b95b0d6c5ff7475657920605c990ba6b2012c6c762f868156d6be4163aa5 +EBUILD gitlab-pages-0.5.0.ebuild 1436 SHA256 b4aabfef9811f4e591dcd71bbd7d7a399c10233be162c0cf5f903effb1ef0f98 SHA512 cc076544c219b497e39e080e469ce2b39ab4b1bcb8a396be9655af963ea35271548bd4446c1435690cfb459f510901ba1db8dd1d0574a4567b3248fc2e03a582 WHIRLPOOL cd087bc65f0eebedefea46f10c176f0163b77b12b71c89f738f94d223f1db2811fc813b49285fc35719c8430ad4ebe0d6362cdc38f2ac13e9cca7133e080b78f +MISC ChangeLog 1676 SHA256 68dcc3076e265189ef365cf68cad85798ca511837a3406e88316b6c84527d5e7 SHA512 eb74f46967d769babbad112b2f2aeff8444a8a763b3d6e5f19d68f0fbe5b367a54e4096057e3ad29bf0e427f2818b8d61a1d2b2d3debf7b39926f6b4d5d6b59d WHIRLPOOL a5c69df06800b69c8a56c59f8fba9d877e43e5f14b6ed120f4a9b40fb91153e865ad9b6b7cfd8b9433fe0ca5e1309d675d213664a5fed3b1d2293591b7943fe2 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-pages/gitlab-pages-0.3.2-r1.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.4.3.ebuild similarity index 67% rename from www-servers/gitlab-pages/gitlab-pages-0.3.2-r1.ebuild rename to www-servers/gitlab-pages/gitlab-pages-0.4.3.ebuild index adb3e32..5a11211 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.3.2-r1.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.4.3.ebuild @@ -8,8 +8,7 @@ inherit eutils golang-build golang-vcs-snapshot user EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." MY_PV="v${PV/_/-}" -MY_BRANCH="1-10-stable" -MY_GIT_HASH="7285dc6" +MY_GIT_HASH="34a68fc" DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages" @@ -19,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~arm ~arm64" LICENSE="MIT" SLOT="0/${PVR}" -DEPEND=">=dev-lang/go-1.5" +DEPEND=">=dev-lang/go-1.8.3" RESTRICT="test mirror" @@ -31,7 +30,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch" + epatch "${FILESDIR}/0001-fix-Makefile-0.3.2.patch" sed -i -E \ -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ @@ -61,19 +60,3 @@ src_install() { newinitd "${T}/${rcscript}" "${PN}" newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}" } - -pkg_postinst() { - elog - elog "If this is a fresh install of GitLab CI Multi Runner, please configure it" - elog "with the following command:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" -} - -pkg_config() { - einfo "You need to register the runner with your GitLab CI instance. Please" - einfo "Follow the instructions at" - einfo - einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md" - einfo - einfo "Perhaps I'll improve the ebuild later ... kthxbye." -} diff --git a/www-servers/gitlab-pages/gitlab-pages-0.5.0.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.5.0.ebuild new file mode 100644 index 0000000..d01ea52 --- /dev/null +++ b/www-servers/gitlab-pages/gitlab-pages-0.5.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils golang-build golang-vcs-snapshot user + +EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." + +MY_PV="v${PV/_/-}" +MY_GIT_HASH="0173d4e" + +DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI" +HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" + +KEYWORDS="~amd64 ~x86 ~arm ~arm64" +LICENSE="MIT" +SLOT="0/${PVR}" + +DEPEND=">=dev-lang/go-1.8.3" + +RESTRICT="test mirror" + +MY_USER="gitlab_pages" + +pkg_setup() { + enewgroup ${MY_USER} + enewuser ${MY_USER} -1 -1 -1 ${MY_USER} +} + +src_prepare() { + epatch "${FILESDIR}/0001-fix-Makefile-0.3.2.patch" + + sed -i -E \ + -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ + src/gitlab.com/gitlab-org/${PN}/Makefile + + eapply_user +} + +src_compile() { + emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all +} + +src_install() { + golang-build_src_install + dobin bin/* + dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG + + # rc script + local rcscript="${PN}-0.3.2.init" + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|g" \ + "${T}/${rcscript}" \ + || die "failed to filter ${rcscript}" + + newinitd "${T}/${rcscript}" "${PN}" + newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}" +} diff --git a/www-servers/gitlab-workhorse/ChangeLog b/www-servers/gitlab-workhorse/ChangeLog index 750c478..f87cc88 100644 --- a/www-servers/gitlab-workhorse/ChangeLog +++ b/www-servers/gitlab-workhorse/ChangeLog @@ -1,3 +1,19 @@ +*gitlab-workhorse-2.3.0 (09 Jul 2017) + + 09 Jul 2017; Manuel Friedli + +gitlab-workhorse-2.3.0.ebuild: + www-servers/gitlab-workhorse: Add ebuild for gitlab-workhorse-2.3.0 + + 09 Jul 2017; Manuel Friedli + -gitlab-workhorse-1.2.1-r1.ebuild, -gitlab-workhorse-1.3.0-r1.ebuild: + www-servers/gitlab-workhorse: Purge obsolete versions. + +*gitlab-workhorse-2.1.1 (17 Jun 2017) + + 17 Jun 2017; Manuel Friedli + +gitlab-workhorse-2.1.1.ebuild: + www-servers/gitlab-workhorse: Add version 2.1.1 + *gitlab-workhorse-1.2.1-r1 (29 Mar 2017) *gitlab-workhorse-1.3.0-r1 (29 Mar 2017) *gitlab-workhorse-1.4.1-r1 (29 Mar 2017) diff --git a/www-servers/gitlab-workhorse/Manifest b/www-servers/gitlab-workhorse/Manifest index 16e0bfb..025a1b7 100644 --- a/www-servers/gitlab-workhorse/Manifest +++ b/www-servers/gitlab-workhorse/Manifest @@ -1,15 +1,15 @@ AUX 0001-fix-Makefile.patch 360 SHA256 7dfdf28c0124c5054d452a9ff33b7f8f9b818f8aac63f26c8c3b567c919e0930 SHA512 d4a54811aadf330a31a562a78a99e34abaea83b647c8002de72fe27c6b58155879f8238f6382979cdc34370f5a81f979cab6d0f54a8ec8e529ca22a118901d3a WHIRLPOOL 19d77424ff65b51b120e88e9c7bd9f9520213d42cf70aa436e339beb402d528ca5efaf14009ecd2b01e9de1a8bb350b82f52541e885265e5649d869df80a7659 AUX gitlab-workhorse-0.8.2.conf 297 SHA256 8bb99a78197ad22892e4c85496101a39f2c82f6c537f44da8185af54dbb44a38 SHA512 d143489c165ef5e68810bb10d5e97da7ad3be6d53618380231706ec16c3fd8bc3eedbc78a09949479a408646e32aae4cdceaca9b271ba3b816e3449b792c5406 WHIRLPOOL 649d34b60afab816dac559989c9a3b0cb9620c2ac2a7617cfcae8bcc2c421791fa612571f83e6611ec8ab8c26c9c79f9832f4e6a70396497dfc5a40d99bbbef9 AUX gitlab-workhorse-0.8.2.init 681 SHA256 bf3f94853781251629daae935d04294febf317061536624e2c01188dd6688ae7 SHA512 6275abe0910e7327f952dba36827a9083264f76753605767cc11ee7b162fdecef3170783800263bf8acbe891d41e6be9e27b5fcca2a4f035b990c9865aa02647 WHIRLPOOL bc983d0413c0743ef0843a3abb46ee2be78ac6e18b56f96de63b4ea8cb9242f8ef6a96f2d593dbcda33a0a60b7f941f27bd704b7f64a85db7379ef0b42233527 -DIST gitlab-workhorse-1.2.1.tar.bz2 381033 SHA256 b9e0bf7c2b3ad1378c59def86d59726e988ee31db94b96d3e907aeae402ce1bd SHA512 de50574b39f84ea980c64cf54e7e0aa5bc94ed933bcb550f5712d07a8d60e4843fcf97993e285bd67361f931dd9a63f5cbde98a96478444b8381f23491635493 WHIRLPOOL 7cea252ada82a4d7281bbdd002fffbc3bebbcffe20748b8e4b8e4e8aa6fcee852bc18076c9ea4761849e24b5291b4552ef3e8ea812f1156ab980f476ded59b7a -DIST gitlab-workhorse-1.3.0.tar.bz2 384385 SHA256 b0acbd61a7ccf37512b569dc50625ff89dec9e181f8d5ed0b6115c81ef611032 SHA512 e2ea0183666e48795d97f19117995ce0191ce6d3a3810ceabb9c365b359839d8603b65608d754fd54b41a50fa2375eb64312203d58988aabfe81026f520d2f8f WHIRLPOOL 35e8eee022fc12e7d281656cdb65f35b23eb45fff739bd6fad05e594be56578043445cd6c5fd0ac3d3b097a4d0215a19cff0cc54c2d0d5dbec6dc5df3398fdaf DIST gitlab-workhorse-1.4.2.tar.bz2 625125 SHA256 4df4d93bc59102c312ad2a642d7f1ca463357c60d440a11fa72cfcbd4363a8e6 SHA512 1fa23991b463136565185982c1d10d17ecccd44f18138dc27cd0ef8ba0c63abc84347475d295fb71de9aaf8ad3de5747bb656c53c87769d3bce5db67571f89e2 WHIRLPOOL 3e5f2d311d96124546492d3b1da0740e70b8418f3a58f2dae2d457fb15a61d3ebdceea0e67c5a474a00ad7ac67575931a9d6ec8a4cc74572bc5549783b76304d DIST gitlab-workhorse-1.4.3.tar.bz2 655746 SHA256 5b621887aa8b6c0cb1b5b1aae6edd4d4cc60de77ef70f263a5968e56899da9ca SHA512 bdf62b8d5925fb45d439d2b9caf4cd2c175129bc3fe3bc24b8914dd128c1b6fc8ed700ad20513ee272e24698964c2daa7657e7bae86d58ae53cbe0e7ef44b89f WHIRLPOOL 507ba152b90db9b9459ef3f939780d39e7af17c6f2081a53c9affe621e4c624c46259993a6d94b218b476a2908ee9e3ff882f27c4d8f29e5ebc98f9bc4d878a7 DIST gitlab-workhorse-2.0.0.tar.bz2 656360 SHA256 4e9864b7885b1102d9eb18e9c4bd3baf6021b4d3b64adbf5e9ba70b49aea8d8b SHA512 f439affafc54a090f105897de3ee5fcf2864c26dfd5f87299097c6827b9563f5ec0f7ebc9b1abfc90d6f88f864a640620c58b8a004aa230789ea5e27cf3a2e4c WHIRLPOOL a8488fcb95d06f88eef01e7d1f045fcab766c439738e44fb523b5198d29531b230bd8a1ac27e53fc668a0ba034773cf44477fce623489afe268be9b110ad04f3 -EBUILD gitlab-workhorse-1.2.1-r1.ebuild 1019 SHA256 59a9b9fef8350811a1ebeb8824b8bacdfc2c145b88367841c82fe327729b63a2 SHA512 e708d5bc395b4eb8760ba218559e65059dcb499ebc45b33360da2b4b738f51fbb81ad1a2f6eb909d0d40025b45faf4c3be8fb84c945f231de0c635c2770bdbc2 WHIRLPOOL b536bb41b413beb5af648e406dc285c2e8d8b2dc8fd2803296753734feca0856219f560817c58c538b0207c4392e3c73142a8c701646033af9218023c1ca7471 -EBUILD gitlab-workhorse-1.3.0-r1.ebuild 1019 SHA256 c89fb85c3f9be066b78dc3eb7eeff6b2a93e5036e526688fe19bfa7c4242795b SHA512 69db5fd2700f3ff5ee8513c60d3a704b7de82757f2c3e8d8162606873aeec05655a30169ce53ca036d52e71507f4d1e39ca1f7520abba3bd9955c5d2408d8a7f WHIRLPOOL 96890317f566dc9775eeb85d231ed92a65979d12adb8dace28bcd52bd1b0e3d5ff3acb852def13edd0d8e797922e82d0fb20b41112933496216578ab92417f97 +DIST gitlab-workhorse-2.1.1.tar.bz2 658851 SHA256 ab827cfa89f5d3e711357a0317a022b4d5db4d91c01ad0b80b56120e315da899 SHA512 6a316647faff83352c344cc36ef7fbaf327dfab9b8f893c39e22d4cde7e78fe703680d2851663953ee94b3ac9f55a142b5380ed23f26a7600044a3af2fdea08f WHIRLPOOL abded7f69b1a1ddc1aed3f8a8b1ddae89aa19eaa67ac1be1847f3ad6a0f5a23142f60fee545a358ecf27f2b15d4630eb42ea0b68a7076af9e26ee36d9db1243e +DIST gitlab-workhorse-2.3.0.tar.bz2 673735 SHA256 61dc7ea978223a56e5f2e4617195e43c9e3179f0057e416545060143ea90ae0e SHA512 290713086d8c30fbbc80d32b6924368ceffceb08fc9330403250b775bab20454d5843bfd7b37c1d88fa60d1bebd5b14d7e8bb6b3557142b56b1d9ab02ce46aee WHIRLPOOL a1507a68c06d7335e5fdae4cbb91b01ddcc9d7c988758fd892676c6a78c9746c6f1fa89fe369efdd2352f85c7dade00554263e1a969ce10dfc87983c3136bf6f EBUILD gitlab-workhorse-1.4.2.ebuild 1019 SHA256 12e00f04075eb815e41640f4ca906ce1aaa833104e79c43f19c1a34c4454ce2c SHA512 8b430448c28ea695502f08928626f628657d58582439c3458370a56dc134c108c24f266a3fe2353b1ecd5082d2e53b985fa998b8919b60f81836579c884555e3 WHIRLPOOL ff37a454aa77734d4cd15b6bc4181a5dc8f1ead2d03710fdc59a514cbaa0a67202ded330021f2c6f763797763b8de94e2ffe86c90cba2336903479abcdfc3437 EBUILD gitlab-workhorse-1.4.3.ebuild 1019 SHA256 9f04f9b9a1af3b6a14af32fc27143ef98cf8d5ea297c754e2af2f75faab90cf9 SHA512 f38aee3ae9318d4db08a6f5bf55a7d25944ca65d132f23e5638e670a31745381d93a39d9489409ee75de943edf80af555638b2748d3eb7b1b8b0d65d8c02d6e7 WHIRLPOOL 60491062d73591e137a7a6d6875174a7f7c31c6972d104c2dd856ef8513276617e1be97f18679853b86638d92ba87152ca5b3f17c43dee79db2918e3e3139584 EBUILD gitlab-workhorse-2.0.0.ebuild 1019 SHA256 6b5b1af7f4bb91d6f38b5160ea4a1711392ba42ae296388c72ceeb1e19dabf99 SHA512 aa607720a13052e2fa5e086d3f5fa2bac42dc9a1028940c6c42e9307596439bb89f6405d23a8f2c216ff9a15e2d83be373adddb6598ed84b7b00af872cd8efc3 WHIRLPOOL 9cd700793dbad67c8a88bf7794bc1273e809b8435702c4359b12c25006fa1a08c8d5963ab76ac75bd46d520442b3195a79659718f8c7bca49d7fb5b4c0d9d6b1 -MISC ChangeLog 6613 SHA256 cb006b86036d17d1a77bd16ee43b701a4bcb245851299fb73181e92fb10cc787 SHA512 e891fd757198a066c82a2f8843911ae836fc962d661d5d5569b82b00b9ce732f015ff5712f32c7ffe71e6ed2091f376ec621cbdfca21d5d0e7e6f85db3be49d1 WHIRLPOOL a6f6b6d975f2d0f73ff17de76c82166a5f106ab869ea15ebd31f15fd4161121c18dd4a1b216884a66e76a2bcf05083d8d6d3105b4c0dcd7dbc13c631a9c0922d +EBUILD gitlab-workhorse-2.1.1.ebuild 1019 SHA256 0b119e55032bf471921e9011cb3a119b45a78000eae87d9ef28b2c314e302793 SHA512 aa571922dec9bf71d48b0ab23356642bf031328fc18c99600221fff5931259a2127e50432e1fd30c8656dec2ec8fa395d8e15c34f65f2a005c08420f26bcf54b WHIRLPOOL daa44b0fc118f2c05b38ddaf96c78aee1a25993c35ec5a71f4647d95ccfc8cd20362de9e6c9331d531ecd81799733953aef4297c1350d4fd223d9b003e75ab04 +EBUILD gitlab-workhorse-2.3.0.ebuild 1019 SHA256 1e7b0b9f7ca61afbdbb525eecb934a858be6bd91ff7ef6614eed2899f207fc8b SHA512 ec98e6aa09ba6245195fa4666fa4174a9ba595922f351dd660c161f419e84dd2c284373a310b55acf986082d175e1659e9396a9c7a3cc324a540b7d67222aaa6 WHIRLPOOL ba7bb5b5a333161bc4a3b04cd00f97893e9e93e63ee505b97d757676520cbbd06d2616be69a248ac81ea3135589fb3f11cd4333f266e1fa293890982d790399e +MISC ChangeLog 7167 SHA256 75e7796530a68aa3913c5881952a701430189d0d54ae89157f8b9fc7fc7ea810 SHA512 bb14554af2c2f4efa9d701bec4722be0034a053ad3ba5a391ac4425dd072541f511e7dfb37b8ba2d79fa6a60300c75620cd1f19d9a31461246c91a4f44d229b5 WHIRLPOOL c4d0b8acf5785c52011886ffe7e937180c65a4f47891465596254ac7b79fae380cba64bf53e0aa34426f726b53c98eb476990d31f31cccc0756b26e7a058539a MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-1.3.0-r1.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild similarity index 91% rename from www-servers/gitlab-workhorse/gitlab-workhorse-1.3.0-r1.ebuild rename to www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild index 8d0ef33..087a4ea 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.3.0-r1.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse" SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" -MY_GIT_COMMIT="b30cda2218572674082636d9851086eeee9a971f" +MY_GIT_COMMIT="e36227d823ff623a60a44281538f139f6864f683" S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}" RESTRICT="mirror" @@ -18,7 +18,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~arm ~arm64" -DEPEND=">=dev-lang/go-1.5.1" +DEPEND=">=dev-lang/go-1.8.3" src_prepare() { epatch "${FILESDIR}/0001-fix-Makefile.patch" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-1.2.1-r1.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild similarity index 91% rename from www-servers/gitlab-workhorse/gitlab-workhorse-1.2.1-r1.ebuild rename to www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild index 6bddb3e..0e4eb77 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.2.1-r1.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse" SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" -MY_GIT_COMMIT="0fe5a09e85de07cae1210627f1ecbaeb38e8372b" +MY_GIT_COMMIT="23e62f5114c7427917f9e1ef336ba227f1543192" S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}" RESTRICT="mirror" @@ -18,7 +18,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~arm ~arm64" -DEPEND=">=dev-lang/go-1.5.1" +DEPEND=">=dev-lang/go-1.8.3" src_prepare() { epatch "${FILESDIR}/0001-fix-Makefile.patch"