diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index c446bff64116..249aa875164e 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,58 +1,58 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.3.4 -PORTREVISION= 1 +PORTVERSION= 15.4.2 +PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= www MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab WWW= https://gitlab.com/gitlab-org/gitlab-workhorse LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../LICENSE BUILD_DEPENDS= git>=2.16.2:devel/git RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool USES= gmake go:modules,no_targets MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" MAKE_ENV+= ${GO_ENV} WRKSRC_SUBDIR= workhorse # found in work/gitlab-foss*/workhorse/go.mod #GO_MODULE= gitlab.com/gitlab-org/gitlab/workhorse USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= a347a04b6129dea62767a196124bebbf338077c9 +GL_COMMIT= ef309cf1466c3d2a9297d735c7127fcaf0c08d48 # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy # so we download the required go.mod file from gitlab # lines are taken from go.mk # --------------------------- FETCH_DEPENDS= ${GO_CMD}:${GO_PORT} \ ca_root_nss>0:security/ca_root_nss MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-foss/-/raw/v${DISTVERSION}/workhorse/ DISTFILES+= go.mod DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} _USES_fetch+= 800:go-post-fetch go-post-fetch: @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; @(cd ${DISTDIR}/${DIST_SUBDIR}; \ [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) # --------------------------- PLIST_FILES= bin/gitlab-resize-image \ bin/gitlab-workhorse \ bin/gitlab-zip-cat \ bin/gitlab-zip-metadata PLIST_DIRS= ${WWWDIR} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME} .include diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 162e5f1b11be..87f892366d6b 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664908085 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0/go.mod) = 855885ccf54184ec1258b41618201b350151d533116429cde4ffa2fe34bf048f -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0/go.mod) = 6158 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0/gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0.tar.gz) = 8d02a9f66fd6fb83f8fbbb52d7aec317a50fa16ea22121021a21281749943f54 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0/gitlab-org-gitlab-foss-a347a04b6129dea62767a196124bebbf338077c9_GL0.tar.gz) = 100648659 +TIMESTAMP = 1665829496 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0/go.mod) = 62de61822cf0c662b35a03c0c836c06b6471962c94ab82908ccfdda989929ce7 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0/go.mod) = 6134 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0/gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0.tar.gz) = 2dd2c29d42a1d6ee106fb2ad5ddd77f660c27adaafe86ff95009f1b8002e23f0 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0/gitlab-org-gitlab-foss-ef309cf1466c3d2a9297d735c7127fcaf0c08d48_GL0.tar.gz) = 101266813