Hi, Am Dienstag, Februar 02, 2021 21:29 CET, schrieb Jeremy Evans <[email protected]>:
> On 02/02 08:55, Sebastian Reitenbach wrote: > > Hi, > > > > an update of security/wpscan would require an update of nokogiri. > > That would also allow to update a handful of other wpscan dependencies. > > > > all other dependent ports still build fine. > > ruby26 FLAVOR doesn't build: > > ERROR: Could not find a valid gem 'racc' (~> 1.4) (required by > '/usr/obj/ports/nokogiri-1.11.1-ruby26/nokogiri-1.11.1.gem' (>= 0)) in any > repository > > nokogiri 1.11 added a dependency on racc. racc is a standard library > starting in ruby 2.7, which is why the port works on ruby 2.7 and 3.0. > We have a port for racc (devel/ruby-racc), so it could be added as a > BDEP/RDEP, possibly only as a BDEP/RDEP when using the ruby26 FLAVOR. > updated patch below, adding ruby-racc for ruby26 FLAVOR. hope that'S OK now? cheers, Sebastian Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 9 Jun 2020 07:14:45 -0000 1.37 +++ Makefile 3 Feb 2021 08:53:00 -0000 @@ -2,9 +2,8 @@ COMMENT= HTML, XML, SAX and Reader parser -DISTNAME= nokogiri-1.10.8 +DISTNAME= nokogiri-1.11.1 CATEGORIES= textproc -REVISION= 0 HOMEPAGE= http://nokogiri.org/ @@ -17,6 +16,13 @@ LIB_DEPENDS= textproc/libxslt MODULES= lang/ruby + +FLAVOR ?= + +.if ${FLAVOR:Mruby26} +BUILD_DEPENDS += ${RUN_DEPENDS} +RUN_DEPENDS += devel/ruby-racc,${MODRUBY_FLAVOR} +.endif CONFIGURE_STYLE= ruby gem ext Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- distinfo 23 Mar 2020 21:33:38 -0000 1.16 +++ distinfo 3 Feb 2021 08:53:00 -0000 @@ -1,2 +1,2 @@ -SHA256 (nokogiri-1.10.8.gem) = CAa4sFQYULWcT1iMU8/0LvLabH+i8LHLy4PRzCGSKPo= -SIZE (nokogiri-1.10.8.gem) = 9251328 +SHA256 (nokogiri-1.11.1.gem) = QsKlTdPvA+8lQxd77jtTCDEyFOmfDRqoX5hDJDKeXKo= +SIZE (nokogiri-1.11.1.gem) = 9266176 Index: patches/patch-_metadata =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/patches/patch-_metadata,v retrieving revision 1.4 diff -u -r1.4 patch-_metadata --- patches/patch-_metadata 15 Mar 2019 07:33:16 -0000 1.4 +++ patches/patch-_metadata 3 Feb 2021 08:53:00 -0000 @@ -6,10 +6,10 @@ Index: .metadata --- .metadata.orig +++ .metadata -@@ -23,7 +23,7 @@ dependencies: +@@ -40,7 +40,7 @@ dependencies: - - "~>" - !ruby/object:Gem::Version - version: 2.4.0 + version: 2.5.0 - type: :runtime + type: :development prerelease: false Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/pkg/PLIST,v retrieving revision 1.17 diff -u -r1.17 PLIST --- pkg/PLIST 23 Mar 2020 21:33:38 -0000 1.17 +++ pkg/PLIST 3 Feb 2021 08:53:00 -0000 @@ -3,6 +3,7 @@ ${GEM_LIB}/build_info/${DISTNAME}.info ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ +${GEM_LIB}/gems/${DISTNAME}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/LICENSE-DEPENDENCIES.md ${GEM_LIB}/gems/${DISTNAME}/LICENSE.md ${GEM_LIB}/gems/${DISTNAME}/README.md @@ -36,9 +37,14 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/parser.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/parser_context.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/push_parser.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/jruby/ +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/jruby/dependencies.rb @so ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/nokogiri.so ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/syntax_error.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/version/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/version.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/version/constant.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/version/info.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/xml/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/xml.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/xml/attr.rb @@ -94,5 +100,9 @@ ${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch ${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch ${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0005-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch +${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0006-htmlParseComment-treat-as-if-it-closed-the-comment.patch +${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0007-use-new-htmlParseLookupCommentEnd-to-find-comment-en.patch +${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0008-use-glibc-strlen.patch +${GEM_LIB}/gems/${DISTNAME}/patches/libxml2/0009-avoid-isnan-isinf.patch ${GEM_LIB}/gems/${DISTNAME}/ports/ ${GEM_LIB}/specifications/${DISTNAME}.gemspec
