Index: branches/2018Q4/www/gitlab-ce/Makefile =================================================================== --- branches/2018Q4/www/gitlab-ce/Makefile (revision 487434) +++ branches/2018Q4/www/gitlab-ce/Makefile (revision 487435) @@ -1,271 +1,271 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.5.3 +PORTVERSION= 11.5.4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories 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! # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options MY_DEPENDS= git>=2.16.2:devel/git \ gitlab-shell>=8.4.1:devel/gitlab-shell \ gitlab-workhorse>=7.1.3:www/gitlab-workhorse \ gitaly>=0.129.0:devel/gitaly \ gitlab-pages>=1.3.1:www/gitlab-pages \ redis>=3.2.12:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ rubygem-rails4>=4.2.10:www/rubygem-rails4 \ rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \ rubygem-responders>=2.0:www/rubygem-responders \ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \ rubygem-default_value_for30>=3.0.5:devel/rubygem-default_value_for30 \ rubygem-rugged>=0.27.0:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.0:devel/rubygem-grape-path-helpers \ rubygem-faraday>=0.12.0:www/rubygem-faraday \ rubygem-devise>=4.4:devel/rubygem-devise \ rubygem-doorkeeper43>=4.3:security/rubygem-doorkeeper43 \ rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \ rubygem-omniauth>=1.8:security/rubygem-omniauth \ rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \ rubygem-omniauth-facebook4>=4.0.0:net/rubygem-omniauth-facebook4 \ rubygem-omniauth-github>=1.3.0:net/rubygem-omniauth-github \ rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \ rubygem-omniauth-google-oauth2>=0.5.3:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth>=1.3.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \ rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \ rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \ rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \ rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \ rubygem-browser>=2.5:www/rubygem-browser \ rubygem-gpgme>=2.0.13:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap20>=2.0.4:net/rubygem-gitlab_omniauth-ldap20 \ rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \ rubygem-grape>=1.1:devel/rubygem-grape \ rubygem-grape-entity>=0.7.1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \ rubygem-graphql>=1.8.0:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \ rubygem-hamlit>=2.8.8:www/rubygem-hamlit \ rubygem-carrierwave>=1.2.3:www/rubygem-carrierwave \ rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ rubygem-fog-aws2>=2.0.1:net/rubygem-fog-aws2 \ rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ rubygem-fog-google>=1.7.1:net/rubygem-fog-google \ rubygem-fog-local>=0.3:net/rubygem-fog-local \ rubygem-fog-openstack02>=0.1:net/rubygem-fog-openstack02 \ rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \ rubygem-fog-aliyun02>=0.2.0:net/rubygem-fog-aliyun02 \ rubygem-google-api-client>=0.23:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0:textproc/rubygem-github-markup17 \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=1.5.6:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-plantuml>=0.0.8:textproc/rubygem-asciidoctor-plantuml \ rubygem-rouge>=3.1:textproc/rubygem-rouge \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.8.2:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \ rubygem-unicorn51>=5.1.0:www/rubygem-unicorn51 \ rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \ rubygem-puma>=3.12:www/rubygem-puma \ rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \ rubygem-state_machines-activerecord>=0.5.1:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=5.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \ rubygem-sidekiq-cron0>=0.6.0:devel/rubygem-sidekiq-cron0 \ rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow>=3.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1:devel/rubygem-re2 \ rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \ rubygem-js_regex>=2.2.1:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ rubygem-hipchat15>=1.5.0:net-im/rubygem-hipchat15 \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-flowdock>=0.7:www/rubygem-flowdock \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-hangouts-chat>=0.0.5:net/rubygem-hangouts-chat \ rubygem-asana>=0.6.0:www/rubygem-asana \ rubygem-ruby-fogbugz021>=0.2.1:devel/rubygem-ruby-fogbugz021 \ rubygem-kubeclient>=3.1.0:www/rubygem-kubeclient \ rubygem-sanitize>=4.6:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.2:textproc/rubygem-loofah \ rubygem-licensee8>=8.9:devel/rubygem-licensee8 \ rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \ rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-chronic>=0.10.2:devel/rubygem-chronic \ rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \ rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \ rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \ rubygem-sass-rails-rails4>=5.0.6:textproc/rubygem-sass-rails-rails4 \ rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \ rubygem-addressable>=2.5.2:www/rubygem-addressable \ rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ rubygem-gon>=6.2.0:www/rubygem-gon \ rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \ rubygem-request_store>=1.3:devel/rubygem-request_store \ rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ rubygem-base32>=0.3.0:converters/rubygem-base32 \ rubygem-sentry-raven>=2.7:devel/rubygem-sentry-raven \ rubygem-premailer-rails19>=1.9.7:mail/rubygem-premailer-rails19 \ rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \ rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \ rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \ rubygem-gettext_i18n_rails_js>=1.3:devel/rubygem-gettext_i18n_rails_js \ rubygem-gettext>=3.2.2:devel/rubygem-gettext \ rubygem-batch-loader>=1.2.1:devel/rubygem-batch-loader \ rubygem-peek>=1.0.1:devel/rubygem-peek \ rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \ rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \ rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \ rubygem-gitlab-sidekiq-fetcher>0:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \ rubygem-octokit>=4.9:net/rubygem-octokit \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \ rubygem-rbtrace>=0.4:devel/rubygem-rbtrace \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \ rubygem-net-ssh>=5.0:security/rubygem-net-ssh \ rubygem-sshkey>=1.9.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ rubygem-gitaly-proto>=0.123.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.15.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf \ rubygem-toml-rb10>=1.0.0:www/rubygem-toml-rb10 \ rubygem-flipper013>=0.13.0:devel/rubygem-flipper013 \ rubygem-flipper-active_record013>=0.13.0:databases/rubygem-flipper-active_record013 \ rubygem-flipper-active_support_cache_store013>=0.13.0:devel/rubygem-flipper-active_support_cache_store013 \ rubygem-lograge>=0.5:www/rubygem-lograge \ rubygem-grape_logging>=1.7:devel/rubygem-grape_logging BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} OPTIONS_SINGLE= DATABASE OPTIONS_SINGLE_DATABASE= PGSQL MYSQL OPTIONS_DEFAULT= PGSQL PGSQL_DESC= Default PostgreSQL support (preferred) MYSQL_DESC= Optional MySQL support PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \ rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \ rubygem-peek-mysql2>=1.1.0:databases/rubygem-peek-mysql2 USE_RUBY= yes USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= aa117376d89f0146cc7c573ec9091ada6041b417 +GL_COMMIT= 315df49c4a0f830bdb0c2c6fb037b2c6ea0e0ba7 USERS= git GROUPS= git NO_ARCH= yes NO_BUILD= yes post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/unicorn.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl post-patch-MYSQL-on: ${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample post-patch-MYSQL-off: ${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile ${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile post-patch-PGSQL-on: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample post-patch-PGSQL-off: ${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile ${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile do-install: (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${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 ${FIND} ${WRKSRC} -name "Gemfile.rail5.lock" -delete ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.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}/usr/home/git/repositories ${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}/shared/tmp ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) .include Index: branches/2018Q4/www/gitlab-ce/distinfo =================================================================== --- branches/2018Q4/www/gitlab-ce/distinfo (revision 487434) +++ branches/2018Q4/www/gitlab-ce/distinfo (revision 487435) @@ -1,3 +1,3 @@ -TIMESTAMP = 1544124680 -SHA256 (gitlab-org-gitlab-ce-aa117376d89f0146cc7c573ec9091ada6041b417_GL0.tar.gz) = 5fb79cd6b05aeb497f9c7fb9e76d00f009fa1fe21bdefe10b83bbe2d5171ccd8 -SIZE (gitlab-org-gitlab-ce-aa117376d89f0146cc7c573ec9091ada6041b417_GL0.tar.gz) = 50977775 +TIMESTAMP = 1544786508 +SHA256 (gitlab-org-gitlab-ce-315df49c4a0f830bdb0c2c6fb037b2c6ea0e0ba7_GL0.tar.gz) = 03b038c8de5de81e89f9d120ca778df57c914caf3e9ef7ecab3ce93cc43e8c64 +SIZE (gitlab-org-gitlab-ce-315df49c4a0f830bdb0c2c6fb037b2c6ea0e0ba7_GL0.tar.gz) = 50983062 Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 487434) +++ branches/2018Q4 (revision 487435) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r487429