From owner-svn-ports-head@freebsd.org Mon Sep 30 22:44:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40F2C1341A3; Mon, 30 Sep 2019 22:44:36 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hyBr0yX9z4Xy7; Mon, 30 Sep 2019 22:44:36 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 016629C2C; Mon, 30 Sep 2019 22:44:36 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8UMiZXR064648; Mon, 30 Sep 2019 22:44:35 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8UMiZaL064644; Mon, 30 Sep 2019 22:44:35 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201909302244.x8UMiZaL064644@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Mon, 30 Sep 2019 22:44:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513438 - in head/devel/gitaly: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/devel/gitaly: . files X-SVN-Commit-Revision: 513438 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 22:44:36 -0000 Author: mfechner Date: Mon Sep 30 22:44:34 2019 New Revision: 513438 URL: https://svnweb.freebsd.org/changeset/ports/513438 Log: devel/gitaly: upgrade to 1.65.0 which is required for gitlab-ce 12.3 upgrade. Added: head/devel/gitaly/files/patch-__support_Makefile.template (contents, props changed) Deleted: head/devel/gitaly/files/patch-__support_makegen.go Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Mon Sep 30 22:41:28 2019 (r513437) +++ head/devel/gitaly/Makefile Mon Sep 30 22:44:34 2019 (r513438) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.59.2 +DISTVERSION= 1.65.0 PORTREVISION= 0 CATEGORIES= devel @@ -25,7 +25,7 @@ MY_DEPENDS= git>=2.21:devel/git \ rubygem-sentry-raven>=2.9.0<2.10.0:devel/rubygem-sentry-raven \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ - rubygem-gitlab-labkit>=0.4.0<0.5.0:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.5.0<0.6.0:devel/rubygem-gitlab-labkit \ rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \ rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371 BUILD_DEPENDS= gem:devel/ruby-gems \ @@ -41,7 +41,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 1e7005f12bda1dfd0b724ebc039cca75f1cd38d1 +GL_COMMIT= aacedbaac8013e341be496cbb5f250fb61094313 # for go dependencies USE_GITHUB= nodefault Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Mon Sep 30 22:41:28 2019 (r513437) +++ head/devel/gitaly/distinfo Mon Sep 30 22:44:34 2019 (r513438) @@ -1,4 +1,4 @@ -TIMESTAMP = 1567416269 +TIMESTAMP = 1569748855 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 @@ -73,7 +73,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 803b300bfb0a7491158ae768b65d6dcd402954a6a24fb663f7f80f8e880485ad -SIZE (gitlab-org-gitaly-1e7005f12bda1dfd0b724ebc039cca75f1cd38d1_GL0.tar.gz) = 2727106 +SHA256 (gitlab-org-gitaly-aacedbaac8013e341be496cbb5f250fb61094313_GL0.tar.gz) = 920510e9792c0b5a3285a3170752f41ed09906e75e9ab92bf1e320b4663578f8 +SIZE (gitlab-org-gitaly-aacedbaac8013e341be496cbb5f250fb61094313_GL0.tar.gz) = 2749728 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 Added: head/devel/gitaly/files/patch-__support_Makefile.template ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitaly/files/patch-__support_Makefile.template Mon Sep 30 22:44:34 2019 (r513438) @@ -0,0 +1,21 @@ +--- _support/Makefile.template.orig 2019-09-29 09:26:06 UTC ++++ _support/Makefile.template +@@ -8,7 +8,7 @@ + # These variables may be overridden at runtime by top-level make + PREFIX ?= /usr/local + INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ +-BUNDLE_FLAGS ?= --deployment ++BUNDLE_FLAGS ?= --local + ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly + BUILD_TAGS := tracer_static tracer_static_jaeger + +@@ -55,8 +55,8 @@ build: ../.ruby-bundle + # step. Both Omnibus and CNG assume it is in the Gitaly root, not in + # _build. Hence the '../' in front. + ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile ++ cd {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS) + cd {{ .GitalyRubyDir }} && bundle config # for debugging +- cd {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS) + touch $@ + + .PHONY: install Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Mon Sep 30 22:41:28 2019 (r513437) +++ head/devel/gitaly/pkg-plist Mon Sep 30 22:44:34 2019 (r513438) @@ -35,6 +35,7 @@ %%DATADIR%%/ruby/gitlab-shell/lib/hooks_utils.rb %%DATADIR%%/ruby/gitlab-shell/lib/http_helper.rb %%DATADIR%%/ruby/gitlab-shell/lib/httpunix.rb +%%DATADIR%%/ruby/gitlab-shell/lib/message.rb %%DATADIR%%/ruby/gitlab-shell/lib/object_dirs_helper.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_access_spec.rb %%DATADIR%%/ruby/gitlab-shell/spec/gitlab_config_spec.rb