diff options
| -rw-r--r-- | devel/gitaly/Makefile | 6 | ||||
| -rw-r--r-- | devel/gitaly/distinfo | 6 | ||||
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 4 | ||||
| -rw-r--r-- | www/gitlab-ce/Makefile | 4 | ||||
| -rw-r--r-- | www/gitlab-ce/distinfo | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index d8506c8042f8..48aff8674f44 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.6.2 +DISTVERSION= 13.6.3 PORTREVISION= 0 CATEGORIES= devel @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.29:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=0.28:devel/rubygem-rugged \ - rubygem-github-linguist>=7.11<8.0:textproc/rubygem-github-linguist \ + rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport60>=6.0.3.3<6.0.4:devel/rubygem-activesupport60 \ rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \ @@ -43,7 +43,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= 9e7d99ff1ab13c6e44fb6cffb0219a3f938a04d0 +GL_COMMIT= a316b208ee7a725c06d0abe34172d0920932413f # for go dependencies USE_GITHUB= nodefault diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 04d5a961d87e..bae3888c24f2 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1607383462 +TIMESTAMP = 1607726461 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 SHA256 (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac27361ef2dadcb9fabbb3bf3a5ed785ebfc4e27 @@ -143,8 +143,8 @@ 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-9e7d99ff1ab13c6e44fb6cffb0219a3f938a04d0_GL0.tar.gz) = 2d49bce605fc3ab22b913ac6c76a3c9620421cce78cdd8da09311d765daf1f91 -SIZE (gitlab-org-gitaly-9e7d99ff1ab13c6e44fb6cffb0219a3f938a04d0_GL0.tar.gz) = 3219060 +SHA256 (gitlab-org-gitaly-a316b208ee7a725c06d0abe34172d0920932413f_GL0.tar.gz) = e9ee1d52ea5273f8f92158e9b2c56f8ea78233da49f83e5219ccad7aa5ddeed3 +SIZE (gitlab-org-gitaly-a316b208ee7a725c06d0abe34172d0920932413f_GL0.tar.gz) = 3219024 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583 SHA256 (gitlab-org-labkit-40dcf811328cfe956de0d89ed9276a9d4f35eddd_GL0.tar.gz) = 21c2f89ff924a28f0783c69d33f0de2ef023e8d5271bbe8672354c4041381a3d diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 271212b09bd6..73e52481d439 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,11 +1,11 @@ ---- ruby/Gemfile.orig 2020-11-20 11:52:08 UTC +--- ruby/Gemfile.orig 2020-12-10 15:14:51 UTC +++ ruby/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0' - gem 'github-linguist', '~> 7.11', require: 'linguist' + gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.3' @@ -21,13 +21,3 @@ gem 'licensee', '~> 8.9.0' diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 7adf7e68afb1..14d1e51810cf 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= gitlab-ce -PORTVERSION?= 13.6.2 +PORTVERSION?= 13.6.3 PORTREVISION?= 0 CATEGORIES= www devel @@ -265,7 +265,7 @@ USE_GITLAB= yes GL_ACCOUNT?= gitlab-org GL_PROJECT?= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT?= f508fb8a043a4b1f996cb7ec8bba198e5b5986f5 +GL_COMMIT?= 857c6c6a6a9b607b3f261164fa75b084f04d8782 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 31cc43a5844c..2d116f315ec7 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607383413 -SHA256 (gitlab-org-gitlab-foss-f508fb8a043a4b1f996cb7ec8bba198e5b5986f5_GL0.tar.gz) = 8ea38d7541f82b48e321928e3b99c8f19c22f6540e4bb8ea9b30251a82f97c6c -SIZE (gitlab-org-gitlab-foss-f508fb8a043a4b1f996cb7ec8bba198e5b5986f5_GL0.tar.gz) = 98754466 +TIMESTAMP = 1607726585 +SHA256 (gitlab-org-gitlab-foss-857c6c6a6a9b607b3f261164fa75b084f04d8782_GL0.tar.gz) = a35638d08fba687748c864f56ba19c337ea7d4a758f5c265731c3b52543a404b +SIZE (gitlab-org-gitlab-foss-857c6c6a6a9b607b3f261164fa75b084f04d8782_GL0.tar.gz) = 98754813 |