Date: Thu, 26 Mar 2020 21:11:06 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529223 - in head: devel/gitaly www/gitlab-ce www/gitlab-workhorse Message-ID: <202003262111.02QLB66Y044060@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Thu Mar 26 21:11:05 2020 New Revision: 529223 URL: https://svnweb.freebsd.org/changeset/ports/529223 Log: Security update to 12.8.8. Changelog: https://about.gitlab.com/releases/2020/03/26/security-release-12-dot-9-dot-1-released/ Security: 08fba28b-6f9f-11ea-bd0b-001b217b3468 Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/www/gitlab-ce/Makefile head/www/gitlab-ce/distinfo head/www/gitlab-ce/pkg-plist head/www/gitlab-workhorse/Makefile head/www/gitlab-workhorse/distinfo Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Thu Mar 26 21:07:31 2020 (r529222) +++ head/devel/gitaly/Makefile Thu Mar 26 21:11:05 2020 (r529223) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 12.8.7 +DISTVERSION= 12.8.8 PORTREVISION= 0 CATEGORIES= devel @@ -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= c75c75c554acd51fa8394ae5579264aac9bf226c +GL_COMMIT= dfdd27bf0ca54f6804263a10d233a332eb2a7b40 # for go dependencies USE_GITHUB= nodefault Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Thu Mar 26 21:07:31 2020 (r529222) +++ head/devel/gitaly/distinfo Thu Mar 26 21:11:05 2020 (r529223) @@ -1,4 +1,4 @@ -TIMESTAMP = 1584570575 +TIMESTAMP = 1585254521 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 @@ -81,7 +81,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-c75c75c554acd51fa8394ae5579264aac9bf226c_GL0.tar.gz) = 4e10b233366001da0aa09b88e5a1ec9684093813326c9167abd052bdd18747d3 -SIZE (gitlab-org-gitaly-c75c75c554acd51fa8394ae5579264aac9bf226c_GL0.tar.gz) = 2869004 +SHA256 (gitlab-org-gitaly-dfdd27bf0ca54f6804263a10d233a332eb2a7b40_GL0.tar.gz) = 742feab7d4edfc19c6f549cb51aa222c24484a2a5e78ab0d7c8e5c4061ccfaae +SIZE (gitlab-org-gitaly-dfdd27bf0ca54f6804263a10d233a332eb2a7b40_GL0.tar.gz) = 2869042 SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149 Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Thu Mar 26 21:07:31 2020 (r529222) +++ head/www/gitlab-ce/Makefile Thu Mar 26 21:11:05 2020 (r529223) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 12.8.7 +PORTVERSION= 12.8.8 PORTREVISION= 0 CATEGORIES= www devel @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # which makes maintaining this long list much easier! MY_DEPENDS= git>=2.22.2:devel/git \ gitlab-shell>=11.0.0:devel/gitlab-shell \ - gitlab-workhorse>=8.21.0:www/gitlab-workhorse \ + gitlab-workhorse>=8.21.1:www/gitlab-workhorse \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-pages>=1.16.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ @@ -113,7 +113,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-rouge>=3.15.0:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ - rubygem-nokogiri>=1.10.5<1.11.0:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.10.8<1.11.0:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy31>=3.1.0<3.2.0:textproc/rubygem-diffy31 \ @@ -245,7 +245,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= b679f55a1991eaf5533e6a82335ca83fc8cf3753 +GL_COMMIT= 6ea04b16a40dd15e4e0e127c8588af26e0f0f8d2 USERS= git GROUPS= git Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab-ce/distinfo Thu Mar 26 21:07:31 2020 (r529222) +++ head/www/gitlab-ce/distinfo Thu Mar 26 21:11:05 2020 (r529223) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584567707 -SHA256 (gitlab-org-gitlab-foss-b679f55a1991eaf5533e6a82335ca83fc8cf3753_GL0.tar.gz) = 7d5149589a89c031d9ac37a7d7a7dbd7db2c3cba2713231ccab1f02a637b850e -SIZE (gitlab-org-gitlab-foss-b679f55a1991eaf5533e6a82335ca83fc8cf3753_GL0.tar.gz) = 88762598 +TIMESTAMP = 1585254116 +SHA256 (gitlab-org-gitlab-foss-6ea04b16a40dd15e4e0e127c8588af26e0f0f8d2_GL0.tar.gz) = 3a9c03eda2875bb1261d0f4d702aa20049335dacdfbd8b6de15cfdbd98c6553b +SIZE (gitlab-org-gitlab-foss-6ea04b16a40dd15e4e0e127c8588af26e0f0f8d2_GL0.tar.gz) = 88758773 Modified: head/www/gitlab-ce/pkg-plist ============================================================================== --- head/www/gitlab-ce/pkg-plist Thu Mar 26 21:07:31 2020 (r529222) +++ head/www/gitlab-ce/pkg-plist Thu Mar 26 21:11:05 2020 (r529223) @@ -4013,6 +4013,7 @@ %%WWWDIR%%/app/controllers/concerns/enforces_two_factor_authentication.rb %%WWWDIR%%/app/controllers/concerns/group_tree.rb %%WWWDIR%%/app/controllers/concerns/hooks_execution.rb +%%WWWDIR%%/app/controllers/concerns/hotlink_interceptor.rb %%WWWDIR%%/app/controllers/concerns/import_url_params.rb %%WWWDIR%%/app/controllers/concerns/initializes_current_user_mode.rb %%WWWDIR%%/app/controllers/concerns/internal_redirect.rb @@ -12599,6 +12600,7 @@ %%WWWDIR%%/lib/gitlab/hook_data/merge_request_builder.rb %%WWWDIR%%/lib/gitlab/hook_data/note_builder.rb %%WWWDIR%%/lib/gitlab/hook_data/wiki_page_builder.rb +%%WWWDIR%%/lib/gitlab/hotlinking_detector.rb %%WWWDIR%%/lib/gitlab/http.rb %%WWWDIR%%/lib/gitlab/http_connection_adapter.rb %%WWWDIR%%/lib/gitlab/http_io.rb @@ -17064,6 +17066,8 @@ %%WWWDIR%%/spec/fixtures/sentry/repos_sample_response.json %%WWWDIR%%/spec/fixtures/spdx.json %%WWWDIR%%/spec/fixtures/ssh_host_example_key.pub +%%WWWDIR%%/spec/fixtures/ssl_certificate.pem +%%WWWDIR%%/spec/fixtures/ssl_key.pem %%WWWDIR%%/spec/fixtures/symlink_export.tar.gz %%WWWDIR%%/spec/fixtures/trace/ansi-sequence-and-unicode %%WWWDIR%%/spec/fixtures/trace/sample_trace @@ -19204,6 +19208,7 @@ %%WWWDIR%%/spec/lib/gitlab/hook_data/issuable_builder_spec.rb %%WWWDIR%%/spec/lib/gitlab/hook_data/issue_builder_spec.rb %%WWWDIR%%/spec/lib/gitlab/hook_data/merge_request_builder_spec.rb +%%WWWDIR%%/spec/lib/gitlab/hotlinking_detector_spec.rb %%WWWDIR%%/spec/lib/gitlab/http_connection_adapter_spec.rb %%WWWDIR%%/spec/lib/gitlab/http_io_spec.rb %%WWWDIR%%/spec/lib/gitlab/http_spec.rb @@ -21243,6 +21248,7 @@ %%WWWDIR%%/spec/support/shared_examples/controllers/error_tracking_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/external_authorization_service_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/githubish_import_controller_shared_examples.rb +%%WWWDIR%%/spec/support/shared_examples/controllers/hotlink_interceptor_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/instance_statistics_controllers_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb %%WWWDIR%%/spec/support/shared_examples/controllers/issuables_list_metadata_shared_examples.rb Modified: head/www/gitlab-workhorse/Makefile ============================================================================== --- head/www/gitlab-workhorse/Makefile Thu Mar 26 21:07:31 2020 (r529222) +++ head/www/gitlab-workhorse/Makefile Thu Mar 26 21:11:05 2020 (r529223) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 8.21.0 +PORTVERSION= 8.21.1 PORTREVISION= 0 CATEGORIES= www @@ -21,7 +21,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags -GL_COMMIT= 62ff7e8ebb426215f64764677130354db18c1f35 +GL_COMMIT= ed1b6367d234d6be2e7d2be80e2b36f9814a2973 # for go dependencies USE_GITHUB= nodefault Modified: head/www/gitlab-workhorse/distinfo ============================================================================== --- head/www/gitlab-workhorse/distinfo Thu Mar 26 21:07:31 2020 (r529222) +++ head/www/gitlab-workhorse/distinfo Thu Mar 26 21:11:05 2020 (r529223) @@ -1,4 +1,4 @@ -TIMESTAMP = 1582616779 +TIMESTAMP = 1585254874 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 @@ -95,8 +95,8 @@ 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-gitlab-workhorse-62ff7e8ebb426215f64764677130354db18c1f35_GL0.tar.gz) = 4f3e3c7c8b8be74288f581f06221d7770272066cc26db4a02ed7b7337ab1dc82 -SIZE (gitlab-org-gitlab-workhorse-62ff7e8ebb426215f64764677130354db18c1f35_GL0.tar.gz) = 206929 +SHA256 (gitlab-org-gitlab-workhorse-ed1b6367d234d6be2e7d2be80e2b36f9814a2973_GL0.tar.gz) = 24ad81c4e59f60b26ecb8f2ffec00dd075f9367198bd08bf019ada26f7522d2b +SIZE (gitlab-org-gitlab-workhorse-ed1b6367d234d6be2e7d2be80e2b36f9814a2973_GL0.tar.gz) = 207780 SHA256 (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 40decb68620c061cadba556f836ef8efc953372b32903fd90825bb88fa79e943 SIZE (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 2800331 SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003262111.02QLB66Y044060>