diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 3b98a5643802..3d6f4f3d6160 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,96 +1,96 @@ PORTNAME= gitaly -DISTVERSION= 15.8.3 +DISTVERSION= 15.8.4 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab WWW= https://gitlab.com/gitlab-org/gitaly LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # Make sure the following patch is included: # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4108 # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport61>=6.1.6<6.2:devel/rubygem-activesupport61 \ rubygem-grpc142>=1.42.0<2:net/rubygem-grpc142 \ rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ rubygem-gitaly>=15.5.0<15.6:net/rubygem-gitaly \ rubygem-gitlab-labkit>=0.29<1:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ rubygem-google-protobuf>=3.21.12<3.22:devel/rubygem-google-protobuf \ rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \ rubygem-redis4>=4.8.0<5:databases/rubygem-redis4 BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=13.22.1:devel/gitlab-shell LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cpe gmake go:modules,no_targets pkgconfig ruby CPE_VENDOR= gitlab MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 1f24c1507ec111c32c8080347a476c0a6a001e93 +GL_COMMIT= 158a9e7f7acea1d93fff2dac4e2421f78de53875 # 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/gitaly/-/raw/v${DISTVERSION}/ 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) # --------------------------- post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample pre-build: (cd ${WRKSRC}/ruby && ${RM} Gemfile.lock && bundle install --local) do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) && \ cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby post-install: ${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /gitlab-shell-hook$$/ s#^#@(,,755) #; \ s#${DATADIR_REL}/ruby/bin#@(,,555) ${DATADIR_REL}/ruby/bin#; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} .include diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 08f28509c243..22de06f43de3 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676462678 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-1f24c1507ec111c32c8080347a476c0a6a001e93_GL0/go.mod) = 28e105ea47304435dc1432661b97514170a8df58bc74075417a2e934b57c0d43 -SIZE (go/devel_gitaly/gitlab-org-gitaly-1f24c1507ec111c32c8080347a476c0a6a001e93_GL0/go.mod) = 9702 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-1f24c1507ec111c32c8080347a476c0a6a001e93_GL0/gitlab-org-gitaly-1f24c1507ec111c32c8080347a476c0a6a001e93_GL0.tar.gz) = 50ee221c735a489b51e921c25c1b80904988e169773b9d5ce7a29f81b3bf45fb -SIZE (go/devel_gitaly/gitlab-org-gitaly-1f24c1507ec111c32c8080347a476c0a6a001e93_GL0/gitlab-org-gitaly-1f24c1507ec111c32c8080347a476c0a6a001e93_GL0.tar.gz) = 2957051 +TIMESTAMP = 1677873622 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/go.mod) = 28e105ea47304435dc1432661b97514170a8df58bc74075417a2e934b57c0d43 +SIZE (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/go.mod) = 9702 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0.tar.gz) = f37281f64232560d9c372ef96d8e6721a0f04d41a54971e828569a4caf654426 +SIZE (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0.tar.gz) = 2957888 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index fd397b6a6c7f..6a7db9211a49 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,423 +1,423 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.8.3 +PORTVERSION= 15.8.4 PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories WWW= https://gitlab.com/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! # devel/rubygem-parser is required for database upgrade process # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 MY_DEPENDS= git>=2.39.2:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=3.2.0:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=15.8.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ gitlab-shell>=14.15.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-rails61>=6.1.6.1<6.1.8:www/rubygem-rails61 \ rubygem-bootsnap115>=1.15.0<1.16:devel/rubygem-bootsnap115 \ rubygem-openssl2>=2.2.2<2.3:security/rubygem-openssl2 \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-view_component-rails61>=2.74.1<2.75:devel/rubygem-view_component-rails61 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ rubygem-pg>=1.4.5<1.5:databases/rubygem-pg \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ rubygem-devise-rails61>=4.8.1<4.9:devel/rubygem-devise-rails61 \ rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper>=5.5.4<6:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.8.3<2:security/rubygem-doorkeeper-openid_connect \ rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \ rubygem-ruby-saml>=1.13.0<1.14:security/rubygem-ruby-saml \ rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \ rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ rubygem-omniauth-alicloud>=2.0.0<2.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \ rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=2.0.0<3:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \ rubygem-gitlab-omniauth-openid-connect>=0.10.0<0.11.0:net/rubygem-gitlab-omniauth-openid-connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2>=1.21.3<1.22.0:security/rubygem-rack-oauth2 \ rubygem-jwt25>=2.5.0<2.6:www/rubygem-jwt25 \ rubygem-gssapi>0:security/rubygem-gssapi \ rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor-rails61>=4.0.2<4.1:security/rubygem-devise-two-factor-rails61 \ rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \ rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \ rubygem-browser>=5.3.1<5.4:www/rubygem-browser \ rubygem-ohai>=16.10<17:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.22<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>=0.17.1<0.18:net/rubygem-net-ldap \ rubygem-grape15>=1.5.2<1.6:devel/rubygem-grape15 \ rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \ rubygem-grape-swagger>=1.5.0<1.6:devel/rubygem-grape-swagger \ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \ rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \ rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \ rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ rubygem-kaminari-rails61>=1.2.2<1.3:www/rubygem-kaminari-rails61 \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \ rubygem-fog-aws>=3.15<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.19<2:net/rubygem-fog-google \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ rubygem-gitlab-fog-azure-rm>=1.4.0<1.5:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ rubygem-aws-sdk-core3168>=3.168.4<3.169:devel/rubygem-aws-sdk-core3168 \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ rubygem-aws-sdk-s31117>=1.117.2<1.118:devel/rubygem-aws-sdk-s31117 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.3.2<2.4:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ rubygem-commonmarker>=0.23.6<0.24:textproc/rubygem-commonmarker \ rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=2.0.17<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.7.0<0.8:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge>=3.30.0<3.31: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.13.10<1.14:textproc/rubygem-nokogiri \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ rubygem-rack22>=2.2.6.2<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \ rubygem-puma>=5.6.5<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq6>=6.5.7<6.6:devel/rubygem-sidekiq6 \ rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \ rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \ rubygem-gitlab-sidekiq-fetcher>=0.9.0<0.10:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit17>=1.7.0<1.8:devel/rubygem-fugit17 \ rubygem-httparty>=0.20.0<0.21:www/rubygem-httparty \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis4>=4.8.0<5:databases/rubygem-redis4 \ rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails61>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ rubygem-asana0>=0.10.13<0.11:www/rubygem-asana0 \ rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ rubygem-loofah>=2.19.1<2.20:textproc/rubygem-loofah \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.5.4<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy>=0.7.6<0.8.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \ rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \ rubygem-terser>=1.0.2:textproc/rubygem-terser \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-tanuki_emoji>=0.6<1:graphics/rubygem-tanuki_emoji \ rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \ rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.2.1<2.3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.6.1<6.7:www/rubygem-rack-attack \ rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \ rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=2.2<3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ rubygem-gitlab-labkit>=0.29.0<0.30:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ rubygem-gettext_i18n_rails18>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails18 \ rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \ rubygem-gettext>=3.3<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \ rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-webrick17>=1.7.0<1.8:www/rubygem-webrick17 \ rubygem-prometheus-client-mmap>=0.17<1:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ rubygem-gitlab-dangerfiles>=3.6.4<3.7:devel/rubygem-gitlab-dangerfiles \ rubygem-octokit>=4.20<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-stackprof>=0.2.21<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \ rubygem-health_check>=3.0<4:devel/rubygem-health_check \ rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.0.0<1.1:net/rubygem-spamcheck \ rubygem-gitaly>=15.5.2<15.6.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \ rubygem-google-protobuf>=3.21.12<4:devel/rubygem-google-protobuf \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper025>=0.25.0<0.26:devel/rubygem-flipper025 \ rubygem-flipper-active_record-rails61>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails61 \ rubygem-flipper-active_support_cache_store-rails61>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails61 \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \ rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \ rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \ rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ rubygem-mail27>=2.7.1<2.7.2,2:mail/rubygem-mail27 \ rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-json>=2.5.1<3:devel/rubygem-json \ rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \ rubygem-oj>=3.13.21<3.14:devel/rubygem-oj \ rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \ rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=2.3<3:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ rubygem-parser>=0:devel/rubygem-parser \ rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ rubygem-CFPropertyList>=0:devel/rubygem-CFPropertyList \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ rubygem-kubeclient>=4.9.3<4.10.0:www/rubygem-kubeclient BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} CONFLICTS_INSTALL= gitolite \ gitolite2 \ gogs \ gitea \ gitosis USES= go:modules ruby shebangfix USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 22f43167474102e26b4b585df6dbb541e48b7879 +GL_COMMIT= 54f2a13176e4d174500a39302d29895d7e729d38 USERS= git GROUPS= git NO_BUILD= yes NO_ARCH= yes OPTIONS_DEFINE= KERBEROS OPTIONS_DEFAULT= KERBEROS KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl # Remove symlink a create a file with content ${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION ${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION # Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/389843 ${MV} ${WRKSRC}/spec/features/projects/pipelines/legacy_pipelines_spec.rb\ ${WRKSRC}/spec/features/projects/pipelines/legacy_pipelines_spec.rb do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${RM} -R ${WRKSRC}/workhorse # Has only a Gemfile.lock, so remove it, is maybe fixed by a newer version ${RM} -R ${WRKSRC}/vendor/gems/omniauth-google-oauth2 ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example # get files for workdir with: find . -name "*.example" ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sockets/private/internal ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \ /db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST} @${ECHO_CMD} "@owner git" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST} #@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} .include diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index e02aa419230e..00c2e0c95d0f 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676463469 -SHA256 (gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0.tar.gz) = 8b0f8aa26f18b234966c5cb60ad1a6af27f89e7528e98e28081df624b8318cf7 -SIZE (gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0.tar.gz) = 99763082 +TIMESTAMP = 1677873438 +SHA256 (gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0.tar.gz) = 5cef76fb50d9aa4b6ed9ffad44b7346fc50b8b8ba7cafc80fb70d837981bbd07 +SIZE (gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0.tar.gz) = 99767300 diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 5058744854b6..01ef28f6592e 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,33 +1,33 @@ PORTNAME= gitlab-pages -PORTVERSION= 15.8.3 +PORTVERSION= 15.8.4 DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= www MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ DISTFILES+= go.mod MAINTAINER= swills@FreeBSD.org COMMENT= Official GitLab Pages daemon WWW= https://gitlab.com/gitlab-org/gitlab-pages LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules GO_MODULE= gitlab.com/gitlab-org/gitlab-pages USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitlab-pages/-/tags/ -GL_COMMIT= a3e84d64b2955ecdd48cce3a7390aa34f234c0ff +GL_COMMIT= 31d5e7e2456cc6e7a4ee44e665c59163645c0c57 GO_BUILDFLAGS= -ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_COMMIT}'" PLIST_FILES= bin/gitlab-pages USE_RC_SUBR= gitlab_pages USERS= gitlab-pages GROUPS= gitlab-pages .include diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 66a163dab4dc..06d9b7fb6f2c 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676462800 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a3e84d64b2955ecdd48cce3a7390aa34f234c0ff_GL0/go.mod) = 407883ba322b73d1526b585fb5a2570826c39759adf176965e8a37b1cf664f2d -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a3e84d64b2955ecdd48cce3a7390aa34f234c0ff_GL0/go.mod) = 2938 -SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-a3e84d64b2955ecdd48cce3a7390aa34f234c0ff_GL0/gitlab-org-gitlab-pages-a3e84d64b2955ecdd48cce3a7390aa34f234c0ff_GL0.tar.gz) = f656415fd8afce10a4e76a8d298d5667109e9350e8f8a6d5d3e6364fa91ee714 -SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-a3e84d64b2955ecdd48cce3a7390aa34f234c0ff_GL0/gitlab-org-gitlab-pages-a3e84d64b2955ecdd48cce3a7390aa34f234c0ff_GL0.tar.gz) = 226667 +TIMESTAMP = 1677873414 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-31d5e7e2456cc6e7a4ee44e665c59163645c0c57_GL0/go.mod) = 407883ba322b73d1526b585fb5a2570826c39759adf176965e8a37b1cf664f2d +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-31d5e7e2456cc6e7a4ee44e665c59163645c0c57_GL0/go.mod) = 2938 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-31d5e7e2456cc6e7a4ee44e665c59163645c0c57_GL0/gitlab-org-gitlab-pages-31d5e7e2456cc6e7a4ee44e665c59163645c0c57_GL0.tar.gz) = 3fdd108bb51685410ba5136ecf0eccb78773ed0454510525d47be4f7f8371355 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-31d5e7e2456cc6e7a4ee44e665c59163645c0c57_GL0/gitlab-org-gitlab-pages-31d5e7e2456cc6e7a4ee44e665c59163645c0c57_GL0.tar.gz) = 226716 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 06fce2a18a4f..5640177308f9 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,58 +1,58 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.8.3 +PORTVERSION= 15.8.4 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.39.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= 22f43167474102e26b4b585df6dbb541e48b7879 +GL_COMMIT= 54f2a13176e4d174500a39302d29895d7e729d38 # 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 d7b89d61baf2..50ad183ca0fa 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676463163 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0/go.mod) = 47c828240bfe55fc868643db03874e5d509117901ba77b8748731cbb4d6b1de9 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0/go.mod) = 6347 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0/gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0.tar.gz) = 8b0f8aa26f18b234966c5cb60ad1a6af27f89e7528e98e28081df624b8318cf7 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0/gitlab-org-gitlab-foss-22f43167474102e26b4b585df6dbb541e48b7879_GL0.tar.gz) = 99763082 +TIMESTAMP = 1677873479 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0/go.mod) = 47c828240bfe55fc868643db03874e5d509117901ba77b8748731cbb4d6b1de9 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0/go.mod) = 6347 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0/gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0.tar.gz) = 5cef76fb50d9aa4b6ed9ffad44b7346fc50b8b8ba7cafc80fb70d837981bbd07 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0/gitlab-org-gitlab-foss-54f2a13176e4d174500a39302d29895d7e729d38_GL0.tar.gz) = 99767300