user/gitlab-foss: upgrade to 15.9.2
This commit is contained in:
parent
bf6ae6587a
commit
46754752e6
GPG key ID:
D62A472A4AA7D541
3 changed files with 41 additions and 48 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
pkgname=gitlab-foss
|
||||
_pkgname=${pkgname%-foss}
|
||||
pkgver=15.8.1
|
||||
pkgver=15.9.2
|
||||
_gittag=v$pkgver
|
||||
pkgrel=0
|
||||
pkgdesc="A version control for your server"
|
||||
|
|
@ -63,8 +63,8 @@ pkggroups="git www-data"
|
|||
install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
|
||||
subpackages="$pkgname-assets::noarch"
|
||||
source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss-$_gittag.tar.gz
|
||||
libgit-1.4-compat.patch
|
||||
database-config.patch
|
||||
libgit-1.4-compat.patch
|
||||
$_pkgname.initd
|
||||
$_pkgname.mailroom.initd
|
||||
$_pkgname.rails.initd
|
||||
|
|
@ -88,8 +88,6 @@ prepare() {
|
|||
|
||||
default_prepare
|
||||
|
||||
cd "$builddir"
|
||||
|
||||
# The default log level is very chatty.
|
||||
sed -i 's/^\(\s*config.log_level\s*=\).*$/\1 :warn/' \
|
||||
config/environments/production.rb
|
||||
|
|
@ -135,13 +133,6 @@ build() {
|
|||
|
||||
bundle install --no-cache
|
||||
|
||||
# Fix https://github.com/funny-falcon/murmurhash3-ruby/pull/9
|
||||
(
|
||||
cd vendor/bundle/ruby/*/extensions/*/*/murmurhash3-*
|
||||
mkdir -p murmurhash3
|
||||
mv native.so murmurhash3/
|
||||
)
|
||||
|
||||
# Replace bundled CA bundle with symlink.
|
||||
(
|
||||
cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/
|
||||
|
|
@ -215,8 +206,6 @@ package() {
|
|||
local datadir="$pkgdir/var/lib/gitlab"
|
||||
local file dest
|
||||
|
||||
cd "$builddir"
|
||||
|
||||
install -d -m755 "$destdir" "$destdir"/bin
|
||||
|
||||
install -d -m755 -o git -g git \
|
||||
|
|
@ -250,7 +239,7 @@ package() {
|
|||
# Install application files.
|
||||
# Note: *VERSION files and doc directory are required (Help in GitLab
|
||||
# menu refers to the doc directory).
|
||||
cp -rl .bundle config.ru Gemfile* INSTALLATION_TYPE Rakefile *VERSION \
|
||||
cp -rl .bundle config.ru Gemfile* INSTALLATION_TYPE Rakefile ./*VERSION \
|
||||
app data db doc fixtures config lib locale metrics_server public sidekiq_cluster vendor \
|
||||
"$destdir"/
|
||||
|
||||
|
|
@ -271,7 +260,7 @@ package() {
|
|||
rm -r app/assets
|
||||
rm -r vendor/assets
|
||||
find public/assets -name '*.vue' -delete
|
||||
find public/assets -type d | xargs rmdir --ignore-fail-on-non-empty
|
||||
find public/assets -type d -exec rmdir --ignore-fail-on-non-empty '{}' \;
|
||||
# These load gems in the assets group.
|
||||
rm config/initializers/gettext_rails_i18n_patch.rb
|
||||
rm config/initializers/sprockets.rb
|
||||
|
|
@ -380,9 +369,9 @@ assets() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
63a4e6ffe7025942c06efe56c71d85287f00feee61a1247eb253f1e8fc2c00acc76a5705b43ca5b4e1cd988511bda617eb92056d90d1036fe3d0b65662cee6e5 gitlab-foss-v15.8.1.tar.gz
|
||||
80e27697772c4529720f2ec65d314641cd5f437070d0fefd3c521852ff6dad8c9127534e379a5c0bcee4bbae8d5a373d131bf91a58606d02c89104e34a88baac libgit-1.4-compat.patch
|
||||
dd984ae890c10119df6c510be1bd22e3d18652115ccaec6cb3e0a7c49d00cc72ec1c7c2414c29e6a13171c0a139626c8227e0ba3020f0ec3fe2c318b47101248 database-config.patch
|
||||
8b99a892515fdeedbded148c31455b373af6d8ba1802d920decfcb4afd4316f8d12ea74134a3ab6a9863e8fbe99b9d58016aa22689324ecc04d380f84ea5c4f7 gitlab-foss-v15.9.2.tar.gz
|
||||
f8b6855445e4086b4a4059a6359fafe7ca78ccf9ed6953a5b2a606d02add9519bb98ccf5f4a3bb750b94cfc44e660e70186813f7c7296fac343377e922e8a54a database-config.patch
|
||||
0a95e0013427c210e8a381edb867f2aa515849e67ae60926cce3410d02869bf20d6ebcfb1953b6a6b32c7838061347564f29b2edd2ee5b41c65634a738786247 libgit-1.4-compat.patch
|
||||
55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd
|
||||
1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd
|
||||
b6a6d9ba20557e61efa24f2d5a489873fefbb981f7d4465794a857b2971263c08ec29cc001c372522cdc0d48245e59751307c9f44f6ef4d87bf2e3ec5c23fb1c gitlab.rails.initd
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
||||
index 5329a8e..a4daab1 100644
|
||||
--- a/config/database.yml.postgresql
|
||||
diff --git a/config/database.yml.postgresql.orig b/config/database.yml.postgresql
|
||||
index c1b1247..dbe5b77 100644
|
||||
--- a/config/database.yml.postgresql.orig
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -18,13 +18,6 @@ production:
|
||||
# port: 8600
|
||||
# record: secondary.postgresql.service.consul
|
||||
# interval: 300
|
||||
@@ -26,14 +26,7 @@ production:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
|
@ -13,13 +13,15 @@ index 5329a8e..a4daab1 100644
|
|||
- username: git
|
||||
- password: "secure password"
|
||||
- host: localhost
|
||||
|
||||
-
|
||||
+
|
||||
#
|
||||
# Development specific
|
||||
@@ -39,13 +32,6 @@ development:
|
||||
host: localhost
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
#
|
||||
@@ -57,13 +50,6 @@ development:
|
||||
# host: localhost
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
|
@ -30,10 +32,10 @@ index 5329a8e..a4daab1 100644
|
|||
|
||||
#
|
||||
# Staging specific
|
||||
@@ -58,13 +44,6 @@ staging:
|
||||
username: git
|
||||
password: "secure password"
|
||||
host: localhost
|
||||
@@ -84,13 +70,6 @@ staging:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
|
@ -44,10 +46,10 @@ index 5329a8e..a4daab1 100644
|
|||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
@@ -80,10 +59,3 @@ test: &test
|
||||
prepared_statements: false
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
@@ -117,10 +96,3 @@ test: &test
|
||||
# prepared_statements: false
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
--- a/Gemfile.lock
|
||||
diff --git a/Gemfile.lock.orig b/Gemfile.lock
|
||||
index 2e548c4..85f047a 100644
|
||||
--- a/Gemfile.lock.orig
|
||||
+++ b/Gemfile.lock
|
||||
@@ -1215 +1215 @@
|
||||
- rugged (1.2.0)
|
||||
+ rugged (1.4.4)
|
||||
@@ -1411 +1411 @@
|
||||
- undercover (0.4.4)
|
||||
+ undercover (0.4.5)
|
||||
@@ -1414 +1414 @@
|
||||
- rugged (>= 0.27, < 1.3)
|
||||
+ rugged (>= 0.27, < 1.6)
|
||||
@@ -1311,7 +1311,7 @@ GEM
|
||||
rubyntlm (0.6.3)
|
||||
rubypants (0.2.0)
|
||||
rubyzip (2.3.2)
|
||||
- rugged (1.5.1)
|
||||
+ rugged (1.4.5)
|
||||
safe_yaml (1.0.4)
|
||||
safety_net_attestation (0.4.0)
|
||||
jwt (~> 2.0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue