From owner-svn-ports-all@freebsd.org  Tue Mar 21 16:40:39 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA9B0D16BD1;
 Tue, 21 Mar 2017 16:40:39 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B752E10E1;
 Tue, 21 Mar 2017 16:40:39 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2LGecGw006686;
 Tue, 21 Mar 2017 16:40:38 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2LGecUF006684;
 Tue, 21 Mar 2017 16:40:38 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201703211640.v2LGecUF006684@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Tue, 21 Mar 2017 16:40:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r436617 - in head/www/gitlab: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Mar 2017 16:40:40 -0000

Author: tz
Date: Tue Mar 21 16:40:38 2017
New Revision: 436617
URL: https://svnweb.freebsd.org/changeset/ports/436617

Log:
  www/gitlab: fix wrong detection of running Sidekiq
  
  Sidekiq is detected as "not running" because when checking with "ps" it
  does not account for column truncation
  
  PR:           209487
  Submitted by: Chris Stankevitz <chris-freebsd-bugs@stankevitz.com>
  Reported by:  otacilio.neto@bsd.com.br
  Reviewed by:  Matthias Fechner <idefix@fechner.net>

Added:
  head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake   (contents, props changed)
Modified:
  head/www/gitlab/Makefile

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Tue Mar 21 16:38:33 2017	(r436616)
+++ head/www/gitlab/Makefile	Tue Mar 21 16:40:38 2017	(r436617)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	8.14.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org

Added: head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake	Tue Mar 21 16:40:38 2017	(r436617)
@@ -0,0 +1,11 @@
+--- lib/tasks/gitlab/check.rake.orig	2017-03-21 16:35:39 UTC
++++ lib/tasks/gitlab/check.rake
+@@ -621,7 +621,7 @@ namespace :gitlab do
+     end
+ 
+     def sidekiq_process_count
+-      ps_ux, _ = Gitlab::Popen.popen(%W(ps ux))
++      ps_ux, _ = Gitlab::Popen.popen(%W(ps wux))
+       ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count
+     end
+   end