...
 
......@@ -2,7 +2,7 @@
# $FreeBSD: head/databases/rubygem-activemodel60/Makefile 532552 2020-04-22 21:29:25Z sunpoet $
PORTNAME= activemodel
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585157998
SHA256 (rubygem/activemodel-6.0.2.2.gem) = 35559978a7641c85d47709c7c3b75fcc456b1ec882631ffeba82e8a4e12f99cd
SIZE (rubygem/activemodel-6.0.2.2.gem) = 58880
TIMESTAMP = 1588923739
SHA256 (rubygem/activemodel-6.0.3.gem) = 1f578a8ac1e111e4770c787d99ec432243ecbfee9593482eef0fadcdbae2295e
SIZE (rubygem/activemodel-6.0.3.gem) = 58880
......@@ -2,7 +2,7 @@
# $FreeBSD: head/databases/rubygem-activerecord60/Makefile 532553 2020-04-22 21:29:30Z sunpoet $
PORTNAME= activerecord
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158003
SHA256 (rubygem/activerecord-6.0.2.2.gem) = 4c6aae2cfa9d19ac9901c3b2514fb1c3ccd82b61839f2b52d6711edc00013c80
SIZE (rubygem/activerecord-6.0.2.2.gem) = 406528
TIMESTAMP = 1588923741
SHA256 (rubygem/activerecord-6.0.3.gem) = 3bc7bef0857854609ac0e249467a2909f23042b6897284302b148018c84175f2
SIZE (rubygem/activerecord-6.0.3.gem) = 407552
......@@ -17,7 +17,7 @@ MY_DEPENDS= git>=2.26:devel/git \
rubygem-rugged>=0.28:devel/rubygem-rugged \
rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport60>=6.0.2.2<6.0.2.3:devel/rubygem-activesupport60 \
rubygem-activesupport60>=6.0.3<6.0.3.1:devel/rubygem-activesupport60 \
rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
......
......@@ -9,7 +9,7 @@
gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
-gem 'activesupport', '6.0.2'
+gem 'activesupport', '6.0.2.2'
+gem 'activesupport', '6.0.3'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
......
......@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/rubygem-actionview60/Makefile 532554 2020-04-22 21:29:35Z sunpoet $
PORTNAME= actionview
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158008
SHA256 (rubygem/actionview-6.0.2.2.gem) = 5e43aae3f0f6961d5dd85002147cccf2dbadfe88f41725d874a1b42e76bd7117
SIZE (rubygem/actionview-6.0.2.2.gem) = 169472
TIMESTAMP = 1588923743
SHA256 (rubygem/actionview-6.0.3.gem) = f8a82d4f9e925cd9bb208ab5f37f91b297fe260b6fab9df2df99844341c9ce68
SIZE (rubygem/actionview-6.0.3.gem) = 169984
......@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/rubygem-activejob60/Makefile 532555 2020-04-22 21:29:39Z sunpoet $
PORTNAME= activejob
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158012
SHA256 (rubygem/activejob-6.0.2.2.gem) = 7ed215efd26e335d8ce56dbf141b735548e33bf6cf9e953f22558e370d4b3fe3
SIZE (rubygem/activejob-6.0.2.2.gem) = 31232
TIMESTAMP = 1588923745
SHA256 (rubygem/activejob-6.0.3.gem) = eb3c4e63e96dc3f6746e245479a8e67c0d5b8316c0f034aa98c82a1975b825e3
SIZE (rubygem/activejob-6.0.3.gem) = 31744
......@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/rubygem-activesupport60/Makefile 532556 2020-04-22 21:29:44Z sunpoet $
PORTNAME= activesupport
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......@@ -17,7 +17,7 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=1.0.2<2:devel/rubygem-concurrent-ruby \
rubygem-i18n>=0.7,2<2,2:devel/rubygem-i18n \
rubygem-minitest>=5.1<6:devel/rubygem-minitest \
rubygem-tzinfo1>=1.1<2:devel/rubygem-tzinfo1 \
rubygem-zeitwerk>=2.2<3:devel/rubygem-zeitwerk
rubygem-zeitwerk>=2.2.2<3:devel/rubygem-zeitwerk
USES= gem
USE_RUBY= yes
......
TIMESTAMP = 1585158016
SHA256 (rubygem/activesupport-6.0.2.2.gem) = 8b73152669af7b8e3840e16052d6d951620e07c63bfc650bae88e5b86643a9d5
SIZE (rubygem/activesupport-6.0.2.2.gem) = 212992
TIMESTAMP = 1588923747
SHA256 (rubygem/activesupport-6.0.3.gem) = 460c7dc137d98409d9964b1216a67572d32904454f55a44f59fdf9d43b19106a
SIZE (rubygem/activesupport-6.0.3.gem) = 214016
......@@ -2,7 +2,7 @@
# $FreeBSD: head/mail/rubygem-actionmailbox60/Makefile 532573 2020-04-22 21:31:13Z sunpoet $
PORTNAME= actionmailbox
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= mail rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......@@ -25,4 +25,6 @@ USE_RUBY= yes
NO_ARCH= yes
PORTSCOUT= limit:^6\.0\.
.include <bsd.port.mk>
TIMESTAMP = 1585158019
SHA256 (rubygem/actionmailbox-6.0.2.2.gem) = c5f6d4bb2b083de45c547089addb351c01bb6c29c8789f447bca19f34f05223e
SIZE (rubygem/actionmailbox-6.0.2.2.gem) = 20480
TIMESTAMP = 1588923749
SHA256 (rubygem/actionmailbox-6.0.3.gem) = 58bd373233d0d70056de073b5ae0b84b598204c651712f450107294807ea9bdb
SIZE (rubygem/actionmailbox-6.0.3.gem) = 20992
......@@ -2,7 +2,7 @@
# $FreeBSD: head/mail/rubygem-actionmailer60/Makefile 532574 2020-04-22 21:31:17Z sunpoet $
PORTNAME= actionmailer
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= mail rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158023
SHA256 (rubygem/actionmailer-6.0.2.2.gem) = baf2a7d294b0f5cff209f754e877eeebb9263115c3f91bf91255733beb9df84f
SIZE (rubygem/actionmailer-6.0.2.2.gem) = 30720
TIMESTAMP = 1588923751
SHA256 (rubygem/actionmailer-6.0.3.gem) = b922a6f15388275e095c4ef2e14a1581bbd84a006bb58242ba652a068304a499
SIZE (rubygem/actionmailer-6.0.3.gem) = 30720
......@@ -2,7 +2,7 @@
# $FreeBSD: head/net/rubygem-activestorage60/Makefile 532575 2020-04-22 21:31:22Z sunpoet $
PORTNAME= activestorage
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158026
SHA256 (rubygem/activestorage-6.0.2.2.gem) = 818c65056c5e58df009bdd89fef099e3b4abcd99f4836360713b646dfb60715e
SIZE (rubygem/activestorage-6.0.2.2.gem) = 50688
TIMESTAMP = 1588923753
SHA256 (rubygem/activestorage-6.0.3.gem) = 8ed4f462195c5460c3086e57e3441321f832fc396631bb76b8fd1d0cae18c8fb
SIZE (rubygem/activestorage-6.0.3.gem) = 50688
......@@ -10,14 +10,14 @@ MAINTAINER= mfechner@FreeBSD.org
COMMENT= Elasticsearch indexer for GitLab
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
#BUILD_DEPENDS= git>=2.16.2:devel/git
BUILD_DEPENDS= git>=2.16.2:devel/git
LIB_DEPENDS= libicui18n.so:devel/icu \
libicuuc.so:devel/icu
#RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
USES= gmake go:modules,no_targets
USES= gmake go:modules,no_targets pkgconfig
MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
USE_GITLAB= yes
......@@ -55,12 +55,9 @@ GL_TUPLE= gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_
gitlab-org:labkit:fac94cb428e67efc019e7ba67429b53fa9b394c5:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
lupine:icu:54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc:lupine_icu/vendor/gitlab.com/lupine/icu
PLIST_FILES= bin/gitlab-workhorse \
bin/gitlab-zip-cat \
bin/gitlab-zip-metadata
PLIST_DIRS= ${WWWDIR}
PLIST_FILES= bin/gitlab-elasticsearch-indexer
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/gitlab-elasticsearch-indexer ${STAGEDIR}${PREFIX}/bin/gitlab-elasticsearch-indexer
.include <bsd.port.mk>
......@@ -2,7 +2,7 @@
# $FreeBSD: head/textproc/rubygem-actiontext60/Makefile 532577 2020-04-22 21:31:32Z sunpoet $
PORTNAME= actiontext
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= textproc rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......@@ -24,4 +24,6 @@ USE_RUBY= yes
NO_ARCH= yes
PORTSCOUT= limit:^6\.0\.
.include <bsd.port.mk>
TIMESTAMP = 1585158030
SHA256 (rubygem/actiontext-6.0.2.2.gem) = 872fb41b79794eaa9d1007e4b2e73cfa031ab2a47e5ee8cdae362518d917fed9
SIZE (rubygem/actiontext-6.0.2.2.gem) = 17408
TIMESTAMP = 1588923755
SHA256 (rubygem/actiontext-6.0.3.gem) = 121c7774a0c9b581e681e84fcb34e8af6e2525e4195a1b815d3407dd77518803
SIZE (rubygem/actiontext-6.0.3.gem) = 17408
......@@ -19,12 +19,13 @@ MY_DEPENDS= git>=2.24.3:devel/git \
gitlab-shell>=12.2.0:devel/gitlab-shell \
gitlab-workhorse>=8.30.1:www/gitlab-workhorse \
gitlab-pages>=1.17.0:www/gitlab-pages \
gitlab-elasticsearch-indexer>=2.2.0:textproc/gitlab-elasticsearch-indexer \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
gtar>0:archivers/gtar \
bash>0:shells/bash \
gtar>0:archivers/gtar \
rubygem-rails60>=6.0.2.2<6.0.2.3:www/rubygem-rails60 \
rubygem-rails60>=6.0.3<6.0.3.1:www/rubygem-rails60 \
rubygem-bootsnap>=1.4.6<2.0:devel/rubygem-bootsnap \
rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \
rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \
......
......@@ -4,7 +4,7 @@
source 'https://rubygems.org'
-gem 'rails', '6.0.2'
+gem 'rails', '6.0.2.2'
+gem 'rails', '6.0.3'
gem 'bootsnap', '~> 1.4.6'
......
......@@ -5,7 +5,7 @@
stop()
{
- bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
+ bundle exec sidekiqctl5 stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
+ bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
}
restart()
......@@ -14,7 +14,7 @@
fi
- ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
+ ${cmd} bundle exec sidekiq5 -C "${sidekiq_config}" -e $RAILS_ENV "$@"
+ ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
}
case "$1" in
--- config/gitlab.yml.example.orig 2020-04-21 23:01:33 UTC
--- config/gitlab.yml.example.orig 2020-05-15 17:18:13 UTC
+++ config/gitlab.yml.example
@@ -955,7 +955,7 @@ production: &base
# Gitaly settings
......@@ -36,7 +36,14 @@
# Git over HTTP
upload_pack: true
@@ -1050,7 +1050,7 @@ production: &base
@@ -1044,13 +1044,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
- indexer_path: /home/git/gitlab-elasticsearch-indexer/
+ indexer_path: %%PREFIX%%/bin/
## Git settings
# CAUTION!
# Use the default values unless you really know what you are doing
git:
......
--- config/initializers/active_record_fix_insert_all.rb.orig 2020-05-04 10:07:41 UTC
--- config/initializers/active_record_fix_insert_all.rb.orig 2020-05-15 17:18:13 UTC
+++ config/initializers/active_record_fix_insert_all.rb
@@ -7,7 +7,7 @@
# This is covered by tests in `BulkInsertSafe`
# that validates handling of different data types
-if Rails.gem_version > Gem::Version.new("6.0.2")
+if Rails.gem_version > Gem::Version.new("6.0.2.2")
+if Rails.gem_version > Gem::Version.new("6.0.3")
raise Gem::DependencyError,
"Remove patch once the https://github.com/rails/rails/pull/38763 is included"
end
......@@ -2,7 +2,7 @@
# $FreeBSD: head/www/rubygem-actioncable60/Makefile 532578 2020-04-22 21:31:36Z sunpoet $
PORTNAME= actioncable
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158033
SHA256 (rubygem/actioncable-6.0.2.2.gem) = b2170b2b670e9f3d8a355a7ad78dabe996b7290c3e1a0390cc8782fabd1a93cd
SIZE (rubygem/actioncable-6.0.2.2.gem) = 42496
TIMESTAMP = 1588923757
SHA256 (rubygem/actioncable-6.0.3.gem) = fe6b115017a16527a535088141ceaf465899cb7e4da2cc3dece30d59c2f66b53
SIZE (rubygem/actioncable-6.0.3.gem) = 42496
......@@ -2,7 +2,7 @@
# $FreeBSD: head/www/rubygem-actionpack60/Makefile 532579 2020-04-22 21:31:41Z sunpoet $
PORTNAME= actionpack
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158038
SHA256 (rubygem/actionpack-6.0.2.2.gem) = 58c0f04386b014e5d4a8a1c1a48a9a67f3fb38243a3be74d7201dc18d68de25c
SIZE (rubygem/actionpack-6.0.2.2.gem) = 216576
TIMESTAMP = 1588923759
SHA256 (rubygem/actionpack-6.0.3.gem) = d6d9e228ac083ed9c62e8ea7470cadeebbb77998e523e0ef0902e532342c08ed
SIZE (rubygem/actionpack-6.0.3.gem) = 217088
......@@ -2,8 +2,7 @@
# $FreeBSD: head/www/rubygem-rails60/Makefile 532583 2020-04-22 21:32:01Z sunpoet $
PORTNAME= rails
PORTVERSION= 6.0.2.2
PORTREVISION= 1
PORTVERSION= 6.0.3
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158043
SHA256 (rubygem/rails-6.0.2.2.gem) = 4b789dc6d942e133032485169aa30553482b528ffea5dd52a3bab853fca0c822
SIZE (rubygem/rails-6.0.2.2.gem) = 6656
TIMESTAMP = 1588923761
SHA256 (rubygem/rails-6.0.3.gem) = 399039af4ca160751f87505e13d1a000dfb65e15e4d86601eb34070b85fc73e7
SIZE (rubygem/rails-6.0.3.gem) = 6656
......@@ -2,7 +2,7 @@
# $FreeBSD: head/www/rubygem-railties60/Makefile 532584 2020-04-22 21:32:06Z sunpoet $
PORTNAME= railties
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60
......
TIMESTAMP = 1585158049
SHA256 (rubygem/railties-6.0.2.2.gem) = 5b9d0d0a814ce9f5061aabd24d31e7bcc6864f6fa16565c1b3d9dc646c6b9ab1
SIZE (rubygem/railties-6.0.2.2.gem) = 454144
TIMESTAMP = 1588923763
SHA256 (rubygem/railties-6.0.3.gem) = 5163bf5652c4419cebb699cd1d723a9b80236bce70e25b1bc2f5d3bab78b0206
SIZE (rubygem/railties-6.0.3.gem) = 455168