Gentoo Archives: gentoo-commits

From: Marc Schiffbauer <mschiff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/mschiff:master commit in: www-apps/gitlabhq/files/, www-apps/gitlabhq/, dev-vcs/gitlab-shell/files/, ...
Date: Tue, 30 Dec 2014 15:13:04
Message-Id: 1419952102.e3504046a7812f26afc20221608ff26b8d9dbc89.mschiff@gentoo
1 commit: e3504046a7812f26afc20221608ff26b8d9dbc89
2 Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 30 15:08:22 2014 +0000
4 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 30 15:08:22 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=e3504046
7
8 remove old gitlabhq stuff
9
10 ---
11 dev-vcs/gitlab-shell/Manifest | 6 -
12 .../gitlab-shell-1.7.1-paths-from-config.patch | 18 -
13 .../files/gitlab-shell-1.8.0-redis-db-option.patch | 21 --
14 dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild | 122 -------
15 dev-vcs/gitlab-shell/gitlab-shell-1.9.3.ebuild | 122 -------
16 www-apps/gitlabhq/Manifest | 10 -
17 www-apps/gitlabhq/files/gitlab-sidekiq.init | 43 ---
18 www-apps/gitlabhq/files/gitlab-unicorn-6.init | 67 ----
19 .../files/gitlabhq-6.0.2-fix-sendmail-config.patch | 20 --
20 .../gitlabhq-6.8.2-email-custom-reply_to.patch | 36 --
21 .../files/gitlabhq-6.8.2-fix-gemfile.patch | 86 -----
22 .../gitlabhq-6.8.2-fix-project-name-regex.patch | 30 --
23 .../files/gitlabhq-6.8.2-ldap-custom-mapping.patch | 99 ------
24 www-apps/gitlabhq/gitlabhq-6.8.2.ebuild | 362 ---------------------
25 www-apps/gitlabhq/metadata.xml | 19 --
26 15 files changed, 1061 deletions(-)
27
28 diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest
29 deleted file mode 100644
30 index dbdc17f..0000000
31 --- a/dev-vcs/gitlab-shell/Manifest
32 +++ /dev/null
33 @@ -1,6 +0,0 @@
34 -AUX gitlab-shell-1.7.1-paths-from-config.patch 922 SHA256 90ff8ce300cd2c1b60749aedb4b69fc6cfd2fa9fbe36437a90458d22e02a3801 SHA512 08bfac9d3660abea270ce0192a9af3ba2737a6de86989437b97df03c80ef7ade9c2c5214bbd2bd267840a3bc6f2cbc50d6a09be48cc89ee1c5e5642d320cd4e6 WHIRLPOOL 1f8f3eb978e244d3faf817ff07c047fd5a9aa343b2813154f76b7639cfc1b7c9e7ecff66bc24a0050193796959a992226b0fdb91b9e80ce9f566f62e08c0854f
35 -AUX gitlab-shell-1.8.0-redis-db-option.patch 625 SHA256 e707b05a5f81b3769ca8125695617335a9a90eb6ad6b0fd48d99a92f70c235ee SHA512 d5fc946937cb6fcff313c2c620ce24b66c0b6226b298214a36915fa5023ae33f348698ad2505e7e441adc80137dc092dd689d066dac9abbe4261a448ad85f753 WHIRLPOOL fc6365a20089cdb923af210c1f8b825e0bdb7dd539ba272efa224c214237d61bac0d9d0730f8bc9436be16fa874752aba5938e380ab1466f2a3baafaf2bc52cc
36 -DIST gitlab-shell-1.8.0.tar.gz 14912 SHA256 ac75e2a5d234f4e64760e2eda5a94c633ec2b31c269deda01e69c6bbc0a25feb SHA512 ab829b597e4610675c773be83035506a97dc623c41f294c94b57fc7351d7985156c5882ba9b1c84d140fe0e0b5c613ab138f8161eee82c4727d049aa39e17efe WHIRLPOOL 72896d55d828d7c9539168391206a908c4a899079eb9bd1461fcdca4947abd806ca91a098d6c4bd67e1f15089636b960704f89285613b86588d039e7b4df4912
37 -DIST gitlab-shell-1.9.3.tar.gz 16186 SHA256 8484554f76aea4443a9de19253a784b0164fd76230e8e1caeb6bf84df1a6a11c SHA512 4d14e731c865528650b134e493ce617b24971a927931c648253f9c3614d72eb21533f63984cb7cfc38a0201e3dfec3c2f5f57d6bd29fe791689548eecd8e9c3b WHIRLPOOL d36a79b3fed631fce5b63808a34ced5210243928209b221c18421f4a4e5af85b3476f74c4b2cbb5379a1c44a29bf7904be704bdcc5180d9d62576e6b76da60da
38 -EBUILD gitlab-shell-1.8.0.ebuild 3344 SHA256 85869536daa29d5316a6050bde97d39f707ecaf9078f535f262b35e0e8c509d5 SHA512 0e314f5b32a303b3637d574a89be908fdd756eca1ee257fd12b3722fc5e3bd16624f0c26f90d6522e84d222fcfaa004a92aafbd9a63cf3f1aba91b2575b243a9 WHIRLPOOL 67149f996b6c71e26fd06d6b22ff7f159e1aa46c457b603f873542769631c51b96bbde90b90e0642e0f09f20010a7355591a38bb4e20a36bf99d1c84564e0052
39 -EBUILD gitlab-shell-1.9.3.ebuild 3346 SHA256 4acfe8b86e1d7fe71bf7725f59bb4e6f5e204ea52210d71548a34426c467040f SHA512 958d3900c8a32c637ad9a0fec7344c3886e2029fe4e51334351e527ad2084883d3df4d779580e2d9a72f1ad60506331bb605a1ce0c2951cbe9e6c65193b23421 WHIRLPOOL 0681d593c4288e6caa0943fc0ec8c026e7695a0ac93c055e1c256fd37ad9cadd621c8004aa7d966cf868afa442e64bb67c889414dbd0bd8b0cfa1513f7a46f64
40
41 diff --git a/dev-vcs/gitlab-shell/files/gitlab-shell-1.7.1-paths-from-config.patch b/dev-vcs/gitlab-shell/files/gitlab-shell-1.7.1-paths-from-config.patch
42 deleted file mode 100644
43 index 6ba4967..0000000
44 --- a/dev-vcs/gitlab-shell/files/gitlab-shell-1.7.1-paths-from-config.patch
45 +++ /dev/null
46 @@ -1,18 +0,0 @@
47 ---- a/support/truncate_repositories.sh 2013-08-26 11:59:22.000000000 +0200
48 -+++ b/support/truncate_repositories.sh 2013-09-10 21:31:30.135841009 +0200
49 -@@ -1,12 +1,12 @@
50 - #!/bin/bash
51 -
52 --home_dir="/home/git"
53 -+repos_path="$(ruby -ryaml -e 'puts YAML::load_file("/etc/gitlab-shell.yml")["repos_path"]')"
54 -
55 - echo "Danger!!! Data Loss"
56 - while true; do
57 -- read -p "Do you wish to delete all directories (except gitolite-admin.git) from $home_dir/repositories/ (y/n) ?: " yn
58 -+ read -p "Do you wish to delete all directories (except gitolite-admin.git) from $repos_path (y/n) ?: " yn
59 - case $yn in
60 -- [Yy]* ) sh -c "find $home_dir/repositories/. -maxdepth 1 -not -name 'gitolite-admin.git' -not -name '.' | xargs rm -rf"; break;;
61 -+ [Yy]* ) sh -c "find $repos_path/. -maxdepth 1 -not -name 'gitolite-admin.git' -not -name '.' | xargs rm -rf"; break;;
62 - [Nn]* ) exit;;
63 - * ) echo "Please answer yes or no.";;
64 - esac
65
66 diff --git a/dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-redis-db-option.patch b/dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-redis-db-option.patch
67 deleted file mode 100644
68 index 4ff7d60..0000000
69 --- a/dev-vcs/gitlab-shell/files/gitlab-shell-1.8.0-redis-db-option.patch
70 +++ /dev/null
71 @@ -1,21 +0,0 @@
72 ---- a/lib/gitlab_config.rb
73 -+++ b/lib/gitlab_config.rb
74 -@@ -53,7 +53,7 @@ class GitlabConfig
75 - if redis.has_key?("socket")
76 - %W(#{redis['bin']} -s #{redis['socket']})
77 - else
78 -- %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']})
79 -+ %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -n #{redis['db']})
80 - end
81 - end
82 - end
83 ---- a/config.yml.example
84 -+++ b/config.yml.example
85 -@@ -25,6 +25,7 @@ redis:
86 - bin: /usr/bin/redis-cli
87 - host: 127.0.0.1
88 - port: 6379
89 -+ # db: 0
90 - # socket: /tmp/redis.socket # Only define this if you want to use sockets
91 - namespace: resque:gitlab
92 -
93
94 diff --git a/dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild
95 deleted file mode 100644
96 index 9d28d06..0000000
97 --- a/dev-vcs/gitlab-shell/gitlab-shell-1.8.0.ebuild
98 +++ /dev/null
99 @@ -1,122 +0,0 @@
100 -# Copyright 1999-2014 Gentoo Foundation
101 -# Distributed under the terms of the GNU General Public License v2
102 -# $Header: $
103 -
104 -EAPI="5"
105 -
106 -USE_RUBY="ruby19 ruby20"
107 -
108 -inherit eutils ruby-ng user
109 -
110 -DESCRIPTION="SSH access and repository management for GitLab"
111 -HOMEPAGE="https://github.com/gitlabhq/gitlab-shell"
112 -SRC_URI="https://github.com/gitlabhq/gitlab-shell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
113 -
114 -LICENSE="MIT"
115 -SLOT="0"
116 -KEYWORDS="amd64 x86"
117 -IUSE=""
118 -
119 -DEPEND=""
120 -RDEPEND="
121 - dev-vcs/git
122 - dev-db/redis
123 - virtual/ssh"
124 -ruby_add_bdepend "
125 - virtual/ruby-ssl"
126 -
127 -MERGE_TYPE="binary"
128 -
129 -RUBY_PATCHES=(
130 - "${PN}-1.7.1-paths-from-config.patch"
131 - "${PN}-1.8.0-redis-db-option.patch"
132 -)
133 -
134 -GIT_USER="git"
135 -DEST_DIR="/usr/share/${PN}"
136 -DATA_DIR="/var/lib/git"
137 -LOGS_DIR="/var/log/gitlab"
138 -CONF_FILE="/etc/gitlab-shell.yml"
139 -
140 -pkg_setup() {
141 - enewgroup ${GIT_USER}
142 - enewuser ${GIT_USER} -1 /bin/bash ${DATA_DIR} "${GIT_USER}"
143 -
144 - local git_shell=$(egetshell ${GIT_USER})
145 - if [ ! ${git_shell} -ef '/bin/bash' ]; then
146 - ewarn "User ${GIT_USER} already exists, but with the shell ${git_shell}."
147 - ewarn "Changing shell to /bin/bash ..."
148 -
149 - usermod -s /bin/bash ${GIT_USER} \
150 - || die "failed to change login shell for ${GIT_USER}"
151 - fi
152 -}
153 -
154 -all_ruby_prepare() {
155 - # fix paths
156 - sed -i -E \
157 - -e "s|/home/git|${DATA_DIR}|" \
158 - -e "s|[\# ]*(log_file: ).*|\1\"${LOGS_DIR}/gitlab-shell.log\"|" \
159 - config.yml.example || die "failed to filter config.yml.example"
160 -
161 - sed -i \
162 - -e "s|File\.join(ROOT_PATH, 'config.yml')|'${CONF_FILE}'|" \
163 - lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
164 -}
165 -
166 -all_ruby_install() {
167 - # install lib
168 - insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
169 -
170 - # install scripts
171 - exeinto ${DEST_DIR}/bin; doexe bin/*
172 - exeinto ${DEST_DIR}/hooks; doexe hooks/*
173 - exeinto ${DEST_DIR}/support; doexe support/*
174 -
175 - # create symlinks to bin
176 - local name; for name in $(basename -a bin/gitlab-*); do
177 - dosym "${DEST_DIR}/bin/${name}" "/usr/bin/${name}"
178 - done
179 -
180 - insinto $(dirname ${CONF_FILE})
181 - newins config.yml.example $(basename ${CONF_FILE})
182 -
183 - # prepare directories
184 - diropts -m750; dodir ${DATA_DIR}
185 - diropts -m770; keepdir ${DATA_DIR}/repositories
186 - diropts -m755; dodir ${LOGS_DIR}
187 -
188 - # GitLab stupidly expects that gitlab-shell is in home of git user...
189 - dosym ${DEST_DIR} ${DATA_DIR}/gitlab-shell
190 -
191 - # fix permissions
192 - fowners -R ${GIT_USER}:${GIT_USER} ${DATA_DIR} ${LOGS_DIR}
193 -}
194 -
195 -pkg_postinst() {
196 - # check git home directory
197 - local git_home=$(egethome ${GIT_USER})
198 - if [ ! "${git_home}" -ef ${DATA_DIR} ]; then
199 - ewarn "An authorized_keys is configured to be inside ${DATA_DIR}/.ssh,"
200 - ewarn "but HOME of ${GIT_USER} user is located in ${git_home}. You must"
201 - ewarn "either change the authorized_keys location in ${CONF_FILE},"
202 - ewarn "or change home directory of ${GIT_USER} user to ${DATA_DIR}"
203 - ewarn "and move ${git_home}/.ssh here."
204 - ewarn
205 - fi
206 -
207 - local auth_dir="${git_home}/.ssh"
208 -
209 - elog "Initializing authorized_keys file in ${auth_dir}"
210 - mkdir -p ${auth_dir}
211 - touch ${auth_dir}/authorized_keys
212 - chmod -R u=rwX,go=- ${auth_dir}
213 - chown -R ${GIT_USER}:${GIT_USER} ${auth_dir}
214 -
215 - elog
216 - elog "GitLab Shell was initialized. Repositories are located in"
217 - elog "${DATA_DIR}/repositories, scripts in ${DEST_DIR}/bin."
218 - elog "All gitlab-* scripts was symlinked to /usr/bin to be on your path."
219 - elog
220 - elog "You should change your gitlab_url in: ${CONF_FILE}."
221 -}
222
223 diff --git a/dev-vcs/gitlab-shell/gitlab-shell-1.9.3.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-1.9.3.ebuild
224 deleted file mode 100644
225 index 57aecbc..0000000
226 --- a/dev-vcs/gitlab-shell/gitlab-shell-1.9.3.ebuild
227 +++ /dev/null
228 @@ -1,122 +0,0 @@
229 -# Copyright 1999-2014 Gentoo Foundation
230 -# Distributed under the terms of the GNU General Public License v2
231 -# $Header: $
232 -
233 -EAPI="5"
234 -
235 -USE_RUBY="ruby19 ruby20"
236 -
237 -inherit eutils ruby-ng user
238 -
239 -DESCRIPTION="SSH access and repository management for GitLab"
240 -HOMEPAGE="https://github.com/gitlabhq/gitlab-shell"
241 -SRC_URI="https://github.com/gitlabhq/gitlab-shell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
242 -
243 -LICENSE="MIT"
244 -SLOT="0"
245 -KEYWORDS="~amd64 ~x86"
246 -IUSE=""
247 -
248 -DEPEND=""
249 -RDEPEND="
250 - dev-vcs/git
251 - dev-db/redis
252 - virtual/ssh"
253 -ruby_add_bdepend "
254 - virtual/ruby-ssl"
255 -
256 -MERGE_TYPE="binary"
257 -
258 -RUBY_PATCHES=(
259 - "${PN}-1.7.1-paths-from-config.patch"
260 - "${PN}-1.8.0-redis-db-option.patch"
261 -)
262 -
263 -GIT_USER="git"
264 -DEST_DIR="/usr/share/${PN}"
265 -DATA_DIR="/var/lib/git"
266 -LOGS_DIR="/var/log/gitlab"
267 -CONF_FILE="/etc/gitlab-shell.yml"
268 -
269 -pkg_setup() {
270 - enewgroup ${GIT_USER}
271 - enewuser ${GIT_USER} -1 /bin/bash ${DATA_DIR} "${GIT_USER}"
272 -
273 - local git_shell=$(egetshell ${GIT_USER})
274 - if [ ! ${git_shell} -ef '/bin/bash' ]; then
275 - ewarn "User ${GIT_USER} already exists, but with the shell ${git_shell}."
276 - ewarn "Changing shell to /bin/bash ..."
277 -
278 - usermod -s /bin/bash ${GIT_USER} \
279 - || die "failed to change login shell for ${GIT_USER}"
280 - fi
281 -}
282 -
283 -all_ruby_prepare() {
284 - # fix paths
285 - sed -i -E \
286 - -e "s|/home/git|${DATA_DIR}|" \
287 - -e "s|[\# ]*(log_file: ).*|\1\"${LOGS_DIR}/gitlab-shell.log\"|" \
288 - config.yml.example || die "failed to filter config.yml.example"
289 -
290 - sed -i \
291 - -e "s|File\.join(ROOT_PATH, 'config.yml')|'${CONF_FILE}'|" \
292 - lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
293 -}
294 -
295 -all_ruby_install() {
296 - # install lib
297 - insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
298 -
299 - # install scripts
300 - exeinto ${DEST_DIR}/bin; doexe bin/*
301 - exeinto ${DEST_DIR}/hooks; doexe hooks/*
302 - exeinto ${DEST_DIR}/support; doexe support/*
303 -
304 - # create symlinks to bin
305 - local name; for name in $(basename -a bin/gitlab-*); do
306 - dosym "${DEST_DIR}/bin/${name}" "/usr/bin/${name}"
307 - done
308 -
309 - insinto $(dirname ${CONF_FILE})
310 - newins config.yml.example $(basename ${CONF_FILE})
311 -
312 - # prepare directories
313 - diropts -m750; dodir ${DATA_DIR}
314 - diropts -m770; keepdir ${DATA_DIR}/repositories
315 - diropts -m755; dodir ${LOGS_DIR}
316 -
317 - # GitLab stupidly expects that gitlab-shell is in home of git user...
318 - dosym ${DEST_DIR} ${DATA_DIR}/gitlab-shell
319 -
320 - # fix permissions
321 - fowners -R ${GIT_USER}:${GIT_USER} ${DATA_DIR} ${LOGS_DIR}
322 -}
323 -
324 -pkg_postinst() {
325 - # check git home directory
326 - local git_home=$(egethome ${GIT_USER})
327 - if [ ! "${git_home}" -ef ${DATA_DIR} ]; then
328 - ewarn "An authorized_keys is configured to be inside ${DATA_DIR}/.ssh,"
329 - ewarn "but HOME of ${GIT_USER} user is located in ${git_home}. You must"
330 - ewarn "either change the authorized_keys location in ${CONF_FILE},"
331 - ewarn "or change home directory of ${GIT_USER} user to ${DATA_DIR}"
332 - ewarn "and move ${git_home}/.ssh here."
333 - ewarn
334 - fi
335 -
336 - local auth_dir="${git_home}/.ssh"
337 -
338 - elog "Initializing authorized_keys file in ${auth_dir}"
339 - mkdir -p ${auth_dir}
340 - touch ${auth_dir}/authorized_keys
341 - chmod -R u=rwX,go=- ${auth_dir}
342 - chown -R ${GIT_USER}:${GIT_USER} ${auth_dir}
343 -
344 - elog
345 - elog "GitLab Shell was initialized. Repositories are located in"
346 - elog "${DATA_DIR}/repositories, scripts in ${DEST_DIR}/bin."
347 - elog "All gitlab-* scripts was symlinked to /usr/bin to be on your path."
348 - elog
349 - elog "You should change your gitlab_url in: ${CONF_FILE}."
350 -}
351
352 diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
353 deleted file mode 100644
354 index e0c345b..0000000
355 --- a/www-apps/gitlabhq/Manifest
356 +++ /dev/null
357 @@ -1,10 +0,0 @@
358 -AUX gitlab-sidekiq.init 979 SHA256 f9bc02031b0418e4c765fae37bb40cd9e16dbe5b1a7f5c105a2d7ba3568b0195 SHA512 e3311f1110fca02a378a9f74704d9241884a1973e90be1dbd663809b524528eda25e3ad0ac5d20737f6ccd78343582557ac579adb976473f8aabc0320172921f WHIRLPOOL 365d539cceacb5ff9171aa7316ac061ef4b4a8d63e6d4a26395afb841878a08bdd1b9bf2709602dc90f15a1ed5ff8566a0e8239e8ab9184e84814a16993f3aeb
359 -AUX gitlab-unicorn-6.init 1663 SHA256 ba211c63d559cbca510483d5536d28131e08f67dc8914444a2c85b27c7a92b60 SHA512 a574b3bb5b9af3e3a707045ac6d783bab73bab1db033d07999b3d06789da0853bc3de0bba39a3c154e5b1ab385926ee3ec4487f4c797708a318fa5df22827069 WHIRLPOOL 497cf52ebb4b33cc6bbd81e53d4961878b2ea9dc42bacabf7a32686e52a54c22eed73836705e80714d7b759cfd2ee1929e6aa12083435f265c472270e158f72a
360 -AUX gitlabhq-6.0.2-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
361 -AUX gitlabhq-6.8.2-email-custom-reply_to.patch 2014 SHA256 7b0a66c3dde960aac805d1b2780be1166135f7b124e1f3a4861fae2f04543c01 SHA512 2c1da90d46ce57dad00df7a55f0af6ab1eca4e09a96580f8482dcff2188d351ce21f1bd366894e64eb1888904f6a8fddc4dec34d88af06e95946c0be834364e2 WHIRLPOOL bf126a9486fab62bdd921459c8d21e13c5de85542dde129e773057ccf9e80662b923f0bc84e2476735c8dafdb5800c6e7249450a37ad04be39d70e766af2ffd3
362 -AUX gitlabhq-6.8.2-fix-gemfile.patch 2263 SHA256 584966eb3efc63a6102754e165c46d50b037e3ea046a2fe1cfc24b53bf03bdea SHA512 9bd6490e86dcc830c759210dc6ceed101c177cee06bc4427398ed03fba8e128413b4cb04317e081b765df5c39987219c2bc1ce5538479ec39d3bcf5d253bb9e0 WHIRLPOOL 8d9dbafd45d61cb23e3126192666e671b8b8d46bc1898c976aa335fb58546c11885b14e370e45ca5dff01a68de7b555a9ae0a8a325f818c54e4e617704c360dd
363 -AUX gitlabhq-6.8.2-fix-project-name-regex.patch 1376 SHA256 71f6c2ebbe3af6012cf523535699001d86c4ad925cc7b78d179a3ec7002ddf9b SHA512 c2fe0959486e2bd05b856a8c9f710a89709fee77bf0c490fffcbf2b014223aed761ad1e1ef42ea3412f595066cf109937fb02135ec4c70c64330c48780bb7655 WHIRLPOOL 8003eb841390e5c5edde24b05a408d9982aeaba0cbccbd7824fbd8d469c445be3bcc46e2d58712fa7de0b8d3aabc9e85a33211071a58b9d2a0f43d97eb8b44ba
364 -AUX gitlabhq-6.8.2-ldap-custom-mapping.patch 3276 SHA256 d335fc980a891a7a24cbb96ec7a4109bb3fc3a89ebc8c797d787e69fff74e7d2 SHA512 7cb523db97986eb94d0feda7be0eb8f400b9df744f25a44a783925059ae97671400bebfbe75b6d803640e4eb828abea193dcde26a2e6d5f103dc9d0913772365 WHIRLPOOL 76d81fd7075bb6dd52b622c6f2147393dd5fcf8e42addb82e9431a019c445f5703a77f31db71a62e05561eb05be8195bf05da0be83cd20db57659a057f7b0481
365 -DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
366 -EBUILD gitlabhq-6.8.2.ebuild 10719 SHA256 cf723823af2609d9918dbe91302d7795ba49d57f2861ba98fb3512c05c6160fc SHA512 292f615eba6d5cd0e5b9789a94d114dc4299663fcfd4a4a839f769ae141a4d9deae030b6f69c7ad66da9b39ae9502cb284259515d5f584138ab7f86fbc5860ad WHIRLPOOL e4ec260a9ceecb8f18c44f0ba5ff5707bb40324d9fb17cdc331cd08de668ae818d11d9db7bf6534c03bcbd3b8c9f4dd91af55b1670b830b95636699436e398b4
367 -MISC metadata.xml 475 SHA256 65a46fa9904c8b7657181e4929f304675a2173e9329aa8fb5d8645515032168f SHA512 b2aa4c167c6287e60bb62a45e3d48fa00a8b080e0f81a966388dd8a1fbc2012f9737d5f02134382e5a0b212b38781c15b0fdf2508fe6b4b7630a8fcebe713065 WHIRLPOOL 5b5f73953ba7b23b7f9590da5f2e22a0930880ceb37eb87c25a8e043943671da1fcf8f561f76d2c262a1f514cb917140c99d77d9f4e448ed260b1a5127603195
368
369 diff --git a/www-apps/gitlabhq/files/gitlab-sidekiq.init b/www-apps/gitlabhq/files/gitlab-sidekiq.init
370 deleted file mode 100644
371 index 99b2d17..0000000
372 --- a/www-apps/gitlabhq/files/gitlab-sidekiq.init
373 +++ /dev/null
374 @@ -1,43 +0,0 @@
375 -#!/sbin/runscript
376 -
377 -name="GitLab Sidekiq"
378 -description="Sidekiq for GitLab @SLOT@"
379 -
380 -: ${gitlab_user:=@USER@}
381 -: ${gitlab_base:="@GITLAB_BASE@"}
382 -: ${rails_env:=production}
383 -
384 -: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
385 -: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
386 -: ${sidekiq_queues:="@QUEUES@"}
387 -
388 -sidekiq_command="/usr/bin/bundle"
389 -sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
390 -
391 -depend() {
392 - need redis
393 - use net
394 -}
395 -
396 -start() {
397 - checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
398 -
399 - ebegin "Starting ${name} - Sidekiq"
400 -
401 - start-stop-daemon --start \
402 - --background --quiet \
403 - --chdir "${gitlab_base}" \
404 - --user=${gitlab_user} \
405 - --pidfile="${sidekiq_pidfile}" \
406 - --env RAILS_ENV=${rails_env} \
407 - --exec ${sidekiq_command} -- ${sidekiq_command_args}
408 - eend $?
409 -}
410 -
411 -stop() {
412 - ebegin "Stopping ${name} - Sidekiq"
413 - start-stop-daemon --stop \
414 - --pidfile=${sidekiq_pidfile} \
415 - --exec ${sidekiq_command}
416 - eend $?
417 -}
418
419 diff --git a/www-apps/gitlabhq/files/gitlab-unicorn-6.init b/www-apps/gitlabhq/files/gitlab-unicorn-6.init
420 deleted file mode 100644
421 index 382be7a..0000000
422 --- a/www-apps/gitlabhq/files/gitlab-unicorn-6.init
423 +++ /dev/null
424 @@ -1,67 +0,0 @@
425 -#!/sbin/runscript
426 -
427 -name="GitLab-@SLOT@"
428 -description="GitLab @SLOT@ on Unicorns"
429 -
430 -: ${gitlab_user:=@USER@}
431 -: ${gitlab_base:="@GITLAB_BASE@"}
432 -: ${rails_env:=production}
433 -
434 -: ${server_pidfile:="/run/gitlab/unicorn.pid"}
435 -
436 -: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
437 -: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
438 -: ${sidekiq_queues:="@QUEUES@"}
439 -
440 -server_command="/usr/bin/bundle"
441 -server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D"
442 -
443 -sidekiq_command="/usr/bin/bundle"
444 -sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
445 -
446 -depend() {
447 - provide gitlab
448 - need redis
449 - use net
450 -}
451 -
452 -start() {
453 - ebegin "Starting ${name} - Unicorn servers"
454 -
455 - checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")"
456 - checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
457 -
458 - start-stop-daemon --start \
459 - --chdir "${gitlab_base}" \
460 - --user=${gitlab_user} \
461 - --pidfile="${server_pidfile}" \
462 - --env RAILS_ENV=${rails_env} \
463 - --exec ${server_command} -- ${server_command_args}
464 - eend $?
465 -
466 - ebegin "Starting ${name} - Sidekiq"
467 -
468 - start-stop-daemon --start \
469 - --background --quiet \
470 - --chdir "${gitlab_base}" \
471 - --user=${gitlab_user} \
472 - --pidfile="${sidekiq_pidfile}" \
473 - --env RAILS_ENV=${rails_env} \
474 - --exec ${sidekiq_command} -- ${sidekiq_command_args}
475 - eend $?
476 -}
477 -
478 -stop() {
479 - ebegin "Stopping ${name} - Sidekiq"
480 - start-stop-daemon --stop \
481 - --pidfile=${sidekiq_pidfile} \
482 - --exec ${sidekiq_command}
483 - eend $?
484 -
485 - ebegin "Stopping ${name} - Unicorn servers"
486 - start-stop-daemon --stop \
487 - --signal QUIT \
488 - --pidfile=${server_pidfile} \
489 - --exec ${server_command}
490 - eend $?
491 -}
492
493 diff --git a/www-apps/gitlabhq/files/gitlabhq-6.0.2-fix-sendmail-config.patch b/www-apps/gitlabhq/files/gitlabhq-6.0.2-fix-sendmail-config.patch
494 deleted file mode 100644
495 index 0a6e8d9..0000000
496 --- a/www-apps/gitlabhq/files/gitlabhq-6.0.2-fix-sendmail-config.patch
497 +++ /dev/null
498 @@ -1,20 +0,0 @@
499 -diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb
500 -index 82eb250..10e25e5 100644
501 ---- a/config/environments/production.rb
502 -+++ b/config/environments/production.rb
503 -@@ -73,11 +73,10 @@ Gitlab::Application.configure do
504 - # config.active_record.auto_explain_threshold_in_seconds = 0.5
505 -
506 - config.action_mailer.delivery_method = :sendmail
507 -- # Defaults to:
508 -- # # config.action_mailer.sendmail_settings = {
509 -- # # location: '/usr/sbin/sendmail',
510 -- # # arguments: '-i -t'
511 -- # # }
512 -+ config.action_mailer.sendmail_settings = {
513 -+ location: '/usr/sbin/sendmail',
514 -+ arguments: '-i'
515 -+ }
516 - config.action_mailer.perform_deliveries = true
517 - config.action_mailer.raise_delivery_errors = true
518 - end
519
520 diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-email-custom-reply_to.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-email-custom-reply_to.patch
521 deleted file mode 100644
522 index 319da52..0000000
523 --- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-email-custom-reply_to.patch
524 +++ /dev/null
525 @@ -1,36 +0,0 @@
526 -diff -ur gitlabhq-6.8.2.orig/app/mailers/notify.rb gitlabhq-6.8.2/app/mailers/notify.rb
527 ---- gitlabhq-6.8.2.orig/app/mailers/notify.rb 2014-05-12 11:15:38.000000000 +0200
528 -+++ gitlabhq-6.8.2/app/mailers/notify.rb 2014-05-21 21:15:49.607758248 +0200
529 -@@ -16,7 +16,7 @@
530 - default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
531 -
532 - default from: Proc.new { default_sender_address.format }
533 -- default reply_to: "noreply@#{Gitlab.config.gitlab.host}"
534 -+ default reply_to: Gitlab.config.gitlab.email_reply_to
535 -
536 - # Just send email with 2 seconds delay
537 - def self.delay
538 -diff -ur gitlabhq-6.8.2.orig/config/gitlab.yml.example gitlabhq-6.8.2/config/gitlab.yml.example
539 ---- gitlabhq-6.8.2.orig/config/gitlab.yml.example 2014-05-12 11:15:38.000000000 +0200
540 -+++ gitlabhq-6.8.2/config/gitlab.yml.example 2014-05-21 21:16:46.744345902 +0200
541 -@@ -37,6 +37,9 @@
542 - # Email address used in the "From" field in mails sent by GitLab
543 - email_from: gitlab@localhost
544 -
545 -+ # Email address used in the "Reply-To" field in mails send by GitLab (default: no-reply@<host>)
546 -+ email_reply_to: no-reply@localhost
547 -+
548 - # Email address of your support contact (default: same as email_from)
549 - support_email: support@localhost
550 -
551 -diff -ur gitlabhq-6.8.2.orig/config/initializers/1_settings.rb gitlabhq-6.8.2/config/initializers/1_settings.rb
552 ---- gitlabhq-6.8.2.orig/config/initializers/1_settings.rb 2014-05-12 11:15:38.000000000 +0200
553 -+++ gitlabhq-6.8.2/config/initializers/1_settings.rb 2014-05-21 21:17:24.905406287 +0200
554 -@@ -78,6 +78,7 @@
555 - Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
556 - Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
557 - Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
558 -+Settings.gitlab['email_reply_to'] ||= "no-reply@#{Settings.gitlab.host}"
559 - Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
560 - Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
561 - Settings.gitlab['user'] ||= 'git'
562
563 diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile.patch
564 deleted file mode 100644
565 index 7bc7218..0000000
566 --- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile.patch
567 +++ /dev/null
568 @@ -1,86 +0,0 @@
569 -diff -ur gitlabhq-6.8.2.orig/Gemfile gitlabhq-6.8.2/Gemfile
570 ---- gitlabhq-6.8.2.orig/Gemfile 2014-05-12 11:15:38.000000000 +0200
571 -+++ gitlabhq-6.8.2/Gemfile 2014-05-22 00:21:48.158938691 +0200
572 -@@ -142,6 +142,10 @@
573 - # Sanitize user input
574 - gem "sanitize", '~> 2.0'
575 -
576 -+# The newer revision of charlock_holmes that is finally fixed to
577 -+# be compatible with Gentoo
578 -+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
579 -+
580 - # Protect against bruteforcing
581 - gem "rack-attack"
582 -
583 -@@ -151,7 +155,6 @@
584 - gem "sass-rails", '~> 4.0.2'
585 - gem "coffee-rails"
586 - gem "uglifier"
587 --gem "therubyracer"
588 - gem 'turbolinks'
589 - gem 'jquery-turbolinks'
590 -
591 -diff -ur gitlabhq-6.8.2.orig/Gemfile.lock gitlabhq-6.8.2/Gemfile.lock
592 ---- gitlabhq-6.8.2.orig/Gemfile.lock 2014-05-12 11:15:38.000000000 +0200
593 -+++ gitlabhq-6.8.2/Gemfile.lock 2014-05-22 00:24:39.954746019 +0200
594 -@@ -1,3 +1,10 @@
595 -+GIT
596 -+ remote: https://github.com/brianmario/charlock_holmes.git
597 -+ revision: dde194609b3513b0d2369ce8f916ae52566154b4
598 -+ ref: dde194609b3513b0d2369ce8f916ae52566154b4
599 -+ specs:
600 -+ charlock_holmes (0.6.9.4)
601 -+
602 - GEM
603 - remote: https://rubygems.org/
604 - specs:
605 -@@ -60,7 +67,6 @@
606 - json (>= 1.7)
607 - celluloid (0.15.2)
608 - timers (~> 1.1.0)
609 -- charlock_holmes (0.6.9.4)
610 - cliver (0.2.2)
611 - code_analyzer (0.4.3)
612 - sexp_processor
613 -@@ -267,7 +273,6 @@
614 - addressable (~> 2.3)
615 - letter_opener (1.1.2)
616 - launchy (~> 2.2)
617 -- libv8 (3.16.14.3)
618 - listen (2.3.1)
619 - celluloid (>= 0.15.2)
620 - rb-fsevent (>= 0.9.3)
621 -@@ -402,7 +407,6 @@
622 - redis-store (~> 1.1.0)
623 - redis-store (1.1.4)
624 - redis (>= 2.2)
625 -- ref (1.0.5)
626 - require_all (1.3.2)
627 - rest-client (1.6.7)
628 - mime-types (>= 1.16)
629 -@@ -496,9 +500,6 @@
630 - term-ansicolor (1.2.2)
631 - tins (~> 0.8)
632 - test_after_commit (0.2.2)
633 -- therubyracer (0.12.0)
634 -- libv8 (~> 3.16.14.0)
635 -- ref
636 - thin (1.6.1)
637 - daemons (>= 1.0.9)
638 - eventmachine (>= 1.0.0)
639 -@@ -567,6 +568,7 @@
640 - bootstrap-sass (~> 3.0)
641 - capybara
642 - carrierwave
643 -+ charlock_holmes!
644 - coffee-rails
645 - colored
646 - coveralls
647 -@@ -654,7 +656,6 @@
648 - stamp
649 - state_machine
650 - test_after_commit
651 -- therubyracer
652 - thin
653 - tinder (~> 1.9.2)
654 - turbolinks
655
656 diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-project-name-regex.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-project-name-regex.patch
657 deleted file mode 100644
658 index 8f986c1..0000000
659 --- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-project-name-regex.patch
660 +++ /dev/null
661 @@ -1,30 +0,0 @@
662 -diff -ur gitlabhq-6.8.2.orig/app/models/project.rb gitlabhq-6.8.2/app/models/project.rb
663 ---- gitlabhq-6.8.2.orig/app/models/project.rb 2014-05-12 11:15:38.000000000 +0200
664 -+++ gitlabhq-6.8.2/app/models/project.rb 2014-05-21 21:05:09.641976937 +0200
665 -@@ -90,7 +90,7 @@
666 - validates :description, length: { maximum: 2000 }, allow_blank: true
667 - validates :name, presence: true, length: { within: 0..255 },
668 - format: { with: Gitlab::Regex.project_name_regex,
669 -- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
670 -+ message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" }
671 - validates :path, presence: true, length: { within: 0..255 },
672 - exclusion: { in: Gitlab::Blacklist.path },
673 - format: { with: Gitlab::Regex.path_regex,
674 -diff -ur gitlabhq-6.8.2.orig/lib/gitlab/regex.rb gitlabhq-6.8.2/lib/gitlab/regex.rb
675 ---- gitlabhq-6.8.2.orig/lib/gitlab/regex.rb 2014-05-12 11:15:38.000000000 +0200
676 -+++ gitlabhq-6.8.2/lib/gitlab/regex.rb 2014-05-21 21:03:43.872609059 +0200
677 -@@ -1,3 +1,5 @@
678 -+# encoding: utf-8
679 -+
680 - module Gitlab
681 - module Regex
682 - extend self
683 -@@ -7,7 +9,7 @@
684 - end
685 -
686 - def project_name_regex
687 -- /\A[a-zA-Z0-9_][a-zA-Z0-9_\-\. ]*\z/
688 -+ /\A\p{Word}[\p{Word}\-:\. ]*\z/
689 - end
690 -
691 - def name_regex
692
693 diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-ldap-custom-mapping.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-ldap-custom-mapping.patch
694 deleted file mode 100644
695 index c8c8f55..0000000
696 --- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-ldap-custom-mapping.patch
697 +++ /dev/null
698 @@ -1,99 +0,0 @@
699 -diff --git a/Gemfile b/Gemfile
700 -index fe8e54e..b33a74e 100644
701 ---- a/Gemfile
702 -+++ b/Gemfile
703 -@@ -36,7 +36,8 @@ gem "gitlab_git", "~> 4.0.0"
704 - gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
705 -
706 - # LDAP Auth
707 --gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
708 -+# Patched for attributes mapping customization
709 -+gem 'gitlab_omniauth-ldap', '1.0.4', require: 'omniauth-ldap', git: 'https://github.com/jirutka/omniauth-ldap.git', ref: 'b55852bfc9b46ecf790a2c5526386702350eab89'
710 -
711 - # Syntax highlighter
712 - gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
713 -diff --git a/Gemfile.lock b/Gemfile.lock
714 -index d0f185b..46543e3 100644
715 ---- a/Gemfile.lock
716 -+++ b/Gemfile.lock
717 -@@ -6,6 +6,17 @@ GIT
718 - charlock_holmes (0.6.9.4)
719 -
720 - GIT
721 -+ remote: https://github.com/jirutka/omniauth-ldap.git
722 -+ revision: b55852bfc9b46ecf790a2c5526386702350eab89
723 -+ ref: b55852bfc9b46ecf790a2c5526386702350eab89
724 -+ specs:
725 -+ gitlab_omniauth-ldap (1.0.4)
726 -+ net-ldap (~> 0.3.1)
727 -+ omniauth (~> 1.0)
728 -+ pyu-ruby-sasl (~> 0.0.3.1)
729 -+ rubyntlm (~> 0.1.1)
730 -+
731 -+GIT
732 - remote: https://github.com/gitlabhq/markup.git
733 - revision: 61ade389c1e1c159359338f570d18464a44ddbc4
734 - ref: 61ade389c1e1c159359338f570d18464a44ddbc4
735 -@@ -193,11 +204,6 @@ GEM
736 - gitlab-linguist (~> 2.9.5)
737 - gitlab-pygments.rb (~> 0.5.4)
738 - gitlab_meta (6.0)
739 -- gitlab_omniauth-ldap (1.0.3)
740 -- net-ldap (~> 0.3.1)
741 -- omniauth (~> 1.0)
742 -- pyu-ruby-sasl (~> 0.0.3.1)
743 -- rubyntlm (~> 0.1.1)
744 - gon (5.0.1)
745 - actionpack (>= 2.3.0)
746 - json
747 -@@ -587,7 +593,7 @@ DEPENDENCIES
748 - gitlab-pygments.rb (~> 0.5.4)
749 - gitlab_git (~> 4.0.0)
750 - gitlab_meta (= 6.0)
751 -- gitlab_omniauth-ldap (= 1.0.3)
752 -+ gitlab_omniauth-ldap (= 1.0.4)!
753 - gon (~> 5.0.0)
754 - grape (~> 0.6.1)
755 - grape-entity (~> 0.3.0)
756 -diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
757 -index 776d930..a5b96e4 100644
758 ---- a/config/gitlab.yml.example
759 -+++ b/config/gitlab.yml.example
760 -@@ -130,6 +130,10 @@ production: &base
761 - method: 'ssl' # "ssl" or "plain"
762 - bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
763 - password: '_the_password_of_the_bind_user'
764 -+ mapping:
765 -+ username: 'uid'
766 -+ name: 'cn'
767 -+ email: 'mail'
768 - # If allow_username_or_email_login is enabled, GitLab will ignore everything
769 - # after the first '@' in the LDAP username submitted by the user on login.
770 - #
771 -diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
772 -index 2539097..739de8e 100644
773 ---- a/config/initializers/devise.rb
774 -+++ b/config/initializers/devise.rb
775 -@@ -223,6 +223,7 @@ Devise.setup do |config|
776 - method: Gitlab.config.ldap['method'],
777 - bind_dn: Gitlab.config.ldap['bind_dn'],
778 - password: Gitlab.config.ldap['password'],
779 -+ mapping: Gitlab.config.ldap['mapping'],
780 - name_proc: email_stripping_proc
781 - end
782 -
783 -diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
784 -index 8afd64f..f1f1bea 100644
785 ---- a/lib/gitlab/ldap/user.rb
786 -+++ b/lib/gitlab/ldap/user.rb
787 -@@ -97,6 +97,10 @@ module Gitlab
788 - 'ldap'
789 - end
790 -
791 -+ def username
792 -+ (auth.info.username || auth.info.nickname).to_s.force_encoding('utf-8')
793 -+ end
794 -+
795 - def raise_error(message)
796 - raise OmniAuth::Error, "(LDAP) " + message
797 - end
798
799 diff --git a/www-apps/gitlabhq/gitlabhq-6.8.2.ebuild b/www-apps/gitlabhq/gitlabhq-6.8.2.ebuild
800 deleted file mode 100644
801 index 8c89e5b..0000000
802 --- a/www-apps/gitlabhq/gitlabhq-6.8.2.ebuild
803 +++ /dev/null
804 @@ -1,362 +0,0 @@
805 -# Copyright 1999-2014 Gentoo Foundation
806 -# Distributed under the terms of the GNU General Public License v2
807 -# $Header: $
808 -
809 -EAPI="5"
810 -
811 -# Mainteiner notes:
812 -# - This ebuild uses Bundler to download and install all gems in deployment mode
813 -# (i.e. into isolated directory inside application). That's not Gentoo way how
814 -# it should be done, but GitLab has too many dependencies that it will be too
815 -# difficult to maintain them via ebuilds.
816 -#
817 -
818 -USE_RUBY="ruby19 ruby20"
819 -PYTHON_COMPAT=( python{2_7,3_{1,2,3}} )
820 -
821 -inherit eutils python-r1 ruby-ng user
822 -
823 -DESCRIPTION="GitLab is a free project and repository management application"
824 -HOMEPAGE="https://github.com/gitlabhq/gitlabhq"
825 -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
826 -
827 -RESTRICT="mirror"
828 -
829 -LICENSE="MIT"
830 -SLOT="6"
831 -KEYWORDS="amd64 x86"
832 -IUSE="mysql +postgres +unicorn"
833 -
834 -## Gems dependencies:
835 -# charlock_holmes dev-libs/icu
836 -# grape, capybara dev-libs/libxml2, dev-libs/libxslt
837 -# json dev-util/ragel
838 -# pygments.rb python 2.7+
839 -# execjs net-libs/nodejs, or any other JS runtime
840 -# pg dev-db/postgresql-base
841 -# mysql virtual/mysql
842 -#
843 -GEMS_DEPEND="
844 - dev-libs/icu
845 - dev-libs/libxml2
846 - dev-libs/libxslt
847 - dev-util/ragel
848 - net-libs/nodejs
849 - postgres? ( dev-db/postgresql-base )
850 - mysql? ( virtual/mysql )"
851 -DEPEND="${GEMS_DEPEND}
852 - >=dev-vcs/gitlab-shell-1.8
853 - dev-vcs/git"
854 -RDEPEND="${DEPEND}
855 - dev-db/redis
856 - virtual/mta"
857 -ruby_add_bdepend "
858 - virtual/rubygems
859 - dev-ruby/bundler"
860 -
861 -#
862 -# fix-gemfile:
863 -# Remove therubyracer that doesn't compile well on Gentoo (we're using
864 -# nodejs instead that is faster and better). Also replace broken
865 -# charlock_holmes version with fixed one.
866 -#
867 -# fix-project-name-regex:
868 -# Allow project name to contain non-ASCII characters.
869 -#
870 -# fix-sendmail-config:
871 -# Fix default settings to work with ssmtp that doesn't know '-t' argument.
872 -#
873 -# "${P}-ldap-custom-mapping.patch"
874 -RUBY_PATCHES=(
875 - "${P}-fix-gemfile.patch"
876 - "${P}-fix-project-name-regex.patch"
877 - "${PN}-6.0.2-fix-sendmail-config.patch"
878 - "${P}-email-custom-reply_to.patch"
879 -)
880 -
881 -MY_NAME="gitlab"
882 -MY_USER="git" # should be same as in gitlab-shell
883 -
884 -DEST_DIR="/opt/${MY_NAME}-${SLOT}"
885 -CONF_DIR="/etc/${MY_NAME}-${SLOT}"
886 -LOGS_DIR="/var/log/${MY_NAME}"
887 -TEMP_DIR="/var/tmp/${MY_NAME}"
888 -
889 -# When updating ebuild to newer version, check list of the queues in
890 -# https://github.com/gitlabhq/gitlabhq/blob/v${PV}/script/background_jobs
891 -SIDEKIQ_QUEUES="post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default"
892 -
893 -all_ruby_prepare() {
894 -
895 - # fix paths
896 - local satellites_path="${TEMP_DIR}/repo_satellites"
897 - local repos_path=/var/lib/git/repositories
898 - local shell_path=/usr/share/gitlab-shell
899 - sed -i -E \
900 - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \
901 - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
902 - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
903 - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
904 - config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
905 -
906 - local run_path=/run/${MY_NAME}
907 - sed -i -E \
908 - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
909 - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
910 - -e "s|/home/git/gitlab|${DEST_DIR}|" \
911 - config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
912 -
913 - sed -i \
914 - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
915 - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
916 -
917 - # modify default database settings for PostgreSQL
918 - sed -i -E \
919 - -e 's|(username:).*|\1 gitlab|' \
920 - -e 's|(password:).*|\1 gitlab|' \
921 - -e 's|(socket:).*|/run/postgresql/.s.PGSQL.5432|' \
922 - config/database.yml.postgresql \
923 - || die "failed to filter database.yml.postgresql"
924 -
925 - # rename config files
926 - mv config/gitlab.yml.example config/gitlab.yml
927 - mv config/unicorn.rb.example config/unicorn.rb
928 -
929 - local dbconf=config/database.yml
930 - if use postgres && ! use mysql; then
931 - mv ${dbconf}.postgresql ${dbconf}
932 - rm ${dbconf}.mysql
933 - elif use mysql && ! use postgres; then
934 - mv ${dbconf}.mysql ${dbconf}
935 - rm ${dbconf}.postgresql
936 - fi
937 -
938 - # remove zzet's stupid migration which expetcs that users are so foolish
939 - # to run GitLab with PostgreSQL's superuser...
940 - rm db/migrate/20121009205010_postgres_create_integer_cast.rb
941 -
942 - # remove useless files
943 - rm -r lib/support/{deploy,init.d}
944 - rm -r script/{background_jobs,web}
945 - use unicorn || rm config/unicorn.rb
946 -}
947 -
948 -all_ruby_install() {
949 - local dest=${DEST_DIR}
950 - local conf=${CONF_DIR}
951 - local logs=${LOGS_DIR}
952 - local temp=${TEMP_DIR}
953 -
954 - # prepare directories
955 - diropts -m750
956 - dodir ${logs} ${temp} ${temp}/repo_satellites
957 -
958 - diropts -m755
959 - dodir ${conf} ${dest}/public/uploads
960 -
961 - dosym ${temp} ${dest}/tmp
962 - dosym ${logs} ${dest}/log
963 -
964 - # install configs
965 - insinto ${conf}
966 - doins -r config/*
967 - dosym ${conf} ${dest}/config
968 -
969 - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
970 -
971 - # remove needless dirs
972 - rm -Rf config tmp log
973 -
974 - # install the rest files
975 - # using cp 'cause doins is slow
976 - cp -Rl * "${D}/${dest}"/
977 -
978 - # install logrotate config
979 - dodir /etc/logrotate.d
980 - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
981 - ${logs}/*.log {
982 - missingok
983 - delaycompress
984 - compress
985 - copytruncate
986 - }
987 - EOF
988 -
989 - ## Install gems via bundler ##
990 -
991 - cd "${D}/${dest}"
992 -
993 - local without="development test aws"
994 - local flag; for flag in mysql postgres unicorn; do
995 - without+="$(use $flag || echo ' '$flag)"
996 - done
997 - local bundle_args="--deployment ${without:+--without ${without}}"
998 -
999 - einfo "Running bundle install ${bundle_args} ..."
1000 - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
1001 -
1002 - # clean gems cache
1003 - rm -Rf vendor/bundle/ruby/*/cache
1004 -
1005 - # fix permissions
1006 - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
1007 - fperms +x script/{rails,check}
1008 -
1009 - ## RC script ##
1010 -
1011 - local rcscript=gitlab-sidekiq.init
1012 - use unicorn && rcscript=gitlab-unicorn-6.init
1013 -
1014 - cp "${FILESDIR}/${rcscript}" "${T}" || die
1015 - sed -i \
1016 - -e "s|@USER@|${MY_USER}|" \
1017 - -e "s|@SLOT@|${SLOT}|" \
1018 - -e "s|@GITLAB_BASE@|${dest}|" \
1019 - -e "s|@LOGS_DIR@|${logs}|" \
1020 - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
1021 - "${T}/${rcscript}" \
1022 - || die "failed to filter ${rcscript}"
1023 -
1024 - newinitd "${T}/${rcscript}" "${MY_NAME}-${SLOT}"
1025 -}
1026 -
1027 -pkg_postinst() {
1028 - elog
1029 - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
1030 - elog
1031 - elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
1032 - elog " for \"production\" environment."
1033 - elog
1034 - elog "3. Then you should create a database for your GitLab instance, if you"
1035 - elog "haven't done so already."
1036 - elog
1037 - if use postgres; then
1038 - elog "If you have local PostgreSQL running, just copy&run:"
1039 - elog " su postgres"
1040 - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
1041 - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
1042 - elog " createdb -E UTF-8 -O gitlab gitlabhq_production"
1043 - elog " Note: You should change your password to something more random..."
1044 - elog
1045 - fi
1046 - elog "4. Finally execute the following command to initlize environment:"
1047 - elog " emerge --config \"=${CATEGORY}/${PF}\""
1048 - elog " Note: Do not forget to start Redis server first!"
1049 - elog
1050 - elog "If this is an update from previous version, it's HIGHLY recommended"
1051 - elog "to backup your database before running the config phase!"
1052 - elog
1053 - elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
1054 - elog "you can't login after the upgrade, be sure to read the section about the"
1055 - elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
1056 - elog "http://goo.gl/5XGRGv."
1057 -}
1058 -
1059 -pkg_config() {
1060 - local shell_conf='/etc/gitlab-shell.yml'
1061 -
1062 - einfo "Checking configuration files"
1063 -
1064 - if [ ! -r "${CONF_DIR}/database.yml" ]; then
1065 - eerror "Copy ${CONF_DIR}/database.yml.* to"
1066 - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
1067 - eerror "database settings for \"production\" environment."; die
1068 - fi
1069 -
1070 - # check gitlab-shell configuration
1071 - if [ -r ${shell_conf} ]; then
1072 - local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
1073 - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
1074 - production gitlab_shell repos_path)"
1075 -
1076 - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
1077 - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
1078 - eerror "must points to the same location! Fix the repos_path location and"
1079 - eerror "run this again."; die
1080 - fi
1081 - else
1082 - ewarn "GitLab Shell checks skipped, could not find config file at"
1083 - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
1084 - ewarn "installed and that repos_path is the same as in GitLab."
1085 - fi
1086 -
1087 - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
1088 - local git_home="$(egethome ${MY_USER})"
1089 -
1090 - # configure Git global settings
1091 - if [ ! -e "${git_home}/.gitconfig" ]; then
1092 - einfo "Setting git user"
1093 - su -l ${MY_USER} -c "
1094 - git config --global user.email '${email_from}';
1095 - git config --global user.name 'GitLab'" \
1096 - || die "failed to setup git name and email"
1097 - fi
1098 -
1099 - if [ ! -d "${DEST_DIR}/.git" ]; then
1100 - # create dummy git repo as workaround for
1101 - # https://github.com/bundler/bundler/issues/2039
1102 - einfo "Initializing dummy git repository to avoid false errors from bundler"
1103 - su -l ${MY_USER} -c "
1104 - cd ${DEST_DIR}
1105 - git init
1106 - git add README.md
1107 - git commit -m 'Dummy repository'" >/dev/null
1108 - fi
1109 -
1110 - ## Initialize app ##
1111 -
1112 - local RAILS_ENV="production"
1113 - local RUBY=${RUBY:-/usr/bin/ruby}
1114 - local BUNDLE="${RUBY} /usr/bin/bundle"
1115 -
1116 - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
1117 -
1118 - if [ -f "${DEST_DIR}/.secret" ]; then
1119 - local update=true
1120 -
1121 - einfo "Migrating database ..."
1122 - exec_rake db:migrate
1123 -
1124 - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496
1125 - einfo "Migrating iids ..."
1126 - exec_rake migrate_iids
1127 -
1128 - einfo "Cleaning old precompiled assets ..."
1129 - exec_rake assets:clean
1130 -
1131 - einfo "Cleaning cache ..."
1132 - exec_rake cache:clear
1133 - else
1134 - local update=false
1135 -
1136 - einfo "Initializing database ..."
1137 - exec_rake gitlab:setup
1138 - fi
1139 -
1140 - einfo "Precompiling assests ..."
1141 - exec_rake assets:precompile
1142 -
1143 - if [ "${update}" = 'true' ]; then
1144 - ewarn
1145 - ewarn "This configuration script runs only common migration tasks."
1146 - ewarn "Please read guides on"
1147 - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
1148 - ewarn "for any additional migration tasks specific to your previous GitLab"
1149 - ewarn "version."
1150 - fi
1151 -}
1152 -
1153 -ryaml() {
1154 - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
1155 -}
1156 -
1157 -exec_rake() {
1158 - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
1159 -
1160 - echo " ${command}"
1161 - su -l ${MY_USER} -c "
1162 - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8
1163 - cd ${DEST_DIR}
1164 - ${command}" \
1165 - || die "failed to run rake $@"
1166 -}
1167
1168 diff --git a/www-apps/gitlabhq/metadata.xml b/www-apps/gitlabhq/metadata.xml
1169 deleted file mode 100644
1170 index d68dded..0000000
1171 --- a/www-apps/gitlabhq/metadata.xml
1172 +++ /dev/null
1173 @@ -1,19 +0,0 @@
1174 -<?xml version="1.0" encoding="UTF-8"?>
1175 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1176 -<pkgmetadata>
1177 - <maintainer>
1178 - <email>mschiff@g.o</email>
1179 - <name>Marc Schiffbauer</name>
1180 - </maintainer>
1181 - <use>
1182 - <flag name="mysql">
1183 - Adds support for the MySQL database.
1184 - </flag>
1185 - <flag name="postgres">
1186 - Adds support for the PostgreSQL database.
1187 - </flag>
1188 - <flag name="unicorn">
1189 - Build with bundled Unicorn server.
1190 - </flag>
1191 - </use>
1192 -</pkgmetadata>