On 09/03 07:12, Antoine Jacoutot wrote:
> On Fri, 2023-09-01 at 15:05 -0600, Jeremy Evans wrote:
> > CVSROOT:????????????????/cvs
> > Module name:????????ports
> > Changes by:??????????jer...@cvs.openbsd.org??????????????2023/09/01 15:05:28
> >
> > Modified files:
> > ????????????????textproc/ruby-nokogiri: Makefile distinfo
> > ????????????????textproc/ruby-nokogiri/patches: patch-_metadata
> > ??????????????????????????????????????????????????????????????????????????????
> > patch-ext_nokogiri_extconf_rb
> > ????????????????textproc/ruby-nokogiri/pkg: PLIST
> >
> > Log message:
> > Update to nokogiri 1.15.4
> >
> > Add NOKOGIRI_LIBXML_MEMORY_MANAGEMENT=default to the configure environment,
> > which switches nokogiri to use the system malloc instead of ruby_xmalloc.
>
> Hi.
>
> This this to have broken security/ruby-cms_scanner:
>
> ===> security/ruby-cms_scanner
> ===> Building from scratch ruby32-cms_scanner-0.13.8
> ===> ruby32-cms_scanner-0.13.8 depends on:
> ruby32-get_process_mem->=0.2.5,<0.3 -> ruby32-get_process_mem-0.2.7
> ===> ruby32-cms_scanner-0.13.8 depends on:
> ruby32-ruby-progressbar->=1.10,<1.12 -> ruby32-ruby-progressbar-1.11.0
> ===> ruby32-cms_scanner-0.13.8 depends on:
> ruby32-opt_parse_validator->=1.9.5,<1.10 -> ruby32-opt_parse_validator-1.9.5
> ===> ruby32-cms_scanner-0.13.8 depends on: ruby32-yajl-ruby->=1.4.1,<1.5 ->
> ruby32-yajl-ruby-1.4.3
> ===> ruby32-cms_scanner-0.13.8 depends on: ruby32-public_suffix->=4.0.3,<4.1
> -> ruby32-public_suffix-4.0.7
> ===> ruby32-cms_scanner-0.13.8 depends on: ruby32-nokogiri->=1.11.4,<1.14 -
> not found
> ===> ruby32-cms_scanner-0.13.8 depends on: ruby32-nokogiri->=1.11.4,<1.14 -
> default ruby32-nokogiri-1.15.4 does not
> match
> ===> Exiting security/ruby-cms_scanner with an error
Thanks for the report. I thought I checked all reverse dependencies,
but I guess I missed this one. Typical gem stupidity here of limiting
newer versions even though they are likely to work fine (nokogori 1.14
had not yet been released at the time of the last cms_scanner release).
The patch below fixes it.
Sebastian, are you OK with the patch below?
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/ruby-cms_scanner/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile 8 Jun 2022 08:47:15 -0000 1.21
+++ Makefile 3 Sep 2023 09:26:16 -0000
@@ -1,6 +1,7 @@
COMMENT = framework to implement CMS scanners
DISTNAME = cms_scanner-0.13.8
+REVISION = 0
CATEGORIES = security
MAINTAINER = Sebastian Reitenbach <sebas...@openbsd.org>
@@ -19,7 +20,7 @@ RUN_DEPENDS += devel/ruby-get_process_m
devel/ruby-opt_parse_validator,${MODRUBY_FLAVOR}>=1.9.5,<1.10 \
devel/ruby-yajl,${MODRUBY_FLAVOR},>=1.4.1,<1.5 \
net/ruby-public_suffix,${MODRUBY_FLAVOR},>=4.0.3,<4.1 \
- textproc/ruby-nokogiri,${MODRUBY_FLAVOR},>=1.11.4,<1.14
\
+ textproc/ruby-nokogiri,${MODRUBY_FLAVOR},>=1.11.4 \
www/ruby-ethon,${MODRUBY_FLAVOR},>=0.14,<0.16 \
www/ruby-typhoeus,${MODRUBY_FLAVOR},>=1.3,<1.5 \
www/ruby-xmlrpc,${MODRUBY_FLAVOR},>=0.3.2,<0.4
Index: patches/patch-_metadata
===================================================================
RCS file: /cvs/ports/security/ruby-cms_scanner/patches/patch-_metadata,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-_metadata
--- patches/patch-_metadata 11 Mar 2022 19:54:01 -0000 1.3
+++ patches/patch-_metadata 3 Sep 2023 09:26:03 -0000
@@ -3,7 +3,17 @@ Remove sys-proctable dependency, only ne
Index: .metadata
--- .metadata.orig
+++ .metadata
-@@ -161,7 +161,7 @@ dependencies:
+@@ -51,9 +51,6 @@ dependencies:
+ - - ">="
+ - !ruby/object:Gem::Version
+ version: 1.11.4
+- - - "<"
+- - !ruby/object:Gem::Version
+- version: 1.14.0
+ type: :runtime
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+@@ -167,7 +164,7 @@ dependencies:
- - "~>"
- !ruby/object:Gem::Version
version: 1.2.2
