kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pull in GitLab security update and all commits needed for it to run properly

Browse source 
Approved by:	ports-secteam (implicit)

MFH: r457863 r457866 r457872 r457873 r457876 r457879 r457890 r457898 r457899 r458098 r458142 r458267 r458333 r458634 r458650 r458652 r459076 r459170 r459191 r459256 r459284 r459288 r459346

textproc/rubygem-twitter-text: add required dependency on rubygem-idn-ruby

PR:		224838
Submitted by:	Matthias Fechner <idefix@fechner.net>

www/gitlab: fix Gemfile for updated dependencies

PR:		224836
Submitted by:	Matthias Fechner <idefix@fechner.net> (maintainer)

Add rubygem-redis3 3.3.5 (copied from rubygem-redis)

- Add PORTSCOUT

Add rubygem-jwt1 1.5.6 (copied from rubygem-jwt)

- Add PORTSCOUT

Update to 4.0.1

Changes:	https://github.com/redis/redis-rb/blob/master/CHANGELOG.md

Update to 2.1.0

Changes:	https://github.com/jwt/ruby-jwt/releases

Change RUN_DEPENDS from rubygem-redis and rubygem-jwt to rubygem-redis3 and rubygem-jwt1

- Bump PORTREVISION for dependency change

devel/rubygem-licensee: update to 9.6.0

