Merge branch 'master' into feature/cleanup-gitlab

This commit is contained in:
Manuel Friedli 2016-01-02 01:57:06 +01:00
commit bff443223c
11 changed files with 43 additions and 24 deletions

View file

@ -1,4 +1,4 @@
AUX gitlab-shell-2.0.0-config-paths.patch 1356 SHA256 442a8e18b4d8e6092db0d39659cba5e41404e90f21070ed50b5460177f28f1b2 SHA512 0445cd42086b2d77825c487d604ddcb11f8fdf4eb8dcdfa1fe1b8e8c24d7b8f273834dbec0bfbb763a35a74605d558cc8d3feaa056eb02a113d18124a764551e WHIRLPOOL 0e3367b229ea4f13818fe2e485dc8da83ad695aec496881cb5eb918b183029b0013518ca64acba1568d93dc418dfaf083c2a86b9f2e3adf9fe15cad038011b30
DIST gitlab-shell-2.6.8.tar.gz 35191 SHA256 196ac258f036ab6d41439b8149ad46dcaeebae727b69bea53a9747c46757ac1c SHA512 8093476675a63b97a56f50838a27fed1f0f355533177927056acdad5d5da450ff4a82242d9b618bc5f6c289820a01f1aaa924787966779e087ce3c8b2c84507d WHIRLPOOL a8a7a8f6dd0a3e49f2a6b6d03200a320802929d5cc283bbf6eddad90644664a3ca8ff14f9ba7760c8026351801f78ce47ca6a5a95d7bc3ab7c1aaad157423d64
EBUILD gitlab-shell-2.6.8.ebuild 3496 SHA256 942e2c5af4d03353b4d5b48a46bcf05c837cf1d0375434ff083ceee7e389ff61 SHA512 34600582b7e2defd8470a2a4f70213f598ac540f57ce9748cdaf16192f1e79a59eb950d1b15231d27b8c07649116364208fd12294e89453159a39f2e56048474 WHIRLPOOL a17a4881720eb0a7e68db927a93cb40d852250acb5b2f6daa4625e5338c6dce6707b90683885ead72769bc9a36d0e173178d3df8616ceab4eb32114955aa2300
DIST gitlab-shell-2.6.9.tar.gz 35487 SHA256 b61839622ca14331b21622b28ff1b28839d86b55c00033b00a4f320df378d8cf SHA512 be5e0c1e6169049d18956229668beca5f6497a090127b204b4ada463bf09ce0df180302b6e85e251cb152716d79ba35975c4842486b9603e7c7001e918e05718 WHIRLPOOL 2430f92b2d370a57f0f68ad6ab227ce50f09af5a2b99bb2556ce38611c70e11a3ca6c27a1da9de219d4f3ef7444e34c380f54c569de65f11dd101953de37b983
EBUILD gitlab-shell-2.6.9.ebuild 3496 SHA256 942e2c5af4d03353b4d5b48a46bcf05c837cf1d0375434ff083ceee7e389ff61 SHA512 34600582b7e2defd8470a2a4f70213f598ac540f57ce9748cdaf16192f1e79a59eb950d1b15231d27b8c07649116364208fd12294e89453159a39f2e56048474 WHIRLPOOL a17a4881720eb0a7e68db927a93cb40d852250acb5b2f6daa4625e5338c6dce6707b90683885ead72769bc9a36d0e173178d3df8616ceab4eb32114955aa2300
MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431

View file

