Date: Thu, 20 Jul 2017 16:21:35 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446269 - in branches/2017Q3/www/gitlab: . files Message-ID: <201707201621.v6KGLZVL011545@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Thu Jul 20 16:21:35 2017 New Revision: 446269 URL: https://svnweb.freebsd.org/changeset/ports/446269 Log: MFH: r445179 r445921 r446031 r446062 r446128 r446257 Fix gemspec for rubygem-hipchat 1.6.0 update - Bump PORTREVISION for package change Change RUN_DEPENDS from rubygem-grape to rubygem-grape0 - Bump PORTREVISION for dependency change Change RUN_DEPENDS from rubygem-rack-cors to rubygem-rack-cors0 - Bump PORTREVISION for dependency change Fix pkgname. Pointy hat: tz Sponsored by: Absolight Really fix the dependencies. Sponsored by: Absolight www/gitlab: Update from 9.1.7 to 9.1.8 Changelog: https://github.com/gitlabhq/gitlabhq/blob/v9.1.8/CHANGELOG.md Security: https://vuxml.FreeBSD.org/freebsd/92f4191a-6d25-11e7-93f7-d43d7e971a1b.html Security: CVE-2017-11438 Approved by: ports-secteam (feld, junovitch) Modified: branches/2017Q3/www/gitlab/Makefile branches/2017Q3/www/gitlab/distinfo branches/2017Q3/www/gitlab/files/patch-Gemfile branches/2017Q3/www/gitlab/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/www/gitlab/Makefile ============================================================================== --- branches/2017Q3/www/gitlab/Makefile Thu Jul 20 16:17:07 2017 (r446268) +++ branches/2017Q3/www/gitlab/Makefile Thu Jul 20 16:21:35 2017 (r446269) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 9.1.7 +PORTVERSION= 9.1.8 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -68,9 +68,9 @@ RUN_DEPENDS= git>=2.8.4:devel/git \ rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \ rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \ rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \ - rubygem-grape>=0.19.0:devel/rubygem-grape \ + rubygem-grape0>=0.19.0:devel/rubygem-grape0 \ rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \ - rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \ + rubygem-rack-cors0>=0.4.0:www/rubygem-rack-cors0 \ rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \ rubygem-hamlit>=2.6.1:www/rubygem-hamlit \ rubygem-carrierwave>=0.11.0:www/rubygem-carrierwave \ @@ -112,6 +112,7 @@ RUN_DEPENDS= git>=2.8.4:devel/git \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ + rubygem-re2>=1.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.1.0:textproc/rubygem-version_sorter \ rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ rubygem-redis>=3.2:databases/rubygem-redis \ @@ -161,7 +162,7 @@ RUN_DEPENDS= git>=2.8.4:devel/git \ rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-ruby-prof>=0.16.2:devel/rubygem-ruby-prof \ - rubygem-oauth2>=1.3.0:net/rubygem-oauth212 \ + rubygem-oauth2>=1.3.0:net/rubygem-oauth2 \ rubygem-paranoia>=2.2:databases/rubygem-paranoia \ rubygem-health_check>=2.6.0:devel/rubygem-health_check \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ Modified: branches/2017Q3/www/gitlab/distinfo ============================================================================== --- branches/2017Q3/www/gitlab/distinfo Thu Jul 20 16:17:07 2017 (r446268) +++ branches/2017Q3/www/gitlab/distinfo Thu Jul 20 16:21:35 2017 (r446269) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498552753 -SHA256 (gitlabhq-gitlabhq-v9.1.7_GH0.tar.gz) = 195f39ea7e3c0714df13403b2cc6311fecc437bf28b9f9cc619dd5b3a49634b0 -SIZE (gitlabhq-gitlabhq-v9.1.7_GH0.tar.gz) = 30511727 +TIMESTAMP = 1500536986 +SHA256 (gitlabhq-gitlabhq-v9.1.8_GH0.tar.gz) = a997937ceb6e7a264564a614ca07a67637b1e93fd5a7c554bfd7ad6aab603e66 +SIZE (gitlabhq-gitlabhq-v9.1.8_GH0.tar.gz) = 30513186 Modified: branches/2017Q3/www/gitlab/files/patch-Gemfile ============================================================================== --- branches/2017Q3/www/gitlab/files/patch-Gemfile Thu Jul 20 16:17:07 2017 (r446268) +++ branches/2017Q3/www/gitlab/files/patch-Gemfile Thu Jul 20 16:21:35 2017 (r446269) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2017-06-07 20:48:31 UTC +--- Gemfile.orig 2017-07-19 22:34:22 UTC +++ Gemfile @@ -1,48 +1,43 @@ source 'https://rubygems.org' @@ -136,7 +136,7 @@ # Run events after state machine commits gem 'after_commit_queue', '~> 1.3.0' -@@ -147,20 +142,20 @@ gem 'redis-namespace', '~> 1.5.2' +@@ -147,13 +142,13 @@ gem 'redis-namespace', '~> 1.5.2' gem 'sidekiq-limit_fetch', '~> 3.4' # Cron Parser @@ -153,6 +153,7 @@ # GitLab settings gem 'settingslogic', '~> 2.0.9' +@@ -163,7 +158,7 @@ gem 're2', '~> 1.0.0' # Misc @@ -161,16 +162,20 @@ # Cache gem 'redis-rails', '~> 5.0.1' -@@ -173,7 +168,7 @@ gem 'connection_pool', '~> 2.0' - gem 'hipchat', '~> 1.5.0' +@@ -173,10 +168,10 @@ gem 'redis', '~> 3.2' + gem 'connection_pool', '~> 2.0' + # HipChat integration +-gem 'hipchat', '~> 1.5.0' ++gem 'hipchat', '~> 1.5' + # JIRA integration -gem 'jira-ruby', '~> 1.1.2' +gem 'jira-ruby', '>= 1.1.2' # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' -@@ -191,7 +186,7 @@ gem 'asana', '~> 0.6.0' +@@ -194,7 +189,7 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration @@ -179,7 +184,7 @@ # d3 gem 'd3_rails', '~> 3.5.0' -@@ -200,7 +195,7 @@ gem 'd3_rails', '~> 3.5.0' +@@ -203,7 +198,7 @@ gem 'd3_rails', '~> 3.5.0' gem 'underscore-rails', '~> 1.8.0' # Sanitize user input @@ -188,7 +193,7 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -210,7 +205,7 @@ gem 'loofah', '~> 2.0.3' +@@ -213,7 +208,7 @@ gem 'loofah', '~> 2.0.3' gem 'licensee', '~> 8.7.0' # Protect against bruteforcing @@ -197,7 +202,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -229,122 +224,41 @@ gem 'chronic', '~> 0.10.2' +@@ -232,122 +227,41 @@ gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' gem 'webpack-rails', '~> 0.9.10' @@ -330,7 +335,7 @@ # Soft deletion gem 'paranoia', '~> 2.2' -@@ -359,4 +273,6 @@ gem 'sys-filesystem', '~> 1.1.6' +@@ -362,4 +276,6 @@ gem 'sys-filesystem', '~> 1.1.6' # Gitaly GRPC client gem 'gitaly', '~> 0.5.0' Modified: branches/2017Q3/www/gitlab/pkg-plist ============================================================================== --- branches/2017Q3/www/gitlab/pkg-plist Thu Jul 20 16:17:07 2017 (r446268) +++ branches/2017Q3/www/gitlab/pkg-plist Thu Jul 20 16:21:35 2017 (r446269) @@ -4955,6 +4955,7 @@ %%WWWDIR%%/db/post_migrate/20170406142253_migrate_user_project_view.rb %%WWWDIR%%/db/post_migrate/20170408033905_remove_old_cache_directories.rb %%WWWDIR%%/db/post_migrate/20170606202615_move_appearance_to_system_dir.rb +%%WWWDIR%%/db/post_migrate/20170613111224_clean_appearance_symlinks.rb @(git,,) %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md @@ -6848,6 +6849,7 @@ %%WWWDIR%%/lib/gitlab/testing/request_blocker_middleware.rb %%WWWDIR%%/lib/gitlab/time_tracking_formatter.rb %%WWWDIR%%/lib/gitlab/timeless.rb +%%WWWDIR%%/lib/gitlab/untrusted_regexp.rb %%WWWDIR%%/lib/gitlab/update_path_error.rb %%WWWDIR%%/lib/gitlab/upgrader.rb %%WWWDIR%%/lib/gitlab/uploads_transfer.rb @@ -7853,6 +7855,7 @@ %%WWWDIR%%/spec/lib/banzai/object_renderer_spec.rb %%WWWDIR%%/spec/lib/banzai/pipeline/description_pipeline_spec.rb %%WWWDIR%%/spec/lib/banzai/pipeline/full_pipeline_spec.rb +%%WWWDIR%%/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb %%WWWDIR%%/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb %%WWWDIR%%/spec/lib/banzai/querying_spec.rb %%WWWDIR%%/spec/lib/banzai/redactor_spec.rb @@ -8197,6 +8200,7 @@ %%WWWDIR%%/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/issue_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/merge_request_template_spec.rb +%%WWWDIR%%/spec/lib/gitlab/untrusted_regexp_spec.rb %%WWWDIR%%/spec/lib/gitlab/upgrader_spec.rb %%WWWDIR%%/spec/lib/gitlab/uploads_transfer_spec.rb %%WWWDIR%%/spec/lib/gitlab/url_blocker_spec.rb @@ -8231,6 +8235,7 @@ %%WWWDIR%%/spec/mailers/previews/devise_mailer_preview.rb %%WWWDIR%%/spec/mailers/previews/notify_preview.rb %%WWWDIR%%/spec/mailers/repository_check_mailer_spec.rb +%%WWWDIR%%/spec/migrations/clean_appearance_symlinks_spec.rb %%WWWDIR%%/spec/migrations/clean_upload_symlinks_spec.rb %%WWWDIR%%/spec/migrations/fill_authorized_projects_spec.rb %%WWWDIR%%/spec/migrations/migrate_build_events_to_pipeline_events_spec.rb @@ -8734,6 +8739,7 @@ %%WWWDIR%%/spec/support/kubernetes_helpers.rb %%WWWDIR%%/spec/support/ldap_helpers.rb %%WWWDIR%%/spec/support/login_helpers.rb +%%WWWDIR%%/spec/support/malicious_regexp_shared_examples.rb %%WWWDIR%%/spec/support/markdown_feature.rb %%WWWDIR%%/spec/support/matchers/access_matchers.rb %%WWWDIR%%/spec/support/matchers/be_like_time.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707201621.v6KGLZVL011545>