PR:		224758
Approved by:	Matthias Fechner <idefix@fechner.net> (maintainer

www/gitlab: remove spurious newline

Reported by:	sunpoet
Pointyhat to:	swills

security/rubygem-rbnacl: update to 5.0.0

www/gitlab: fix Gemfile for updated dependencies

PR:		224932
Submitted by:	Matthias Fechner <idefix@fechner.net> (maintainer)

Fix Gemfile for rubygem-fog-core 2.0.0 update

- Bump PORTREVISION for package change

Fix Gemfile for rubygem-jquery-atwho-rails 1.5.4 update

- Bump PORTREVISION for package change

Fix Gemfile for rubygem-fog-google 1.0.0 update

- Bump PORTREVISION for package change

Fix gitlab issue by creating rubygem-licensee8

PR:		225047
Submitted by:	Matthias Fechner <idefix@fechner.net> (maintainer)

devel/rubygem-licensee: update to 9.7.0

PR:		224999
Approved by:	Matthias Fechner <idefix@fechner.net> (maintainer)

textproc/rubygem-rouge: update to 3.1.0

PR:		224785
Approved by:	maintainer timeout (kuriyama, > 2 weeks)

textproc/rubygem-rouge2: create port for 2.x ver

Needed by GitLab

textproc/rubygem-rouge2: add missing PKGNAMESUFFIX

Pointyhat to:	swills
Reported by:	antoine

textproc/rubygem-rouge2: add conflict

www/rubygem-gollum-lib: depend on 2.x version of rouge

This version is required by gollum-lib

www/gitlab: update to 10.1.6

Approved by:	idefix@fechner.net (maintainer, via private email)
Obtained from:	http://gitlab.toco-domains.de/FreeBSD/GitLab/commits/10.1
Security:	65fab89f-2231-46db-8541-978f4e87f32a

Mark CONFLICTS_INSTALL with rubygems-rouge2
This commit is contained in:
Steve Wills 2018-01-19 23:03:40 +00:00
parent be8ec228aa
commit 2f446f5a98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q1/; revision=459482
32 changed files with 213 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/Makefile
View file

@ -985,6 +985,7 @@
SUBDIR += rubygem-redis-actionpack-rails5
SUBDIR += rubygem-redis-actionpack-rails50
SUBDIR += rubygem-redis-namespace
SUBDIR += rubygem-redis3
SUBDIR += rubygem-seed-fu
SUBDIR += rubygem-sqlite3
SUBDIR += rubygem-sqlite3-ruby

2
databases/rubygem-redis/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
PORTVERSION= 3.3.5
PORTVERSION= 4.0.1
CATEGORIES= databases rubygems
MASTER_SITES= RG

6
databases/rubygem-redis/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507043292
SHA256 (rubygem/redis-3.3.5.gem) = 3b47205af551f81623da98160550270c3aa365e97b46e3a3de8581f8502f8144
SIZE (rubygem/redis-3.3.5.gem) = 92672
TIMESTAMP = 1514824406
SHA256 (rubygem/redis-4.0.1.gem) = 8f7f5eaaeb0f96e4adacfe05aef265d67e229780f20c5bdf4e22121bea1334f8
SIZE (rubygem/redis-4.0.1.gem) = 91648

22
databases/rubygem-redis3/Makefile Normal file
View file

@ -0,0 +1,22 @@
# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
# $FreeBSD$
PORTNAME= redis
PORTVERSION= 3.3.5
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 3
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Ruby client library for Redis, the key value storage server
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
PORTSCOUT= limit:^3\.
NO_ARCH= yes
USE_RUBY= yes
USES= gem
.include <bsd.port.mk>

3
databases/rubygem-redis3/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1507043292
SHA256 (rubygem/redis-3.3.5.gem) = 3b47205af551f81623da98160550270c3aa365e97b46e3a3de8581f8502f8144
SIZE (rubygem/redis-3.3.5.gem) = 92672

3
databases/rubygem-redis3/pkg-descr Normal file
View file

@ -0,0 +1,3 @@
rubygem-redis is a Ruby client library for the Redis key-value store.
WWW: https://github.com/redis/redis-rb

1
devel/Makefile
View file

@ -5520,6 +5520,7 @@
SUBDIR += rubygem-librarianp
SUBDIR += rubygem-libyajl2
SUBDIR += rubygem-licensee
SUBDIR += rubygem-licensee8
SUBDIR += rubygem-listen
SUBDIR += rubygem-little-plugger
SUBDIR += rubygem-local_time

5
devel/rubygem-licensee/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= licensee
PORTVERSION= 8.7.0
PORTVERSION= 9.7.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
@ -12,7 +12,8 @@ COMMENT= Detects under what license a project is distributed
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged
RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged \
rubygem-octokit>=4.8.0:net/rubygem-octokit
NO_ARCH= yes
USE_RUBY= yes

6
devel/rubygem-licensee/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1497437247
SHA256 (rubygem/licensee-8.7.0.gem) = 42992036a97e20bc1b80284d44f098f2f6e45fae7c8982cff2985230fa0612da
SIZE (rubygem/licensee-8.7.0.gem) = 129024
TIMESTAMP = 1515424194
SHA256 (rubygem/licensee-9.7.0.gem) = 2de9ae98e23e4c6e883ab199135474b72c23f8cb45cb0e85ce973d1ae68b00dc
SIZE (rubygem/licensee-9.7.0.gem) = 199168

26
devel/rubygem-licensee8/Makefile Normal file
View file

@ -0,0 +1,26 @@
# Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net>
# $FreeBSD$
PORTNAME= licensee
PORTVERSION= 8.7.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 8
MAINTAINER= idefix@fechner.net
COMMENT= Detects under what license a project is distributed
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
RUN_DEPENDS= rubygem-rugged>=0.24:devel/rubygem-rugged
PORTSCOUT= limit:^8\.
NO_ARCH= yes
USE_RUBY= yes
USES= gem
PLIST_FILES= bin/licensee
.include <bsd.port.mk>

3
devel/rubygem-licensee8/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1497437247
SHA256 (rubygem/licensee-8.7.0.gem) = 42992036a97e20bc1b80284d44f098f2f6e45fae7c8982cff2985230fa0612da
SIZE (rubygem/licensee-8.7.0.gem) = 129024

5
devel/rubygem-licensee8/pkg-descr Normal file
View file

@ -0,0 +1,5 @@
Licensee automates the process of reading LICENSE files and compares their
contents to known licenses using a fancy math thing called Rabin-Karp
rolling-hashes.
WWW: https://github.com/benbalter/licensee

2
security/rubygem-rbnacl/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rbnacl
PORTVERSION= 4.0.2
PORTVERSION= 5.0.0
CATEGORIES= security rubygems
MASTER_SITES= RG

6
security/rubygem-rbnacl/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1509621492
SHA256 (rubygem/rbnacl-4.0.2.gem) = 885c5f5dfa23007132df6d34992067f867968fcef8071e371ca5378ef88bb321
SIZE (rubygem/rbnacl-4.0.2.gem) = 220160
TIMESTAMP = 1514155105
SHA256 (rubygem/rbnacl-5.0.0.gem) = 3364b6bcd50d716c15d692bcd9e77d22e15927b9e442b496a5a7e1e4f3d2bb76
SIZE (rubygem/rbnacl-5.0.0.gem) = 221184

1
textproc/Makefile
View file

@ -1558,6 +1558,7 @@
SUBDIR += rubygem-rmmseg-cpp
SUBDIR += rubygem-ronn
SUBDIR += rubygem-rouge
SUBDIR += rubygem-rouge2
SUBDIR += rubygem-rttool
SUBDIR += rubygem-ruby-augeas
SUBDIR += rubygem-ruby-xslt

4
textproc/rubygem-rouge/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rouge
PORTVERSION= 2.2.1
PORTVERSION= 3.1.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@ -12,6 +12,8 @@ LICENSE= BSD2CLAUSE MIT
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS_INSTALL= rubygems-rouge2
NO_ARCH= yes
USES= gem
USE_RUBY= yes

6
textproc/rubygem-rouge/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1506009272
SHA256 (rubygem/rouge-2.2.1.gem) = 9a6dfba66fd686449eff227fb5f938e0abfe6722a61c6bbb1f834d5b2654770a
SIZE (rubygem/rouge-2.2.1.gem) = 281088
TIMESTAMP = 1514155083
SHA256 (rubygem/rouge-3.1.0.gem) = 856739590f995f79abbf7511939a1de7681e08bfead899d024c62bae1c1a7cc5
SIZE (rubygem/rouge-3.1.0.gem) = 282624

25
textproc/rubygem-rouge2/Makefile Normal file
View file

@ -0,0 +1,25 @@
# $FreeBSD$
PORTNAME= rouge
PORTVERSION= 2.2.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 2
MAINTAINER= ruby@FreeBSD.org
COMMENT= Simple, easy-to-extend drop-in replacement for pygments
LICENSE= BSD2CLAUSE MIT
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS_INSTALL= rubygems-rouge
NO_ARCH= yes
USES= gem
USE_RUBY= yes
PLIST_FILES= bin/rougify
PORTSCOUT= limit:^2.*
.include <bsd.port.mk>

3
textproc/rubygem-rouge2/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1506009272
SHA256 (rubygem/rouge-2.2.1.gem) = 9a6dfba66fd686449eff227fb5f938e0abfe6722a61c6bbb1f834d5b2654770a
SIZE (rubygem/rouge-2.2.1.gem) = 281088

4
textproc/rubygem-rouge2/pkg-descr Normal file
View file

@ -0,0 +1,4 @@
Rouge aims to a be a simple, easy-to-extend drop-in replacement for
pygments.
WWW: https://github.com/jneen/rouge

4
textproc/rubygem-twitter-text/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= twitter-text
PORTVERSION= 2.1.0
PORTREVISION= 1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@ -11,7 +12,8 @@ COMMENT= Ruby gem for handling of Twitter texts
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-unf>=0.1.0:textproc/rubygem-unf
RUN_DEPENDS= rubygem-unf>=0.1.0:textproc/rubygem-unf \
rubygem-idn-ruby>=0:dns/rubygem-idn-ruby
NO_ARCH= yes
USE_RUBY= yes

1
www/Makefile
View file

@ -2059,6 +2059,7 @@
SUBDIR += rubygem-jsobfu
SUBDIR += rubygem-json-jwt
SUBDIR += rubygem-jwt
SUBDIR += rubygem-jwt1
SUBDIR += rubygem-kaminari
SUBDIR += rubygem-kaminari-actionview
SUBDIR += rubygem-kaminari-actionview-rails5

13
www/gitlab/Makefile
View file

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 10.1.5
PORTVERSION= 10.1.6
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= www devel
MAINTAINER= idefix@fechner.net
@ -58,7 +57,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \
rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \
rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
rubygem-jwt>=1.5.6:www/rubygem-jwt \
rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \
rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \
rubygem-akismet>=2.0:devel/rubygem-akismet \
rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \
@ -102,7 +101,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \
rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \
rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
rubygem-asciidoctor-plantuml>=0.0.7:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge>=2.0:textproc/rubygem-rouge \
rubygem-rouge2>=2.0:textproc/rubygem-rouge2 \
rubygem-truncato>=0.7.9:textproc/rubygem-truncato \
rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \
rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \
@ -122,7 +121,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \
rubygem-re2>=1.1.1: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 \
rubygem-redis3>=3.2:databases/rubygem-redis3 \
rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \
rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \
@ -136,7 +135,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \
rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
rubygem-loofah>=2.0.3:textproc/rubygem-loofah \
rubygem-licensee>=8.7:devel/rubygem-licensee \
rubygem-licensee8>=8.7:devel/rubygem-licensee8 \
rubygem-rack-attack>=4.4.1:www/rubygem-rack-attack \
rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
@ -185,7 +184,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \
rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \
rubygem-rbnacl>=4.0:security/rubygem-rbnacl \
rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \
rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \

6
www/gitlab/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1512812405
SHA256 (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 8b8f8d88757bb7cc4f204c31f3d67fe4f4191fb25d1e4df81cf2c4361e10a725
SIZE (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 41727928
TIMESTAMP = 1516175210
SHA256 (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = b01bd5e10adb5b21c4cafc5e9fe5fa388c52fe7546708d0ed58f57644bc76b9c
SIZE (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = 41739152

54
www/gitlab/files/patch-Gemfile
View file

@ -1,4 +1,4 @@
--- Gemfile.orig 2017-11-14 20:51:25 UTC
--- Gemfile.orig 2018-01-11 16:23:59 UTC
+++ Gemfile
@@ -1,49 +1,49 @@
source 'https://rubygems.org'
@ -33,8 +33,9 @@
gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.2.0'
-gem 'omniauth', '~> 1.4.2'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth', '>= 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth-auth0', '>= 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
@ -44,12 +45,14 @@
+gem 'omniauth-google-oauth2', '>= 0.5.2'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.7.0'
-gem 'omniauth-saml', '~> 1.7.0'
-gem 'omniauth-shibboleth', '~> 1.2.0'
-gem 'omniauth-twitter', '~> 1.2.0'
-gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth-saml', '>= 1.7.0'
+gem 'omniauth-shibboleth', '>= 1.2.0'
+gem 'omniauth-twitter', '>= 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth_crowd', '>= 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.1'
-gem 'rack-oauth2', '~> 1.2.1'
+gem 'rack-oauth2', '>= 1.2.1'
@ -70,7 +73,7 @@
# API
gem 'grape', '~> 1.0'
@@ -87,13 +87,13 @@ gem 'hashie-forbidden_attributes'
@@ -87,25 +87,25 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
@ -87,7 +90,10 @@
# for backups
gem 'fog-aws', '~> 1.4'
@@ -102,10 +102,10 @@ gem 'fog-google', '~> 0.5'
-gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 0.5'
+gem 'fog-core', '>= 1.44'
+gem 'fog-google', '>= 0.5'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
@ -161,7 +167,7 @@
# GitLab settings
gem 'settingslogic', '~> 2.0.9'
@@ -168,7 +168,7 @@ gem 're2', '~> 1.1.1'
@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1'
# Misc
@ -169,8 +175,11 @@
+gem 'version_sorter', '>= 2.1.0'
# Cache
gem 'redis-rails', '~> 5.0.1'
@@ -178,10 +178,10 @@ gem 'redis', '~> 3.2'
gem 'redis-rails', '~> 5.0.2'
# Redis
-gem 'redis', '~> 3.2'
+gem 'redis', '>= 3.2'
gem 'connection_pool', '~> 2.0'
# HipChat integration
@ -183,7 +192,7 @@
# Flowdock integration
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
@@ -199,13 +199,13 @@ gem 'asana', '~> 0.6.0'
@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -199,7 +208,10 @@
gem 'babosa', '~> 1.0.2'
# Sanitizes SVG input
@@ -215,7 +215,7 @@ gem 'loofah', '~> 2.0.3'
-gem 'loofah', '~> 2.0.3'
+gem 'loofah', '>= 2.0.3'
# Working with license
gem 'licensee', '~> 8.7.0'
# Protect against bruteforcing
@ -208,7 +220,7 @@
# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
@@ -234,25 +234,25 @@ gem 'chronic', '~> 0.10.2'
@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
gem 'webpack-rails', '~> 0.9.10'
@ -225,10 +237,11 @@
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.1.0'
+gem 'gon', '>= 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0'
-gem 'request_store', '~> 1.3'
+gem 'gon', '>= 6.1.0'
+gem 'jquery-atwho-rails', '>= 1.3.2'
+gem 'jquery-rails', '>= 4.1.0'
+gem 'request_store', '>= 1.3'
gem 'select2-rails', '~> 3.5.9'
@ -239,9 +252,10 @@
-gem 'sentry-raven', '~> 2.5.3'
+gem 'sentry-raven', '>= 2.5.3'
gem 'premailer-rails', '~> 1.9.7'
-gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '>= 1.9.7'
@@ -260,135 +260,51 @@ gem 'premailer-rails', '~> 1.9.7'
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', '~> 4.0.9'
gem 'gettext_i18n_rails', '~> 1.8.0'
@ -363,7 +377,8 @@
+gem 'email_reply_trimmer', '>= 0.1'
gem 'html2text'
gem 'ruby-prof', '~> 0.16.2'
-gem 'ruby-prof', '~> 0.16.2'
+gem 'ruby-prof', '>= 0.16.2'
# OAuth
-gem 'oauth2', '~> 1.4'
@ -387,7 +402,10 @@
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -398,9 +314,9 @@ group :ed25519 do
gem 'rbnacl-libsodium'
- gem 'rbnacl', '~> 4.0'
+ gem 'rbnacl', '~> 4.0.2'
gem 'bcrypt_pbkdf', '~> 1.0'
end
# Gitaly GRPC client

11
www/gitlab/pkg-plist
View file

@ -3434,6 +3434,7 @@
%%WWWDIR%%/app/serializers/container_tags_serializer.rb
%%WWWDIR%%/app/serializers/deploy_key_entity.rb
%%WWWDIR%%/app/serializers/deploy_key_serializer.rb
%%WWWDIR%%/app/serializers/deploy_keys_project_entity.rb
%%WWWDIR%%/app/serializers/deployment_entity.rb
%%WWWDIR%%/app/serializers/deployment_serializer.rb
%%WWWDIR%%/app/serializers/discussion_entity.rb
@ -5851,6 +5852,8 @@
%%WWWDIR%%/db/migrate/20171006091000_add_name_foreign_key_to_ci_build_trace_sections.rb
%%WWWDIR%%/db/migrate/20171012101043_add_circuit_breaker_properties_to_application_settings.rb
%%WWWDIR%%/db/migrate/20171017145932_add_new_circuitbreaker_settings_to_application_settings.rb
%%WWWDIR%%/db/migrate/20171211145425_add_can_push_to_deploy_keys_projects.rb
%%WWWDIR%%/db/migrate/20171215113714_populate_can_push_from_deploy_keys_projects.rb
%%WWWDIR%%/db/migrate/limits_to_mysql.rb
%%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb
%%WWWDIR%%/db/migrate/merge_request_diff_file_limits_to_mysql.rb
@ -5938,6 +5941,8 @@
%%WWWDIR%%/db/post_migrate/20170927112318_update_legacy_diff_notes_type_for_import.rb
%%WWWDIR%%/db/post_migrate/20170927112319_update_notes_type_for_import.rb
%%WWWDIR%%/db/post_migrate/20171005130944_schedule_create_gpg_key_subkeys_from_gpg_keys.rb
%%WWWDIR%%/db/post_migrate/20171215121205_post_populate_can_push_from_deploy_keys_projects.rb
%%WWWDIR%%/db/post_migrate/20171215121259_remove_can_push_from_keys.rb
@(git,,) %%WWWDIR%%/db/schema.rb
%%WWWDIR%%/db/seeds.rb
%%WWWDIR%%/doc/README.md
@ -8096,6 +8101,7 @@
%%WWWDIR%%/lib/gitlab/middleware/read_only.rb
%%WWWDIR%%/lib/gitlab/middleware/static.rb
%%WWWDIR%%/lib/gitlab/middleware/webpack_proxy.rb
%%WWWDIR%%/lib/gitlab/o_auth.rb
%%WWWDIR%%/lib/gitlab/o_auth/auth_hash.rb
%%WWWDIR%%/lib/gitlab/o_auth/provider.rb
%%WWWDIR%%/lib/gitlab/o_auth/session.rb
@ -8519,12 +8525,14 @@
%%WWWDIR%%/spec/controllers/import/gitea_controller_spec.rb
%%WWWDIR%%/spec/controllers/import/github_controller_spec.rb
%%WWWDIR%%/spec/controllers/import/gitlab_controller_spec.rb
%%WWWDIR%%/spec/controllers/import/gitlab_projects_controller_spec.rb
%%WWWDIR%%/spec/controllers/import/google_code_controller_spec.rb
%%WWWDIR%%/spec/controllers/invites_controller_spec.rb
%%WWWDIR%%/spec/controllers/metrics_controller_spec.rb
%%WWWDIR%%/spec/controllers/notification_settings_controller_spec.rb
%%WWWDIR%%/spec/controllers/oauth/applications_controller_spec.rb
%%WWWDIR%%/spec/controllers/oauth/authorizations_controller_spec.rb
%%WWWDIR%%/spec/controllers/omniauth_callbacks_controller_spec.rb
%%WWWDIR%%/spec/controllers/passwords_controller_spec.rb
%%WWWDIR%%/spec/controllers/profiles/accounts_controller_spec.rb
%%WWWDIR%%/spec/controllers/profiles/avatars_controller_spec.rb
@ -9570,6 +9578,8 @@
%%WWWDIR%%/spec/javascripts/new_branch_spec.js
%%WWWDIR%%/spec/javascripts/notebook/cells/code_spec.js
%%WWWDIR%%/spec/javascripts/notebook/cells/markdown_spec.js
%%WWWDIR%%/spec/javascripts/notebook/cells/output/html_sanitize_tests.js
%%WWWDIR%%/spec/javascripts/notebook/cells/output/html_spec.js
%%WWWDIR%%/spec/javascripts/notebook/cells/output/index_spec.js
%%WWWDIR%%/spec/javascripts/notebook/cells/prompt_spec.js
%%WWWDIR%%/spec/javascripts/notebook/index_spec.js
@ -10869,6 +10879,7 @@
%%WWWDIR%%/spec/services/projects/enable_deploy_key_service_spec.rb
%%WWWDIR%%/spec/services/projects/fork_service_spec.rb
%%WWWDIR%%/spec/services/projects/forks_count_service_spec.rb
%%WWWDIR%%/spec/services/projects/gitlab_projects_import_service_spec.rb
%%WWWDIR%%/spec/services/projects/hashed_storage_migration_service_spec.rb
%%WWWDIR%%/spec/services/projects/housekeeping_service_spec.rb
%%WWWDIR%%/spec/services/projects/import_service_spec.rb

3
www/rubygem-gollum-lib/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= gollum-lib
PORTVERSION= 4.2.7
PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-gemojione>=3.2:graphics/rubygem-gemojione \
rubygem-gollum-grit_adapter>=1.0:www/rubygem-gollum-grit_adapter \
rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri \
rubygem-rouge>=2.1:textproc/rubygem-rouge \
rubygem-rouge2>=2.1:textproc/rubygem-rouge2 \
rubygem-sanitize>=2.1:textproc/rubygem-sanitize \
rubygem-stringex>=2.6:devel/rubygem-stringex

2
www/rubygem-jwt/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= jwt
PORTVERSION= 1.5.6
PORTVERSION= 2.1.0
CATEGORIES= www devel rubygems
MASTER_SITES= RG

6
www/rubygem-jwt/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1480754982
SHA256 (rubygem/jwt-1.5.6.gem) = 842b43dbc2dc605113556a96ec59241b325e15cbec160a8f8b222e4142f89f88
SIZE (rubygem/jwt-1.5.6.gem) = 32768
TIMESTAMP = 1507365146
SHA256 (rubygem/jwt-2.1.0.gem) = 7e7e7ffc1a5ebce628ac7da428341c50615a3a10ac47bb74c22c1cba325613f0
SIZE (rubygem/jwt-2.1.0.gem) = 37888

22
www/rubygem-jwt1/Makefile Normal file
View file

@ -0,0 +1,22 @@
# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
# $FreeBSD$
PORTNAME= jwt
PORTVERSION= 1.5.6
CATEGORIES= www devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 1
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= JSON Web Token implementation in Ruby
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
PORTSCOUT= limit:^1\.
NO_ARCH= yes
USE_RUBY= yes
USES= gem
.include <bsd.port.mk>

3
www/rubygem-jwt1/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1480754982
SHA256 (rubygem/jwt-1.5.6.gem) = 842b43dbc2dc605113556a96ec59241b325e15cbec160a8f8b222e4142f89f88
SIZE (rubygem/jwt-1.5.6.gem) = 32768

5
www/rubygem-jwt1/pkg-descr Normal file
View file

@ -0,0 +1,5 @@
JWT is a Ruby implementation of JSON Web Token draft 06 [1].
[1] http://self-issued.info/docs/draft-jones-json-web-token-06.html
WWW: https://github.com/jwt/ruby-jwt