@ -1,6 +1,6 @@
AUX fix-Makefile-0.4.2.patch 508 SHA256 970bb7ce34fd846902ad83394e929f7162d3c33ddf8307f0538e1f3fb9d1b59f SHA512 77ef8cd1781a1dcd86483ec53db72ad31ea00556c96831f6f4af39c010a4075b503cf5c6a62c787139f92ab651f9a8fefecb8bdab6da38f9a139f89e96c15c86 WHIRLPOOL 33ee8956a2497f7a324f6970e3a8ec83ced3a2364593ce1272cc665c761f2d83a2ab6b73062a333216acb9d345108672181323c3228d94fd1630c29ef4c533e3
AUX fix-Makefile-0.5.1.patch 508 SHA256 f63fe5302487d698212b52984f3f51efb3a6768558ae8927044c6a84f1814bc0 SHA512 27916751eda48b5cf4b8a3d650c74ca5031462fec14648a7535def6ebd321d49e1104b84f916109b5fdccdd90f9ee42fdbec587e3ee52f9c649fb49caac283e6 WHIRLPOOL 6f04c95575233eadd8b5f4d3e0ce564591d12e279d9827383292296d118dfc8670e239e2aaa74a3c132cc205b4d6214cb54edc983a5d2270dc005720955c805a
AUX gitlab-workhorse.conf 248 SHA256 6d11d63aa869cfd8c6f77c3a875984c226db633be899ad7ce97fafe94236eee7 SHA512 234213c8361702bdfeea40bd306b5899de19f34ce985e090a86e01aa601cf4ed23da4dfb75f74fe5986bbea5535a7a6a745406b4f67f79d352bd1c863777c7f1 WHIRLPOOL 8ac1134cde3aee942466d206e703ebd5330f83537d7e29641447f812d857bcc57b07fbf82eab086c0d622750694f64fabf8ffca2ba26a725f61b40fd1941e963
AUX gitlab-workhorse.init 653 SHA256 f38c37ed818cb8c25fb800bfcb5448f659e876b78ea33ea7a1ba3c80e73ea95e SHA512 2667997def39e6dc17e6a1d9be06d6e855d5d3e956e64d93bb3e74bbad0a1d427dc034f9c139f3b05e2666abab014404b2c8013c5347f4ec25fbf5ef86e7e88e WHIRLPOOL 63cd7ff80d88676b44c2d6ccdadf74907d5f8e4268f03ee11775c423bf95955f9d3aaeedd79fa6e0486b2d225336eb2ffa165dd7b9ac87ed0c2d403dc7e5afb4
DIST gitlab-workhorse-0.4.2.tar.bz2 14206 SHA256 09bd196334c2cde6e86a905df23ad904aaea7f01915b23c7e36cbff40fd0e14d SHA512 dcd2081786729ebcdd19aa1b5763a3ab4cf3e834ba0198827e354f610cbd338367229c2a57576413a3b18ab09a5fb1467eb0c9fe825830269a8990b662bce01a WHIRLPOOL 749803ad942e58e6dcf55dc4dcddf788591af7fe56729c946991e38c70f54aac65b3ba282e9a0106c9e717213ba70ba9c754257aee6bc5fedb3471eb333db4d6
EBUILD gitlab-workhorse-0.4.2.ebuild 878 SHA256 736ec8a77301e562545caebe75401dce1a5ab0ce9d27ca6d97e0029a088c3119 SHA512 099f0aaf00becd913f24db9cade200f987a1f9fb14f44d4290ad450f55ba50bbc3b7d5cc829072e371d0be98f0f000de96e5431a78ba0a62c287d6c3b256f6ce WHIRLPOOL b41e5570b35b6e4bda9509e25386db647bbff974a41c1a484cb6e7b65b67166fb31832b6b3edbdb2820da391a6836fae2ef692a13400939d7869598b2a89c8b7
DIST gitlab-workhorse-0.5.1.tar.bz2 18396 SHA256 fe5170da871cb48136f35f90963242fe64871185cbf3fcf13129a7f98ff1fc97 SHA512 5d46b047f2aeb7cf174bc3cd5d13e9d6595ddfb2cd80fa174733e3948903552995c4b6ebc2da27a24f50bbb00bf7da44a12b71acb49d90abfe245d2f59a6a3e6 WHIRLPOOL 43ee51fe5db55f1459c0e45ab867cb78f055f811be515af2ba272915df0cd894b899ab9ef9b11e8a53803c1156739d3057fb8d09b9bc3cf36973728dd4a44c8a
EBUILD gitlab-workhorse-0.5.1.ebuild 866 SHA256 188539bf1d1f156a37f5044058508e9140f80e648fccdba3c438307a73f14fb9 SHA512 6f8dd6210a522a87e72795ea6b78d4b6a825b8ba6c610c30e04676980ffe49db5e5199d780284ff778e7ba75a633406c95762f16d55b5c15e8d881a3ad8ba567 WHIRLPOOL f713e415daaa8d654b334ed6d991446b6d600192867d6f93e02f9196d1c5454abce92022668ab49e2cc1f084c79da43a6b65d120cec6e627a7dc6f5eaccda651
MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431

View file

@ -6,7 +6,7 @@ index c2c8c59..419f4d8 100644
-PREFIX=/usr/local
-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
+PREFIX=${DESTDIR}/usr
+VERSION=0.4.2-$(shell date -u +%Y%m%d.%H%M%S)
+VERSION=0.5.1-$(shell date -u +%Y%m%d.%H%M%S)
gitlab-workhorse: $(wildcard *.go)
- go build -ldflags "-X main.Version ${VERSION}" -o gitlab-workhorse

View file

@ -6,10 +6,10 @@ EAPI="5"
inherit eutils user
DESCRIPTION="GitLab Workhorse is the new backend for Git-over-HTTP communication needed for GitLab >= 8.2"
DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for GitLab >= 8.2"
HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2"
S="${WORKDIR}/${P}-7a84085b1671f5d6b28408a83ff97a4ff3428b71"
S="${WORKDIR}/${P}-bd5ec0015cf9f9f13d6909bd0d2013b9a2fa5aec"
RESTRICT="mirror"
LICENSE="MIT"

