Page MenuHomeFreeBSD
Files F155021860

D29628.id87016.diff
No OneTemporary
Actions

D29628.id87016.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1706,7 +1706,7 @@
.if defined(WRKSRC)
DEV_WARNING+= "You are using USE_GITLAB and WRKSRC is set which is wrong. Set GL_PROJECT, GL_ACCOUNT correctly, and/or set WRKSRC_SUBDIR and remove WRKSRC entirely."
.endif
-WRKSRC?= ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}-${GL_COMMIT}
+WRKSRC?= ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}
.endif
# If the distname is not extracting into a specific subdirectory, have the
Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -547,7 +547,7 @@
. endif
. if empty(USE_GITLAB:Mnodefault)
-MASTER_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/repository/${GL_COMMIT}/archive.tar.gz?dummy=/
+MASTER_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_COMMIT}.tar.gz?dummy=/
. endif
GL_SITE_DEFAULT= https://gitlab.com
GL_SITE?= ${GL_SITE_DEFAULT}
@@ -617,8 +617,8 @@
DISTNAME_${_group}:= ${GL_ACCOUNT_${_group}}-${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}_GL${_GITLAB_REV}
DISTFILE_${_group}:= ${DISTNAME_${_group}}${_GITLAB_EXTRACT_SUFX}
DISTFILES:= ${DISTFILES} ${DISTFILE_${_group}}:${_group}
-MASTER_SITES:= ${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/repository/${GL_COMMIT_${_group}}/archive.tar.gz?dummy=/:${_group}
-WRKSRC_${_group}:= ${WRKDIR}/${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}-${GL_COMMIT_${_group}}
+MASTER_SITES:= ${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/-/archive/${GL_COMMIT_${_group}}.tar.gz?dummy=/:${_group}
+WRKSRC_${_group}:= ${WRKDIR}/${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}
. if !empty(GL_SUBDIR_${_group})
_SITES_extract:= ${_SITES_extract} 690:post-extract-gl-${_group}
post-extract-gl-${_group}:
Index: devel/gitaly/Makefile
===================================================================
--- devel/gitaly/Makefile
+++ devel/gitaly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitaly
-DISTVERSION= 13.10.1
+DISTVERSION= 13.10.2
PORTREVISION= 0
CATEGORIES= devel
@@ -44,7 +44,7 @@
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT= bb27a5a3b1085a191e9fcc66a50c3d71cde24237
+GL_COMMIT= 566d0ed013b36ca369e72fd5d1a9a9cc7606132a
# for go dependencies
USE_GITHUB= nodefault
Index: devel/gitaly/distinfo
===================================================================
--- devel/gitaly/distinfo
+++ devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1617222766
+TIMESTAMP = 1617806114
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-909beea2cc74_GH0.tar.gz) = 50b452d12987d884f45c85bd2de8ea7076cd54f6f2c8b612a1d4c1704e52b5df
@@ -161,9 +161,9 @@
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-bb27a5a3b1085a191e9fcc66a50c3d71cde24237_GL0.tar.gz) = 2e76557a78228444b2598b8e01194af5f42be763e3c40f22fda6205ea93a2aa9
-SIZE (gitlab-org-gitaly-bb27a5a3b1085a191e9fcc66a50c3d71cde24237_GL0.tar.gz) = 3395696
-SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3
-SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583
-SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd
-SIZE (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 141565
+SHA256 (gitlab-org-gitaly-566d0ed013b36ca369e72fd5d1a9a9cc7606132a_GL0.tar.gz) = 32e20b1de98c530a51f2bff821c070474311a53d14006513702ec7c25dd62658
+SIZE (gitlab-org-gitaly-566d0ed013b36ca369e72fd5d1a9a9cc7606132a_GL0.tar.gz) = 3396774
+SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15
+SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693
+SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90
+SIZE (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 141810
Index: www/gitlab-ce/Makefile
===================================================================
--- www/gitlab-ce/Makefile
+++ www/gitlab-ce/Makefile
@@ -1,7 +1,7 @@
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
PORTNAME= gitlab-ce
-PORTVERSION= 13.10.1
+PORTVERSION= 13.10.2
PORTREVISION= 0
CATEGORIES= www devel
@@ -269,7 +269,7 @@
GL_ACCOUNT?= gitlab-org
GL_PROJECT?= gitlab-foss
# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT?= c93927607f55350f2e2af4bdaf03ff9dba80ab1d
+GL_COMMIT?= 7efd19e3716ab6f9146052da76d1bd59ec815f2d
USERS= git
GROUPS= git
Index: www/gitlab-ce/distinfo
===================================================================
--- www/gitlab-ce/distinfo
+++ www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617222645
-SHA256 (gitlab-org-gitlab-foss-c93927607f55350f2e2af4bdaf03ff9dba80ab1d_GL0.tar.gz) = 44d82b3ba741e1fb86aa4bc62fc63ecd3a3529a156b85dd317269dd7d9a76f39
-SIZE (gitlab-org-gitlab-foss-c93927607f55350f2e2af4bdaf03ff9dba80ab1d_GL0.tar.gz) = 100193634
+TIMESTAMP = 1617716412
+SHA256 (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 9f1173a52eea1f6c27895ba05883a6b23d4e0968a3e6de47424a587018eda0b4
+SIZE (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 100381606
Index: www/gitlab-ce/pkg-plist
===================================================================
--- www/gitlab-ce/pkg-plist
+++ www/gitlab-ce/pkg-plist
@@ -12337,6 +12337,7 @@
%%WWWDIR%%/data/whats_new/202012160001_13_07.yml
%%WWWDIR%%/data/whats_new/202101140001_13_08.yml
%%WWWDIR%%/data/whats_new/202102180001_13_09.yml
+%%WWWDIR%%/data/whats_new/202103220001_13_10.yml
%%WWWDIR%%/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml
%%WWWDIR%%/db/fixtures/development/01_admin.rb
%%WWWDIR%%/db/fixtures/development/02_application_settings.rb
@@ -17846,10 +17847,12 @@
%%WWWDIR%%/doc/user/group/contribution_analytics/img/group_stats_table.png
%%WWWDIR%%/doc/user/group/contribution_analytics/index.md
%%WWWDIR%%/doc/user/group/custom_project_templates.md
+%%WWWDIR%%/doc/user/group/epics/epic_boards.md
%%WWWDIR%%/doc/user/group/epics/img/button_close_epic.png
%%WWWDIR%%/doc/user/group/epics/img/button_reopen_epic.png
%%WWWDIR%%/doc/user/group/epics/img/containing_epic.png
%%WWWDIR%%/doc/user/group/epics/img/epic_activity_sort_order_v13_2.png
+%%WWWDIR%%/doc/user/group/epics/img/epic_board_v13_10.png
%%WWWDIR%%/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
%%WWWDIR%%/doc/user/group/epics/img/epic_view_v13.0.png
%%WWWDIR%%/doc/user/group/epics/img/epics_search.png
@@ -28607,6 +28610,7 @@
%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/operations/strategy.json
%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/packages/collection_package.json
%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/packages/composer/index.json
+%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/packages/composer/index_v2.json
%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/packages/composer/package.json
%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/packages/composer/provider.json
%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/packages/group_package.json
@@ -29652,6 +29656,7 @@
%%WWWDIR%%/spec/frontend/emoji/components/category_spec.js
%%WWWDIR%%/spec/frontend/emoji/components/emoji_group_spec.js
%%WWWDIR%%/spec/frontend/emoji/components/emoji_list_spec.js
+%%WWWDIR%%/spec/frontend/emoji/components/utils_spec.js
%%WWWDIR%%/spec/frontend/emoji/index_spec.js
%%WWWDIR%%/spec/frontend/emoji/support/unicode_support_map_spec.js
%%WWWDIR%%/spec/frontend/environment.js
Index: www/gitlab-pages/distinfo
===================================================================
--- www/gitlab-pages/distinfo
+++ www/gitlab-pages/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1616307528
+TIMESTAMP = 1617805195
SHA256 (andybalholm-brotli-v1.0.1_GH0.tar.gz) = f14b686896b3bae2782350bbaf2aadfb9c6a4916e54beb28b393e592aa4af48e
SIZE (andybalholm-brotli-v1.0.1_GH0.tar.gz) = 593298
SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
@@ -115,9 +115,9 @@
SIZE (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 3126
SHA256 (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 0f865bd53c02e7d89115aaa60ce8b8147b1f71238f2cf33a6593465f845703cb
SIZE (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 2309
-SHA256 (gitlab-org-gitlab-pages-3d68f89c6ef3c7d3cd13838e4ab521301ac5754e_GL0.tar.gz) = 5fd3b431581da662c6441c12be3e82d29fa9941ce8033df3aacf8f2ff5dbb688
-SIZE (gitlab-org-gitlab-pages-3d68f89c6ef3c7d3cd13838e4ab521301ac5754e_GL0.tar.gz) = 207996
-SHA256 (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = 726285dab86f2c912b1bd7c9909d904189c9b890284c10bc1cc19e30a14de917
-SIZE (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = 18000
-SHA256 (gitlab-org-labkit-949268af2aa8352c644cb1cbc63cf4112972d2c9_GL0.tar.gz) = 7f85a6a010cc5b4b6e2a6152ea8fe338f7ecf9c1078c43a9ade331c60af12572
-SIZE (gitlab-org-labkit-949268af2aa8352c644cb1cbc63cf4112972d2c9_GL0.tar.gz) = 151120
+SHA256 (gitlab-org-gitlab-pages-3d68f89c6ef3c7d3cd13838e4ab521301ac5754e_GL0.tar.gz) = 067908ae0cfa4cfde62715be5e150e383e4c84ea1027a26dee327ad2ef63e3e3
+SIZE (gitlab-org-gitlab-pages-3d68f89c6ef3c7d3cd13838e4ab521301ac5754e_GL0.tar.gz) = 208466
+SHA256 (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = c4faae244f7203b243d31704efedb97ef6f8e1faf6b2f70e87555e0f6e19d426
+SIZE (gitlab-org-go-mimedb-e7aae885685d3b4c73716eae321d8486e914ad74_GL0.tar.gz) = 17978
+SHA256 (gitlab-org-labkit-949268af2aa8352c644cb1cbc63cf4112972d2c9_GL0.tar.gz) = 655809f0ff0c8b4c97e3a021dc6ebce9ffeabdd17927aae3973b5295e099db1a
+SIZE (gitlab-org-labkit-949268af2aa8352c644cb1cbc63cf4112972d2c9_GL0.tar.gz) = 151360
Index: www/gitlab-workhorse/Makefile
===================================================================
--- www/gitlab-workhorse/Makefile
+++ www/gitlab-workhorse/Makefile
@@ -1,7 +1,7 @@
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
PORTNAME?= gitlab-workhorse
-PORTVERSION?= 13.10.1
+PORTVERSION?= 13.10.2
PORTREVISION?= 0
CATEGORIES= www
@@ -22,7 +22,7 @@
GL_ACCOUNT?= gitlab-org
GL_PROJECT= gitlab-foss
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT?= c93927607f55350f2e2af4bdaf03ff9dba80ab1d
+GL_COMMIT?= 7efd19e3716ab6f9146052da76d1bd59ec815f2d
# for go dependencies
USE_GITHUB= nodefault
@@ -149,4 +149,3 @@
.include <bsd.port.mk>
-
Index: www/gitlab-workhorse/distinfo
===================================================================
--- www/gitlab-workhorse/distinfo
+++ www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1617349208
+TIMESTAMP = 1617805831
SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
SHA256 (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7
@@ -179,9 +179,9 @@
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-foss-c93927607f55350f2e2af4bdaf03ff9dba80ab1d_GL0.tar.gz) = 44d82b3ba741e1fb86aa4bc62fc63ecd3a3529a156b85dd317269dd7d9a76f39
-SIZE (gitlab-org-gitlab-foss-c93927607f55350f2e2af4bdaf03ff9dba80ab1d_GL0.tar.gz) = 100193634
-SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 98d3cd87fb3feb8a14b5ac9e4a968e7a841cc3b309f997a2ba78aa8fd0b58c2d
-SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3143193
-SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd
-SIZE (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 141565
+SHA256 (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 9f1173a52eea1f6c27895ba05883a6b23d4e0968a3e6de47424a587018eda0b4
+SIZE (gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0.tar.gz) = 100381606
+SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 000027af9d1bca6db30bb4e0b27fcb4b6315ae7c0787639c044eaa449fc3d8d0
+SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3145584
+SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90
+SIZE (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 141810

File Metadata

Mime Type
text/plain
Expires
Fri, May 1, 6:06 PM (8 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32591394
Default Alt Text
D29628.id87016.diff (13 KB)

Event Timeline