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 | |
| 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')
18 files changed, 171 insertions, 4 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 diff --git a/security/rubygem-acme-client-gitlab/Makefile b/security/rubygem-acme-client-gitlab/Makefile new file mode 100644 index 000000000000..c14bb1d646d5 --- /dev/null +++ b/security/rubygem-acme-client-gitlab/Makefile @@ -0,0 +1,24 @@ +PORTNAME= acme-client +PORTVERSION= 2.0.19 +CATEGORIES= security rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Client for the ACME protocol +WWW= https://github.com/unixcharles/acme-client + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-base64>=0.2.0<0.3:converters/rubygem-base64 \ + rubygem-faraday-gitlab>=1.0<3.0.0:www/rubygem-faraday-gitlab \ + rubygem-faraday-retry-gitlab>=1.0<3.0.0:www/rubygem-faraday-retry-gitlab + +USES= gem shebangfix + +SHEBANG_FILES= bin/setup + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/security/rubygem-acme-client-gitlab/distinfo b/security/rubygem-acme-client-gitlab/distinfo new file mode 100644 index 000000000000..cad789afef46 --- /dev/null +++ b/security/rubygem-acme-client-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1728632728 +SHA256 (rubygem/acme-client-2.0.19.gem) = 29647ab04cde309503cf553d3f9d0a25dcca6588caca57f55f12d6c8833244f8 +SIZE (rubygem/acme-client-2.0.19.gem) = 21504 diff --git a/security/rubygem-acme-client-gitlab/pkg-descr b/security/rubygem-acme-client-gitlab/pkg-descr new file mode 100644 index 000000000000..7422e34a7e71 --- /dev/null +++ b/security/rubygem-acme-client-gitlab/pkg-descr @@ -0,0 +1 @@ +acme-client is a client implementation of the ACMEv2 protocol in Ruby. diff --git a/security/rubygem-googleauth-gitlab/Makefile b/security/rubygem-googleauth-gitlab/Makefile new file mode 100644 index 000000000000..9e26e30aae58 --- /dev/null +++ b/security/rubygem-googleauth-gitlab/Makefile @@ -0,0 +1,25 @@ +PORTNAME= googleauth +PORTVERSION= 1.11.2 +CATEGORIES= security rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Google Auth Library for Ruby +WWW= https://github.com/googleapis/google-auth-library-ruby + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-faraday-gitlab>=1.0<3.0:www/rubygem-faraday-gitlab \ + rubygem-google-cloud-env-gitlab>=2.1<3:net/rubygem-google-cloud-env-gitlab \ + rubygem-jwt>=1.4<3.0:www/rubygem-jwt \ + rubygem-multi_json>=1.11<2:devel/rubygem-multi_json \ + rubygem-os>=0.9<2.0:devel/rubygem-os \ + rubygem-signet-gitlab>=0.16<2:security/rubygem-signet-gitlab + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/security/rubygem-googleauth-gitlab/distinfo b/security/rubygem-googleauth-gitlab/distinfo new file mode 100644 index 000000000000..03478707b837 --- /dev/null +++ b/security/rubygem-googleauth-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1729927069 +SHA256 (rubygem/googleauth-1.11.2.gem) = 7e6bacaeed7aea3dd66dcea985266839816af6633e9f5983c3c2e0e40a44731e +SIZE (rubygem/googleauth-1.11.2.gem) = 51712 diff --git a/security/rubygem-googleauth-gitlab/pkg-descr b/security/rubygem-googleauth-gitlab/pkg-descr new file mode 100644 index 000000000000..64c923a63f90 --- /dev/null +++ b/security/rubygem-googleauth-gitlab/pkg-descr @@ -0,0 +1,5 @@ +This is Google's officially supported ruby client library for using OAuth 2.0 +authorization and authentication with Google APIs. It allows simple +authorization for accessing Google APIs and provides support for Application +Default Credentials, as described at +https://developers.google.com/accounts/docs/application-default-credentials diff --git a/security/rubygem-omniauth-alicloud/Makefile b/security/rubygem-omniauth-alicloud/Makefile index 2fd7d085b129..af3d650cfc09 100644 --- a/security/rubygem-omniauth-alicloud/Makefile +++ b/security/rubygem-omniauth-alicloud/Makefile @@ -1,5 +1,6 @@ PORTNAME= omniauth-alicloud PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://gitlab.com/gitlab-jh/jh-team/omniauth-alicloud LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-omniauth-oauth2>=1.8<2:net/rubygem-omniauth-oauth2 +RUN_DEPENDS= rubygem-omniauth-oauth2-gitlab>=1.8<2:net/rubygem-omniauth-oauth2-gitlab USES= gem diff --git a/security/rubygem-omniauth-atlassian-oauth2/Makefile b/security/rubygem-omniauth-atlassian-oauth2/Makefile index e74657e9c92b..84adfad8551b 100644 --- a/security/rubygem-omniauth-atlassian-oauth2/Makefile +++ b/security/rubygem-omniauth-atlassian-oauth2/Makefile @@ -1,6 +1,6 @@ PORTNAME= omniauth-atlassian-oauth2 PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security rubygems MASTER_SITES= RG @@ -10,8 +10,8 @@ WWW= https://github.com/aguynamedben/omniauth-atlassian-oauth2 LICENSE= MIT -RUN_DEPENDS= rubygem-omniauth1>=1.1.1:security/rubygem-omniauth1 \ - rubygem-omniauth-oauth2>=1.5:net/rubygem-omniauth-oauth2 +RUN_DEPENDS= rubygem-omniauth>=1.1.1:security/rubygem-omniauth \ + rubygem-omniauth-oauth2-gitlab>=1.5:net/rubygem-omniauth-oauth2-gitlab USES= gem diff --git a/security/rubygem-omniauth-oauth2-generic-gitlab/Makefile b/security/rubygem-omniauth-oauth2-generic-gitlab/Makefile new file mode 100644 index 000000000000..a776c31d0623 --- /dev/null +++ b/security/rubygem-omniauth-oauth2-generic-gitlab/Makefile @@ -0,0 +1,24 @@ +PORTNAME= omniauth-oauth2-generic +PORTVERSION= 0.2.8 +CATEGORIES= security rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Generic, Configurable OmniAuth Strategy for OAuth2 providers +WWW= https://gitlab.com/satorix/omniauth-oauth2-generic + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= rubygem-omniauth-oauth2-gitlab>=1.0<2:net/rubygem-omniauth-oauth2-gitlab \ + rubygem-rake>=0:devel/rubygem-rake + +USES= gem + +NO_ARCH= yes + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/console ${STAGEDIR}${PREFIX}/bin/setup + +.include <bsd.port.mk> diff --git a/security/rubygem-omniauth-oauth2-generic-gitlab/distinfo b/security/rubygem-omniauth-oauth2-generic-gitlab/distinfo new file mode 100644 index 000000000000..243ac13ece23 --- /dev/null +++ b/security/rubygem-omniauth-oauth2-generic-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1600177188 +SHA256 (rubygem/omniauth-oauth2-generic-0.2.8.gem) = ce6e8539019d5ebf2f48867072b9f248f148bb4cbe7166dee655865abfae7613 +SIZE (rubygem/omniauth-oauth2-generic-0.2.8.gem) = 12288 diff --git a/security/rubygem-omniauth-oauth2-generic-gitlab/pkg-descr b/security/rubygem-omniauth-oauth2-generic-gitlab/pkg-descr new file mode 100644 index 000000000000..0d70fa0bed3b --- /dev/null +++ b/security/rubygem-omniauth-oauth2-generic-gitlab/pkg-descr @@ -0,0 +1,16 @@ +omniauth-oauth2-generic provides an OmniAuth strategy for authenticating with an +OAuth2 service using the authorization grant flow. + +Most OmniAuth gems are written either as abstractions (omniauth-oauth2) or for a +specific provider (omniauth-github), but this one is designed to be configurable +enough to work with any basic OAuth2 provider. The primary differences between +OAuth2 provider strategies in OmniAuth are: +- The server's domain +- The URL paths used to authorize, request tokens and get user info +- The structure of the returned user information + +These are all configurable options in this gem. There my be certain +requirements/features of some providers not covered by this gem's options, but +it was designed primarily so that if you are implementing your own OAuth2 +provider for your service, you don't need to write an OmniAuth strategy as long +as it is compatible with the basic options provided by this gem. diff --git a/security/rubygem-rack-oauth2-gitlab/Makefile b/security/rubygem-rack-oauth2-gitlab/Makefile new file mode 100644 index 000000000000..5620c2b4660c --- /dev/null +++ b/security/rubygem-rack-oauth2-gitlab/Makefile @@ -0,0 +1,25 @@ +PORTNAME= rack-oauth2 +PORTVERSION= 2.2.1 +CATEGORIES= security rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= OAuth 2.0 Server & Client Library +WWW= https://github.com/nov/rack-oauth2 + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-activesupport70>=0:devel/rubygem-activesupport70 \ + rubygem-attr_required>=0:devel/rubygem-attr_required \ + rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab \ + rubygem-faraday-follow_redirects-gitlab>=0:www/rubygem-faraday-follow_redirects-gitlab \ + rubygem-json-jwt-gitlab>=1.11.0:www/rubygem-json-jwt-gitlab \ + rubygem-rack>=2.1.0,3:www/rubygem-rack + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/security/rubygem-rack-oauth2-gitlab/distinfo b/security/rubygem-rack-oauth2-gitlab/distinfo new file mode 100644 index 000000000000..1ca2dcb4adac --- /dev/null +++ b/security/rubygem-rack-oauth2-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1708450826 +SHA256 (rubygem/rack-oauth2-2.2.1.gem) = c73aa87c508043e2258f02b4fb110cacba9b37d2ccf884e22487d014a120d1a5 +SIZE (rubygem/rack-oauth2-2.2.1.gem) = 30208 diff --git a/security/rubygem-rack-oauth2-gitlab/pkg-descr b/security/rubygem-rack-oauth2-gitlab/pkg-descr new file mode 100644 index 000000000000..0ff338777a75 --- /dev/null +++ b/security/rubygem-rack-oauth2-gitlab/pkg-descr @@ -0,0 +1,2 @@ +OAuth 2.0 Server & Client Library. +Both Bearer and MAC token type are supported. diff --git a/security/rubygem-signet-gitlab/Makefile b/security/rubygem-signet-gitlab/Makefile new file mode 100644 index 000000000000..9233697a634e --- /dev/null +++ b/security/rubygem-signet-gitlab/Makefile @@ -0,0 +1,23 @@ +PORTNAME= signet +PORTVERSION= 0.19.0 +CATEGORIES= security rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= OAuth 1.0 / OAuth 2.0 implementation +WWW= https://github.com/google/signet + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-addressable>=2.8<3:www/rubygem-addressable \ + rubygem-faraday-gitlab>=0.17.5<3.0:www/rubygem-faraday-gitlab \ + rubygem-jwt>=1.5<3.0:www/rubygem-jwt \ + rubygem-multi_json>=1.10<2:devel/rubygem-multi_json + +USES= gem + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/security/rubygem-signet-gitlab/distinfo b/security/rubygem-signet-gitlab/distinfo new file mode 100644 index 000000000000..a54077e9930e --- /dev/null +++ b/security/rubygem-signet-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1708450566 +SHA256 (rubygem/signet-0.19.0.gem) = 537f3939f57f141f691e6069a97ec40f34fadafc4c7e5ba94edb06cf4350dd31 +SIZE (rubygem/signet-0.19.0.gem) = 35840 diff --git a/security/rubygem-signet-gitlab/pkg-descr b/security/rubygem-signet-gitlab/pkg-descr new file mode 100644 index 000000000000..67c26b0f4af6 --- /dev/null +++ b/security/rubygem-signet-gitlab/pkg-descr @@ -0,0 +1 @@ +Signet is an OAuth 1.0 / OAuth 2.0 implementation. |