diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2024-11-22 14:08:43 +0200 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2024-11-22 15:15:15 +0200 |
| commit | edc8d0390e04766c7102c04cdba727b8c0fd22d6 (patch) | |
| tree | e9fa78df8edac36c0c97c44afc4ca0514aaabe04 /net/rubygem-omniauth-oauth2-gitlab | |
| parent | www/gitlab: update to 17.6.0 (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 'net/rubygem-omniauth-oauth2-gitlab')
| -rw-r--r-- | net/rubygem-omniauth-oauth2-gitlab/Makefile | 21 | ||||
| -rw-r--r-- | net/rubygem-omniauth-oauth2-gitlab/distinfo | 3 | ||||
| -rw-r--r-- | net/rubygem-omniauth-oauth2-gitlab/files/patch-gemspec | 15 | ||||
| -rw-r--r-- | net/rubygem-omniauth-oauth2-gitlab/pkg-descr | 1 |
4 files changed, 40 insertions, 0 deletions
diff --git a/net/rubygem-omniauth-oauth2-gitlab/Makefile b/net/rubygem-omniauth-oauth2-gitlab/Makefile new file mode 100644 index 000000000000..d120f0f01af6 --- /dev/null +++ b/net/rubygem-omniauth-oauth2-gitlab/Makefile @@ -0,0 +1,21 @@ +PORTNAME= omniauth-oauth2 +PORTVERSION= 1.8.0 +CATEGORIES= net rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Abstract OAuth2 strategy for OmniAuth +WWW= https://github.com/omniauth/omniauth-oauth2 + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= rubygem-oauth2-gitlab>=1.4<3:net/rubygem-oauth2-gitlab \ + rubygem-omniauth>=1.9<3:security/rubygem-omniauth + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/net/rubygem-omniauth-oauth2-gitlab/distinfo b/net/rubygem-omniauth-oauth2-gitlab/distinfo new file mode 100644 index 000000000000..e197572d0b5d --- /dev/null +++ b/net/rubygem-omniauth-oauth2-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1656093034 +SHA256 (rubygem/omniauth-oauth2-1.8.0.gem) = b2f8e9559cc7e2d4efba57607691d6d2b634b879fc5b5b6ccfefa3da85089e78 +SIZE (rubygem/omniauth-oauth2-1.8.0.gem) = 11776 diff --git a/net/rubygem-omniauth-oauth2-gitlab/files/patch-gemspec b/net/rubygem-omniauth-oauth2-gitlab/files/patch-gemspec new file mode 100644 index 000000000000..f42ffd158980 --- /dev/null +++ b/net/rubygem-omniauth-oauth2-gitlab/files/patch-gemspec @@ -0,0 +1,15 @@ +Fix runtime of www/gitlab-ce + +Allow omniauth 1.9.* to fix bundler check when gitlab starts. + +--- omniauth-oauth2.gemspec.orig 2024-02-21 06:39:47 UTC ++++ omniauth-oauth2.gemspec +@@ -21,7 +21,7 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + s.add_runtime_dependency(%q<oauth2>.freeze, [">= 1.4".freeze, "< 3".freeze]) +- s.add_runtime_dependency(%q<omniauth>.freeze, ["~> 2.0".freeze]) ++ s.add_runtime_dependency(%q<omniauth>.freeze, [">= 1.9".freeze, "< 3".freeze]) + s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0".freeze]) + end + diff --git a/net/rubygem-omniauth-oauth2-gitlab/pkg-descr b/net/rubygem-omniauth-oauth2-gitlab/pkg-descr new file mode 100644 index 000000000000..696e63d7c02b --- /dev/null +++ b/net/rubygem-omniauth-oauth2-gitlab/pkg-descr @@ -0,0 +1 @@ +An abstract OAuth2 strategy for OmniAuth. |