diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2019-09-30 22:44:34 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2019-09-30 22:44:34 +0000 |
| commit | b8d71505e3dd36a29acfd91876790373d5a0dc9e (patch) | |
| tree | 9cb606f36c0b9a0b6e5baccb2ca2f421381a43a8 | |
| parent | www/rubygem-kubeclient: upgrade to 4.4.0 which is required for gitlab-ce 12.3... (diff) | |
devel/gitaly: upgrade to 1.65.0 which is required for gitlab-ce 12.3 upgrade.
Notes
Notes:
svn path=/head/; revision=513438
| -rw-r--r-- | devel/gitaly/Makefile | 6 | ||||
| -rw-r--r-- | devel/gitaly/distinfo | 6 | ||||
| -rw-r--r-- | devel/gitaly/files/patch-__support_Makefile.template (renamed from devel/gitaly/files/patch-__support_makegen.go) | 8 | ||||
| -rw-r--r-- | devel/gitaly/pkg-plist | 1 |
4 files changed, 11 insertions, 10 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index f799b8233eb8..fef636c09800 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -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 diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 6b7fb24b1785..a5507672383d 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -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) = 6b89d1a6684475fcbaed3f9d2137 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 diff --git a/devel/gitaly/files/patch-__support_makegen.go b/devel/gitaly/files/patch-__support_Makefile.template index f4cfcec068a2..649d13bc7be5 100644 --- a/devel/gitaly/files/patch-__support_makegen.go +++ b/devel/gitaly/files/patch-__support_Makefile.template @@ -1,6 +1,6 @@ ---- _support/makegen.go.orig 2019-08-22 16:24:24 UTC -+++ _support/makegen.go -@@ -320,7 +320,7 @@ var templateText = ` +--- _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/ @@ -9,7 +9,7 @@ ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger -@@ -368,8 +368,8 @@ build: ../.ruby-bundle +@@ -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 diff --git a/devel/gitaly/pkg-plist b/devel/gitaly/pkg-plist index 0a2b1a645de4..5ab644eda954 100644 --- a/devel/gitaly/pkg-plist +++ b/devel/gitaly/pkg-plist @@ -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 |