MFH: r518203

Update to 1.12.0 which is required for gitlab-ce 12.5.

Approved by:	ports-secteam (joneum)

2 files changed, 7 insertions, 20 deletions

diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 964a605eeee5..824b92c36d6c 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-pages
-PORTVERSION=	1.11.0
+PORTVERSION=	1.12.0
 CATEGORIES=	www
 
 MAINTAINER=	swills@FreeBSD.org
@@ -17,9 +17,10 @@ USE_GITHUB=	nodefault
 
 GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
-GL_COMMIT=	fa804e9f422cb1525324e917a4b318bea8596067
+GL_COMMIT=	9c69ac5306545be017701dfff7afe25c8b814c3f
 
 # Build with: make gomod-vendor
+# 39dd
 GH_TUPLE=	\
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		certifi:gocertifi:a5e0173ced67:certifi_gocertifi/vendor/github.com/certifi/gocertifi \
@@ -36,13 +37,9 @@ GH_TUPLE=	\
 		golang:sys:bbd175535a8b:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		golang:tools:2dc213d980bc:golang_tools/vendor/golang.org/x/tools \
-		google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
 		gorilla:context:v1.1.1:gorilla_context/vendor/github.com/gorilla/context \
 		gorilla:securecookie:v1.1.1:gorilla_securecookie/vendor/github.com/gorilla/securecookie \
 		gorilla:sessions:v1.2.0:gorilla_sessions/vendor/github.com/gorilla/sessions \
-		grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
-		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
-		grpc:grpc-go:v1.19.1:grpc_grpc_go/vendor/google.golang.org/grpc \
 		kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
 		karrick:godirwalk:v1.10.12:karrick_godirwalk/vendor/github.com/karrick/godirwalk \
 		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
@@ -59,8 +56,8 @@ GH_TUPLE=	\
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		wadey:gocovmerge:b5bfa59ec0ad:wadey_gocovmerge/vendor/github.com/wadey/gocovmerge
+
 GL_TUPLE=	\
-		gitlab-org:gitaly:c013d9f144d1d288fed054d0541241b4c6d3bdcc:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \
 		gitlab-org:labkit:3253d7975ca73714779c0a1fc95a27fb678071b6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
 		lupine:go-mimedb:e8af1d65987739a7ab277dedd9772c7398154ff3:lupine_go_mimedb/vendor/gitlab.com/lupine/go-mimedb
 
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 138c37469010..34c69c75044e 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1571856475
+TIMESTAMP = 1574433094
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (certifi-gocertifi-a5e0173ced67_GH0.tar.gz) = f021fd5f62b221aac04e69b030ace59fd2a0912433fb6b938965a61f49410ba6
@@ -29,20 +29,12 @@ SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (golang-tools-2dc213d980bc_GH0.tar.gz) = dc372f7b80fb4d12ba60445427b1e7e9138942183ae4353f3f894c04e507df2d
 SIZE (golang-tools-2dc213d980bc_GH0.tar.gz) = 2267969
-SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377
-SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775
 SHA256 (gorilla-context-v1.1.1_GH0.tar.gz) = 2dfdd051c238695bf9ebfed0bf6a8c533507ac0893bce23be5930e973736bb03
 SIZE (gorilla-context-v1.1.1_GH0.tar.gz) = 4574
 SHA256 (gorilla-securecookie-v1.1.1_GH0.tar.gz) = b7897b2243f0d43913aca318593c5c2586294fcd3265189d564ddda1b880fe95
 SIZE (gorilla-securecookie-v1.1.1_GH0.tar.gz) = 41240
 SHA256 (gorilla-sessions-v1.2.0_GH0.tar.gz) = 576d154ff12273d88d25864d14bd9b0fb1a864274d1fb3e224546529068c8968
 SIZE (gorilla-sessions-v1.2.0_GH0.tar.gz) = 13352
-SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b
-SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266
-SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
-SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
-SHA256 (grpc-grpc-go-v1.19.1_GH0.tar.gz) = 05faffafaadb6fdd4be7862aeb987cb2aa57f59cb0b695bcf673e6bd6182207f
-SIZE (grpc-grpc-go-v1.19.1_GH0.tar.gz) = 600232
 SHA256 (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = c032455620be4be434428bfe5b73679ccd7c01f402607c45204d233ce8923309
 SIZE (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = 4898
 SHA256 (karrick-godirwalk-v1.10.12_GH0.tar.gz) = 738995006bf8412f17cbc2d8ef717f7568139548fdee311531ee68f90c39ac2d
@@ -75,10 +67,8 @@ SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e
 SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
 SHA256 (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 0f865bd53c02e7d89115aaa60ce8b8147b1f71238f2cf33a6593465f845703cb
 SIZE (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 2309
-SHA256 (gitlab-org-gitlab-pages-fa804e9f422cb1525324e917a4b318bea8596067_GL0.tar.gz) = 8f4b5bf256b86f13de5655cc448e27c14df6c5cd44e930109aa182fcbe29ab6d
-SIZE (gitlab-org-gitlab-pages-fa804e9f422cb1525324e917a4b318bea8596067_GL0.tar.gz) = 106167
-SHA256 (gitlab-org-gitaly-c013d9f144d1d288fed054d0541241b4c6d3bdcc_GL0.tar.gz) = a1f406a9eaef26a2e39e4cf9adc417fdbce45c164de46bec6aa2e2d0cf1388df
-SIZE (gitlab-org-gitaly-c013d9f144d1d288fed054d0541241b4c6d3bdcc_GL0.tar.gz) = 2743550
+SHA256 (gitlab-org-gitlab-pages-9c69ac5306545be017701dfff7afe25c8b814c3f_GL0.tar.gz) = ba13c18ec141703f4d8e460e0379342d6e9cc18a50c2ac00888cc31d88a0867e
+SIZE (gitlab-org-gitlab-pages-9c69ac5306545be017701dfff7afe25c8b814c3f_GL0.tar.gz) = 103572
 SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
 SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149
 SHA256 (lupine-go-mimedb-e8af1d65987739a7ab277dedd9772c7398154ff3_GL0.tar.gz) = 1312f727d2910acf56382c6dfc26eb4d504fb02d79d7fc731f514d051e275d91