On Sun, Nov 27, 2022 at 06:31:31PM +0000, Jeremy Evans wrote:
> On 11/27 06:24, Stuart Henderson wrote:
> > On 2022/11/24 19:13, Jeremy Evans wrote:
> > > Update to the latest versions of Ruby. Release notes at:
> > >
> > > * https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/
> > > * https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-0-5-released/
> > > * https://www.ruby-lang.org/en/news/2022/11/24/ruby-2-7-7-released/
> >
> > There's a new "dangling symlink" check in the rubygems version
> > in 3.1.3,
> >
> > https://github.com/ruby/ruby/commit/522b75f1b666051f86a3c8961fd4255e560c5020#diff-8f51ef27aa7c1bf289ef010df42fb4a5f0635d0149776e57bc86985c98bc6480R456
> >
> > This is triggered by sysutils/ruby-r10k which skips two files,
> >
> > WARNING: r10k-3.14.2 ships with a dangling symlink named ./spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir pointing to missing spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1 file. Ignoring
> > WARNING: r10k-3.14.2 ships with a dangling symlink named ./spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file pointing to missing spec/fixtures/unit/util/purgeable/managed_one/expected_1 file. Ignoring
> >
> > As they're no longer present in the fake-install dir, packaging
> > fails:
> >
> > Error: /pobj/r10k-3.14.2-ruby31/fake-i386-ruby31/usr/local/lib/ruby/gems/3.1/gems/r10k-3.14.2/spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir does not exist
> > Error: /pobj/r10k-3.14.2-ruby31/fake-i386-ruby31/usr/local/lib/ruby/gems/3.1/gems/r10k-3.14.2/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file does not exist
> > pkg_create: can't continue
> >
>
> Yep, naddy hit this and notified Sebastian and me earlier. Below is
> patch I came up with. The affected files are in the specs, so they can
> safely be ignored. OKs?
Please commit. There's no point in waiting for maintainer in such cases.
>
> Thanks,
> Jeremy
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/ruby-r10k/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- Makefile 11 Mar 2022 19:57:59 -0000 1.41
> +++ Makefile 27 Nov 2022 17:21:37 -0000
> @@ -4,6 +4,7 @@ DISTNAME = r10k-3.14.2
> CATEGORIES = sysutils
> HOMEPAGE = https://github.com/puppetlabs/r10k
> MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
> +REVISION = 0
>
> # Apache 2.0
> PERMIT_PACKAGE = Yes
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/ruby-r10k/pkg/PLIST,v
> retrieving revision 1.28
> diff -u -p -r1.28 PLIST
> --- pkg/PLIST 11 Mar 2022 19:57:59 -0000 1.28
> +++ pkg/PLIST 27 Nov 2022 17:21:27 -0000
> @@ -394,9 +394,9 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/fixture
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir
> -${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir
> +@comment ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
> -${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file
> +@comment ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_two/
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_two/.hidden/
> ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_two/.hidden/unmanaged_3
>
No comments:
Post a Comment