www-apps/gitlab-ce: updated lates RC ebuild

Package-Manager: portage-2.3.0
2017-01-16 19:51:44 +01:00 · 2017-01-16 19:51:44 +01:00 · 5812fa38ab
commit 5812fa38ab
parent f4d46457a7
5 changed files with 97 additions and 11 deletions
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@ -1,3 +1,11 @@
+*gitlab-ce-8.16.0_rc2 (16 Jan 2017)
+
+  16 Jan 2017; Manuel Friedli <manuel@fritteli.ch>
+  +files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch,
+  +gitlab-ce-8.16.0_rc2.ebuild, -gitlab-ce-8.16.0_rc1.ebuild,
+  gitlab-ce-9999.ebuild:
+  www-apps/gitlab-ce: updated lates RC ebuild
+
 *gitlab-ce-8.15.0_rc1 (16 Dec 2016)

  16 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.15.0_rc1.ebuild,
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -3,6 +3,7 @@ AUX 02-gitlab-ce-8.11.0-fix-redis-config-path.patch 423 SHA256 4878d37082c7e5c0a
 AUX 03-gitlab-ce-8.14.0-database.yml.patch 2172 SHA256 8435bf632aab03057342d5d6d75f016b006da00157c0cce2661416b752f8b75d SHA512 048aa5877ef30e702727b917cf7fb6bd534c497a7c24ab55640635598af293b0567bb9f356c4b91d55291341ced50847909f117f46d3fc9962c2f7a0f7b6bfb9 WHIRLPOOL 87b62f5e326211c2ff9001742a04b71bd94b21f4851778a513f7e1981da193dc16718559be42a0ba21aaa0c2f5b65a2571bc20174c063aa13e6436f0b422f057
 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 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
@ -12,10 +13,10 @@ AUX gitlab-workhorse.service 930 SHA256 09348a52fec333b4b19828752e0484400c1efa9d
 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_rc1.tar.gz 20713419 SHA256 acd6f649cffecc7bbb8320d5b1a3e91dd34f5fca5bd78a844ae0541219ae4ed6 SHA512 38768e0c5495f92998edc45dcae7997406ab26d88f96f82388dca0c64850d27e9a8c072a51f949f2e7b527687ef6e0a12224cc62b5fc12821cd1b70d611ba993 WHIRLPOOL d5d622d58876531f71fb3bf9fe0c9f3cf2b1acd8befcae9e7344ca05bafdcfd5528fd99e096f01ed7d2e6acb40c26f843ab03cfa47d5c141d6ed5c7cdb7ab22a
+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
 EBUILD gitlab-ce-8.15.4.ebuild 11982 SHA256 db794f18bc0d023a8b6adf49b82c2e37fd38b7206b064a7700289c0cfa16961c SHA512 ca30780d28ffc0242ac5f6ccad178cc44464a81f2d44cb13e53ddf06700d0f39b9fee9b77e356735435079b34090049d50d9019af71e92d6d8faaf3767a39dc5 WHIRLPOOL 42ee8b8e5a2c6fba69ecdbf6e306a87f369fa193f721c73481edc744953bfd210cb4495bc603ba01566efb2b0869ec71284a1f1b1c34d1a124bd08546829ca37
-EBUILD gitlab-ce-8.16.0_rc1.ebuild 11959 SHA256 2c1d431421b194b1adf4094a60b64503969f30793319300d3a139e995d74a75f SHA512 8c63846f633cb3729d9f499ca9b0de62ff1240d62ff74413e9bac54ceb7fcd1f5b7b0bab9d2fc36cdcfdd98306c8aa448c59bc27c3e925eaa11ac60b0608df28 WHIRLPOOL f7a7f3c7eff310b3fba53d4ae1f03d41aa7e1ef8ecac2e1a2b7d0b9c4d81b572c2eab821b2aaeae8a0f3c11fe0aafde5d2bef019d9f44785496341f4af964956
-EBUILD gitlab-ce-9999.ebuild 11916 SHA256 07ab1b9ad70ccfa349aaec23f400e3a229b3e74d089d383b7b8dbbb2bc99f24e SHA512 334c5f8c3ede88d7116a733f953a3b09de365aee97a4a9c58b9da762b1a644d2e90b6c0ffc81f71baa6c52594ca03878850818a68988fb80a3d41ca9d68bb923 WHIRLPOOL 6c51017b06547f723c1abb8fae002ab05e206a240c189ac048e2f1c388a4bb03cf84d22e3683713ea29f3196b5d05734fd12243a972b8e435b27e304a5315ba5
-MISC ChangeLog 12134 SHA256 d90c37dd130c4d65cf1fbcf7cc3202e4c0cdc277e8c93f6f504af75cf8569cc0 SHA512 ed221d43270e2f4c3069b796445bf871c7dd6e1def0227be148667410efa0ec3ae122d89a00437520982116ca56daf3ab6f494026ac2ebf8d511c50e97e69f03 WHIRLPOOL e11b0465d4755686d2e1e1136b0f4d3e542a801fb5b2667937cb63f3493e5dfb825603090988b580d55fd5d0448d408836bbc5e878c5b844a26a1f16ec252605
+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
 MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3
--- 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
@ -0,0 +1,77 @@
+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
--- a/www-apps/gitlab-ce/gitlab-ce-8.16.0_rc2.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.16.0_rc2.ebuild
@ -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="33e94dc50e6f2502b2b65fb7c1ebfd5d4f03322a"
+MY_GIT_COMMIT="1f6619260193eb1e4a2d9ed20113e7590494321d"

 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -69,7 +69,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )"
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.13.6"
+	>=dev-ruby/bundler-1.13.7"

 #
 # fix-sendmail-config:
@ -82,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"
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@ -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$

@ -67,7 +67,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )"
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.13.6"
+	>=dev-ruby/bundler-1.13.7"

 #
 # fix-sendmail-config:
@ -80,7 +80,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"