diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2024-11-22 12:08:43 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2024-11-22 13:15:15 +0000 |
| commit | edc8d0390e04766c7102c04cdba727b8c0fd22d6 (patch) | |
| tree | e9fa78df8edac36c0c97c44afc4ca0514aaabe04 /security/Makefile | |
| parent | 2c08bdde941541c19d159fe8f51cfc01085c744a (diff) | |
www/gitlab: fix regression from 335fc7c38d61142727cb9f01fd9e401c476e4ad8
Gitlab requires net-http 0.4.1:
Because faraday >= 2, < 2.5 could not be found in locally installed gems
and faraday >= 2.5, < 2.12.1 could not be found in locally installed gems,
faraday >= 2, < 2.12.1 cannot be used.
And because faraday >= 2.12.1 depends on faraday-net_http >= 2.0, < 3.5,
faraday >= 2 requires faraday-net_http >= 2.0, < 3.5.
Because faraday-net_http >= 3.4.0 depends on net-http >= 0.5.0
and faraday-net_http >= 2.0, < 3.4.0 could not be found in locally installed
gems,
faraday-net_http >= 2.0 requires net-http >= 0.5.0.
Thus, faraday >= 2 requires net-http >= 0.5.0.
So, because Gemfile depends on faraday ~> 2
and Gemfile depends on net-http = 0.4.1,
version solving has failed.
While fixing the problem, moved gitlab used packages to own package names with a
PKGNAMESUFFIX of `-gitlab`.
This should make the gitlab package much more stable if updates in the ports are done.
Diffstat (limited to 'security/Makefile')
| -rw-r--r-- | security/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/Makefile b/security/Makefile index 91b1c619527f..9ed7adfea2cf 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1111,6 +1111,7 @@ SUBDIR += rotate SUBDIR += rpm-sequoia SUBDIR += rubygem-acme-client + SUBDIR += rubygem-acme-client-gitlab SUBDIR += rubygem-aes_key_wrap SUBDIR += rubygem-airbrussh SUBDIR += rubygem-android_key_attestation @@ -1143,6 +1144,7 @@ SUBDIR += rubygem-encryptor SUBDIR += rubygem-ezcrypto SUBDIR += rubygem-googleauth + SUBDIR += rubygem-googleauth-gitlab SUBDIR += rubygem-gpgme SUBDIR += rubygem-gpgr SUBDIR += rubygem-gssapi @@ -1182,6 +1184,7 @@ SUBDIR += rubygem-omniauth-multipassword SUBDIR += rubygem-omniauth-multipassword2 SUBDIR += rubygem-omniauth-oauth2-generic + SUBDIR += rubygem-omniauth-oauth2-generic-gitlab SUBDIR += rubygem-omniauth-rails_csrf_protection SUBDIR += rubygem-omniauth-saml SUBDIR += rubygem-omniauth-saml1 @@ -1200,6 +1203,7 @@ SUBDIR += rubygem-pwned SUBDIR += rubygem-pyu-ruby-sasl SUBDIR += rubygem-rack-oauth2 + SUBDIR += rubygem-rack-oauth2-gitlab SUBDIR += rubygem-rasn1 SUBDIR += rubygem-razorback-scriptNugget SUBDIR += rubygem-rbnacl @@ -1233,6 +1237,7 @@ SUBDIR += rubygem-securecompare SUBDIR += rubygem-securerandom SUBDIR += rubygem-signet + SUBDIR += rubygem-signet-gitlab SUBDIR += rubygem-six SUBDIR += rubygem-ssh_data SUBDIR += rubygem-sshkey |