linux
/
gentoo-overlay
1
1
Fork 0
Code Issues 1 Pull Requests Actions Releases Wiki Activity

Merge branch '73-gitlab-8-16-4' into 'master' 

Resolve "Gitlab-8.16.4"

Closes #73

See merge request !139
This commit is contained in:
Manuel Friedli 2017-02-15 00:46:12 +01:00
parent 5812fa38ab b4abe56f27
commit ac4bf59559
13 changed files with 45 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-vcs/gitlab-shell/ChangeLog
View File

@ -1,3 +1,7 @@
14 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
-files/gitlab-shell-3.2.0-config-paths.patch, -gitlab-shell-4.0.3.ebuild:
dev-vcs/gitlab-shell: deleted old ebuild
*gitlab-shell-4.0.3 (12 Dec 2016)
12 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-4.0.3.ebuild:

5
dev-vcs/gitlab-shell/Manifest
View File

@ -1,8 +1,5 @@
AUX gitlab-shell-3.2.0-config-paths.patch 1826 SHA256 c83db7c37dcac577ce499eab4bb0168253f49d303ba1991fdec90d13cc3fe37a SHA512 7524b6b8cd7cd141a56c468efa303b1d21576ac9e03cb866cbf9dcac34e1b8d4f356333737050e2e5dfeb0f0ad904b3f548c40e1209c1f35054ed2027b1d8271 WHIRLPOOL fdbd2dfe43ff4a2af97227fbf8c4589ca3734ebf0320b7e9c5e8ea39882c49d45815a0ee3c765a141affacbe48f4063987b9664a918e0e216b49ca46a475cc5f
AUX gitlab-shell-4.1.1-config-paths.patch 2152 SHA256 e789f0c8a8b7ec8a840ce26dd63d6e5386a149f619d7ad5a6788577d897c4826 SHA512 6ae5af0c364061af4c9675804e2f6d6b662ed4891ed4c80bc1be39e9da6343db372e58bf04a0d3c8a4fc218daeb8cda45636e0da0c67ec801168e84004d05b86 WHIRLPOOL b8136b81ef943c15feeca303d1d7f0d55c85ff7f7ec82bfceea026ce334ca24fce0dfb599946562bd0aceb89a2216bcfaa894235c43f41e3031a305f85e756b4
DIST gitlab-shell-4.0.3.tar.gz 76721 SHA256 66f9a3572e6cd06632a267a5248c4878bf48ff62f5360b3108f42100b3ffd361 SHA512 b45027141557403a9e7818dec93b3e790a38887c22f3a2d0f298f1238e51ce4d96f603b2b225433275afd601e7544a611b98ec6711b0ed95228f321fe4b8d898 WHIRLPOOL 836e7476c874cfede14b66ee445cfac08db2cf22f2803fc0def8a20924e2578b441d605d85a923f2951bd5a6a9d11e79f1a15762bd401b8111e61fbe1d28b56e
DIST gitlab-shell-4.1.1.tar.gz 78829 SHA256 61f684b4528b0b789aad80efbfd8f9870d113f6e2794e589e0db9e74e6737e1d SHA512 17b929da1c6148a9af2787ca4a18081e3108622a40c6fb3f02f36f4ba41f2a1d61cf83509ace849093334af8f4ad74d8a36393bf9fca7ab21163d2f48b499879 WHIRLPOOL cfd258e93abeae4a33c1578114d56186c81a7c5894a3ccb9b690dd9a78051746916f3bac2b7146b8378534d5e177ba4cacb4c2011b64011328b056d4d397967e
EBUILD gitlab-shell-4.0.3.ebuild 3653 SHA256 4c47b55bc61c0d86499f2b7ab3a94ae1b5b6886faf9035f2a98094ebf7701aea SHA512 7de7b0c8b164d50de2cac220f66fe5a9a51809db8e565e74d27449ac2629c566b0d5d90b3d6f9dd0a2bf609526ec4cc62744d2c80d27b302d5719ec28f3485c3 WHIRLPOOL 79ea419a1107ea54aa0937cee7043e7691799ead6dabea69bb11ea57af0403102e5e7ab4de844f2358449578dd583d433eebfc567f88c1e2110e7fe1731ca47b
EBUILD gitlab-shell-4.1.1.ebuild 3653 SHA256 06702f4658b8ac1bada6b322b833f65270656730417d8c9bb000ab1fb23af8f0 SHA512 dc63160d98dabfcbaa9982fe841fd581a1b1b2a968e7c7bd1ee336e449214fa89da33477f0d4744941ee3ecb8688386883a5923e78025bdcfd1556e68ea7371c WHIRLPOOL cd59e133d1d02f082f10312b358c6c8718898aa008a967fc85934656500ceefc44a6affae286123c481aa902fa51cdb7e7f98788057fdd08304ed99f643ef27c
MISC ChangeLog 2576 SHA256 bdf6d8055e11a9d46fa77cd325fca046028cc50e6c5cfdb2350ad4aa5190370a SHA512 e88f5072f982524104ebef77c018946d1f37a1f0bb572c29e9bb529de4a774a6ceba1844a0b5d40a130f4c29b8dae177387f8bbf7b28c2736ee621a7fec8cdcc WHIRLPOOL f4852d792d410e59b97bcc65e14575f1ca77f562eba89dde926375efb8d5660c27e0ab4d2336f33bf898b2c468b6b6b82b9168e36bb96305107d17ebf2464efc
MISC ChangeLog 2747 SHA256 fffb08ba51e2f70696e59273c2bcdeca86124eb0dc8dca8ecf6b6fd207230066 SHA512 a7145a9d4e8eaa3918866f266a33436c80cb29f37f3b8f51dc17c7d2deed051fe96a670686bac071ca92309a9aa731446dda70d6ae0963685f4adff15bca6cec WHIRLPOOL 46d5804bb630a61f2879a1e840dedc4eb05ca5162e7575a1bcf5ce344da945d8d5bd959eef2d565a3209684453cf3aecde8fe7cd6a6d9f8415d11c8d3574d2db
MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1

64
dev-vcs/gitlab-shell/files/gitlab-shell-3.2.0-config-paths.patch
View File

@ -1,64 +0,0 @@
diff --git a/config.yml.example b/config.yml.example
index 166e384..4a47b28 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -25,11 +25,11 @@ 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 root directory.
-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
+# Default is /opt/gitlab/.gitlab_shell_secret.
+# secret_file: "/opt/gitlab/.gitlab_shell_secret"
# Redis settings used for pushing commit notices to gitlab
redis:
@@ -43,7 +43,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 beaf173..6e1b799 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
def gitlab_url
@@ -36,7 +36,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

130
dev-vcs/gitlab-shell/gitlab-shell-4.0.3.ebuild
View File

@ -1,130 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
USE_RUBY="ruby21 ruby23"
inherit eutils ruby-ng user
MY_PV="v${PV/_/-}"
MY_GIT_COMMIT="d4f2f5bae9808dd08b67f04cf928dab3a5f04f13"
DESCRIPTION="SSH access and repository management for GitLab"
HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
SRC_URI="https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~arm ~arm64"
IUSE=""
DEPEND=""
RDEPEND="
>=dev-vcs/git-2.7.4
dev-db/redis
virtual/ssh"
ruby_add_bdepend "
virtual/ruby-ssl"
MERGE_TYPE="binary"
RUBY_PATCHES=(
"${PN}-3.2.0-config-paths.patch"
)
GIT_USER="git"
DEST_DIR="/usr/share/${PN}"
DATA_DIR="/var/lib/git"
LOGS_DIR="/var/log/gitlab"
CONF_FILE="/etc/gitlab-shell.yml"
pkg_setup() {
enewgroup ${GIT_USER}
enewuser ${GIT_USER} -1 /bin/bash ${DATA_DIR} "${GIT_USER}"
local git_shell=$(egetshell ${GIT_USER})
if [ ! ${git_shell} -ef '/bin/bash' ]; then
ewarn "User ${GIT_USER} already exists, but with the shell ${git_shell}."
ewarn "Changing shell to /bin/bash ..."
usermod -s /bin/bash ${GIT_USER} \
|| die "failed to change login shell for ${GIT_USER}"
fi
}
all_ruby_prepare() {
# fix paths
sed -i -E \
-e "s|/home/git|${DATA_DIR}|" \
-e "s|[\# ]*(log_file: ).*|\1\"${LOGS_DIR}/gitlab-shell.log\"|" \
config.yml.example || die "failed to filter config.yml.example"
sed -i \
-e "s|File\.join(ROOT_PATH, 'config.yml')|'${CONF_FILE}'|" \
lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
}
all_ruby_install() {
# install lib
insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
# install scripts
exeinto ${DEST_DIR}/bin; doexe bin/*
exeinto ${DEST_DIR}/hooks; doexe hooks/*
exeinto ${DEST_DIR}/support; doexe support/*
# create symlinks to bin
local name; for name in $(basename -a bin/gitlab-*); do
dosym "${DEST_DIR}/bin/${name}" "/usr/bin/${name}"
done
insinto $(dirname ${CONF_FILE})
newins config.yml.example $(basename ${CONF_FILE})
# 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"
# prepare directories
diropts -m750; dodir ${DATA_DIR}
diropts -m770; keepdir ${DATA_DIR}/repositories
diropts -m755; dodir ${LOGS_DIR}
# GitLab stupidly expects that gitlab-shell is in home of git user...
dosym ${DEST_DIR} ${DATA_DIR}/gitlab-shell
# fix permissions
fowners -R ${GIT_USER}:${GIT_USER} ${DATA_DIR} ${LOGS_DIR}
}
pkg_postinst() {
# check git home directory
local git_home=$(egethome ${GIT_USER})
if [ ! "${git_home}" -ef ${DATA_DIR} ]; then
ewarn "An authorized_keys is configured to be inside ${DATA_DIR}/.ssh,"
ewarn "but HOME of ${GIT_USER} user is located in ${git_home}. You must"
ewarn "either change the authorized_keys location in ${CONF_FILE},"
ewarn "or change home directory of ${GIT_USER} user to ${DATA_DIR}"
ewarn "and move ${git_home}/.ssh here."
ewarn
fi
local auth_dir="${git_home}/.ssh"
elog "Initializing authorized_keys file in ${auth_dir}"
mkdir -p ${auth_dir}
touch ${auth_dir}/authorized_keys
chmod -R u=rwX,go=- ${auth_dir}
chown -R ${GIT_USER}:${GIT_USER} ${auth_dir}
elog
elog "GitLab Shell was initialized. Repositories are located in"
elog "${DATA_DIR}/repositories, scripts in ${DEST_DIR}/bin."
elog "All gitlab-* scripts was symlinked to /usr/bin to be on your path."
elog
elog "You should change your gitlab_url in: ${CONF_FILE}."
}

4
dev-vcs/gitlab-workhorse/ChangeLog
View File

@ -1,3 +1,7 @@
14 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
-files/fix-Makefile-1.1.1.patch, -gitlab-workhorse-1.1.1.ebuild:
dev-vcs/gitlab-workhorse: added new ebuild, removed old one
*gitlab-workhorse-1.1.1 (12 Dec 2016)
12 Dec 2016; Manuel Friedli <manuel@fritteli.ch>

8
dev-vcs/gitlab-workhorse/Manifest
View File

@ -1,10 +1,10 @@
AUX fix-Makefile-1.1.1.patch 354 SHA256 b86b7b8df53776684bdc6dc1f39d4416db618327397d6d37bbfa719d34b75f46 SHA512 4d998b7786fe280c1e903c924920e405db4ee2f6675831c7f63dfa801fe23a7584ea61860cb0cdf0972b3939e053fb5f27f995e105c67d04fa913610f08c4dcb WHIRLPOOL 267b0b07c79ac90239eed95c4b465f4c47321d05ebc419cff26416db1646831fe6088657b33086886c790a074347e3c9c44c85792465adf378e5aecc1b6d2299
AUX fix-Makefile-1.2.1.patch 354 SHA256 7cb067ad7465e0e72eb503edb4f56e2b080806cb66826b2890a492add86d41df SHA512 0616061973d6cd9a5871095fe7ec1a7a80054399e6926bea8ac36b1196c1a962459eefffcd18a9a080d9bfa1a195aa504ad50642a117e9bace28fe6cad638e24 WHIRLPOOL 428a0db0e0696ceb8931bd89bcfcf476039e8cd7eb04d7bedf39af41338ce72d495fa572ab050c8747026ff9d28c59b15baf8c6c3ac5b9ca198e20bbd702622e
AUX fix-Makefile-1.3.0.patch 354 SHA256 777616d246eb99b2189f68df3eaac9b538845884fda25f879738268f2ecd3112 SHA512 44052c8b90beef243ffc59cabf5c58d84c7e5482022a036ee59f9b4ef392ac5c5df9e36bf0ee8229943d5139da99367dba860622ac1b0e71e5065bdb1d1759d5 WHIRLPOOL 67e27b31dd279dffca80fc79c409f0696430f75dae7a57433d5b913e4b60b99fbdee50089edc70cae69e0e0d95d4602d03975b9b48fa7678ccdeca3b1d0d9c76
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.1.1.tar.bz2 356238 SHA256 dbaa8559beff71f887a67606b8f0a8f197b3d79fc4b99eeaf07b2940755da623 SHA512 6a01c206139d56a7058c8a00ac2a9f930dfdf744b979cc1e1bde831bb362ede2be4542f66c3048920bb4b1ce91311580041d705ae4f00e4b8d78691aed62fb90 WHIRLPOOL fd150e15dbdf5dfc988ee953369279ee97452c8e5c9a5c4d6f20a129c30cd9a2b2119e30e62fd741472de45a29661663774247060616213b26c76afc37300cdc
DIST gitlab-workhorse-1.2.1.tar.bz2 381033 SHA256 b9e0bf7c2b3ad1378c59def86d59726e988ee31db94b96d3e907aeae402ce1bd SHA512 de50574b39f84ea980c64cf54e7e0aa5bc94ed933bcb550f5712d07a8d60e4843fcf97993e285bd67361f931dd9a63f5cbde98a96478444b8381f23491635493 WHIRLPOOL 7cea252ada82a4d7281bbdd002fffbc3bebbcffe20748b8e4b8e4e8aa6fcee852bc18076c9ea4761849e24b5291b4552ef3e8ea812f1156ab980f476ded59b7a
EBUILD gitlab-workhorse-1.1.1.ebuild 950 SHA256 3f6d9813ac7db6f8816ec02f95e1c6332d7e93c8880ce548c9680304c610b95c SHA512 d607edcbe4c73e736d886d0e342de4b738a16ddbbcc5266653194fba3613cda15fa8516a5a45131a6cc0bd42e7bfa77910837b55258c7cef47b337fba5aa1dde WHIRLPOOL dedd9011f5ec182a3317c34bed540cee000cd34cb59ee5164c902faf9fbf0be102f63cd548dc42c1133025378a2bce8a243d53289c4902172eb78389349179c7
DIST gitlab-workhorse-1.3.0.tar.bz2 384385 SHA256 b0acbd61a7ccf37512b569dc50625ff89dec9e181f8d5ed0b6115c81ef611032 SHA512 e2ea0183666e48795d97f19117995ce0191ce6d3a3810ceabb9c365b359839d8603b65608d754fd54b41a50fa2375eb64312203d58988aabfe81026f520d2f8f WHIRLPOOL 35e8eee022fc12e7d281656cdb65f35b23eb45fff739bd6fad05e594be56578043445cd6c5fd0ac3d3b097a4d0215a19cff0cc54c2d0d5dbec6dc5df3398fdaf
EBUILD gitlab-workhorse-1.2.1.ebuild 950 SHA256 7a3dd2657fb3a3224d57170d4ac416f1d5b74512b9ca84ff0f1d73dc07929994 SHA512 3002655f560b8d15d5cb32e0cf0ba96ae404c160649d9c41deb76e094a21b9e302701a627b26651ef8368374510ddcf416df4079fb034a72c298a0c8ba59317a WHIRLPOOL d75356d647620369083b579d3246f23a97a37490759fc84ea10dfe93636330c77d1a4832151d56d677b05fe8a026dcb9e44686c9c042db66cacf9191c644af2b
MISC ChangeLog 5491 SHA256 c4ec478ebb95514ff906ae600e9dd56f0aebc9f1ee4e988eb0b9c855b73c6d00 SHA512 09cd0ab1cfd42a8683d5b98b5e6ce4fb037e99cb00804c8df01037c2cd261d3578db39456160b210b03de27e2de8723e63c3ea4633406610963a51920f03d189 WHIRLPOOL 68f88a121dff93ae4e348d11ca80cbe3102aea6f3377250bda6563239b7670c59e07b1425924b747650ac8082833587c77e4b0995827079fe74cae8cd0b4455f
EBUILD gitlab-workhorse-1.3.0.ebuild 950 SHA256 3b6ac03d566350a703e5822dab7dcbf8348b355abc9fd093db460ae58a442349 SHA512 065b393b1ad002b69ed5641016f92971fd57dc6ebf5c8619b59fcb9948ab8ea8b6c42eb211a12d1dda4b84a700134d5b582abb72c3450a07effe6e5e735c537e WHIRLPOOL 4d99f80727a225ee8164be6f9df1fbdd80d88ac407d12bd65d0463735f36fec713a1aacfdde14190b3a3510d4bdffad8409467a6b12112f71a26d43c8ab71a52
MISC ChangeLog 5672 SHA256 1a553d519a05437459078a9a14c0089f122954b7182cdfc05fbf0ae58e8b7287 SHA512 4d9107f6598bee4d82c9233aeed35fd0c05c826312626bd6642b62c7e0709ed53673297e7a32c9786b9e7b15944f00b81c8b87c405cc17ad892a649c4fcb46c8 WHIRLPOOL efd980fb357de4f86c19cc8d0f366126ddd1223927656a9309f1dd2f3daab90681dce8e2648b5f4bd764c7c85d02bcb8f4a400532e87b3e8440a04e729094287
MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1

2
dev-vcs/gitlab-workhorse/files/fix-Makefile-1.1.1.patch → dev-vcs/gitlab-workhorse/files/fix-Makefile-1.3.0.patch
View File

@ -6,7 +6,7 @@ index 3f6ac91..663ffbb 100644
-PREFIX=/usr/local
-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
+PREFIX=${DESTDIR}/usr
+VERSION=v1.1.1-$(shell date -u +%Y%m%d.%H%M%S)
+VERSION=v1.3.0-$(shell date -u +%Y%m%d.%H%M%S)
BUILD_DIR = $(shell pwd)
export GOPATH=${BUILD_DIR}/_build
export GO15VENDOREXPERIMENT=1

2
dev-vcs/gitlab-workhorse/gitlab-workhorse-1.1.1.ebuild → dev-vcs/gitlab-workhorse/gitlab-workhorse-1.3.0.ebuild
View File

@ -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="f2d0435b2688b0083dce97bb20895befe3b98282"
MY_GIT_COMMIT="b30cda2218572674082636d9851086eeee9a971f"
S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
RESTRICT="mirror"

8
www-apps/gitlab-ce/ChangeLog
View File

@ -1,3 +1,11 @@
*gitlab-ce-8.16.4 (14 Feb 2017)
*gitlab-ce-8.17.0_rc1 (14 Feb 2017)
14 Feb 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.16.4.ebuild,
+gitlab-ce-8.17.0_rc1.ebuild, -gitlab-ce-8.14.5.ebuild,
-gitlab-ce-8.16.0_rc2.ebuild, gitlab-ce-9999.ebuild:
www-apps/gitlab-ce: added ebuild for gitlab-ce-8.16.4
*gitlab-ce-8.16.0_rc2 (16 Jan 2017)
16 Jan 2017; Manuel Friedli <manuel@fritteli.ch>

12
www-apps/gitlab-ce/Manifest
View File

@ -11,12 +11,12 @@ AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e7
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.14.5.tar.gz 29722006 SHA256 8e03214c1f741cf813453e7764a0da1d8f0ec957b5395d2e359b9f24bb5f3c8e SHA512 afdc8bcd3022f1b1e5f14c76a5ee696eda462ffeeba94411f3f82ba0b2e0647d017982f0357fe66a1272929569eb0f24e5d18bfda78b88599e91c9486438aaa9 WHIRLPOOL 1eba1abf2543bb8203349fe03e6debf5e837effcf7a23d1f4e7e49900db7d1bc77c62ca6f95c5b26b7c00c396499f3cc8c2ec2d0e5f209bc2d7da99d2f7a4668
DIST gitlab-ce-8.15.4.tar.gz 20029958 SHA256 5d9df84b82e8b453f61f822fce44afb9603d03b3de23d73c855ce12f7629a33a SHA512 1e2315343ba2efb521bc5dc197b63f7b3af895327de76d1823345d6d39921d9a995b65f6211b572c07cf4a4583bcaf7e6f1ef159b38a7b7b1aa731e2f653c3ff WHIRLPOOL c85e4a389dec2d8807a158447eafb1062b2e1c70eb243f898c5155a26af92c99dba7bcf60217a51c26afbcb3e04ce996177b6e90cd4a0199f8fdc2c79c575ed8
DIST gitlab-ce-8.16.0_rc2.tar.gz 20774518 SHA256 fbacb1f80c47343c46533cc05a17173c252ebf9168422cb22cae43e85a04d708 SHA512 63243875ed05dcc12e5b03c72123946f4efb67a5aa9803ad1bf757accb5ff7f5f9ee61a1cf91672cd97e9a3e21dedc142728dae5e32776ef4e4250259196b5f3 WHIRLPOOL e4520aad4a7f9ef832cf1ba7a129fe7345c77590d5f586542a7a28a257bfd26e60560f09e6595551a6277a9583a6d2da3b59b0899fc31a871dfddf6669d68818
EBUILD gitlab-ce-8.14.5.ebuild 12058 SHA256 ef48879ad31e34e3b451ed39d1a196c1ae37b53296b39fb2f5d9c55f8cb04fc0 SHA512 24b314b35b24712471bf0f9e887a3c8cd434be2d5231f270ea0ef5f4d59377b2ba1049bf3ee7bf5feb54f77bd1d9d4121409640bd562a3a871c6bef1e7a80f45 WHIRLPOOL 7fef550d27617de2176b0f3fadb4575ad15f09e3bc204a82ea0b62c97497d36c1e0154fd18b483ac678ff7b5f8ecb464161a132ecf250bad839f28dd721e5100
DIST gitlab-ce-8.16.4.tar.gz 20899790 SHA256 0ee69f010f2306a6b1d7fda377a0780951560880c974f62b8ab15935ddd93930 SHA512 a81ed04326262569a4d0112476624efafebf8fad8296fd6866881bb280abc5e9f7275bbe94d6d5e8c40491d88422368349a34066206fb60dcef3578f9ab0ccd1 WHIRLPOOL f5d3d84bb0c5fedddc195326603911abec19c8d0de95e26ccdb1db10df195288e3ecf1ad6aa04e1a778b6987418466508f4080888fcfa1847825916141cc87eb
DIST gitlab-ce-8.17.0_rc1.tar.gz 22687611 SHA256 1e084e796313c3ece0dda45994823c3d168b44b559d13b5833482898a2c4a29a SHA512 6b8a9074a5f25bfd04738f42ad70c78cb627a44ed2d8e97d16a36b4e8217c4dd882af3d32ffc16143639fa5d7f46156805a5271c979e153736a1ff96802ca07f WHIRLPOOL ea5bac7c5d61b8ce10210f19cc2ceb22c07359bdfbd40261d2c69b956e27b7eab5dd92f892c950ddfbc193402aa81b3f59fc796803d05e2cd37cb56c31f22a53
EBUILD gitlab-ce-8.15.4.ebuild 11982 SHA256 db794f18bc0d023a8b6adf49b82c2e37fd38b7206b064a7700289c0cfa16961c SHA512 ca30780d28ffc0242ac5f6ccad178cc44464a81f2d44cb13e53ddf06700d0f39b9fee9b77e356735435079b34090049d50d9019af71e92d6d8faaf3767a39dc5 WHIRLPOOL 42ee8b8e5a2c6fba69ecdbf6e306a87f369fa193f721c73481edc744953bfd210cb4495bc603ba01566efb2b0869ec71284a1f1b1c34d1a124bd08546829ca37
EBUILD gitlab-ce-8.16.0_rc2.ebuild 11959 SHA256 331a1495d7b66606aa91b7371e82e3a93b5ebbd4f769eece696eb39d8da0b04c SHA512 f5a23c412b0b6e0335d7d257e228099916b0bba1a4942629f63d1b32c81d190949f75cad89b36e4aaa4795e477da507c2e5a5b31daf6e8781f188d222886232f WHIRLPOOL 272b80fe5aed6453766462e0a61ef3ff8a4c4aa85255194ce3c169dbf469937fd1854b02626ddd617843f76e5cd7a0c305580bdec6de52d67b10d122e9bfd769
EBUILD gitlab-ce-9999.ebuild 11916 SHA256 935879ee08aa1a9dd7914766f913834dbb71f95438ebf53b7a8c5e78d8ae62d1 SHA512 2ca0b09f3fcbf3abf5c6dce066a4ffc2cdf95196a4cc36116c6f784a6d908fec667b63cc92fdc39665f3b78029b5ce85d9b8e4dfb541dde4b8568946c990459b WHIRLPOOL 32e18abbd6690268d3c4decc067c4a484f6644c9fe94d59154671519f02aa400f1ff974b2b114dd430c6d1790c5f3668be0a202a83c7d451424eb1a706a1315d
MISC ChangeLog 12415 SHA256 74794cd33aef92f0d52309c17a86864debdb0470d01caf40eb92c68368cb90d4 SHA512 17248d3d2addc2f0171c608d8a3ddd925a7ac15a4d28f1bcafcabda6b135f88ead6d60843f0f9fe7d0d370f08d4e0bcf64858cc020065c20e4ebcb26e9f02930 WHIRLPOOL c5fb6f75f8d55e3b4f1c20e0a05587fd59831b31a88c06ee14851d7b27906d8c60d8afc037f328a6c324f56c87a667bf712b7e1b24ff2b3d3be9beeada094c27
EBUILD gitlab-ce-8.16.4.ebuild 11982 SHA256 91875777d0953bffddd31318d9c5d4666ba59bd3446804d063c1199c603bd5a6 SHA512 7112bf185f25d90a11ee2a6e9d197c1ce781b49c486cc1afaff002ad66dcec7c9b43c3b9b6c26c62d23bb7e8c0fdd4c527e53a99f9674bb4af1e404454960227 WHIRLPOOL 76bd66e8b7d4ff04f02354cb6cdf3fa0b92ccf2cdcad26cf117f12330b3f3588713fd0d0465da2515750348975eb81daa6e02f984025804b7db50da99f4e8e5e
EBUILD gitlab-ce-8.17.0_rc1.ebuild 12155 SHA256 6ce027d69b1fb5d5ff46a4f1c745ec0510b23c52f584cd89b0168f80c17dd69a SHA512 841f59f0f57f2eea09a786a931277724333a870c964f846ea01f1dd8f4d3928a2c62c59a2c7d4670c45d0abb76cee9145d4dde2eb509054f06545d9e20858f0b WHIRLPOOL ee2179f1f75e2e3ef89490ec5bd244b6ab84c9fd7f058c3d9275554bcaca01382ed9ecfb2277cbe876a0060100a4b463d42194113e233bbfa74481b9ae9be3c9
EBUILD gitlab-ce-9999.ebuild 11916 SHA256 5bb2586d9d739d9453392f4bca9a6e2a3156be359e50de7e88d8f928a3ac2945 SHA512 0b5180f9166f9ecb63bdb5ff13fc1b7c50136cf6e5e64521783bdeb0f02925e5ff040527bf5c30653f85e1260aed1082b1a747fa3d32ca5f9cadc8f25368c149 WHIRLPOOL 6b1c1aa264f4f6fef97d0234de73eb833b09f3a2a681f90a134b022fe84ac99fdeb39f9af932a60369bb8a8062ceddb09fde21f56193378976568405b933bc89
MISC ChangeLog 12731 SHA256 0dc12bc05b7eab06d38065ae68fcc80334712097723f67879c2904a22ca02eb7 SHA512 4ffe901aad98647bae759ca60d4b896989748add60029df9c39139e17c900b768deeef0130ad74d0c4945295848be3094084722af0633c488c632319179f1c67 WHIRLPOOL b76aafcc2902a19d568429237517ea61b6bf876a157c8aca4fa180edee8115b653dd5bb2fed2fd1f33cedfde44bdd261195eea4a395874092ee638fe27ccf58b
MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3

6
www-apps/gitlab-ce/gitlab-ce-8.16.0_rc2.ebuild → www-apps/gitlab-ce/gitlab-ce-8.16.4.ebuild
View File

@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23"
inherit eutils ruby-ng user systemd
MY_PV="v${PV/_/-}"
MY_GIT_COMMIT="1f6619260193eb1e4a2d9ed20113e7590494321d"
MY_GIT_COMMIT="f32ee822d66afcf8d6288d5e2e5660e19b18d5a7"
DESCRIPTION="GitLab is a free project and repository management application"
HOMEPAGE="https://about.gitlab.com/"
@ -27,7 +27,7 @@ RESTRICT="mirror"
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
KEYWORDS="~amd64 ~x86 ~arm ~arm64"
IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
## Gems dependencies:
@ -56,7 +56,7 @@ COMMON_DEPEND="
${GEMS_DEPEND}
~dev-vcs/gitlab-shell-4.1.1
>=dev-vcs/git-2.8.4
~dev-vcs/gitlab-workhorse-1.2.1
~dev-vcs/gitlab-workhorse-1.3.0
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
DEPEND="

21
www-apps/gitlab-ce/gitlab-ce-8.14.5.ebuild → www-apps/gitlab-ce/gitlab-ce-8.17.0_rc1.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23"
inherit eutils ruby-ng user systemd
MY_PV="v${PV/_/-}"
MY_GIT_COMMIT="6f43aa0d606498982e2beb915ff098f3ffe513c3"
MY_GIT_COMMIT="ba92981ff8faa36a2aa2a09adbc656c169a61620"
DESCRIPTION="GitLab is a free project and repository management application"
HOMEPAGE="https://about.gitlab.com/"
@ -27,7 +27,7 @@ RESTRICT="mirror"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~arm ~arm64"
KEYWORDS=""
IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
## Gems dependencies:
@ -54,9 +54,9 @@ CDEPEND="
virtual/pkgconfig"
COMMON_DEPEND="
${GEMS_DEPEND}
~dev-vcs/gitlab-shell-4.0.3
>=dev-vcs/git-2.7.4
~dev-vcs/gitlab-workhorse-1.1.1
~dev-vcs/gitlab-shell-4.1.1
>=dev-vcs/git-2.8.4
~dev-vcs/gitlab-workhorse-1.3.0
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
DEPEND="
@ -67,10 +67,9 @@ RDEPEND="
>=dev-db/redis-2.8
virtual/mta
systemd? ( sys-apps/systemd:0= )"
# dev-ruby/bundler should be >=1.13.6, but that doesn't exist yet in the tree.
ruby_add_bdepend "
virtual/rubygems
>=dev-ruby/bundler-1.0"
>=dev-ruby/bundler-1.13.7"
#
# fix-sendmail-config:
@ -83,7 +82,7 @@ RUBY_PATCHES=(
"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"
"05-${PN}-8.16.0-replace-sys-filesystem.patch"
)
MY_NAME="gitlab"
@ -360,6 +359,10 @@ pkg_config() {
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"

2
www-apps/gitlab-ce/gitlab-ce-9999.ebuild
View File

@ -54,7 +54,7 @@ COMMON_DEPEND="
${GEMS_DEPEND}
>=dev-vcs/gitlab-shell-4.1.1
>=dev-vcs/git-2.8.4
>=dev-vcs/gitlab-workhorse-1.2.1
>=dev-vcs/gitlab-workhorse-1.3.0
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
DEPEND="