user/gitlab-foss: upgrade to 15.11.9

user/gitlab-foss/117063_openssl3-compat.patch

@@ -1,5 +1,7 @@
 diff --git a/Gemfile b/Gemfile
 index 1110e324e1113488bf76d7ab94352b999c478cc9..a819b603296ec9f11c4bff00cb9e00e41ea7ceae 100644
+diff --git a/Gemfile.orig b/Gemfile
+index 25fbc65..247c2f9 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -17,9 +17,7 @@ gem 'rails', '~> 6.1.7.2'
@@ -10,10 +12,9 @@ index 1110e324e1113488bf76d7ab94352b999c478cc9..a819b603296ec9f11c4bff00cb9e00e4
 -# See https://stdgems.org/openssl/#gem-version.
 -gem 'openssl', '2.2.2'
 +gem 'openssl', '~> 3.0'
- # This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
- # Since the latest version caused problems with GitLab, we pin this to an older
- # version for now.
+ gem 'ipaddr', '~> 1.2.5'
  
+ # Responders respond_to and respond_with
 diff --git a/Gemfile.checksum b/Gemfile.checksum
 index f5228227f1b0723c3cbf9dbf618b4c825c430038..fe206bde66995c30682eec938def27a1698e7417 100644
 --- a/Gemfile.checksum
@@ -89,3 +90,4 @@ index e526e90e25009e3c0ee6facdb4fea63f2374d69a..478af41266db213e9ec8d7b3bb97ca54
        expect(Gitlab::AppLogger).to receive(:error).with("Secure File Parser Failure (#{corrupt_file.id}): #{message}")
        corrupt_file.update_metadata!
      end
+

user/gitlab-foss/APKBUILD

@@ -3,7 +3,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=gitlab-foss
 _pkgname=${pkgname%-foss}
-pkgver=15.10.8
+pkgver=15.11.9
 _gittag=v$pkgver
 pkgrel=0
 pkgdesc="A version control for your server"
@@ -66,7 +66,6 @@ subpackages="$pkgname-assets::noarch $pkgname-openrc"
 source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss-$_gittag.tar.gz
 	database-config.patch
 	117063_openssl3-compat.patch
-	use-bundler-2.3.patch
 	$_pkgname.initd
 	$_pkgname.mailroom.initd
 	$_pkgname.rails.initd
@@ -101,6 +100,10 @@ prepare() {
 	# Remove all locale files except en.
 	find locale -type d -mindepth 1 ! -name en -exec rm -rf {} +
 
+	# Allow use of any bundler
+	sed -i -e '/BUNDLED/,+1d' Gemfile.lock
+
+
 	# Some gems are broken, so we copy our fixed version
 	# instead of installing it from RubyGems using Bundler.
 	for i in grpc rugged; do
@@ -267,7 +270,6 @@ package() {
 	find public/assets -name '*.vue' -delete
 	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
 
 	# Remove more stuff not neeeded in production.
@@ -374,10 +376,9 @@ assets() {
 }
 
 sha512sums="
-a73def79a826ab0ad29c7b29576c8523221bf5e6dd123531d6939b27b699b0551237ee913e7a43c4b8bd0fbd7586b7418bf761b272fae2355cfbb0cf1553e61b  gitlab-foss-v15.10.8.tar.gz
+bc7c55201d4df800bef74f063bbdc47fc2fde3d2bd6f05d4a8dd2f8e932ca8ef1a2aa63a0d7d163ee6ce9704a29ea25a9bb463d3e6dfc6d3f0ebb94eecde9831  gitlab-foss-v15.11.9.tar.gz
 f8b6855445e4086b4a4059a6359fafe7ca78ccf9ed6953a5b2a606d02add9519bb98ccf5f4a3bb750b94cfc44e660e70186813f7c7296fac343377e922e8a54a  database-config.patch
-857ae19d63240a581281f7816939ed751d3df0262e7f3c3ec5208672cf8a117c46af34de8232dcc6381d93f6b6f96eb32bb8fca89620835080653b713ce9ec1e  117063_openssl3-compat.patch
-6121907ec56911e34416e0443a72c4aa628050ac896b8305f6e43c01be93a93c75066a15f1db0e5337a5412c3f0cd51edca5f5064ab9484330343ce98a79a7c6  use-bundler-2.3.patch
+a22de84624079c64b774cb71701e1835f46b9c42880b8e33981daace356914d067b556821f940655963e1f2977c7f3f90a7e12536b7c379fcea3bdbaf9a1348d  117063_openssl3-compat.patch
 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b  gitlab.initd
 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a  gitlab.mailroom.initd
 b6a6d9ba20557e61efa24f2d5a489873fefbb981f7d4465794a857b2971263c08ec29cc001c372522cdc0d48245e59751307c9f44f6ef4d87bf2e3ec5c23fb1c  gitlab.rails.initd

user/gitlab-foss/use-bundler-2.3.patch

@@ -1,10 +0,0 @@
-diff --git a/Gemfile.lock.orig b/Gemfile.lock
-index 1f1f566..39af9ce 100644
---- a/Gemfile.lock.orig
-+++ b/Gemfile.lock
-@@ -1936,4 +1935,4 @@ DEPENDENCIES
-   yajl-ruby (~> 1.4.3)
- 
- BUNDLED WITH
--   2.4.8
-+   2.3.26