View file

@ -0,0 +1,15 @@
Title: Upgrade to gitlab-ce-8.3.2
Author: Manuel Friedli <manuel@fritteli.ch>
Content-Type: text/plain
Posted: 2016-01-02
Revision: 1
News-Item-Format: 1.0
Display-If-Installed: www-apps/gitlab-ce
GitLab 8.3 introduces some major changes related to proxying HTTP requests
through Apache / nginx. Notably, all requests are now routed through
gitlab-workhorse. Before you upgrade, please read the upgrade guide at
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/8.2-to-8.3.md
Thank you.

View file

@ -1,3 +1,3 @@
DIST FeedReader-1.2.1.tar.gz 970118 SHA256 cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a SHA512 386c4c137bb4abba918e4f987666358ebe3926b0d4d3b466648d2679efd218376baf1ff58c987dfff953e9b6f084a47db34df8044a3a64ecb1f8e560f0f09e74 WHIRLPOOL 3e6f62c18ffb1dbe669f969b76de496463a49804c3da5d9e35e8726e4cef45552291c94b33cf3129805720cacc51953d60dfb4b54658344c261b412f29ab847f
EBUILD feedreader-1.2.1.ebuild 1454 SHA256 023d0c3fa1490302e975b8f8e7c2a674cba4b21a9c3ca071ef2894758fe7a53e SHA512 411e0da9ac84b2cce0486e5f161485381952c0ab32490ce5f890244b909a7ad4692b227896844fe7b7ccbc4a6cdf07f4be45ff811a946908dde00c5120f9c831 WHIRLPOOL e478933dccf5faa5eb54e8081a31dce490acd5707a158d180f907e8f7a3f607533fd077fe5d49890f7c34c803c1415bf6241a230dd572e230e0ffb580a571a02
EBUILD feedreader-1.2.1.ebuild 1443 SHA256 8f076117efa49d072585369b5b480df112e49bbe2c23691d620074d3992f08ed SHA512 fa970a752e02dcc111d64e8594ee4e28535a1716137259fe85f6c95f6af4b68da4287ac0c25778ef33197ebbeae8178dba45f04007e0ad3e2ee22a99ab247e69 WHIRLPOOL 0e7414e3f63ac7f0212829d46e45bc57aa77c53994e5c82df311f27f5b9007a92497ae5aeaa7adcb4e8c3941536f56f40c6dd3215007cffe2d0221a1eb003b08
MISC metadata.xml 338 SHA256 065c970f65dc2d874999563e23f1cd3b3eb7d81b3858c7c9fed5ede9c9230d03 SHA512 9f668348e070853e0b24d1bf8f18dcc33d80f40f8d70fe7363b6d008f3a1e841b14a3cadf94e40643b39b4fec18bb06df5ae0a3412b96cc5c43a8c5fe7aa1f19 WHIRLPOOL 51094d7ce385f827f140171e796cfa35a0acc4e69d6c5eea5e305af79be3c255d5d8d1b08fdb219a54e9771b6d8311a03845c1ef1ca4076cd93617d16cb35ed6

View file

@ -11,7 +11,7 @@ VALA_MIN_API_VERSION="0.24"
MY_P="FeedReader"
DESCRIPTION="Simple and modern News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly"
DESCRIPTION="Simple News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly"
HOMEPAGE="http://jangernert.github.io/${PN}/"
SRC_URI="https://launchpad.net/${PN}/1.2/${PV}/+download/${MY_P}-${PV}.tar.gz"

View file

@ -6,7 +6,7 @@ AUX gitlab-unicorn-8.2.init 2550 SHA256 d3a611b1ef6ec91c2e840e61385c886ffd095853
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.2.1.tar.gz 9960073 SHA256 505467b7efcf713a6bada73513aafb58f0be731ec0d5ed2933797ffd74064076 SHA512 8030e60fbc3b61098913cd5debe1e138b95d0cb824f8f8949247d444d9dff9d4dee1e3a4f5bef5078fceee6ffa099dac7fb2aa9429e9dabda10c532226a0fc65 WHIRLPOOL e8c3fbf06a0545c6c2517ac3d285474702ff26c6f2412b5d64bc91513fa122ece10544ed2f3f8718e2214fab28656bb3619f9dfa256a90eb0877538a576c0f5b
EBUILD gitlab-ce-8.2.1.ebuild 11187 SHA256 7c1cd3de0c0d44687b4ba300b0dba4d5042036bdd30830616574e01976199b27 SHA512 dd102a1b82f065022b0cdca59c05f163ffadcc2a40d950f91c8c4ead0f51c25a0a5637fdfa88a53f985def1dbcba5af9c17c436b5fe98a6d7be10682d6c83340 WHIRLPOOL c5dc65cd90c2fd5aa00fb12c65eb1dd65bcd37dd8275cf86dd15758703114ae057cf7c19955cd2c7e24fe403a214c78e9021edfd648d307e384600f8a882eaa4
EBUILD gitlab-ce-9999.ebuild 10960 SHA256 9d771927fc3fb9e0227bf909eeb1c3376f05c5a9bbf2571dc214535321436cde SHA512 209d42d491e6ed180773ca6b7252ab3aeb0eb103b9ea935e6e23d79e7e132e1485936db0aa9336104fc3bbb94c73b740080c81967523b0c28dbcc0f14e0abbee WHIRLPOOL b7b9fc3112965cd40c12039f73cb8d9e6bfaeae17c1022e5d3838c599e76f83c31882c9676a83b379dca474f142f1e2ffa9443259e0fc1a761b48f0b4e0ba350
DIST gitlab-ce-8.3.2.tar.gz 10683322 SHA256 87f6c27043058bba2d879c079f36a81f09f77c8e359ff7cf3bb0f5ebc4dca73e SHA512 a4d05cef4edcdd3ea07858eb52f1fa093a323d6586bcab9e5e2bd78320e56566c496146a89ed24410a551fa5d770a44b018636c11f55eae325cd6ec13de94f77 WHIRLPOOL 2bf74671e58d9f625c385ce2bcd8909bed828108deea17fd4bdbea7bf9d365dda14d1422699582a818fb656ab43cdea7f841c2334de152070dd2acac2f195e05
EBUILD gitlab-ce-8.3.2.ebuild 11155 SHA256 88584cccc0118bbcd40160666a948028727175b14250cf583ed433a410f5ba5a SHA512 7c7ebe17bfee4fe1cd322b58c30aab53d28e1c131935a572bf5559aec236421b8c442bfa1931da915709cc23a52a1fc187018bee12ef21c19b61383d192fe414 WHIRLPOOL 14b3c003fe73e07a6a01a6cc01ab99b9aef536ad89ae606bdc96585a0dc8c0a3a4acda78b1e9c580725b21a401227f2e3ace2d3da36976d264055fb0e0a10111
EBUILD gitlab-ce-9999.ebuild 11209 SHA256 64550d2d6bb5306df3c60a7e8b77562306ed2b41fb1045aaad3bbc6598916260 SHA512 d8ea512d408505362e464fd626490e676442c319029aaf07f34360b47c724fd017db52e0d3b713590dcc6253cc343e571fc7d9f6d2261445d1ae79e2d3c662db WHIRLPOOL 3e8366d75fe3c739b5a55942afd36acb456fa478500334de9bd8efd4f144bf59cad9c91643e7b99f7046a11c76003d52be1ba52f20fcb7e1802bb16e02080745
MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

View file

@ -12,9 +12,8 @@ EAPI="5"
#
USE_RUBY="ruby21"
PYTHON_COMPAT=( python2_7 )
inherit eutils python-r1 ruby-ng user systemd
inherit eutils ruby-ng user systemd
MY_PKGNAME="gitlabhq"
@ -53,13 +52,13 @@ CDEPEND="
dev-util/cmake
virtual/pkgconfig"
DEPEND="${GEMS_DEPEND}
>=dev-vcs/gitlab-shell-2.6.8
>=dev-vcs/gitlab-shell-2.6.9
dev-vcs/git
~dev-vcs/gitlab-workhorse-0.4.2
~dev-vcs/gitlab-workhorse-0.5.1
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/23 )"
RDEPEND="${DEPEND}
dev-db/redis
>=dev-db/redis-2.8
virtual/mta
systemd? ( sys-apps/systemd:0= )"
ruby_add_bdepend "

View file

@ -52,13 +52,13 @@ CDEPEND="
dev-util/cmake
virtual/pkgconfig"
DEPEND="${GEMS_DEPEND}
>=dev-vcs/gitlab-shell-2.6.8
>=dev-vcs/gitlab-shell-2.6.9
dev-vcs/git
>=dev-vcs/gitlab-workhorse-0.4.2
~dev-vcs/gitlab-workhorse-0.5.1
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/23 )"
RDEPEND="${DEPEND}
dev-db/redis
>=dev-db/redis-2.8
virtual/mta
systemd? ( sys-apps/systemd:0= )"
ruby_add_bdepend "
@ -229,6 +229,14 @@ all_ruby_install() {
}
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!"
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
@ -251,9 +259,6 @@ pkg_postinst() {
elog " emerge --config \"=${CATEGORY}/${PF}\""
elog " Note: Do not forget to start Redis server first!"
elog
elog "If this is an update from previous version, it's HIGHLY recommended"
elog "to backup your database before running the config phase!"
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"