? ruby-puppet_forge.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-puppet_forge/Makefile,v
diff -u -r1.16 Makefile
--- Makefile 11 Mar 2022 18:53:17 -0000 1.16
+++ Makefile 31 Oct 2023 10:31:11 -0000
@@ -1,7 +1,6 @@
COMMENT = tools to access the Puppet Forge API
-DISTNAME = puppet_forge-2.3.4
-REVISION = 0
+DISTNAME = puppet_forge-5.0.2
CATEGORIES = devel
HOMEPAGE = https://github.com/puppetlabs/forge-ruby
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
@@ -12,10 +11,9 @@
MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
RUN_DEPENDS += archivers/ruby-minitar,${MODRUBY_FLAVOR} \
- devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.11,<1 \
- devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=1.0,<2.0 \
- www/ruby-faraday,${MODRUBY_FLAVOR}>=0.14,<0.18 \
- www/ruby-faraday_middleware,${MODRUBY_FLAVOR}>=0.9.0,<0.15
+ devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=1,<2 \
+ www/ruby-faraday,${MODRUBY_FLAVOR}>=2,<3 \
+ www/ruby-faraday-follow_redirects,${MODRUBY_FLAVOR}>=0.3.0,<0.4
CONFIGURE_STYLE = ruby gem
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ruby-puppet_forge/distinfo,v
diff -u -r1.13 distinfo
--- distinfo 7 Apr 2020 21:18:54 -0000 1.13
+++ distinfo 31 Oct 2023 10:31:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (puppet_forge-2.3.4.gem) = 56DNnnLQAxmgXHphAoc5Cu9UWu+w01O8yX2HwD6T6co=
-SIZE (puppet_forge-2.3.4.gem) = 772608
+SHA256 (puppet_forge-5.0.2.gem) = p+ZBXjY+9hf0p4sLydhtsahpcx5QDPKsu/mLFdwN/2k=
+SIZE (puppet_forge-5.0.2.gem) = 774144
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ruby-puppet_forge/pkg/PLIST,v
diff -u -r1.8 PLIST
--- pkg/PLIST 11 Mar 2022 18:53:17 -0000 1.8
+++ pkg/PLIST 31 Oct 2023 10:31:11 -0000
@@ -3,6 +3,7 @@
${GEM_LIB}/gems/${DISTNAME}/.github/
${GEM_LIB}/gems/${DISTNAME}/.github/workflows/
${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ruby-rspec.yml
+${GEM_LIB}/gems/${DISTNAME}/.github/workflows/snyk_merge.yml
${GEM_LIB}/gems/${DISTNAME}/.gitignore
${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
${GEM_LIB}/gems/${DISTNAME}/CODEOWNERS
@@ -19,8 +20,7 @@
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/error.rb
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/lazy_accessors.rb
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/lazy_relations.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/middleware/
-${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/middleware/symbolify_json.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/lru_cache.rb
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/tar/
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/tar.rb
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/tar/mini.rb
@@ -36,8 +36,6 @@
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/v3/release.rb
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/v3/user.rb
${GEM_LIB}/gems/${DISTNAME}/lib/puppet_forge/version.rb
-${GEM_LIB}/gems/${DISTNAME}/locales/
-${GEM_LIB}/gems/${DISTNAME}/locales/config.yaml
${GEM_LIB}/gems/${DISTNAME}/puppet_forge.gemspec
${GEM_LIB}/gems/${DISTNAME}/spec/
${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/
@@ -91,8 +89,7 @@
${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/connection_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/lazy_accessors_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/lazy_relations_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/middleware/
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/middleware/symbolify_json_spec.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/lru_cache_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/tar/
${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/tar/mini_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/unit/forge/tar_spec.rb
On Tuesday, October 31, 2023 10:35 CET, Klemens Nanni <kn@openbsd.org> wrote:
> On Tue, Oct 31, 2023 at 09:12:43AM +0100, Sebastian Reitenbach wrote:
> > The current ruby-faraday version in ports does need an update as well. They totally changed internal dependencies, that's also why ruby-faraday-middleware got deprecated and can go.
> >
> > Sorry, missed that, ruby-faraday update attached.
>
> New ruby-faraday won't install due to devel/ruby-puppet_forge still
> requiring the old version:
>
yes, there's a loooong trail, intermingled in puppet and r10k dependencies.
I believe/hope that should be the last one missing, see attached ruby-puppet_forge update.
Do you have r10k installed on that host? Then you may need to update that as well, and
maybe even more. If that's the case, you may find missing other pieces here: https://github.com/buzzdeee/mystuff
in the end, sysutils/ruby-puppet/6 and www/ruby-faraday_middleware will/have to go away.
> ===> Building from scratch ruby32-faraday-2.7.11
> ===> ruby32-faraday-2.7.11 depends on: ruby32-faraday-net_http->=2,<3.1 -> ruby32-faraday-net_http-3.0.2
> ===> ruby32-faraday-2.7.11 depends on: ruby->=3.2.0,<3.3 -> ruby-3.2.2p1
> ===> Installing ruby32-faraday-2.7.11 from /usr/ports/packages/amd64/all/
> ruby32-faraday-0.17.4->2.7.11 forward dependencies:
> | Dependency of ruby32-faraday_middleware-0.12.2 on ruby32-faraday->=0.7.4,<1.0 doesn't match
> | Dependency of ruby32-puppet_forge-2.3.4p0 on ruby32-faraday->=0.14,<0.18 doesn't match
> NOT MERGING: can't find update for ruby32-faraday_middleware-0.12.2-> (ok)
> NOT MERGING: can't find update for ruby32-puppet_forge-2.3.4p0-> (ok)
> Couldn't find updates for ruby32-faraday-0.17.4 ruby32-faraday_middleware-0.12.2 ruby32-puppet_forge-2.3.4p0
> Couldn't install ruby32-faraday-2.7.11
No comments:
Post a Comment