CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/09 16:53:27 Modified files: devel : Makefile Log message: Unhook ruby-rb-gsl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/09 16:51:20 Modified files: graphics/ruby-rmagick: Makefile distinfo graphics/ruby-rmagick/pkg: PLIST Log message: Update to rmagick 5.1.0 Fixes issues when using llvm 15. Add new dependency on ruby-pkg-config. Remove test code as gem no longer ships tests. OK jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/09 16:49:57 Modified files: devel : Makefile Log message: Hookup ruby-pkg-config
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/09 16:48:43 Log message: Import ruby-pkg-config 1.5.1 New dependency of ruby-rmagick. OK jca@ Status: Vendor Tag: jeremy Release Tags: jeremy_2023-Jan-09 N ports/devel/ruby-pkg-config/Makefile N ports/devel/ruby-pkg-config/distinfo N ports/devel/ruby-pkg-config/pkg/DESCR N ports/devel/ruby-pkg-config/pkg/PLIST No conflicts created by this import
Re: graphics/ruby-rmagick 5.1.0
On 01/08 01:54, Jeremy Evans wrote: > This updates the ruby-rmagick port to the latest release. I've > confirmed that this doesn't have the code that jca@ found broke with > llvm 15. > > This requires a new dependency, ruby-pkg-config, which is attached. Looks like I forgot the attachment the first time. Here it is. > The gem no longer ships tests, so this disables the testing tasks. > > The only gem that depends on ruby-rmagick is ruby-gruff, which still > builds correctly. > > I plan on committing this in a couple days unless I hear objections. > > Thanks, > Jeremy > > Index: Makefile > === > RCS file: /cvs/ports/graphics/ruby-rmagick/Makefile,v > retrieving revision 1.36 > diff -u -p -r1.36 Makefile > --- Makefile 11 Mar 2022 19:23:22 - 1.36 > +++ Makefile 8 Jan 2023 21:47:46 - > @@ -1,7 +1,6 @@ > COMMENT =Ruby interface to ImageMagick > > -DISTNAME = rmagick-2.16.0 > -REVISION = 1 > +DISTNAME = rmagick-5.1.0 > CATEGORIES = graphics > > HOMEPAGE = https://github.com/rmagick/rmagick > @@ -13,11 +12,9 @@ MODULES = lang/ruby > > WANTLIB += MagickCore-6.Q16 MagickWand-6.Q16 > > +BUILD_DEPENDS = devel/ruby-pkg-config,${MODRUBY_FLAVOR}>=1.4,<2 > LIB_DEPENDS =graphics/ImageMagick > > CONFIGURE_STYLE = ruby gem ext > - > -TEST_DEPENDS = ${BASE_PKGPATH} > -MODRUBY_TEST = rspec3 > > .include > Index: distinfo > === > RCS file: /cvs/ports/graphics/ruby-rmagick/distinfo,v > retrieving revision 1.8 > diff -u -p -r1.8 distinfo > --- distinfo 4 Nov 2016 21:38:34 - 1.8 > +++ distinfo 8 Jan 2023 21:30:04 - > @@ -1,2 +1,2 @@ > -SHA256 (rmagick-2.16.0.gem) = BtPJaYidMQZRJ+kKYSkExXV4UpNCD20ESotN2lgJPVU= > -SIZE (rmagick-2.16.0.gem) = 1545728 > +SHA256 (rmagick-5.1.0.gem) = YJyewMj/SgRqwBBavxSwG3DfeGf/k1MfF7SyRKjIU4c= > +SIZE (rmagick-5.1.0.gem) = 241664 > Index: pkg/PLIST > === > RCS file: /cvs/ports/graphics/ruby-rmagick/pkg/PLIST,v > retrieving revision 1.11 > diff -u -p -r1.11 PLIST > --- pkg/PLIST 11 Mar 2022 19:23:22 - 1.11 > +++ pkg/PLIST 8 Jan 2023 21:47:37 - > @@ -1,347 +1,34 @@ > ${GEM_LIB}/cache/${DISTNAME}.gem > ${GEM_LIB}/gems/${DISTNAME}/ > +${GEM_LIB}/gems/${DISTNAME}/.codeclimate.yml > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/ > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/Dockerfile > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/ImageMagick6/ > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/ImageMagick6/devcontainer.json > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/devcontainer.json > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/setup-repo.sh > +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/setup-user.sh > ${GEM_LIB}/gems/${DISTNAME}/.editorconfig > +${GEM_LIB}/gems/${DISTNAME}/.github/ > +${GEM_LIB}/gems/${DISTNAME}/.github/ISSUE_TEMPLATE.md > +${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ > +${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ci.yml > ${GEM_LIB}/gems/${DISTNAME}/.gitignore > -${GEM_LIB}/gems/${DISTNAME}/.hound.yml > ${GEM_LIB}/gems/${DISTNAME}/.rspec > ${GEM_LIB}/gems/${DISTNAME}/.rubocop.yml > -${GEM_LIB}/gems/${DISTNAME}/.simplecov > -${GEM_LIB}/gems/${DISTNAME}/.travis.yml > +${GEM_LIB}/gems/${DISTNAME}/.rubocop_todo.yml > +${GEM_LIB}/gems/${DISTNAME}/.yardopts > ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md > ${GEM_LIB}/gems/${DISTNAME}/CODE_OF_CONDUCT.md > ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md > -${GEM_LIB}/gems/${DISTNAME}/Doxyfile > ${GEM_LIB}/gems/${DISTNAME}/Gemfile > ${GEM_LIB}/gems/${DISTNAME}/LICENSE > -${GEM_LIB}/gems/${DISTNAME}/README.textile > +${GEM_LIB}/gems/${DISTNAME}/README.md > ${GEM_LIB}/gems/${DISTNAME}/Rakefile > ${GEM_LIB}/gems/${DISTNAME}/before_install_linux.sh > ${GEM_LIB}/gems/${DISTNAME}/before_install_osx.sh > -${GEM_LIB}/gems/${DISTNAME}/deprecated/ > -${GEM_LIB}/gems/${DISTNAME}/deprecated/RMagick.rb > -${GEM_LIB}/gems/${DISTNAME}/doc/ > -${GEM_LIB}/gems/${DISTNAME}/doc/.cvsignore > -${GEM_LIB}/gems/${DISTNAME}/doc/comtasks.html > -${GEM_LIB}/gems/${DISTNAME}/doc/constants.html > -${GEM_LIB}/gems/${DISTNAME}/doc/css/ > -${GEM_LIB}/gems/${DISTNAME}/doc/css/doc.css > -${GEM_LIB}/gems/${DISTNAME}/doc/css/popup.css > -${GEM_LIB}/gems/${DISTNAME}/doc/css/ref.css > -${GEM_LIB}/gems/${DISTNAME}/doc/draw.html > -${GEM_LIB}/gems/${DISTNAME}/doc/ex/ > -${GEM_LIB}/gems/${DISTNAME}/doc/ex/InitialCoords.rb > -${GEM_LIB}/gems/${DISTNAME}/doc/ex/NewCoordSys.rb > -${GEM_LIB}/gems/${DISTNAME}/doc/ex/OrigCoordSys.rb > -${GEM_LIB}/gems/$
Drop devel/ruby-rb-gsl ?
This port has issues with llvm 15 (incompatible pointer to integer conversions). No port depends on this port. No release upstream, and what appears to be only a single pull request merged in almost 6 years. OKs to remove? Thanks, Jeremy
graphics/ruby-rmagick 5.1.0
This updates the ruby-rmagick port to the latest release. I've confirmed that this doesn't have the code that jca@ found broke with llvm 15. This requires a new dependency, ruby-pkg-config, which is attached. The gem no longer ships tests, so this disables the testing tasks. The only gem that depends on ruby-rmagick is ruby-gruff, which still builds correctly. I plan on committing this in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/graphics/ruby-rmagick/Makefile,v retrieving revision 1.36 diff -u -p -r1.36 Makefile --- Makefile11 Mar 2022 19:23:22 - 1.36 +++ Makefile8 Jan 2023 21:47:46 - @@ -1,7 +1,6 @@ COMMENT = Ruby interface to ImageMagick -DISTNAME = rmagick-2.16.0 -REVISION = 1 +DISTNAME = rmagick-5.1.0 CATEGORIES = graphics HOMEPAGE = https://github.com/rmagick/rmagick @@ -13,11 +12,9 @@ MODULES =lang/ruby WANTLIB += MagickCore-6.Q16 MagickWand-6.Q16 +BUILD_DEPENDS =devel/ruby-pkg-config,${MODRUBY_FLAVOR}>=1.4,<2 LIB_DEPENDS = graphics/ImageMagick CONFIGURE_STYLE = ruby gem ext - -TEST_DEPENDS = ${BASE_PKGPATH} -MODRUBY_TEST = rspec3 .include Index: distinfo === RCS file: /cvs/ports/graphics/ruby-rmagick/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo4 Nov 2016 21:38:34 - 1.8 +++ distinfo8 Jan 2023 21:30:04 - @@ -1,2 +1,2 @@ -SHA256 (rmagick-2.16.0.gem) = BtPJaYidMQZRJ+kKYSkExXV4UpNCD20ESotN2lgJPVU= -SIZE (rmagick-2.16.0.gem) = 1545728 +SHA256 (rmagick-5.1.0.gem) = YJyewMj/SgRqwBBavxSwG3DfeGf/k1MfF7SyRKjIU4c= +SIZE (rmagick-5.1.0.gem) = 241664 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/ruby-rmagick/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- pkg/PLIST 11 Mar 2022 19:23:22 - 1.11 +++ pkg/PLIST 8 Jan 2023 21:47:37 - @@ -1,347 +1,34 @@ ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ +${GEM_LIB}/gems/${DISTNAME}/.codeclimate.yml +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/ +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/Dockerfile +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/ImageMagick6/ +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/ImageMagick6/devcontainer.json +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/devcontainer.json +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/setup-repo.sh +${GEM_LIB}/gems/${DISTNAME}/.devcontainer/setup-user.sh ${GEM_LIB}/gems/${DISTNAME}/.editorconfig +${GEM_LIB}/gems/${DISTNAME}/.github/ +${GEM_LIB}/gems/${DISTNAME}/.github/ISSUE_TEMPLATE.md +${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ +${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ci.yml ${GEM_LIB}/gems/${DISTNAME}/.gitignore -${GEM_LIB}/gems/${DISTNAME}/.hound.yml ${GEM_LIB}/gems/${DISTNAME}/.rspec ${GEM_LIB}/gems/${DISTNAME}/.rubocop.yml -${GEM_LIB}/gems/${DISTNAME}/.simplecov -${GEM_LIB}/gems/${DISTNAME}/.travis.yml +${GEM_LIB}/gems/${DISTNAME}/.rubocop_todo.yml +${GEM_LIB}/gems/${DISTNAME}/.yardopts ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md ${GEM_LIB}/gems/${DISTNAME}/CODE_OF_CONDUCT.md ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md -${GEM_LIB}/gems/${DISTNAME}/Doxyfile ${GEM_LIB}/gems/${DISTNAME}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/LICENSE -${GEM_LIB}/gems/${DISTNAME}/README.textile +${GEM_LIB}/gems/${DISTNAME}/README.md ${GEM_LIB}/gems/${DISTNAME}/Rakefile ${GEM_LIB}/gems/${DISTNAME}/before_install_linux.sh ${GEM_LIB}/gems/${DISTNAME}/before_install_osx.sh -${GEM_LIB}/gems/${DISTNAME}/deprecated/ -${GEM_LIB}/gems/${DISTNAME}/deprecated/RMagick.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ -${GEM_LIB}/gems/${DISTNAME}/doc/.cvsignore -${GEM_LIB}/gems/${DISTNAME}/doc/comtasks.html -${GEM_LIB}/gems/${DISTNAME}/doc/constants.html -${GEM_LIB}/gems/${DISTNAME}/doc/css/ -${GEM_LIB}/gems/${DISTNAME}/doc/css/doc.css -${GEM_LIB}/gems/${DISTNAME}/doc/css/popup.css -${GEM_LIB}/gems/${DISTNAME}/doc/css/ref.css -${GEM_LIB}/gems/${DISTNAME}/doc/draw.html -${GEM_LIB}/gems/${DISTNAME}/doc/ex/ -${GEM_LIB}/gems/${DISTNAME}/doc/ex/InitialCoords.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/NewCoordSys.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/OrigCoordSys.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/PreserveAspectRatio.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/RotateScale.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/Skew.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/Use01.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/Use02.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/Use03.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/ViewBox.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/adaptive_threshold.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/add_noise.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/affine.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/affine_transform.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/arc.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/arcpath.rb -${GEM_LIB}/gems/${DISTNAME}/doc/ex/arcs01.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 20:05:07 Modified files: audio : Makefile databases : Makefile devel : Makefile graphics : Makefile net: Makefile security : Makefile sysutils : Makefile textproc : Makefile www: Makefile x11: Makefile Log message: Build ruby32 FLAVORs of ruby gem ext ports by default For devel/ruby-sorted_set and graphics/ruby-rqrcode-core, do not do FLAVORed builds by default, as these are pure ruby libraries with no native component.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:50:28 Modified files: audio/ruby-taglib: Makefile distinfo audio/ruby-taglib/pkg: PLIST Log message: Update to ruby-taglib 1.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:50:00 Modified files: x11/ruby-tk: Makefile distinfo Log message: Avoid warning on Ruby 3.2 using distpatch Switch to using Tk 8.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:48:46 Modified files: www/ruby-passenger: Makefile Added files: www/ruby-passenger/patches: patch-src_ruby_supportlib_phusion_passenger_platform_info_operating_system_rb Log message: Allow building on Ruby 3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:48:15 Modified files: sysutils/ruby-shadow: Makefile distinfo Log message: Add distpatches from GitHub pull requests to allow building and avoid warnings on Ruby 3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:47:02 Modified files: devel/ruby-prof: Makefile distinfo devel/ruby-prof/pkg: PLIST Log message: Update to ruby-prof 1.4.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:46:28 Modified files: databases/ruby-tiny_tds: Makefile distinfo Added files: databases/ruby-tiny_tds/patches: patch-ext_tiny_tds_result_c Log message: Update to tiny_tds 2.1.5 Add patch to avoid warning on Ruby 3.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/01/07 19:44:58 Modified files: lang/ruby/3.2 : Makefile Added files: lang/ruby/3.2/patches: patch-lib_rubygems_update_suggestion_rb Log message: Avoid printing of nagging rubygems update message
Prepare for building Ruby 3.2 ports with native extensions by default
by-shadow-config-fix.patch) = 1151 +SIZE (ruby-shadow-taint-fix.patch) = 2265 Index: www/ruby-passenger/Makefile === RCS file: /cvs/ports/www/ruby-passenger/Makefile,v retrieving revision 1.68 diff -u -p -r1.68 Makefile --- www/ruby-passenger/Makefile 11 Mar 2022 20:10:55 - 1.68 +++ www/ruby-passenger/Makefile 6 Jan 2023 00:45:54 - @@ -5,6 +5,7 @@ BROKEN-hppa = rake fails when linking P PASS_VERSION = 6.0.4 NGINX_VERSION =1.16.1 DISTNAME = passenger-${PASS_VERSION} +REVISION = 0 ONLY_FOR_ARCHS = aarch64 amd64 arm i386 Index: www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_operating_system_rb === RCS file: www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_operating_system_rb diff -N www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_operating_system_rb --- /dev/null 1 Jan 1970 00:00:00 - +++ www/ruby-passenger/patches/patch-src_ruby_supportlib_phusion_passenger_platform_info_operating_system_rb 5 Jan 2023 23:06:27 - @@ -0,0 +1,14 @@ +Remove use of File.exists?, removed in Ruby 3.2 + +Index: src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb +--- src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb.orig src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb +@@ -236,7 +236,7 @@ module PhusionPassenger + memoize :supports_lfence_instruction?, true + + def self.requires_no_tls_direct_seg_refs? +- return File.exists?("/proc/xen/capabilities") && cpu_architectures[0] == "x86" ++ return File.exist?("/proc/xen/capabilities") && cpu_architectures[0] == "x86" + end + memoize :requires_no_tls_direct_seg_refs?, true + end Index: x11/ruby-tk/Makefile === RCS file: /cvs/ports/x11/ruby-tk/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- x11/ruby-tk/Makefile11 Mar 2022 20:17:18 - 1.8 +++ x11/ruby-tk/Makefile6 Jan 2023 00:42:44 - @@ -1,16 +1,22 @@ -COMMENT= ruby graphical tooklit using Tk +COMMENT= Ruby interface to the Tk graphical toolkit DISTNAME= tk-0.4.0 CATEGORIES=x11 +REVISION= 0 HOMEPAGE= https://github.com/ruby/tk MAINTAINER=Jeremy Evans +MASTER_SITES0= https://github.com/ruby/tk/commit/ +PATCHFILES= ruby-tk-undef-fix{bf02b2aaa1e4d7688b84ea771a56d9d53e63015c}.patch:0 +PATCH_DIST_STRIP= -p1 + # MIT PERMIT_PACKAGE=Yes MODULES= lang/ruby x11/tk +MODTK_VERSION= 8.6 CONFIGURE_STYLE= ruby gem ext @@ -21,7 +27,7 @@ CONFIGURE_ARGS = --with-tcl-include=${MO --with-tcllib=${MODTCL_LIB} \ --with-tklib=${MODTK_LIB} \ --with-X11-dir=${X11BASE} -WANTLIB = X11 ${MODTCL_LIB} ${MODTK_LIB} +WANTLIB = X11 ${MODTK_WANTLIB} LIB_DEPENDS = ${MODTK_LIB_DEPENDS} .include Index: x11/ruby-tk/distinfo === RCS file: /cvs/ports/x11/ruby-tk/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- x11/ruby-tk/distinfo26 May 2021 20:35:49 - 1.3 +++ x11/ruby-tk/distinfo6 Jan 2023 00:07:24 - @@ -1,2 +1,4 @@ +SHA256 (ruby-tk-undef-fix.patch) = 3sW75HfWh66KtK5/WCIHrcY4K74zKFwlwtTj2+XO1ZA= SHA256 (tk-0.4.0.gem) = ar/8VrYKR+g6+acG0b9doQzmmOgSGfgdq24tTYZtt6o= +SIZE (ruby-tk-undef-fix.patch) = 919 SIZE (tk-0.4.0.gem) = 1721856
Avoid rubygems upgrade nag message in Ruby 3.2 rubygems
This disables messages like this when trying to install a gem: A new release of RubyGems is available: 3.4.1 - 3.4.2! Run `gem update --system 3.4.2` to update your installation. I'll be committing this in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/lang/ruby/3.2/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile26 Dec 2022 03:03:57 - 1.1.1.1 +++ Makefile5 Jan 2023 00:20:54 - @@ -3,6 +3,7 @@ DISTNAME = ruby-${VERSION} SHARED_LIBS = ruby32 0.0 NEXTVER = 3.3 PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER} +REVISION-main =0 PSEUDO_FLAVORS=no_ri_docs bootstrap # Do not build the RI docs on slow arches Index: patches/patch-lib_rubygems_update_suggestion_rb === RCS file: patches/patch-lib_rubygems_update_suggestion_rb diff -N patches/patch-lib_rubygems_update_suggestion_rb --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-lib_rubygems_update_suggestion_rb 5 Jan 2023 00:20:54 - @@ -0,0 +1,22 @@ +Avoid printing of nagging update message: + + A new release of RubyGems is available: 3.4.1 - 3.4.2! + Run `gem update --system 3.4.2` to update your installation. + +When using the OpenBSD port, important updates to rubygems will +be distributed via normal updates to the related ruby ports. + +return false while true is used instead of plain return false to +avoid the statement not reached verbose mode warning. + +Index: lib/rubygems/update_suggestion.rb +--- lib/rubygems/update_suggestion.rb.orig lib/rubygems/update_suggestion.rb +@@ -31,6 +31,7 @@ Run `gem update --system #{Gem.latest_rubygems_version + # Determines if current environment is eglible for update suggestion. + + def eglible_for_update? ++return false while true + # explicit opt-out + return false if Gem.configuration[:prevent_update_suggestion] + return false if ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
Re: Ruby 3.2.0
On 12/26 10:07, George Koehler wrote: > On Sun, 25 Dec 2022 15:52:33 + (UTC) > Jeremy Evans wrote: > > > Ruby 3.2.0 was released today, release announcement at: > > https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ > > I tried to build lang/ruby/3.2 after you imported it, but an installed > devel/ruby-shims broke "make fake". I fixed the build by adding > CONFIGURE_ENV += --without-baseruby > > I also observe that ruby%3.2 would depend on ruby%3.1 if your arch has > yjit (amd64, aarch64). The chain of build dependencies is > > lang/ruby/3.2 -> lang/rust -> devel/llvm > -> devel/swig -> lang/ruby/3.1 > > If the default ruby changed from 3.1 to 3.2, this might become a > circular dependency. Agreed. One approach is hard coding the Ruby version used for swig: Index: Makefile === RCS file: /cvs/ports/devel/swig/Makefile,v retrieving revision 1.80 diff -u -p -r1.80 Makefile --- Makefile2 Nov 2022 16:37:58 - 1.80 +++ Makefile28 Dec 2022 01:38:07 - @@ -23,6 +23,9 @@ MODULES = lang/python \ MODRUBY_RUNDEP = No +# Do not update to 3.2+ +MODRUBY_REV = 3.1 + MODPY_RUNDEP = No MODPHP_BUILDDEP = Yes This only gets us a couple extra years (till we drop Ruby 3.1 support). An alternative approach is adding a no_yjit FLAVOR to Ruby 3.2+, and have swig depend on that. Maybe a committer with more experience dealing with these issues can propose a better solution? > My build failed on powerpc (no yjit), but I had installed both > ruby 3.1.2 and ruby-shims for other reasons. (I hadn't upgraded to > 3.1.3.) "make configure" detected 3.1.2 via the shim, > > configure: loading site script /usr/ports/pobj/ruby-3.2.0/config.site > checking for ruby... /usr/local/bin/ruby > ruby31: No such file or directory -- tool/downloader.rb (LoadError) > checking build system type... powerpc-unknown-openbsd7.2 > ... >* man page type: doc >* BASERUBY -v: ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) \ > [powerpc-openbsd] > > In "make fake", baseruby failed to require tool/downloader.rb because > we had deleted it in POST_EXTRACT. I don't need to download gems nor > run baseruby, because ruby-3.2.0.tar.gz has all the stuff. (When I > build ruby from git, I need baseruby.) I add --without-baseruby to > ignore ruby-shims and package ruby%3.2 normally. > > I put CONFIGURE_ENV += --without-baseruby in 3.2/Makefile.inc, but it > should probably go in Makefile.inc. > --George OK jeremy@ for putting it in Makefile.inc. No bumps required, since it should be a no-op if a ruby binary is not present. > > Index: 3.2/Makefile > === > RCS file: /cvs/ports/lang/ruby/3.2/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- 3.2/Makefile 26 Dec 2022 03:03:57 - 1.1.1.1 > +++ 3.2/Makefile 27 Dec 2022 02:31:36 - > @@ -30,6 +30,7 @@ COMPILER = base-clang ports-gcc > > # Fix path for JIT compiler to not use shims in ports obj bin dir > CONFIGURE_ENV += ac_cv_path_MJIT_CC=`which ${CC}` > +CONFIGURE_ARGS +=--without-baseruby > > GEM_EXTENSIONS_DIR = > lib/ruby/gems/${REV}/extensions/${MACHINE_ARCH:S/i386/x86/:S/amd64/x86_64/}-openbsd > SUBST_VARS += GEM_EXTENSIONS_DIR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/12/25 20:06:59 Modified files: lang/ruby : Makefile.inc Log message: Use explicit instead of implicit minor version for ruby version No effect for official releases. Makes testing beta releases easier. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/12/25 20:05:16 Modified files: lang/ruby : ruby.port.mk Log message: Use ruby32 FLAVOR for building Ruby 3.2 ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/12/25 20:03:59 Log message: Import Ruby 3.2.0 sparc64 compiler fix and arm64 testing from tb@ OK tb@ Status: Vendor Tag: jeremy Release Tags: jeremy_2022-Dec-25 N ports/lang/ruby/3.2/Makefile N ports/lang/ruby/3.2/distinfo N ports/lang/ruby/3.2/patches/patch-common_mk N ports/lang/ruby/3.2/patches/patch-compile_c N ports/lang/ruby/3.2/patches/patch-configure N ports/lang/ruby/3.2/patches/patch-ext_etc_etc_c N ports/lang/ruby/3.2/patches/patch-ext_extmk_rb N ports/lang/ruby/3.2/patches/patch-ext_ripper_depend N ports/lang/ruby/3.2/patches/patch-lib_fileutils_rb N ports/lang/ruby/3.2/patches/patch-lib_rubygems_ext_builder_rb N ports/lang/ruby/3.2/patches/patch-lib_mkmf_rb N ports/lang/ruby/3.2/patches/patch-lib_rubygems_commands_install_command_rb N ports/lang/ruby/3.2/patches/patch-lib_rubygems_dependency_installer_rb N ports/lang/ruby/3.2/patches/patch-thread_pthread_h N ports/lang/ruby/3.2/patches/patch-lib_rubygems_ext_ext_conf_builder_rb N ports/lang/ruby/3.2/patches/patch-template_builtin_binary_inc_tmpl N ports/lang/ruby/3.2/pkg/DESCR-main N ports/lang/ruby/3.2/pkg/DESCR-ri_docs N ports/lang/ruby/3.2/pkg/MESSAGE-main N ports/lang/ruby/3.2/pkg/PLIST-main N ports/lang/ruby/3.2/pkg/PLIST-ri_docs N ports/lang/ruby/3.2/pkg/UNMESSAGE-main No conflicts created by this import
Ruby 3.2.0
Ruby 3.2.0 was released today, release announcement at: https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ Diff below for ruby.port.mk to build Ruby 3.2 packages for Ruby library ports. I've been testing Ruby 3.2.0 on amd64 since beta1. OKs to import? Thanks, Jeremy Index: ruby.port.mk === RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v retrieving revision 1.109 diff -u -p -r1.109 ruby.port.mk --- ruby.port.mk31 Oct 2022 20:28:25 - 1.109 +++ ruby.port.mk11 Nov 2022 05:22:27 - @@ -22,7 +22,7 @@ MODRUBY_HANDLE_FLAVORS ?= No # If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR # for each ruby interpreter .if !defined(FLAVORS) -FLAVORS= ruby27 ruby30 ruby31 +FLAVORS= ruby27 ruby30 ruby31 ruby32 . if !${CONFIGURE_STYLE:L:Mext} FLAVORS+= jruby . endif @@ -50,7 +50,7 @@ FLAVOR = ruby31 # Check for conflicting FLAVORs and set MODRUBY_REV appropriately based # on the FLAVOR. -.for i in ruby27 ruby30 ruby31 jruby +.for i in ruby27 ruby30 ruby31 ruby32 jruby . if ${FLAVOR:M$i} MODRUBY_REV = ${i:C/ruby([0-9])/\1./} .if ${FLAVOR:N$i:Mruby27} || \ ruby32.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/12/23 09:44:53 Modified files: lang/jruby : Makefile distinfo lang/jruby/patches: patch-jffi_build_xml lang/jruby/pkg : PLIST Log message: Update to JRuby 9.4.0.0 Update embedded jffi to 1.3.10. Use Java 17 instead of 1.8. Create appropriate site_ruby directory.
JRuby 9.3.9.0 -> 9.4.0.0
This updates JRuby to the latest release, 9.4.0.0. This is a large jump over 9.3.9.0, as the version of Ruby being implemented is updated from 2.6 to 3.1 (skipping 2.7 and 3.0). Release announcement at https://www.jruby.org/2022/11/23/jruby-9-4-0-0.html Porting wise, I'm switching the Java version from 1.8 to 17, to take advantage of the performance improvements. JRuby 9.5 is going to drop Java 1.8 support. This fixes the creation of the site_ruby directory to match the version of Ruby in use. Previously, it created site_ruby directories for 1.8, 1.9, 2.0, which probably dates back to JRuby 1.7. Tested on amd64, the only supported arch. I plan to commit this in a few days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.105 diff -u -p -r1.105 Makefile --- Makefile26 Oct 2022 21:49:34 - 1.105 +++ Makefile19 Dec 2022 21:40:32 - @@ -3,12 +3,12 @@ ONLY_FOR_ARCHS = amd64 COMMENT = pure-Java implementation of the Ruby language -V =9.3.9.0 +V =9.4.0.0 DISTNAME = jruby-dist-${V}-bin PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby DISTFILES =${DISTNAME}.tar.gz \ - jffi-1.3.5.tar.gz:0 \ + jffi-1.3.10.tar.gz:0 \ ${JRUBY_LAUNCHER_GEM}:1 HOMEPAGE = http://www.jruby.org/ @@ -23,7 +23,7 @@ MASTER_SITES0 = https://github.com/jnr/j MASTER_SITES1 =${MASTER_SITE_RUBYGEMS} MODULES = java -MODJAVA_VER = 1.8+ +MODJAVA_VER = 17+ MODJAVA_BUILD =ant USE_GMAKE =Yes @@ -42,6 +42,7 @@ JFFI_HOME = ${WRKDIST}/jffi JFFI_ARCH =${MACHINE_ARCH:S/amd64/x86_64/}-OpenBSD FFI_ARCH = ${JFFI_ARCH:L} JRUBY_LAUNCHER_GEM = jruby-launcher-1.1.19-java.gem +JRUBY_RUBY_VERSION = 3.1 SUBST_VARS = JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V RDOC_V JAVA_HOME MODJAVA_BUILD_DIR = ${JFFI_HOME} @@ -77,13 +78,13 @@ do-install: ln -s ${TRUEPREFIX}/jruby/bin/jruby ${PREFIX}/bin/jruby ${INSTALL_DATA_DIR} ${JRUBY_HOME} ${INSTALL_DATA_DIR} ${JRUBY_HOME}/bin - for file in ast bundle bundler gem jgem jirb jirb_swing jruby jrubyc racc rake rdoc ri; \ + for file in ast bundle bundler erb irb gem jgem jirb jirb_swing jruby jrubyc racc rake rdoc ri; \ do ${INSTALL_SCRIPT} ${WRKBUILD}/bin/$$file ${JRUBY_HOME}/bin/$$file; \ done ${INSTALL_DATA_DIR} ${JRUBY_HOME}/lib cd ${WRKBUILD}/lib && tar -cf - * | \ tar -C ${JRUBY_HOME}/lib -xf - - mkdir -p ${JRUBY_HOME}/lib/ruby/{1.8,1.9,2.0}/site_ruby + mkdir -p ${JRUBY_HOME}/lib/ruby/${JRUBY_RUBY_VERSION}/site_ruby find ${JRUBY_HOME}/lib \( -name '*.orig' -o -name '*.beforesubst' \) \ -delete mv ${JRUBY_HOME}/lib/ruby/gems/{shared,1.8} Index: distinfo === RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.71 diff -u -p -r1.71 distinfo --- distinfo26 Oct 2022 21:49:34 - 1.71 +++ distinfo19 Dec 2022 21:30:11 - @@ -1,6 +1,6 @@ -SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ= -SHA256 (jruby-dist-9.3.9.0-bin.tar.gz) = JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg= +SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw= +SHA256 (jruby-dist-9.4.0.0-bin.tar.gz) = iXu4qYrUOty/X9OqdeyFszEoOMlJWSyj9iPcH1adKHA= SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo= -SIZE (jffi-1.3.5.tar.gz) = 3152240 -SIZE (jruby-dist-9.3.9.0-bin.tar.gz) = 28614865 +SIZE (jffi-1.3.10.tar.gz) = 3304571 +SIZE (jruby-dist-9.4.0.0-bin.tar.gz) = 29468004 SIZE (jruby-launcher-1.1.19-java.gem) = 64000 Index: patches/patch-jffi_build_xml === RCS file: /cvs/ports/lang/jruby/patches/patch-jffi_build_xml,v retrieving revision 1.5 diff -u -p -r1.5 patch-jffi_build_xml --- patches/patch-jffi_build_xml11 Mar 2022 19:29:04 - 1.5 +++ patches/patch-jffi_build_xml19 Dec 2022 21:32:37 - @@ -3,7 +3,7 @@ Work with Java 10+. Index: jffi/build.xml --- jffi/build.xml.orig +++ jffi/build.xml -@@ -146,8 +146,9 @@ +@@ -151,8 +151,9 @@ @@ -14,7 +14,7 @@ Index: jffi/build.xml -@@ -315,27 +316,10 @@ +@@ -320,27 +321,10 @@ Index: pkg/PLIST === RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v retrieving revision 1.62 diff -u -p -r1.62 PLIST --- pkg/PLIST 26 Oct 2022 21:49:34 - 1.62 +++ pkg/PLIST 19 Dec 2022 23:02:20 - @@ -4,8 +4,10 @@ jruby/bin/ jruby/bin/ast jruby/bin/bundle jruby/bin/bundler +jruby/bin/erb jruby/bin/gem jruby/bin/jgem +jruby/bin/irb jruby/bin/jirb jruby/bin/jirb_swing @bin jruby/bin/jruby @@ -20,443 +22,587 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/28 08:47:51 Modified files: sysutils/ruby-r10k: Makefile sysutils/ruby-r10k/pkg: PLIST Log message: Unbreak after upgrade to Ruby 3.1.3
Re: Ruby 3.1.3, 3.0.5, 2.7.7
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? Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/sysutils/ruby-r10k/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile11 Mar 2022 19:57:59 - 1.41 +++ Makefile27 Nov 2022 17:21:37 - @@ -4,6 +4,7 @@ DISTNAME = r10k-3.14.2 CATEGORIES = sysutils HOMEPAGE = https://github.com/puppetlabs/r10k MAINTAINER = Sebastian Reitenbach +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 - 1.28 +++ pkg/PLIST 27 Nov 2022 17:21:27 - @@ -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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/26 18:16:40 Modified files: lang/ruby/3.1 : Tag: OPENBSD_7_2 Makefile distinfo lang/ruby/3.1/patches: Tag: OPENBSD_7_2 patch-common_mk patch-configure patch-ext_extmk_rb patch-ext_openssl_ossl_pkey_c patch-lib_mkmf_rb lang/ruby/3.1/pkg: Tag: OPENBSD_7_2 PLIST-main PLIST-ri_docs Added files: lang/ruby/3.1/patches: Tag: OPENBSD_7_2 patch-lib_rubygems_ext_builder_rb Removed files: lang/ruby/3.1/patches: Tag: OPENBSD_7_2 patch-lib_rubygems_ext_ext_conf_builder_rb Log message: Update to Ruby 3.1.3 Remove patch for the removing the capstone detection, no longer needed. Update patch for gem install --user-install, needed due to changes in rubygems.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/26 18:14:40 Modified files: lang/ruby/3.0 : Tag: OPENBSD_7_2 Makefile distinfo lang/ruby/3.0/patches: Tag: OPENBSD_7_2 patch-configure patch-ext_extmk_rb lang/ruby/3.0/pkg: Tag: OPENBSD_7_2 PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/26 18:13:50 Modified files: lang/ruby/2.7 : Tag: OPENBSD_7_2 Makefile distinfo lang/ruby/2.7/patches: Tag: OPENBSD_7_2 patch-configure patch-ext_extmk_rb lang/ruby/2.7/pkg: Tag: OPENBSD_7_2 PLIST-main PLIST-ri_docs Log message: Update to Ruby 2.7.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/26 18:10:37 Modified files: lang/ruby/3.1 : Makefile distinfo lang/ruby/3.1/patches: patch-common_mk patch-configure patch-ext_extmk_rb patch-ext_openssl_ossl_pkey_c patch-lib_mkmf_rb lang/ruby/3.1/pkg: PLIST-main PLIST-ri_docs Added files: lang/ruby/3.1/patches: patch-lib_rubygems_ext_builder_rb Removed files: lang/ruby/3.1/patches: patch-lib_rubygems_ext_ext_conf_builder_rb Log message: Update to Ruby 3.1.3 Remove patch for the removing the capstone detection, no longer needed. Update patch for gem install --user-install, needed due to changes in rubygems.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/26 18:10:09 Modified files: lang/ruby/3.0 : Makefile distinfo lang/ruby/3.0/patches: patch-configure patch-ext_extmk_rb lang/ruby/3.0/pkg: PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/26 18:09:54 Modified files: lang/ruby/2.7 : Makefile distinfo lang/ruby/2.7/patches: patch-configure patch-ext_extmk_rb lang/ruby/2.7/pkg: PLIST-main PLIST-ri_docs Log message: Update to Ruby 2.7.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/24 17:20:16 Modified files: www/ruby-puma : Makefile distinfo www/ruby-puma/pkg: PLIST Log message: Update to puma 6.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/24 17:19:52 Modified files: databases/ruby-sqlite3: Makefile distinfo databases/ruby-sqlite3/pkg: PLIST Added files: databases/ruby-sqlite3/patches: patch-_metadata Log message: Update to ruby sqlite3 1.5.4 Upstream changed to using an embedded SQLite by default. Use --enable-system-libraries to use the system SQLite. Add a build dependency on ruby-mini_portile2, and add a patch so it isn't needed at runtime.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/24 17:17:27 Modified files: databases/ruby-pg: Makefile distinfo Log message: Update to pg 1.4.5
Ruby 3.1.3, 3.0.5, 2.7.7
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/ This fixes one security issue in CGI: https://www.ruby-lang.org/en/news/2022/11/22/http-response-splitting-in-cgi-cve-2021-33621/ Briefly tested on amd64. I'll be running more tests, and plan to commit in a couple days. I'll also update -stable afterwards. Thanks, Jeremy Index: 2.7/Makefile === RCS file: /cvs/ports/lang/ruby/2.7/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- 2.7/Makefile4 Jul 2022 16:29:03 - 1.21 +++ 2.7/Makefile24 Nov 2022 18:43:44 - @@ -1,4 +1,4 @@ -VERSION = 2.7.6 +VERSION = 2.7.7 DISTNAME = ruby-${VERSION} SHARED_LIBS = ruby27 0.0 NEXTVER = 2.8 Index: 2.7/distinfo === RCS file: /cvs/ports/lang/ruby/2.7/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- 2.7/distinfo14 Apr 2022 20:32:06 - 1.10 +++ 2.7/distinfo24 Nov 2022 18:43:55 - @@ -1,4 +1,4 @@ SHA256 (ruby-2.7-ffi-closure-fix.patch) = 4MKbiJzsl+VKRd24hZ4wWmiRQnEJgMKGcZS2KUsN1TU= -SHA256 (ruby-2.7.6.tar.gz) = 5yA7DMCUQu0sCJNtSD+KwUDsHHLje7XEAWRreGbLXRA= +SHA256 (ruby-2.7.7.tar.gz) = 4QEn22kdf/NkAs/oj0GMjQJaPx7qkgRLFi3XLwuMe5A= SIZE (ruby-2.7-ffi-closure-fix.patch) = 1033 -SIZE (ruby-2.7.6.tar.gz) = 16919639 +SIZE (ruby-2.7.7.tar.gz) = 16947579 Index: 2.7/patches/patch-configure === RCS file: /cvs/ports/lang/ruby/2.7/patches/patch-configure,v retrieving revision 1.4 diff -u -p -r1.4 patch-configure --- 2.7/patches/patch-configure 11 Mar 2022 19:29:13 - 1.4 +++ 2.7/patches/patch-configure 24 Nov 2022 18:44:51 - @@ -6,7 +6,7 @@ so ports don't have to be bumped when Op Index: configure --- configure.orig +++ configure -@@ -28775,7 +28775,7 @@ fi +@@ -29967,7 +29967,7 @@ fi ;; #( openbsd*|mirbsd*) : @@ -15,12 +15,12 @@ Index: configure ;; #( solaris*) : -@@ -30336,7 +30336,7 @@ _ACEOF +@@ -31603,7 +31603,7 @@ fi - else + else $as_nop -arch="${target_cpu}-${target_os}" +arch="${target_cpu}-openbsd" - cat >>confdefs.h <<_ACEOF - #define RUBY_PLATFORM "$arch" - _ACEOF + printf "%s\n" "#define RUBY_PLATFORM \"$arch\"" >>confdefs.h + + Index: 2.7/patches/patch-ext_extmk_rb === RCS file: /cvs/ports/lang/ruby/2.7/patches/patch-ext_extmk_rb,v retrieving revision 1.2 diff -u -p -r1.2 patch-ext_extmk_rb --- 2.7/patches/patch-ext_extmk_rb 11 Mar 2022 19:29:13 - 1.2 +++ 2.7/patches/patch-ext_extmk_rb 24 Nov 2022 18:44:46 - @@ -3,7 +3,7 @@ Build extensions in verbose mode by defa Index: ext/extmk.rb --- ext/extmk.rb.orig +++ ext/extmk.rb -@@ -646,7 +646,7 @@ exts.map! {|d| "#{ext_prefix}/#{d}/."} +@@ -649,7 +649,7 @@ exts.map! {|d| "#{ext_prefix}/#{d}/."} FileUtils.makedirs(File.dirname($command_output)) begin atomic_write_open($command_output) do |mf| Index: 2.7/pkg/PLIST-main === RCS file: /cvs/ports/lang/ruby/2.7/pkg/PLIST-main,v retrieving revision 1.9 diff -u -p -r1.9 PLIST-main --- 2.7/pkg/PLIST-main 14 Apr 2022 20:32:06 - 1.9 +++ 2.7/pkg/PLIST-main 24 Nov 2022 18:54:58 - @@ -45,7 +45,7 @@ include/ruby-${REV}/ruby/util.h include/ruby-${REV}/ruby/version.h include/ruby-${REV}/ruby/vm.h include/ruby-${REV}/${SUB}/ -include/ruby-${REV}/${SUB}/rb_mjit_min_header-2.7.6.h +include/ruby-${REV}/${SUB}/rb_mjit_min_header-2.7.7.h include/ruby-${REV}/${SUB}/ruby/ include/ruby-${REV}/${SUB}/ruby/config.h @so lib/libruby27.so @@ -1402,7 +1402,7 @@ lib/ruby/gems/${REV}/gems/bundler-2.1.4/ lib/ruby/gems/${REV}/gems/bundler-2.1.4/libexec/ lib/ruby/gems/${REV}/gems/bundler-2.1.4/libexec/bundle lib/ruby/gems/${REV}/gems/bundler-2.1.4/libexec/bundler -lib/ruby/gems/${REV}/gems/cgi-0.1.0.1/ +lib/ruby/gems/${REV}/gems/cgi-0.1.0.2/ lib/ruby/gems/${REV}/gems/csv-3.1.2/ lib/ruby/gems/${REV}/gems/date-3.0.3/ lib/ruby/gems/${REV}/gems/dbm-1.1.0/ @@ -1478,7 +1478,7 @@ lib/ruby/gems/${REV}/gems/net-telnet-0.2 lib/ruby/gems/${REV}/gems/net-telnet-0.2.0/net-telnet.gemspec lib/ruby/gems/${REV}/gems/observer-0.1.0/ lib/ruby/gems/${REV}/gems/open3-0.1.0/ -lib/ruby/gems/${REV}/gems/openssl-2.1.3/ +lib/ruby/gems/${REV}/gems/openssl-2.1.4/ lib/ruby/gems/${REV}/gems/ostruct-0.2.0/ lib/ruby/gems/${REV}/gems/power_assert-1.1.7/ lib/ruby/gems/${REV}/gems/power_assert-1.1.7/.gitignore @@ -1764,7 +1764,7 @@ lib/ruby/gems/${REV}/specifications/defa
Update ruby-puma 6.0.0
This updates to the latest version of puma. Changelog at https://github.com/puma/puma/blob/v6.0.0/History.md Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/www/ruby-puma/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile23 Aug 2022 17:55:22 - 1.13 +++ Makefile14 Oct 2022 02:09:15 - @@ -1,6 +1,6 @@ COMMENT = simple, fast, threaded webserver for rack applications -DISTNAME = puma-5.6.5 +DISTNAME = puma-6.0.0 CATEGORIES = www HOMEPAGE = https://puma.io/ Index: distinfo === RCS file: /cvs/ports/www/ruby-puma/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo23 Aug 2022 17:55:22 - 1.9 +++ distinfo14 Oct 2022 02:09:19 - @@ -1,2 +1,2 @@ -SHA256 (puma-5.6.5.gem) = ZhAp0VoRXp9sBkGmnIMP/Z8bmsY/zQeR2UzNkA4D+GM= -SIZE (puma-5.6.5.gem) = 208384 +SHA256 (puma-6.0.0.gem) = KvMRCVdPIlog/y1l5SvT9F4edYtaRa5Q6WLli2uvS/k= +SIZE (puma-6.0.0.gem) = 218112 Index: pkg/PLIST === RCS file: /cvs/ports/www/ruby-puma/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 23 Aug 2022 17:55:22 - 1.9 +++ pkg/PLIST 14 Oct 2022 02:10:21 - @@ -29,6 +29,8 @@ ${GEM_LIB}/gems/${DISTNAME}/docs/restart ${GEM_LIB}/gems/${DISTNAME}/docs/signals.md ${GEM_LIB}/gems/${DISTNAME}/docs/stats.md ${GEM_LIB}/gems/${DISTNAME}/docs/systemd.md +${GEM_LIB}/gems/${DISTNAME}/docs/testing_benchmarks_local_files.md +${GEM_LIB}/gems/${DISTNAME}/docs/testing_test_rackup_ci_files.md ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma.rb @@ -52,7 +54,10 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/eve ${GEM_LIB}/gems/${DISTNAME}/lib/puma/io_buffer.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/jruby_restart.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/json_serialization.rb +${GEM_LIB}/gems/${DISTNAME}/lib/puma/launcher/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/launcher.rb +${GEM_LIB}/gems/${DISTNAME}/lib/puma/launcher/bundle_pruner.rb +${GEM_LIB}/gems/${DISTNAME}/lib/puma/log_writer.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl/context_builder.rb @@ -61,7 +66,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/plu ${GEM_LIB}/gems/${DISTNAME}/lib/puma/plugin.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/plugin/tmp_restart.rb @so ${GEM_LIB}/gems/${DISTNAME}/lib/puma/puma_http11.so -${GEM_LIB}/gems/${DISTNAME}/lib/puma/queue_close.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/builder.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/urlmap.rb
Update ruby-sqlite3 1.5.4
This updates to the latest version of the sqlite3 gem. Changelog here: https://github.com/sparklemotion/sqlite3-ruby/blob/v1.5.4/CHANGELOG.md They made significant changes to the gem since the previous release. They now embed SQLite by default. This uses --enable-system-libraries when building to link against the system SQLite instead of using the embedded version. There is now a build dependency on mini_portile2. Just as in ruby-nokogiri, we modify the gem metadata so we can make mini_portile2 a build dependency instead of a run dependency. Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-sqlite3/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile11 Mar 2022 18:31:45 - 1.46 +++ Makefile22 Nov 2022 18:33:31 - @@ -1,6 +1,6 @@ COMMENT= access a SQLite3 database from ruby -DISTNAME= sqlite3-1.4.2 +DISTNAME= sqlite3-1.5.4 CATEGORIES=databases MAINTAINER = Jeremy Evans @@ -14,8 +14,10 @@ MODULES= lang/ruby WANTLIB= sqlite3 LIB_DEPENDS= databases/sqlite3 +BUILD_DEPENDS= devel/ruby-mini_portile2,${MODRUBY_FLAVOR}>=2.7.0,<3.0 CONFIGURE_STYLE= ruby gem ext +CONFIGURE_ARGS=--enable-system-libraries MODRUBY_TEST= rake TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR} \ Index: distinfo === RCS file: /cvs/ports/databases/ruby-sqlite3/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo3 Feb 2020 19:03:27 - 1.19 +++ distinfo22 Nov 2022 18:26:37 - @@ -1,2 +1,2 @@ -SHA256 (sqlite3-1.4.2.gem) = 6LjvOw91wY4afuYsVnjIJ+mTieU/pV63qaX1dFkASlI= -SIZE (sqlite3-1.4.2.gem) = 70656 +SHA256 (sqlite3-1.5.4.gem) = XU9r7SOmKWUcll9RB4YfEd9HnXTu7zpw1uxwLygRIQE= +SIZE (sqlite3-1.5.4.gem) = 3167744 Index: patches/patch-_metadata === RCS file: patches/patch-_metadata diff -N patches/patch-_metadata --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-_metadata 22 Nov 2022 18:30:27 - @@ -0,0 +1,15 @@ +Make mini_portile2 a development dependency, as it is only needed +for building. + +Index: .metadata +--- .metadata.orig .metadata +@@ -19,7 +19,7 @@ dependencies: + - - "~>" + - !ruby/object:Gem::Version + version: 2.8.0 +- type: :runtime ++ type: :development + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: Index: pkg/PLIST === RCS file: /cvs/ports/databases/ruby-sqlite3/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- pkg/PLIST 11 Mar 2022 18:31:45 - 1.16 +++ pkg/PLIST 22 Nov 2022 18:35:33 - @@ -1,17 +1,17 @@ ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/.gemtest -${GEM_LIB}/gems/${DISTNAME}/.travis.yml -${GEM_LIB}/gems/${DISTNAME}/API_CHANGES.rdoc -${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.rdoc +${GEM_LIB}/gems/${DISTNAME}/API_CHANGES.md +${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md +${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md ${GEM_LIB}/gems/${DISTNAME}/ChangeLog.cvs ${GEM_LIB}/gems/${DISTNAME}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/LICENSE -${GEM_LIB}/gems/${DISTNAME}/Manifest.txt -${GEM_LIB}/gems/${DISTNAME}/README.rdoc -${GEM_LIB}/gems/${DISTNAME}/Rakefile -${GEM_LIB}/gems/${DISTNAME}/appveyor.yml +${GEM_LIB}/gems/${DISTNAME}/LICENSE-DEPENDENCIES +${GEM_LIB}/gems/${DISTNAME}/README.md +${GEM_LIB}/gems/${DISTNAME}/dependencies.yml ${GEM_LIB}/gems/${DISTNAME}/faq/ +${GEM_LIB}/gems/${DISTNAME}/faq/faq.md ${GEM_LIB}/gems/${DISTNAME}/faq/faq.rb ${GEM_LIB}/gems/${DISTNAME}/faq/faq.yml ${GEM_LIB}/gems/${DISTNAME}/lib/ @@ -27,12 +27,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/ ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/translator.rb ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/value.rb ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/version.rb -${GEM_LIB}/gems/${DISTNAME}/rakelib/ -${GEM_LIB}/gems/${DISTNAME}/rakelib/faq.rake -${GEM_LIB}/gems/${DISTNAME}/rakelib/gem.rake -${GEM_LIB}/gems/${DISTNAME}/rakelib/native.rake -${GEM_LIB}/gems/${DISTNAME}/rakelib/vendor_sqlite3.rake -${GEM_LIB}/gems/${DISTNAME}/setup.rb +${GEM_LIB}/gems/${DISTNAME}/ports/ +${GEM_LIB}/gems/${DISTNAME}/ports/archives/ +${GEM_LIB}/gems/${DISTNAME}/ports/archives/sqlite-autoconf-340.tar.gz ${GEM_LIB}/gems/${DISTNAME}/test/ ${GEM_LIB}/gems/${DISTNAME}/test/helper.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_backup.rb
Update: databases/ruby-pg 1.4.5
Simple update to the latest version of ruby-pg. Changelog at: https://raw.githubusercontent.com/ged/ruby-pg/v1.4.5/History.rdoc Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-pg/Makefile,v retrieving revision 1.47 diff -u -p -r1.47 Makefile --- Makefile25 Aug 2022 22:31:31 - 1.47 +++ Makefile22 Nov 2022 22:38:08 - @@ -1,6 +1,6 @@ COMMENT = PostgreSQL database interface for ruby -DISTNAME = pg-1.4.3 +DISTNAME = pg-1.4.5 CATEGORIES = databases MAINTAINER = Jeremy Evans Index: distinfo === RCS file: /cvs/ports/databases/ruby-pg/distinfo,v retrieving revision 1.30 diff -u -p -r1.30 distinfo --- distinfo25 Aug 2022 22:31:31 - 1.30 +++ distinfo22 Nov 2022 22:38:21 - @@ -1,2 +1,2 @@ -SHA256 (pg-1.4.3.gem) = qwIZzdnldQq7BLi8paWkkPYKvfN1AwJ/0vkNDC0x8vo= -SIZE (pg-1.4.3.gem) = 201728 +SHA256 (pg-1.4.5.gem) = wTm9NJB+e74ykam15lG88A3h+KmaMUjAZLwtGxC1pvE= +SIZE (pg-1.4.5.gem) = 202240
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/15 20:01:49 Modified files: databases/timescaledb: Makefile Log message: Mark BROKEN as timescaledb does not yet work with PostgreSQL 15. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/15 20:01:21 Modified files: databases/repmgr: Makefile distinfo databases/repmgr/pkg: PLIST Log message: Update to repmgr 5.3.3 to work with PostgreSQL 15. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/15 20:01:01 Modified files: databases/postgresql-pllua: Makefile distinfo Log message: Adjust dependencies and use upstream pull request to work with PostgreSQL 15. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/15 20:00:30 Modified files: databases/postgresql-previous: Makefile distinfo databases/postgresql-previous/patches: patch-src_Makefile_shlib patch-src_bin_scripts_vacuumdb_c patch-src_include_storage_s_lock_h patch-src_interfaces_libpq_Makefile databases/postgresql-previous/pkg: PLIST Log message: Update postgresql-previous to PostgreSQL 14.6 following postgresql update to 15.1. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/15 19:59:23 Modified files: databases/postgresql: Makefile distinfo databases/postgresql/patches: patch-src_bin_scripts_vacuumdb_c patch-src_include_storage_s_lock_h patch-src_interfaces_libpq_Makefile databases/postgresql/pkg: PLIST-contrib PLIST-docs PLIST-main PLIST-plpython PLIST-server Log message: Update to PostgreSQL 15.1 Bulk testing and help tb@ OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/14 15:55:46 Modified files: security/easy-rsa: Tag: OPENBSD_7_2 Makefile distinfo security/easy-rsa/pkg: Tag: OPENBSD_7_2 PLIST Log message: Update to easy-rsa 3.1.1 Fixes issue with LibreSSL 3.6.0. Add upstream patch to work around bug in number_only option parsing in 3.1.1. OK tb@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/11/14 15:39:20 Modified files: security/easy-rsa: Makefile distinfo security/easy-rsa/pkg: PLIST Log message: Update to easy-rsa 3.1.1 Fixes issue with LibreSSL 3.6.0. Add upstream patch to work around bug in number_only option parsing in 3.1.1. OK tb@ sthen@
Update: easy-rsa 3.1.1
After an upgrade to OpenBSD 7.2, I found that easy-rsa was unable to generate certificate requests when not encrypting the key file, as it used -noenc instead of -nodes. This issue is fixed in easy-rsa 3.1.1. Not sure if we should considering applying https://github.com/OpenVPN/easy-rsa/commit/4472516e24b068542cfd1ff5c3e51c3b89eb38b1 as a distpatch. I ran into the issue this fixes after the upgrading to easy-rsa 3.1.1. It's not too difficult to work around, though. OKs? Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/security/easy-rsa/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile8 Jun 2022 16:13:14 - 1.14 +++ Makefile14 Nov 2022 18:24:20 - @@ -1,6 +1,6 @@ COMMENT = small RSA key management package -V =3.1.0 +V =3.1.1 PKGNAME = easy-rsa-${V} DISTNAME = EasyRSA-${V} EXTRACT_SUFX = .tgz Index: distinfo === RCS file: /cvs/ports/security/easy-rsa/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo8 Jun 2022 16:13:14 - 1.9 +++ distinfo14 Nov 2022 18:24:24 - @@ -1,2 +1,2 @@ -SHA256 (EasyRSA-3.1.0.tgz) = AbB+y1jcAD5H1OdPn8TaNexoQuls0APWbtcqQ9+YNlk= -SIZE (EasyRSA-3.1.0.tgz) = 61255 +SHA256 (EasyRSA-3.1.1.tgz) = d51CXKzx3lYmK3p+1rkLNuYUzpJz8IrXuGmSdAyzsqU= +SIZE (EasyRSA-3.1.1.tgz) = 68434 Index: pkg/PLIST === RCS file: /cvs/ports/security/easy-rsa/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 11 Mar 2022 19:53:22 - 1.9 +++ pkg/PLIST 14 Nov 2022 18:24:28 - @@ -6,7 +6,9 @@ share/easy-rsa/README.md share/easy-rsa/README.quickstart.md share/easy-rsa/doc/ share/easy-rsa/doc/EasyRSA-Advanced.md +share/easy-rsa/doc/EasyRSA-Contributing.md share/easy-rsa/doc/EasyRSA-Readme.md +share/easy-rsa/doc/EasyRSA-Renew-and-Revoke.md share/easy-rsa/doc/EasyRSA-Upgrade-Notes.md share/easy-rsa/doc/Hacking.md share/easy-rsa/doc/Intro-To-PKI.md
Re: Early look: PostgreSQL 15.0
On 10/20 11:23, Theo Buehler wrote: > On Thu, Oct 13, 2022 at 06:07:51PM +0000, Jeremy Evans wrote: > > When I have time, I'll run a partial bulk of the PostgreSQL ports and > > try to fix any breakage. Hopefully I can complete that work by the > > release of PostgreSQL 15.1. > > There were three build failures: posgresql-pllua, repmgr, timescaledb. > Details below. > > Given the non-trivial changes that are/were required in these consumers, > I would not be surprised by a variety of runtime fallout. > > > databases/postgresql-pllua > -- > > Constrains on postgresql-client->=14,<15, postgresql-server->=14,<15. > Builds fine when bumping upper bounds to 16. > > See this, however: https://github.com/pllua/pllua/issues/10 > > > databases/repmgr > > > repmgr-client.c:185:39: error: incomplete definition of type 'struct passwd' > strncpy(runtime_options.username, pw->pw_name, MAXLEN); > ~~^ > > postgresql/server/port.h no longer pulls in pwd.h. To fix build, > patching #include into repmgr-client.c is enough. > > Upstream support for PostgreSQL 15 is only available from version 5.3.3 > https://repmgr.org/docs/current/release-5.3.3.html > This includes various 15-specific fixes (some relating to shared memory). > > > databases/timescaledb > - > > CMake Error at CMakeLists.txt:362 (message): > TimescaleDB only supports PostgreSQL 12, 13 and 14 > > This is still the case with the latest timescaledb 2.8.1 and they still > seem to be sorting out fallout in the 2.9 branch. PostgreSQL 15.1 was released recently: https://www.postgresql.org/about/news/postgresql-151-146-139-1213-1118-and-1023-released-2543/ Here's an updated diff with the following changes: * postgresql: 14.5 -> 15.1 * postgresql-previous: 13.5 -> 14.6 * postgresql-pllua: Use upstream pull request for PG 15 support and bump * repmgr: 5.2.1 -> 5.3.3 * timescaledb: Mark BROKEN until release with PostgreSQL 15 support Can someone please put this into a bulk? Assuming no build fallout, I'd like to commit this, so I'm also looking for OKs. It's a good point in the release cycle for the switch, and will give us a few months to potentially discover and fix any runtime issues. No security issues in the PostgreSQL release, so I'm not planning on updating 7.2 -stable to 14.6 unless someone requests it. Thanks, Jeremy Index: databases/postgresql/Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.290 diff -u -p -r1.290 Makefile --- databases/postgresql/Makefile 8 Nov 2022 11:14:46 - 1.290 +++ databases/postgresql/Makefile 12 Nov 2022 08:07:53 - @@ -4,17 +4,11 @@ COMMENT-docs= PostgreSQL RDBMS documenta COMMENT-contrib=PostgreSQL RDBMS contributions COMMENT-plpython=Python procedural language for PostgreSQL COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version -REVISION-contrib= 0 -REVISION-docs= 0 -REVISION-pg_upgrade= 0 -REVISION-plpython= 0 -REVISION-server=0 -VERSION= 14.5 -PREV_MAJOR=13 +VERSION= 15.1 +PREV_MAJOR=14 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} -REVISION-main= 0 DPB_PROPERTIES=parallel @@ -22,7 +16,7 @@ CATEGORIES= databases SHARED_LIBS= ecpg7.10 \ ecpg_compat 4.10 \ pgtypes 4.9 \ - pq 6.13 + pq 6.14 HOMEPAGE= https://www.postgresql.org/ Index: databases/postgresql/distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.94 diff -u -p -r1.94 distinfo --- databases/postgresql/distinfo 15 Aug 2022 18:07:16 - 1.94 +++ databases/postgresql/distinfo 12 Nov 2022 08:09:45 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-14.5.tar.gz) = kOrTk9vGVMsAdeqvDsIFjmuYZs7UeP7TzytopbwE6yQ= -SIZE (postgresql-14.5.tar.gz) = 28988974 +SHA256 (postgresql-15.1.tar.gz) = 6izwWahYgmVLmJrNB+3BIYMxZKMDQPruDTYVz3BY5mw= +SIZE (postgresql-15.1.tar.gz) = 29778341 Index: databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c === RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-src_bin_scripts_vacuumdb_c --- databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c 11 Mar 2022 18:31:37 - 1.5 +++ databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c 23 May 2022 20:11:09 - @@ -9,4 +9,4 @@ Index: src/bin/scr
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/10/26 15:49:35 Modified files: lang/jruby : Makefile distinfo lang/jruby/pkg : PLIST Log message: Update to JRuby 9.3.9.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/10/26 13:09:37 Modified files: lang/ruby/3.1 : Makefile lang/ruby/3.1/pkg: MESSAGE-main Log message: Fix mistakes in MESSAGE-main >From vtam...@pasosdejesus.org
Re: Small fix for ruby package
On 10/26 11:44, vtamara wrote: > > > There are small mistakes in pkg/MESSAGE-main Thanks for reporting, I'll commit your fix shortly. Jeremy > > Patch below. > > Blessings. > > -- > > Dios, gracias por tu amor infinito. > -- > Vladimir T??mara Pati??o. http://vtamara.pasosdeJesus.org/ > http://www.pasosdejesus.org/dominio_publico_colombia.html > > diff --git a/arboldes/usr/ports/mystuff/lang/ruby/3.1/Makefile > b/arboldes/usr/ports/mystuff/lang/ruby/3.1/Makefile > index 3bfc4e53..9fc5beac 100644 > --- a/arboldes/usr/ports/mystuff/lang/ruby/3.1/Makefile > +++ b/arboldes/usr/ports/mystuff/lang/ruby/3.1/Makefile > @@ -3,7 +3,7 @@ DISTNAME = ruby-${VERSION} > SHARED_LIBS = ruby31 0.0 > NEXTVER = 3.2 > PKGSPEC-main ?= ruby->=3.1.0,<${NEXTVER} > -REVISION-main = 0 > +REVISION-main = 1 > > # Backport fix for fixnum*fixnum multiplication on octeon > PATCHFILES = > ruby-octeon-fix{fe6245b4309c855e6aca5b786ad50a72d53d278a}.patch:0 > diff --git a/arboldes/usr/ports/mystuff/lang/ruby/3.1/pkg/MESSAGE-main > b/arboldes/usr/ports/mystuff/lang/ruby/3.1/pkg/MESSAGE-main > index 68c5d7df..8419f075 100644 > --- a/arboldes/usr/ports/mystuff/lang/ruby/3.1/pkg/MESSAGE-main > +++ b/arboldes/usr/ports/mystuff/lang/ruby/3.1/pkg/MESSAGE-main > @@ -7,10 +7,10 @@ create symbolic links like so (overwriting any previous > default): > ln -sf ${PREFIX}/bin/erb31 ${PREFIX}/bin/erb > ln -sf ${PREFIX}/bin/gem31 ${PREFIX}/bin/gem > ln -sf ${PREFIX}/bin/irb31 ${PREFIX}/bin/irb > - ln -sf ${PREFIX}/bin/rdoc31 ${PREFIX}/bin/racc > + ln -sf ${PREFIX}/bin/racc31 ${PREFIX}/bin/racc > ln -sf ${PREFIX}/bin/rake31 ${PREFIX}/bin/rake > - ln -sf ${PREFIX}/bin/rdoc31 ${PREFIX}/bin/rbs > - ln -sf ${PREFIX}/bin/rdoc31 ${PREFIX}/bin/rdbg > + ln -sf ${PREFIX}/bin/rbs31 ${PREFIX}/bin/rbs > + ln -sf ${PREFIX}/bin/rdbg31 ${PREFIX}/bin/rdbg > ln -sf ${PREFIX}/bin/rdoc31 ${PREFIX}/bin/rdoc > ln -sf ${PREFIX}/bin/ri31 ${PREFIX}/bin/ri > ln -sf ${PREFIX}/bin/typeprof31 ${PREFIX}/bin/typeprof
Update: lang/jruby 9.3.9.0
Update to the latest version of JRuby. Release announcement at: https://www.jruby.org/2022/10/24/jruby-9-3-9-0.html Tested on amd64, the only supported arch. Will commit in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.104 diff -u -p -r1.104 Makefile --- Makefile15 Sep 2022 19:28:56 - 1.104 +++ Makefile24 Oct 2022 19:53:18 - @@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64 COMMENT = pure-Java implementation of the Ruby language -V =9.3.8.0 +V =9.3.9.0 DISTNAME = jruby-dist-${V}-bin PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby Index: distinfo === RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.70 diff -u -p -r1.70 distinfo --- distinfo15 Sep 2022 19:28:56 - 1.70 +++ distinfo24 Oct 2022 19:53:27 - @@ -1,6 +1,6 @@ SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ= -SHA256 (jruby-dist-9.3.8.0-bin.tar.gz) = Z0pNEwhjH6pfASTQHXPrHtyJNG7n3iHHDhQwW9YbRt8= +SHA256 (jruby-dist-9.3.9.0-bin.tar.gz) = JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg= SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo= SIZE (jffi-1.3.5.tar.gz) = 3152240 -SIZE (jruby-dist-9.3.8.0-bin.tar.gz) = 27752001 +SIZE (jruby-dist-9.3.9.0-bin.tar.gz) = 28614865 SIZE (jruby-launcher-1.1.19-java.gem) = 64000 Index: pkg/PLIST === RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v retrieving revision 1.61 diff -u -p -r1.61 PLIST --- pkg/PLIST 15 Sep 2022 19:28:56 - 1.61 +++ pkg/PLIST 24 Oct 2022 19:55:53 - @@ -37,10 +37,10 @@ jruby/lib/ruby/gems/1.8/cache/rake-12.3. jruby/lib/ruby/gems/1.8/cache/test-unit-3.2.9.gem jruby/lib/ruby/gems/1.8/cache/xmlrpc-0.3.0.gem jruby/lib/ruby/gems/1.8/gems/ -jruby/lib/ruby/gems/1.8/gems/bundler-2.2.29/ -jruby/lib/ruby/gems/1.8/gems/bundler-2.2.29/exe/ -jruby/lib/ruby/gems/1.8/gems/bundler-2.2.29/exe/bundle -jruby/lib/ruby/gems/1.8/gems/bundler-2.2.29/exe/bundler +jruby/lib/ruby/gems/1.8/gems/bundler-2.2.33/ +jruby/lib/ruby/gems/1.8/gems/bundler-2.2.33/exe/ +jruby/lib/ruby/gems/1.8/gems/bundler-2.2.33/exe/bundle +jruby/lib/ruby/gems/1.8/gems/bundler-2.2.33/exe/bundler jruby/lib/ruby/gems/1.8/gems/did_you_mean-1.3.0/ jruby/lib/ruby/gems/1.8/gems/did_you_mean-1.3.0/.ruby-version jruby/lib/ruby/gems/1.8/gems/did_you_mean-1.3.0/.travis.yml @@ -265,13 +265,13 @@ jruby/lib/ruby/gems/1.8/gems/rake-12.3.3 jruby/lib/ruby/gems/1.8/gems/rake-12.3.3/lib/rake/version.rb jruby/lib/ruby/gems/1.8/gems/rake-12.3.3/lib/rake/win32.rb jruby/lib/ruby/gems/1.8/gems/rake-12.3.3/rake.gemspec -jruby/lib/ruby/gems/1.8/gems/rdoc-6.1.2.1/ -jruby/lib/ruby/gems/1.8/gems/rdoc-6.1.2.1/exe/ -jruby/lib/ruby/gems/1.8/gems/rdoc-6.1.2.1/exe/rdoc -jruby/lib/ruby/gems/1.8/gems/rdoc-6.1.2.1/exe/ri -jruby/lib/ruby/gems/1.8/gems/rubygems-update-3.2.29/ -jruby/lib/ruby/gems/1.8/gems/rubygems-update-3.2.29/bin/ -jruby/lib/ruby/gems/1.8/gems/rubygems-update-3.2.29/bin/update_rubygems +jruby/lib/ruby/gems/1.8/gems/rdoc-6.3.3/ +jruby/lib/ruby/gems/1.8/gems/rdoc-6.3.3/exe/ +jruby/lib/ruby/gems/1.8/gems/rdoc-6.3.3/exe/rdoc +jruby/lib/ruby/gems/1.8/gems/rdoc-6.3.3/exe/ri +jruby/lib/ruby/gems/1.8/gems/rubygems-update-3.2.33/ +jruby/lib/ruby/gems/1.8/gems/rubygems-update-3.2.33/bin/ +jruby/lib/ruby/gems/1.8/gems/rubygems-update-3.2.33/bin/update_rubygems jruby/lib/ruby/gems/1.8/gems/test-unit-3.2.9/ jruby/lib/ruby/gems/1.8/gems/test-unit-3.2.9/COPYING jruby/lib/ruby/gems/1.8/gems/test-unit-3.2.9/GPL @@ -418,7 +418,7 @@ jruby/lib/ruby/gems/1.8/gems/xmlrpc-0.3. jruby/lib/ruby/gems/1.8/gems/xmlrpc-0.3.0/xmlrpc.gemspec jruby/lib/ruby/gems/1.8/specifications/ jruby/lib/ruby/gems/1.8/specifications/default/ -jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.2.29.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.2.33.gemspec jruby/lib/ruby/gems/1.8/specifications/default/cmath-1.0.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/csv-3.2.5.gemspec jruby/lib/ruby/gems/1.8/specifications/default/e2mmap-0.1.0.gemspec @@ -429,7 +429,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/ipaddr-1.2.2.gemspec jruby/lib/ruby/gems/1.8/specifications/default/irb-1.0.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/jar-dependencies-0.4.1.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.13.0-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.14.0-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/jruby-readline-1.3.7-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/json-2.5.1-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/logger-1.5.1.gemspec @@ -437,13
Re: Early look: PostgreSQL 15.0
On 10/20 11:23, Theo Buehler wrote: > On Thu, Oct 13, 2022 at 06:07:51PM +0000, Jeremy Evans wrote: > > When I have time, I'll run a partial bulk of the PostgreSQL ports and > > try to fix any breakage. Hopefully I can complete that work by the > > release of PostgreSQL 15.1. > > There were three build failures: posgresql-pllua, repmgr, timescaledb. > Details below. Theo, Thank you very much for running the bulk, that saves me a lot of time. With only 3 failures, the results are much better than in previous years. sthen@ committed a /etc/daily fix, so we can drop the new shared memory patch. > Given the non-trivial changes that are/were required in these consumers, > I would not be surprised by a variety of runtime fallout. Historically there hasn't been much runtime fallout from PostgreSQL upgrades. Hopefully by committing fairly early in the release cycle, we'll get sufficient testing before the release of OpenBSD 7.3. > databases/postgresql-pllua > -- > > Constrains on postgresql-client->=14,<15, postgresql-server->=14,<15. > Builds fine when bumping upper bounds to 16. > > See this, however: https://github.com/pllua/pllua/issues/10 Yep, we'll definitely want to patch that if they don't commit a fix upstream. > databases/repmgr > > > repmgr-client.c:185:39: error: incomplete definition of type 'struct passwd' > strncpy(runtime_options.username, pw->pw_name, MAXLEN); > ~~^ > > postgresql/server/port.h no longer pulls in pwd.h. To fix build, > patching #include into repmgr-client.c is enough. > > Upstream support for PostgreSQL 15 is only available from version 5.3.3 > https://repmgr.org/docs/current/release-5.3.3.html > This includes various 15-specific fixes (some relating to shared memory). We should upgrade to 5.3.3 to fix this. > databases/timescaledb > - > > CMake Error at CMakeLists.txt:362 (message): > TimescaleDB only supports PostgreSQL 12, 13 and 14 > > This is still the case with the latest timescaledb 2.8.1 and they still > seem to be sorting out fallout in the 2.9 branch. Pretty typical for timescaledb. I plan on marking it BROKEN when updating to PostgreSQL 15.1 if it isn't fixed by then. That's what we did during the PostgreSQL 13->14 upgrade. Thanks, Jeremy
Early look: PostgreSQL 15.0
Here's a diff to upgrade PostgreSQL from 14.5 to 15.0, not including dependent ports (except postgresql-previous). Not currently intended for commit, that won't happen until 15.1 at the earliest. Release notes at: https://www.postgresql.org/about/news/postgresql-15-released-2526/ When I have time, I'll run a partial bulk of the PostgreSQL ports and try to fix any breakage. Hopefully I can complete that work by the release of PostgreSQL 15.1. The main part I want feedback on is a new patch that silently treats the dynamic_shared_memory_type = posix as dynamic_shared_memory_type = shm. Since 15beta1, I had an issue where the PostgreSQL server would stop working after a week. I traced that issue to OpenBSD deleting the shared memory files in /tmp that shm_open(3) creates, since they were more than a week old. Possibly this is only an issue on lightly loaded servers, but unless daily(8) skips deleting these files automatically, I consider the approach the patch uses necessary for reliable operation. Thanks, Jeremy Index: postgresql/Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.289 diff -u -p -r1.289 Makefile --- postgresql/Makefile 15 Aug 2022 18:07:16 - 1.289 +++ postgresql/Makefile 13 Oct 2022 14:46:13 - @@ -5,8 +5,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib COMMENT-plpython=Python procedural language for PostgreSQL COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version -VERSION= 14.5 -PREV_MAJOR=13 +VERSION= 15.0 +PREV_MAJOR=14 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} @@ -16,7 +16,7 @@ CATEGORIES= databases SHARED_LIBS= ecpg7.10 \ ecpg_compat 4.10 \ pgtypes 4.9 \ - pq 6.13 + pq 6.14 HOMEPAGE= https://www.postgresql.org/ Index: postgresql/distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.94 diff -u -p -r1.94 distinfo --- postgresql/distinfo 15 Aug 2022 18:07:16 - 1.94 +++ postgresql/distinfo 13 Oct 2022 14:46:34 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-14.5.tar.gz) = kOrTk9vGVMsAdeqvDsIFjmuYZs7UeP7TzytopbwE6yQ= -SIZE (postgresql-14.5.tar.gz) = 28988974 +SHA256 (postgresql-15.0.tar.gz) = +cfJvanZNZuxN+1RCsHPkOavofc5wGFrtrY3srwstgQ= +SIZE (postgresql-15.0.tar.gz) = 29385837 Index: postgresql/patches/patch-src_backend_storage_ipc_dsm_impl_c === RCS file: postgresql/patches/patch-src_backend_storage_ipc_dsm_impl_c diff -N postgresql/patches/patch-src_backend_storage_ipc_dsm_impl_c --- /dev/null 1 Jan 1970 00:00:00 - +++ postgresql/patches/patch-src_backend_storage_ipc_dsm_impl_c 13 Jul 2022 19:14:13 - @@ -0,0 +1,27 @@ +Use sysv shared memory instead of posix, even if posix specified. + +Without this change, with the default dynamic_shared_memory_type = posix, +shared memory files would be created in /tmp via shm_open, and the +database would stop working after a week as /etc/daily deletes files more +than a week old. + +Previous versions of PostgreSQL on OpenBSD use dynamic_shared_memory_type = posix, +but for some reason they don't have this issue. Since many users copy settings +from previous postgresql.conf when upgrading, it's likely they will copy this +setting, which will appear to work, until it fails after a week. + +This silently treats dynamic_shared_memory_type = posix as sysv, which doesn't +have this issue as it does not use temporary files. + +Index: src/backend/storage/ipc/dsm_impl.c +--- src/backend/storage/ipc/dsm_impl.c.orig src/backend/storage/ipc/dsm_impl.c +@@ -170,8 +170,6 @@ dsm_impl_op(dsm_op op, dsm_handle handle, Size request + { + #ifdef USE_DSM_POSIX + case DSM_IMPL_POSIX: +- return dsm_impl_posix(op, handle, request_size, impl_private, +- mapped_address, mapped_size, elevel); + #endif + #ifdef USE_DSM_SYSV + case DSM_IMPL_SYSV: Index: postgresql/patches/patch-src_bin_scripts_vacuumdb_c === RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-src_bin_scripts_vacuumdb_c --- postgresql/patches/patch-src_bin_scripts_vacuumdb_c 11 Mar 2022 18:31:37 - 1.5 +++ postgresql/patches/patch-src_bin_scripts_vacuumdb_c 23 May 2022 20:11:09 - @@ -9,4 +9,4 @@ Index: src/bin/scripts/vacuumdb.c + #include "postgres_fe.h" - #include "catalog/pg_class_d.h" + #include Index: postgresql/patches/patch-src_include_storage_s_lock_h ===
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/10/05 12:37:48 Modified files: databases/ruby-sequel_pg: Makefile distinfo Log message: Update to sequel_pg 1.17.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/09/15 13:28:56 Modified files: lang/jruby : Makefile distinfo lang/jruby/pkg : PLIST Log message: Update to JRuby 9.3.8.0
Update: lang/jruby 9.3.8.0
Simple update to the latest version of JRuby. Release notes at: https://www.jruby.org/2022/09/13/jruby-9-3-8-0.html Among other things, a security fix for a YAML parsing bug (CVE-2022-25857). Tested on amd64, the only supported arch. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.103 diff -u -p -r1.103 Makefile --- Makefile18 Aug 2022 23:28:38 - 1.103 +++ Makefile13 Sep 2022 17:17:57 - @@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64 COMMENT = pure-Java implementation of the Ruby language -V =9.3.7.0 +V =9.3.8.0 DISTNAME = jruby-dist-${V}-bin PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby Index: distinfo === RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.69 diff -u -p -r1.69 distinfo --- distinfo18 Aug 2022 23:28:38 - 1.69 +++ distinfo13 Sep 2022 17:17:57 - @@ -1,6 +1,6 @@ SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ= -SHA256 (jruby-dist-9.3.7.0-bin.tar.gz) = lKeos77qwiU6iHbnOt+sa+zssrVNLd+mjyRdyBln0ME= +SHA256 (jruby-dist-9.3.8.0-bin.tar.gz) = Z0pNEwhjH6pfASTQHXPrHtyJNG7n3iHHDhQwW9YbRt8= SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo= SIZE (jffi-1.3.5.tar.gz) = 3152240 -SIZE (jruby-dist-9.3.7.0-bin.tar.gz) = 27731024 +SIZE (jruby-dist-9.3.8.0-bin.tar.gz) = 27752001 SIZE (jruby-launcher-1.1.19-java.gem) = 64000 Index: pkg/PLIST === RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v retrieving revision 1.60 diff -u -p -r1.60 PLIST --- pkg/PLIST 29 Jun 2022 22:46:52 - 1.60 +++ pkg/PLIST 13 Sep 2022 17:17:57 - @@ -420,7 +420,7 @@ jruby/lib/ruby/gems/1.8/specifications/ jruby/lib/ruby/gems/1.8/specifications/default/ jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.2.29.gemspec jruby/lib/ruby/gems/1.8/specifications/default/cmath-1.0.0.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/csv-3.1.2.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/csv-3.2.5.gemspec jruby/lib/ruby/gems/1.8/specifications/default/e2mmap-0.1.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.15.4-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/fileutils-1.4.1.gemspec @@ -437,7 +437,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/mutex_m-0.1.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/ostruct-0.5.5.gemspec jruby/lib/ruby/gems/1.8/specifications/default/prime-0.1.0.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/psych-3.3.2-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/psych-3.3.3-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/racc-1.5.2-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/rake-ant-1.0.4.gemspec jruby/lib/ruby/gems/1.8/specifications/default/rdoc-6.1.2.1.gemspec @@ -842,9 +842,8 @@ jruby/lib/ruby/stdlib/csv.rb jruby/lib/ruby/stdlib/csv/core_ext/ jruby/lib/ruby/stdlib/csv/core_ext/array.rb jruby/lib/ruby/stdlib/csv/core_ext/string.rb -jruby/lib/ruby/stdlib/csv/delete_suffix.rb jruby/lib/ruby/stdlib/csv/fields_converter.rb -jruby/lib/ruby/stdlib/csv/match_p.rb +jruby/lib/ruby/stdlib/csv/input_record_separator.rb jruby/lib/ruby/stdlib/csv/parser.rb jruby/lib/ruby/stdlib/csv/row.rb jruby/lib/ruby/stdlib/csv/table.rb @@ -1165,8 +1164,8 @@ jruby/lib/ruby/stdlib/org/bouncycastle/b jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk15on/1.68/bctls-jdk15on-1.68.jar jruby/lib/ruby/stdlib/org/yaml/ jruby/lib/ruby/stdlib/org/yaml/snakeyaml/ -jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.28/ -jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar +jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.31/ +jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.31/snakeyaml-1.31.jar jruby/lib/ruby/stdlib/org/yaml/snakeyaml/maven-metadata-local.xml jruby/lib/ruby/stdlib/ostruct.rb jruby/lib/ruby/stdlib/pathname.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/09/01 09:25:26 Modified files: databases/ruby-sequel: Makefile distinfo databases/ruby-sequel/pkg: PLIST Log message: Update to Sequel 5.60.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/25 16:31:31 Modified files: databases/ruby-pg: Makefile distinfo Log message: Update to pg 1.4.3
databases/ruby-pg 1.4.1 -> 1.4.3
Simple update to the latest version of pg. Changes are: * Avoid memory bloat possible in put_copy_data in pg-1.4.0 to 1.4.2. * Use Encoding::BINARY for JOHAB, removing some useless code. * Properly handle empty host parameter when connecting. Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-pg/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile3 Jul 2022 18:32:41 - 1.46 +++ Makefile23 Aug 2022 17:00:40 - @@ -1,6 +1,6 @@ COMMENT = PostgreSQL database interface for ruby -DISTNAME = pg-1.4.1 +DISTNAME = pg-1.4.3 CATEGORIES = databases MAINTAINER = Jeremy Evans Index: distinfo === RCS file: /cvs/ports/databases/ruby-pg/distinfo,v retrieving revision 1.29 diff -u -p -r1.29 distinfo --- distinfo3 Jul 2022 18:32:41 - 1.29 +++ distinfo23 Aug 2022 17:00:43 - @@ -1,2 +1,2 @@ -SHA256 (pg-1.4.1.gem) = OGu/+tIjzOHdqQPa0sWSaOQfPRg3klBmca5SYBH/BIc= -SIZE (pg-1.4.1.gem) = 201728 +SHA256 (pg-1.4.3.gem) = qwIZzdnldQq7BLi8paWkkPYKvfN1AwJ/0vkNDC0x8vo= +SIZE (pg-1.4.3.gem) = 201728
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/23 11:55:22 Modified files: www/ruby-puma : Makefile distinfo www/ruby-puma/pkg: PLIST Removed files: www/ruby-puma/patches: patch-ext_puma_http11_mini_ssl_c Log message: Update to puma 5.6.5 OK kmos@
www/ruby-puma 5.3.2 -> 5.6.5
Simple update to the latest release of Puma. Changelog available at https://github.com/puma/puma/blob/master/History.md Remove patch applied upstream. Among other things, fixes the following security issues: * CVE-2022-24790 * GHSA-rmj8-8hhh-gv5h * CVE-2021-41136 Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/www/ruby-puma/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile11 Mar 2022 20:10:55 - 1.12 +++ Makefile23 Aug 2022 16:48:43 - @@ -1,8 +1,7 @@ COMMENT = simple, fast, threaded webserver for rack applications -DISTNAME = puma-5.3.2 +DISTNAME = puma-5.6.5 CATEGORIES = www -REVISION = 0 HOMEPAGE = https://puma.io/ Index: distinfo === RCS file: /cvs/ports/www/ruby-puma/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo26 May 2021 20:32:38 - 1.8 +++ distinfo23 Aug 2022 16:49:07 - @@ -1,2 +1,2 @@ -SHA256 (puma-5.3.2.gem) = ssrmO5dY1HUKrg24IIRLA9yiBsU8IIVQSfUUoQrAqlI= -SIZE (puma-5.3.2.gem) = 201216 +SHA256 (puma-5.6.5.gem) = ZhAp0VoRXp9sBkGmnIMP/Z8bmsY/zQeR2UzNkA4D+GM= +SIZE (puma-5.6.5.gem) = 208384 Index: patches/patch-ext_puma_http11_mini_ssl_c === RCS file: patches/patch-ext_puma_http11_mini_ssl_c diff -N patches/patch-ext_puma_http11_mini_ssl_c --- patches/patch-ext_puma_http11_mini_ssl_c11 Mar 2022 20:10:55 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,21 +0,0 @@ -Fix build with Opaque DH in LibreSSL 3.5. - -Index: ext/puma_http11/mini_ssl.c ext/puma_http11/mini_ssl.c.orig -+++ ext/puma_http11/mini_ssl.c -@@ -91,13 +91,13 @@ DH *get_dh2048() { - static unsigned char dh2048_g[] = { 0x02 }; - - DH *dh; --#if !(OPENSSL_VERSION_NUMBER < 0x1015L || defined(LIBRESSL_VERSION_NUMBER)) -+#if !(OPENSSL_VERSION_NUMBER < 0x1015L) - BIGNUM *p, *g; - #endif - - dh = DH_new(); - --#if OPENSSL_VERSION_NUMBER < 0x1015L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x1015L - dh->p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); - dh->g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); - Index: pkg/PLIST === RCS file: /cvs/ports/www/ruby-puma/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 11 Mar 2022 20:10:55 - 1.8 +++ pkg/PLIST 23 Aug 2022 16:50:46 - @@ -21,9 +21,6 @@ ${GEM_LIB}/gems/${DISTNAME}/docs/images/ ${GEM_LIB}/gems/${DISTNAME}/docs/jungle/ ${GEM_LIB}/gems/${DISTNAME}/docs/jungle/README.md ${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/ -${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/README.md -${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/puma -${GEM_LIB}/gems/${DISTNAME}/docs/jungle/rc.d/puma.conf ${GEM_LIB}/gems/${DISTNAME}/docs/kubernetes.md ${GEM_LIB}/gems/${DISTNAME}/docs/nginx.md ${GEM_LIB}/gems/${DISTNAME}/docs/plugins.md @@ -54,7 +51,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/err ${GEM_LIB}/gems/${DISTNAME}/lib/puma/events.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/io_buffer.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/jruby_restart.rb -${GEM_LIB}/gems/${DISTNAME}/lib/puma/json.rb +${GEM_LIB}/gems/${DISTNAME}/lib/puma/json_serialization.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/launcher.rb ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl/ ${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/18 17:28:38 Modified files: lang/jruby : Makefile distinfo Log message: Update to JRuby 9.3.7.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/18 09:08:38 Modified files: databases/postgresql: Tag: OPENBSD_7_1 Makefile distinfo databases/postgresql/pkg: Tag: OPENBSD_7_1 PLIST-docs Log message: Update to PostgreSQL 14.5, fixes CVE-2022-2625
lang/jruby 9.3.7.0
This updates to the latest version of JRuby. Release announcement at https://www.jruby.org/2022/08/16/jruby-9-3-7-0.html Tested on amd64, the only supported arch. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.102 diff -u -p -r1.102 Makefile --- Makefile29 Jun 2022 22:46:52 - 1.102 +++ Makefile16 Aug 2022 23:09:27 - @@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64 COMMENT = pure-Java implementation of the Ruby language -V =9.3.6.0 +V =9.3.7.0 DISTNAME = jruby-dist-${V}-bin PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby Index: distinfo === RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.68 diff -u -p -r1.68 distinfo --- distinfo29 Jun 2022 22:46:52 - 1.68 +++ distinfo16 Aug 2022 23:09:48 - @@ -1,6 +1,6 @@ SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ= -SHA256 (jruby-dist-9.3.6.0-bin.tar.gz) = dHr2r5mmdPII9A2o2yLXfG2kk6gygOmQtS1SOr2UmeI= +SHA256 (jruby-dist-9.3.7.0-bin.tar.gz) = lKeos77qwiU6iHbnOt+sa+zssrVNLd+mjyRdyBln0ME= SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo= SIZE (jffi-1.3.5.tar.gz) = 3152240 -SIZE (jruby-dist-9.3.6.0-bin.tar.gz) = 27730957 +SIZE (jruby-dist-9.3.7.0-bin.tar.gz) = 27731024 SIZE (jruby-launcher-1.1.19-java.gem) = 64000
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/16 17:09:16 Modified files: databases/ruby-sequel_pg: Makefile distinfo Log message: Update to sequel_pg 1.16.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/15 12:07:16 Modified files: databases/postgresql: Makefile distinfo databases/postgresql/pkg: PLIST-docs Log message: Update to PostgreSQL 14.5
PostgreSQL 14.5
Apparently I was not paying attention back in June when they released 14.4. In my defense, no CVE in the 14.4 release. The 14.5 release fixes CVE-2022-2625. Release announcements: https://www.postgresql.org/about/news/postgresql-144-released-2470/ https://www.postgresql.org/about/news/postgresql-145-138-1212-1117-1022-and-15-beta-3-released-2496/ No regressions in some basic tests. OKs? After this is committed, I'll backport to -stable. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.288 diff -u -p -r1.288 Makefile --- Makefile21 May 2022 15:36:16 - 1.288 +++ Makefile12 Aug 2022 16:59:59 - @@ -5,11 +5,10 @@ COMMENT-contrib=PostgreSQL RDBMS contrib COMMENT-plpython=Python procedural language for PostgreSQL COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version -VERSION= 14.3 +VERSION= 14.5 PREV_MAJOR=13 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} -REVISION-server=1 DPB_PROPERTIES=parallel Index: distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.93 diff -u -p -r1.93 distinfo --- distinfo14 May 2022 17:51:54 - 1.93 +++ distinfo12 Aug 2022 17:00:49 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-14.3.tar.gz) = GO/zBDhwPdel8qfKkWdBvOPJnq20AlvGJoryaOjpCcU= -SIZE (postgresql-14.3.tar.gz) = 28930973 +SHA256 (postgresql-14.5.tar.gz) = kOrTk9vGVMsAdeqvDsIFjmuYZs7UeP7TzytopbwE6yQ= +SIZE (postgresql-14.5.tar.gz) = 28988974 Index: pkg/PLIST-docs === RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v retrieving revision 1.106 diff -u -p -r1.106 PLIST-docs --- pkg/PLIST-docs 14 May 2022 17:51:55 - 1.106 +++ pkg/PLIST-docs 12 Aug 2022 18:14:47 - @@ -271,6 +271,7 @@ share/doc/postgresql/html/ecpg-errors.ht share/doc/postgresql/html/ecpg-informix-compat.html share/doc/postgresql/html/ecpg-library.html share/doc/postgresql/html/ecpg-lo.html +share/doc/postgresql/html/ecpg-oracle-compat.html share/doc/postgresql/html/ecpg-pgtypes.html share/doc/postgresql/html/ecpg-preproc.html share/doc/postgresql/html/ecpg-process.html @@ -705,6 +706,8 @@ share/doc/postgresql/html/regress.html share/doc/postgresql/html/release-14-1.html share/doc/postgresql/html/release-14-2.html share/doc/postgresql/html/release-14-3.html +share/doc/postgresql/html/release-14-4.html +share/doc/postgresql/html/release-14-5.html share/doc/postgresql/html/release-14.html share/doc/postgresql/html/release-prior.html share/doc/postgresql/html/release.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/08/01 10:23:45 Modified files: devel/ruby-rake-compiler: Makefile distinfo devel/ruby-rake-compiler/patches: patch-lib_rake_extensiontask_rb devel/ruby-rake-compiler/pkg: PLIST Removed files: devel/ruby-rake-compiler/patches: patch-tasks_bin_cross-ruby_rake Log message: Update to rake-compiler 1.2.0 Remove use of SUBST_CMD, no longer needed. Remove test code, as tests now have dependencies not in ports. Remove cross compiling support as mingw was removed last year. Add patch to remove chown/chgrp use when not running as root, similar to how Ruby is patched.
Update devel/ruby-rake-compiler 0.7.9 -> 1.2.0
This updates rake-compiler to the newest version. The previous version was over a decade old. This removes the support for cross compiling with mingw, as devel/mingw was removed last year. This adds a new patch section to patch out the use of -o root -g bin when running rake-compiler as a regular user. A similar patch is already done in the Ruby ports, to the gem extension building code. This removes now unnecessary use of SUBST_CMD. It also removes the test code, which no longer work as they require dependencies not in ports. Tested on amd64. Will commit in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/devel/ruby-rake-compiler/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile11 Mar 2022 18:53:17 - 1.14 +++ Makefile29 Jul 2022 20:52:03 - @@ -1,10 +1,9 @@ COMMENT = build and package Ruby extensions using Rake as glue -DISTNAME = rake-compiler-0.7.9 -REVISION = 6 +DISTNAME = rake-compiler-1.2.0 CATEGORIES = devel -HOMEPAGE = https://github.com/luislavena/rake-compiler +HOMEPAGE = https://github.com/rake-compiler/rake-compiler MAINTAINER = Jeremy Evans @@ -14,15 +13,5 @@ PERMIT_PACKAGE = Yes MODULES = lang/ruby CONFIGURE_STYLE = ruby gem - -pre-configure: - ${SUBST_CMD} -DMAKE_PROGRAM=${MAKE_PROGRAM} \ - ${WRKSRC}/lib/rake/extensiontask.rb \ - ${WRKSRC}/tasks/bin/cross-ruby.rake - rm ${WRKSRC}/lib/rake/extensiontask.rb.beforesubst \ - ${WRKSRC}/tasks/bin/cross-ruby.rake.beforesubst - -TEST_DEPENDS = devel/ruby-isolate,${MODRUBY_FLAVOR} -MODRUBY_TEST = rake rspec .include Index: distinfo === RCS file: /cvs/ports/devel/ruby-rake-compiler/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo18 Jan 2015 03:13:46 - 1.3 +++ distinfo29 Jul 2022 20:21:23 - @@ -1,2 +1,2 @@ -SHA256 (rake-compiler-0.7.9.gem) = iEhKAhaDiF6mUqeUKaC8hw4gWGvdAGo43IzYLsckpqw= -SIZE (rake-compiler-0.7.9.gem) = 31232 +SHA256 (rake-compiler-1.2.0.gem) = 4CvPVtLz2Ay4eLdgJo6PE9yOQlHJ+6CA3td5sWeub/U= +SIZE (rake-compiler-1.2.0.gem) = 38912 Index: patches/patch-lib_rake_extensiontask_rb === RCS file: /cvs/ports/devel/ruby-rake-compiler/patches/patch-lib_rake_extensiontask_rb,v retrieving revision 1.4 diff -u -p -r1.4 patch-lib_rake_extensiontask_rb --- patches/patch-lib_rake_extensiontask_rb 11 Mar 2022 18:53:17 - 1.4 +++ patches/patch-lib_rake_extensiontask_rb 29 Jul 2022 20:39:49 - @@ -1,27 +1,43 @@ -Include the mingw directory in the PATH if cross compiling. +Do not try to chown/chgrp when installing unless running +as root. This is done for the same reasons as the patch for +lib/rubygems/ext/ext_conf_builder.rb in the Ruby port. Don't have it accidently use gmake, because the makefiles created can use BSD make extensions. lib/rake/extensiontask.rb.orig Wed Dec 31 16:00:00 1969 -+++ lib/rake/extensiontask.rb Wed Nov 30 04:25:41 2011 -@@ -70,6 +70,8 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/nativ - # only define cross platform functionality when enabled - return unless @cross_compile - -+ ENV['PATH'] = "${LOCALBASE}/mingw32/bin:#{ENV['PATH']}" -+ - if cross_platform.is_a?(Array) then - cross_platform.each { |platf| define_cross_platform_tasks(platf) } - else -@@ -359,9 +361,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/nativ - if RUBY_PLATFORM =~ /mswin/ then - 'nmake' - else --ENV['MAKE'] || %w[gmake make].find { |c| -- system("#{c} -v >> #{dev_null} 2>&1") --} -+ENV['MAKE'] || 'make' - end +Index: lib/rake/extensiontask.rb +--- lib/rake/extensiontask.rb.orig lib/rake/extensiontask.rb +@@ -157,7 +157,9 @@ module Rake + task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, tmp_binary_path, "#{tmp_path}/Makefile"] do + # install in lib for native platform only + unless for_platform +- sh "#{make} install target_prefix=", chdir: tmp_path ++ command = "#{make} install target_prefix=" ++ command += " INSTALL_PROG='/usr/bin/install -c -m 0755'" unless Process.uid == 0 ++ sh command, chdir: tmp_path + end end - @make + # copy binary from temporary location to staging directory +@@ -502,20 +504,7 @@ Java extension should be preferred. + end + + def make +- unless @make +-@make = +- if RUBY_PLATFORM =~ /mswin/ then +-'nmake' +- else +-ENV['MAKE'] || find_make +- end +-
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/07/12 17:39:34 Modified files: databases/ruby-ldap: Makefile Log message: Remove --without-libldap from configure args This has been broken at runtime since the update to OpenLDAP 2.6.2. ruby-ldap previously linked to libldap_r, but the OpenLDAP update removed libldap_r, and the code compiled without linking to any ldap library, breaking at runtime. Update WANTLIB while here.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/07/09 18:08:19 Modified files: databases/ruby-ldap: Makefile distinfo Added files: databases/ruby-ldap/patches: patch-conn_c Log message: Avoid deprecation warnings related to taint using upstream pull request Add local patch to build with Ruby 3.2.
Re: Remove ruby-bundler?
On Fri, Jul 8, 2022 at 1:27 PM Kurt Mosiejczuk wrote: > bundler is another port where the version is quite old and our ruby > language packages have modern versions bundled in. > > Do we want to remove it? > OK jeremy@ for your diff and removing bundler. Thanks, Jeremy Diff included below plucks it out of the only consumers, and both are > from TEST_DEPENDS so I didn't bump REVISION > > --Kurt > > Index: databases/ruby-resque/Makefile > === > RCS file: /cvs/ports/databases/ruby-resque/Makefile,v > retrieving revision 1.10 > diff -u -p -r1.10 Makefile > --- databases/ruby-resque/Makefile 11 Mar 2022 18:31:45 - > 1.10 > +++ databases/ruby-resque/Makefile 8 Jul 2022 20:24:23 - > @@ -22,7 +22,6 @@ RUN_DEPENDS= converters/ruby-multi_json > > MODRUBY_TEST= rake > TEST_DEPENDS= databases/redis \ > - devel/ruby-bundler,${MODRUBY_FLAVOR} \ > devel/ruby-mocha,${MODRUBY_FLAVOR} \ > www/ruby-rack-test,${MODRUBY_FLAVOR} > > Index: devel/ruby-rspec/1/Makefile > === > RCS file: /cvs/ports/devel/ruby-rspec/1/Makefile,v > retrieving revision 1.13 > diff -u -p -r1.13 Makefile > --- devel/ruby-rspec/1/Makefile 11 Mar 2022 18:53:18 - 1.13 > +++ devel/ruby-rspec/1/Makefile 8 Jul 2022 20:24:23 - > @@ -16,7 +16,6 @@ post-install: > > # Requires heckle and quite a few other libraries to run its own > # specs, so this is currently broken. > -TEST_DEPENDS = devel/ruby-bundler,${MODRUBY_FLAVOR}>=1.0.21 > MODRUBY_TEST = rake rspec > > .include > >
Patch databases/ruby-ldap to avoid deprecation warnings
This patches ruby-ldap to apply an upstream pull request to avoid deprecation warnings. It also applies a local patch to allow building on Ruby 3.2+. Other than removing the deprecation warnings, this should have no effect. Tested on amd64. Will be commiting in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-ldap/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- Makefile14 May 2022 15:35:07 - 1.40 +++ Makefile7 Jul 2022 22:13:22 - @@ -1,11 +1,15 @@ COMMENT= Ruby interface to some common LDAP libraries PKGNAME= ldap-0.9.20 -REVISION= 0 +REVISION= 1 DISTNAME= ruby-${PKGNAME} CATEGORIES=databases -HOMEPAGE= https://github.com/alexey-chebotar/ruby-ldap +MASTER_SITES0= https://github.com/bearded/ruby-ldap/commit/ +PATCHFILES= ruby-ldap-taint-fix{72a4a89b28a99560b018b78069b29632f362a7d0}.patch:0 +PATCH_DIST_STRIP= -p1 + +HOMEPAGE= https://github.com/bearded/ruby-ldap MAINTAINER=Jeremy Evans Index: distinfo === RCS file: /cvs/ports/databases/ruby-ldap/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo12 Nov 2019 06:40:03 - 1.8 +++ distinfo7 Jul 2022 22:13:24 - @@ -1,2 +1,4 @@ SHA256 (ruby-ldap-0.9.20.gem) = LUj2d36gzWSYSnOtAjiyeGn4Ni4BmPIVSHByVOzTMqM= +SHA256 (ruby-ldap-taint-fix.patch) = os0NA2gy8ey9rmNu9+gAIic5XTa8MUbUXiE1XcVo1mA= SIZE (ruby-ldap-0.9.20.gem) = 67072 +SIZE (ruby-ldap-taint-fix.patch) = 757 Index: patches/patch-conn_c === RCS file: patches/patch-conn_c diff -N patches/patch-conn_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-conn_c7 Jul 2022 22:18:35 - @@ -0,0 +1,15 @@ +Avoid deprecation message in Ruby 3.1, allow building with Ruby 3.2. + +Index: conn.c +--- conn.c.orig conn.c +@@ -1855,7 +1855,8 @@ Init_ldap_conn () + { + rb_ldap_sort_obj = Qnil; + +- rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cData); ++ rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cObject); ++ rb_undef_alloc_func(rb_cLDAP_Conn); + rb_define_attr (rb_cLDAP_Conn, "referrals", 1, 0); + rb_define_attr (rb_cLDAP_Conn, "controls", 1, 0); + rb_define_attr (rb_cLDAP_Conn, "sasl_quiet", 1, 1);
Re: Remove devel/ruby-minitest?
On 07/06 04:43, Kurt Mosiejczuk wrote: > On Wed, Jul 06, 2022 at 08:56:32PM +0100, Stuart Henderson wrote: > > On 2022/07/06 15:50, Kurt Mosiejczuk wrote: > > > minitest is included in the ruby language package for all current versions > > > of ruby in the tree (2.7, 3.0, 3.1). > > > > Shall we remove devel/ruby-minitest? > > > That makes sense to me. OK jeremy@ for removal after dependencies have been handled. > It does mean I'll need to remove the DEPENDS in the following five ports > (which I realized _after_ I sent the email): > > devel/ruby-activesupport > devel/ruby-hoe > devel/ruby-ruby_parser > devel/ruby-zentest > devel/ruby-vlad > > > > (quirks diff invlulded to show how I'd handle the removal there) > > > Alternatively: add @pkgpath to the relevant ruby ports (i.e. > > @pkgpath devel/ruby-minitest,ruby27 to lang/ruby/2.7, etc), > > then it's a silent merge. > > Jeremy, any preference on quirks vs. PLIST in the ruby language packages? This should not be added to quirks, nor should PLIST be updated. There is a general quirk added for all rubyXY ports when rubyXY support is removed, which should suffice for this. That does mean that users will not be warned for a while, but that is harmless. The minitest port doesn't actually conflict with the ruby port, since the minitest version it uses is older than the versions shipped with ruby. Thanks, Jeremy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/07/04 10:33:10 Modified files: lang/ruby/3.0 : Makefile distinfo lang/ruby/3.1 : Makefile distinfo Log message: Backport a fix for some integer multiplications on octeon Integer multiplications where both integers are less than 64-bit but the multiplication was greater than 64-bit were handled using an int128_t type on octeon, with inconsistent results. The simplest fix in this case is to not use an int128_t type, and fallback to the default codepath. I pushed a fix for this upstream, this backports that fix. Problem discovered by the openssl-ruby tests Initial debugging by tb@ and claudio@ Access to octeon thanks to bluhm@ Further debugging and fix by me Testing by tb@ and visa@ OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/07/04 10:29:03 Modified files: lang/ruby : Makefile.inc lang/ruby/2.7 : Makefile Log message: Add MASTER_SITES0 and PATCH_DIST_STRIP to Makefile.inc Any Ruby distpatches are going to use these going forward, and it's better to set these once in Makefile.inc instead of in the Makefile for each version.
Fix Ruby integer multiplication issue on octeon
bluhm@'s octeon test machine found a consistently failing openssl-ruby test. tb@ and claudio@ did some analysis and found the issue was not a LibreSSL issue, but a general issue with attempting to create a Time object in Ruby after the year 2115. Since this was a Ruby issue and not a LibreSSL issue, @tb got me involved. @bluhm granted me access to an octeon machine, allowing me to debug the issue. I found the underlying cause was an general multiplication issue in Ruby when using two integers less than 64-bit that when multiplied resulted in a integer greater than 64-bit. On octeon, Ruby was using an int128_t type in this case, but the results were not consistent. A simple workaround of not using a int128_t type fixes the issue. Ruby falls back to a different approach in this case. tb@ did some testing and it does not appear there is a general int128_t problem on octeon. visa@ tested my patch to avoid the use of the int128_t type, and found it fixed the failing openssl-ruby test. I committed my patch upstream, and would like to backport the fix to our ports for Ruby 3.0 and 3.1. OKs for the following patch? This updates MASTER_SITES0 in the Ruby port to use GitHub instead of bugs.ruby-lang.org by default, since that's where I've been backporting recent commits from. It adds my upstream commit as a distpatch for Ruby 3.0 and 3.1. The patch doesn't apply on Ruby 2.7, so I don't plan to fix this on Ruby 2.7 unless requested. Thank you to tb@, visa@, bluhm@, and claudio@ for their help in resolving this issue. Jeremy Index: Makefile.inc === RCS file: /cvs/ports/lang/ruby/Makefile.inc,v retrieving revision 1.27 diff -u -p -r1.27 Makefile.inc --- Makefile.inc11 Mar 2022 19:29:13 - 1.27 +++ Makefile.inc3 Jul 2022 18:43:08 - @@ -23,7 +23,7 @@ MAINTAINER ?= Jeremy Evans https://cache.ruby-lang.org/pub/ruby/${VERSION:R}/ -MASTER_SITES0 ?= https://bugs.ruby-lang.org/attachments/download/ +MASTER_SITES0 ?= https://github.com/ruby/ruby/commit/ CONFIGURE_STYLE ?= gnu CONFIGURE_ARGS += --enable-shared \ Index: 2.7/Makefile === RCS file: /cvs/ports/lang/ruby/2.7/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- 2.7/Makefile14 Apr 2022 20:32:06 - 1.20 +++ 2.7/Makefile3 Jul 2022 18:43:08 - @@ -4,7 +4,6 @@ SHARED_LIBS = ruby27 0.0 NEXTVER = 2.8 PKGSPEC-main ?= ruby->=2.7.0,<${NEXTVER} -MASTER_SITES0 =https://github.com/ruby/ruby/commit/ # Backport fix for regression in 2.7.2+ to avoid crash in ffi_closure_free PATCHFILES = ruby-2.7-ffi-closure-fix{040cfc89b9a110cd0fb2abdcd35e8215b4a71f60}.patch:0 PATCH_DIST_STRIP = -p1 Index: 3.0/Makefile === RCS file: /cvs/ports/lang/ruby/3.0/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- 3.0/Makefile14 Apr 2022 20:32:59 - 1.11 +++ 3.0/Makefile3 Jul 2022 18:43:08 - @@ -3,6 +3,11 @@ DISTNAME = ruby-${VERSION} SHARED_LIBS = ruby30 0.0 NEXTVER = 3.1 PKGSPEC-main ?= ruby->=3.0.0,<${NEXTVER} +REVISION-main =0 + +# Backport fix for fixnum*fixnum multiplication on octeon +PATCHFILES = ruby-octeon-fix{fe6245b4309c855e6aca5b786ad50a72d53d278a}.patch:0 +PATCH_DIST_STRIP = -p1 PSEUDO_FLAVORS=no_ri_docs bootstrap # Do not build the RI docs on slow arches Index: 3.0/distinfo === RCS file: /cvs/ports/lang/ruby/3.0/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- 3.0/distinfo14 Apr 2022 20:32:59 - 1.5 +++ 3.0/distinfo3 Jul 2022 18:43:08 - @@ -1,2 +1,4 @@ SHA256 (ruby-3.0.4.tar.gz) = cLR8IHrwS86azqJiMI+0KJPT4kTzmkq8WGkgoccjcis= +SHA256 (ruby-octeon-fix.patch) = qFc5PJPaBF1ly9Kr9hXaQIYLmPPyUUw7ThMTkfE6y3A= SIZE (ruby-3.0.4.tar.gz) = 21139486 +SIZE (ruby-octeon-fix.patch) = 1880 Index: 3.1/Makefile === RCS file: /cvs/ports/lang/ruby/3.1/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- 3.1/Makefile14 Apr 2022 20:33:25 - 1.7 +++ 3.1/Makefile3 Jul 2022 18:43:08 - @@ -3,6 +3,11 @@ DISTNAME = ruby-${VERSION} SHARED_LIBS = ruby31 0.0 NEXTVER = 3.2 PKGSPEC-main ?= ruby->=3.1.0,<${NEXTVER} +REVISION-main =0 + +# Backport fix for fixnum*fixnum multiplication on octeon +PATCHFILES = ruby-octeon-fix{fe6245b4309c855e6aca5b786ad50a72d53d278a}.patch:0 +PATCH_DIST_STRIP = -p1 PSEUDO_FLAVORS=no_ri_docs bootstrap # Do not build the RI docs on slow arches I
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/07/03 12:32:41 Modified files: databases/ruby-pg: Makefile distinfo Log message: Update to pg 1.4.1
Update databases/ruby-pg 1.4.1
Simple update to the latest version of ruby-pg. Release notes at https://github.com/ged/ruby-pg/blob/master/History.rdoc Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-pg/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- Makefile27 May 2022 20:55:23 - 1.45 +++ Makefile1 Jul 2022 16:06:02 - @@ -1,6 +1,6 @@ COMMENT = PostgreSQL database interface for ruby -DISTNAME = pg-1.3.5 +DISTNAME = pg-1.4.1 CATEGORIES = databases MAINTAINER = Jeremy Evans Index: distinfo === RCS file: /cvs/ports/databases/ruby-pg/distinfo,v retrieving revision 1.28 diff -u -p -r1.28 distinfo --- distinfo27 May 2022 20:55:23 - 1.28 +++ distinfo1 Jul 2022 16:06:15 - @@ -1,2 +1,2 @@ -SHA256 (pg-1.3.5.gem) = JtY/8CenLlCVDMDtoLo4qHjdWdfMJwXSM0qWPFj9PoM= -SIZE (pg-1.3.5.gem) = 201216 +SHA256 (pg-1.4.1.gem) = OGu/+tIjzOHdqQPa0sWSaOQfPRg3klBmca5SYBH/BIc= +SIZE (pg-1.4.1.gem) = 201728
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/06/29 16:46:52 Modified files: lang/jruby : Makefile distinfo lang/jruby/pkg : PLIST Log message: Update to JRuby 9.3.6.0
Update lang/jruby 9.3.6.0
Simple update to the latest version of JRuby. Release notes at: https://www.jruby.org/2022/06/27/jruby-9-3-6-0.html Tested on amd64, the only supported arch. Will commit in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.101 diff -u -p -r1.101 Makefile --- Makefile25 Mar 2022 22:16:24 - 1.101 +++ Makefile27 Jun 2022 21:02:38 - @@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64 COMMENT = pure-Java implementation of the Ruby language -V =9.3.4.0 +V =9.3.6.0 DISTNAME = jruby-dist-${V}-bin PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby Index: distinfo === RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.67 diff -u -p -r1.67 distinfo --- distinfo25 Mar 2022 22:16:24 - 1.67 +++ distinfo27 Jun 2022 21:02:46 - @@ -1,6 +1,6 @@ SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ= -SHA256 (jruby-dist-9.3.4.0-bin.tar.gz) = UxVE0yeocVXYyATxU6LfPPBPAYJWHLLdLJNy9IYFtlw= +SHA256 (jruby-dist-9.3.6.0-bin.tar.gz) = dHr2r5mmdPII9A2o2yLXfG2kk6gygOmQtS1SOr2UmeI= SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo= SIZE (jffi-1.3.5.tar.gz) = 3152240 -SIZE (jruby-dist-9.3.4.0-bin.tar.gz) = 27717077 +SIZE (jruby-dist-9.3.6.0-bin.tar.gz) = 27730957 SIZE (jruby-launcher-1.1.19-java.gem) = 64000 Index: pkg/PLIST === RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v retrieving revision 1.59 diff -u -p -r1.59 PLIST --- pkg/PLIST 25 Mar 2022 22:16:24 - 1.59 +++ pkg/PLIST 27 Jun 2022 21:03:52 - @@ -429,13 +429,13 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/ipaddr-1.2.2.gemspec jruby/lib/ruby/gems/1.8/specifications/default/irb-1.0.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/jar-dependencies-0.4.1.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.12.2-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.13.0-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/jruby-readline-1.3.7-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/json-2.5.1-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/logger-1.5.1.gemspec jruby/lib/ruby/gems/1.8/specifications/default/matrix-0.3.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/mutex_m-0.1.0.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/ostruct-0.5.1.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/ostruct-0.5.5.gemspec jruby/lib/ruby/gems/1.8/specifications/default/prime-0.1.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/psych-3.3.2-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/racc-1.5.2-java.gemspec
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/06/24 08:39:26 Modified files: x11/fluxbox: Makefile distinfo Log message: Apply upstream distpatch to fix maxDepth issue Fixes Firefox in certain multimonitor configurations OK kn@
Fix Firefox on Fluxbox in multi-monitor configurations
Running Firefox on Fluxbox is broken in certain multimonitor configurations, due to a bug in Fluxbox. This bug has been fixed upstream, but they haven't put out a release since. This applies the upstream patch as a distpatch to fix the issue. Tested and confirmed to fix the issue on amd64. OKs? Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/x11/fluxbox/Makefile,v retrieving revision 1.89 diff -u -p -r1.89 Makefile --- Makefile11 Mar 2022 20:15:30 - 1.89 +++ Makefile24 Jun 2022 01:17:03 - @@ -1,9 +1,14 @@ COMMENT = window manager based on the original Blackbox code DISTNAME = fluxbox-1.3.7 CATEGORIES = x11 -REVISION = 4 +REVISION = 5 HOMEPAGE = http://fluxbox.org/ + +MASTER_SITES0 = http://git.fluxbox.org/fluxbox.git/patch/ +# Backport fix for maxDepth to fix usage with Firefox +PATCHFILES = fluxbox-firefox-fix.patch{?id=dcdde4d32c93d01df205bc06d7dfcbd356be031f}:0 +PATCH_DIST_STRIP = -p1 # X11 PERMIT_PACKAGE = Yes Index: distinfo === RCS file: /cvs/ports/x11/fluxbox/distinfo,v retrieving revision 1.29 diff -u -p -r1.29 distinfo --- distinfo9 Feb 2015 15:52:13 - 1.29 +++ distinfo24 Jun 2022 01:17:03 - @@ -1,2 +1,4 @@ SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58= +SHA256 (fluxbox-firefox-fix.patch) = oRWRrVGIr5l0j27eaEdDKuxUo8ISrCmHOqgupe7e4Ts= SIZE (fluxbox-1.3.7.tar.gz) = 1267833 +SIZE (fluxbox-firefox-fix.patch) = 4080
Re: [NEW] devel/ruby-rbtree devel/ruby-set devel/ruby-sorted_set
On Tue, Jun 21, 2022 at 1:43 PM Kurt Mosiejczuk wrote: > Ruby as of 3.0 stopped shipping Set. > > Sorted_set was split out of Set since it needed the external library > rbtree for > decent performance. > > Here are the three gems to import and make them available for Ruby 3.0/3.1 > > I've marked the FLAVORS as just "ruby30 ruby31" since ruby27 has them built > in and jRuby has its own implementations built in still. > > ok to import? > Ruby didn't stop shipping Set in Ruby 3.0, though it is true that sorted_set was removed. So importing ruby-set should not be necessary. Looks like sorted-set has a runtime dependency on the set gem, you should patch that out as it isn't necessary (make patch, then edit $WRKSRC/.metadata). I would remove the use of FLAVORS in rbtree and sorted_set. It's not a problem to build a Ruby 2.7 version, the Ruby 2.7 version is not built by default anyway, and removing FLAVORS will ease maintenance burden when Ruby 3.2 is added. For sorted_set, seems odd to comment out the .git* files in the package, but leave the bin directory. No objections to keeping it that way, though. For rbtree, it has a C extension, so CONFIGURE_STYLE should be "ruby gem ext". The ${GEM_LIB}/extensions directory should be removed from the PLIST. Most files from ${GEM_LIB}/gems/${DISTNAME} should be removed as well. I would change the rbtree PLIST to: ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/LICENSE ${GEM_LIB}/gems/${DISTNAME}/MANIFEST ${GEM_LIB}/gems/${DISTNAME}/README ${GEM_LIB}/gems/${DISTNAME}/lib/ @so ${GEM_LIB}/gems/${DISTNAME}/lib/rbtree.so ${GEM_LIB}/gems/${DISTNAME}/test.rb ${GEM_LIB}/specifications/${DISTNAME}.gemspec Thanks, Jeremy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/06/06 10:21:07 Modified files: mail/ruby-mime-types-data: Makefile distinfo mail/ruby-mime-types-data/pkg: PLIST Log message: Update to mime-types-data 3.2022.0105 >From George Rosamond
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/06/06 10:19:02 Modified files: mail/ruby-mime-types: Makefile distinfo Log message: Update to mime-types 3.4.1 >From George Rosamond
Re: [UPDATE] mail/ruby-mini_mime-1.1.2
On Sun, Jun 5, 2022 at 3:23 PM George Rosamond wrote: > Update from 1.0.2 to 1.1.2. > > Most changes related to upstreams updating of mime types. > Committed. In the future, please make sure to use make update-plist to make sure the PLIST is updated. Thanks, Jeremy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/06/06 10:14:16 Modified files: mail/ruby-mini_mime: Makefile distinfo mail/ruby-mini_mime/pkg: PLIST Log message: Update to mini_mime 1.1.2 Mostly from George Rosamond
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/06/03 16:55:43 Modified files: databases/ruby-mysql2: Makefile distinfo databases/ruby-mysql2/pkg: PLIST Removed files: databases/ruby-mysql2/patches: patch-ext_mysql2_client_c patch-ext_mysql2_result_c patch-ext_mysql2_statement_c Log message: Update to mysql2 0.5.4 Drop local patches, no longer needed.
Update: databases/ruby-mysql 0.5.4
Simple update to the latest release of mysql2. Remove current patches as they were applied upstream. Changelog at https://github.com/brianmario/mysql2/releases/tag/0.5.4 Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-mysql2/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- Makefile25 Apr 2022 16:04:21 - 1.31 +++ Makefile1 Jun 2022 22:33:55 - @@ -1,7 +1,6 @@ COMMENT= modern, simple and very fast MySQL library for Ruby -DISTNAME= mysql2-0.5.3 -REVISION= 1 +DISTNAME= mysql2-0.5.4 CATEGORIES=databases HOMEPAGE= https://github.com/brianmario/mysql2 Index: distinfo === RCS file: /cvs/ports/databases/ruby-mysql2/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo3 Feb 2020 19:03:03 - 1.13 +++ distinfo1 Jun 2022 22:33:55 - @@ -1,2 +1,2 @@ -SHA256 (mysql2-0.5.3.gem) = XKLZfZwl+ifcZ+ynfdjXPxJXbEzU9vbBixKSWjy7JDQ= -SIZE (mysql2-0.5.3.gem) = 74240 +SHA256 (mysql2-0.5.4.gem) = AbuVo+oYzerm3M3VPCm0yXqHPDvOHTW1JAVd8io4Xnc= +SIZE (mysql2-0.5.4.gem) = 79360 Index: patches/patch-ext_mysql2_client_c === RCS file: patches/patch-ext_mysql2_client_c diff -N patches/patch-ext_mysql2_client_c --- patches/patch-ext_mysql2_client_c 25 Apr 2022 16:04:21 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -Index: ext/mysql2/client.c - -Don't use tainted string function. - ext/mysql2/client.c.orig -+++ ext/mysql2/client.c -@@ -175,7 +175,7 @@ static void rb_mysql_client_mark(void * wrapper) { - - static VALUE rb_raise_mysql2_error(mysql_client_wrapper *wrapper) { - VALUE rb_error_msg = rb_str_new2(mysql_error(wrapper->client)); -- VALUE rb_sql_state = rb_tainted_str_new2(mysql_sqlstate(wrapper->client)); -+ VALUE rb_sql_state = rb_str_new2(mysql_sqlstate(wrapper->client)); - VALUE e; - - rb_enc_associate(rb_error_msg, rb_utf8_encoding()); Index: patches/patch-ext_mysql2_result_c === RCS file: patches/patch-ext_mysql2_result_c diff -N patches/patch-ext_mysql2_result_c --- patches/patch-ext_mysql2_result_c 25 Apr 2022 16:04:21 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -Index: ext/mysql2/result.c - -Undef Mysql2::Result alloc function to avoid warning on Ruby 3.2. - ext/mysql2/result.c.orig -+++ ext/mysql2/result.c -@@ -969,6 +969,7 @@ void init_mysql2_result() { - cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime")); - - cMysql2Result = rb_define_class_under(mMysql2, "Result", rb_cObject); -+ rb_undef_alloc_func(cMysql2Result); - rb_define_method(cMysql2Result, "each", rb_mysql_result_each, -1); - rb_define_method(cMysql2Result, "fields", rb_mysql_result_fetch_fields, 0); - rb_define_method(cMysql2Result, "free", rb_mysql_result_free_, 0); Index: patches/patch-ext_mysql2_statement_c === RCS file: patches/patch-ext_mysql2_statement_c diff -N patches/patch-ext_mysql2_statement_c --- patches/patch-ext_mysql2_statement_c25 Apr 2022 16:04:21 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,25 +0,0 @@ -Index: ext/mysql2/statement.c - -Remove use of tainted string function. - -Undef Mysql2::Statement alloc function to avoid warning on Ruby 3.2. - ext/mysql2/statement.c.orig -+++ ext/mysql2/statement.c -@@ -46,7 +46,7 @@ void rb_raise_mysql2_stmt_error(mysql_stmt_wrapper *st - VALUE e; - GET_CLIENT(stmt_wrapper->client); - VALUE rb_error_msg = rb_str_new2(mysql_stmt_error(stmt_wrapper->stmt)); -- VALUE rb_sql_state = rb_tainted_str_new2(mysql_stmt_sqlstate(stmt_wrapper->stmt)); -+ VALUE rb_sql_state = rb_str_new2(mysql_stmt_sqlstate(stmt_wrapper->stmt)); - - rb_encoding *conn_enc; - conn_enc = rb_to_encoding(wrapper->encoding); -@@ -576,6 +576,7 @@ void init_mysql2_statement() { - cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal")); - - cMysql2Statement = rb_define_class_under(mMysql2, "Statement", rb_cObject); -+ rb_undef_alloc_func(cMysql2Statement); - rb_define_method(cMysql2Statement, "param_count", rb_mysql_stmt_param_count, 0); - rb_define_method(cMysql2Statement, "field_count", rb_mysql_stmt_field_count, 0); - rb_define_method(cMysql2Statement, "_execute", rb_mysql_stmt_execute, -1); Index: pkg/PLIST === RCS file: /cvs/ports/databases/ruby-mysql2/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 11 Mar 2022 18:31:44 - 1.12 +++ pkg/PLIST 1 Jun 2022 22:33:55 - @@ -16,6 +16,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/r
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/05/27 14:55:23 Modified files: databases/ruby-pg: Makefile distinfo Log message: Update to pg 1.3.5
Update: ruby-pg 1.3.5
Simple update to the latest release of the pg gem. Release notes available at https://github.com/ged/ruby-pg/blob/master/History.rdoc Tested on amd64. Will commit in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-pg/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- Makefile18 Mar 2022 20:47:45 - 1.44 +++ Makefile25 May 2022 20:04:12 - @@ -1,6 +1,6 @@ COMMENT = PostgreSQL database interface for ruby -DISTNAME = pg-1.3.4 +DISTNAME = pg-1.3.5 CATEGORIES = databases MAINTAINER = Jeremy Evans Index: distinfo === RCS file: /cvs/ports/databases/ruby-pg/distinfo,v retrieving revision 1.27 diff -u -p -r1.27 distinfo --- distinfo18 Mar 2022 20:47:45 - 1.27 +++ distinfo25 May 2022 20:04:27 - @@ -1,2 +1,2 @@ -SHA256 (pg-1.3.4.gem) = q7I3I0Y/3IyHf0Jnm4QOgVGO4mtHK1rE/TFW+tUcDCQ= -SIZE (pg-1.3.4.gem) = 200192 +SHA256 (pg-1.3.5.gem) = JtY/8CenLlCVDMDtoLo4qHjdWdfMJwXSM0qWPFj9PoM= +SIZE (pg-1.3.5.gem) = 201216
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/05/25 14:02:45 Modified files: security/ruby-bcrypt: Makefile distinfo security/ruby-bcrypt/pkg: PLIST Log message: Update to bcrypt gem 3.1.18
Update: ruby-bcrypt 3.1.18
This updates to the latest release of the bcrypt gem. CHANGELOG located at https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/CHANGELOG One undocumented change is that attempts to use a password with a null byte will now raise an exception. Tested on amd64. I plan on committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/security/ruby-bcrypt/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile11 Mar 2022 19:54:01 - 1.29 +++ Makefile23 May 2022 17:35:49 - @@ -1,6 +1,6 @@ COMMENT = Ruby binding for the bcrypt() password hashing algorithm -VERSION = 3.1.13 +VERSION = 3.1.18 DISTNAME = bcrypt-${VERSION} CATEGORIES = security Index: distinfo === RCS file: /cvs/ports/security/ruby-bcrypt/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo12 Nov 2019 06:46:00 - 1.8 +++ distinfo23 May 2022 17:35:52 - @@ -1,2 +1,2 @@ -SHA256 (bcrypt-3.1.13.gem) = l2oa/CsQ54y4AX/7dlgzYahn701g1liFWMCOJ0uoICo= -SIZE (bcrypt-3.1.13.gem) = 54272 +SHA256 (bcrypt-3.1.18.gem) = FU3gsLCJ5W1ZgMUDethfyVVM+/SZZThnPB3bybYbHxE= +SIZE (bcrypt-3.1.18.gem) = 55808 Index: pkg/PLIST === RCS file: /cvs/ports/security/ruby-bcrypt/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 11 Mar 2022 19:54:01 - 1.9 +++ pkg/PLIST 23 May 2022 17:37:00 - @@ -1,12 +1,13 @@ ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ +${GEM_LIB}/gems/${DISTNAME}/.github/ +${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ +${GEM_LIB}/gems/${DISTNAME}/.github/workflows/ruby.yml ${GEM_LIB}/gems/${DISTNAME}/.gitignore ${GEM_LIB}/gems/${DISTNAME}/.rspec -${GEM_LIB}/gems/${DISTNAME}/.travis.yml ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG ${GEM_LIB}/gems/${DISTNAME}/COPYING ${GEM_LIB}/gems/${DISTNAME}/Gemfile -${GEM_LIB}/gems/${DISTNAME}/Gemfile.lock ${GEM_LIB}/gems/${DISTNAME}/README.md ${GEM_LIB}/gems/${DISTNAME}/Rakefile ${GEM_LIB}/gems/${DISTNAME}/bcrypt.gemspec @@ -16,8 +17,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bcrypt.r ${GEM_LIB}/gems/${DISTNAME}/lib/bcrypt/engine.rb ${GEM_LIB}/gems/${DISTNAME}/lib/bcrypt/error.rb ${GEM_LIB}/gems/${DISTNAME}/lib/bcrypt/password.rb -${GEM_LIB}/gems/${DISTNAME}/lib/bcrypt_ext.so +@so ${GEM_LIB}/gems/${DISTNAME}/lib/bcrypt_ext.so ${GEM_LIB}/gems/${DISTNAME}/spec/ +${GEM_LIB}/gems/${DISTNAME}/spec/TestBCrypt.java ${GEM_LIB}/gems/${DISTNAME}/spec/bcrypt/ ${GEM_LIB}/gems/${DISTNAME}/spec/bcrypt/engine_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/bcrypt/error_spec.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/05/16 14:35:51 Modified files: databases/postgresql: Tag: OPENBSD_7_1 Makefile distinfo databases/postgresql/pkg: Tag: OPENBSD_7_1 PLIST-docs Log message: Update to PostgreSQL 14.3 OK danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/05/14 11:51:55 Modified files: databases/postgresql: Makefile distinfo databases/postgresql/patches: patch-src_include_storage_s_lock_h databases/postgresql/pkg: PLIST-docs Log message: Update to PostgreSQL 14.3 OK danj@
Update: PostgreSQL 14.3
Update to the latest release of PostgreSQL, fixing CVE-2022-1552, see release announcement: https://www.postgresql.org/about/news/postgresql-143-137-1211-1116-and-1021-released-2449/ Tested briefly on amd64. I plan to do more testing tomorrow, and assuming no problems, commit the day after. I'll also update -stable early next week. Do we want to upgrade postgresql-previous for this? It's only supposed to be used for pg_upgrade, and I don't think the CVE affects that. If anyone wants that, please let me know and I can update that as well. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.285 diff -u -p -r1.285 Makefile --- Makefile11 Mar 2022 18:31:37 - 1.285 +++ Makefile12 May 2022 19:27:43 - @@ -5,12 +5,10 @@ COMMENT-contrib=PostgreSQL RDBMS contrib COMMENT-plpython=Python procedural language for PostgreSQL COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version -VERSION= 14.2 +VERSION= 14.3 PREV_MAJOR=13 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} - -REVISION-server=1 DPB_PROPERTIES=parallel Index: distinfo === RCS file: /cvs/ports/databases/postgresql/distinfo,v retrieving revision 1.92 diff -u -p -r1.92 distinfo --- distinfo12 Feb 2022 21:10:34 - 1.92 +++ distinfo12 May 2022 18:38:51 - @@ -1,2 +1,2 @@ -SHA256 (postgresql-14.2.tar.gz) = k00SLrq9bc4+CZN9yZWFh23QiZJb5aIw2v0URawZWHg= -SIZE (postgresql-14.2.tar.gz) = 28794023 +SHA256 (postgresql-14.3.tar.gz) = GO/zBDhwPdel8qfKkWdBvOPJnq20AlvGJoryaOjpCcU= +SIZE (postgresql-14.3.tar.gz) = 28930973 Index: pkg/PLIST-docs === RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v retrieving revision 1.105 diff -u -p -r1.105 PLIST-docs --- pkg/PLIST-docs 11 Mar 2022 18:31:37 - 1.105 +++ pkg/PLIST-docs 12 May 2022 19:28:16 - @@ -704,6 +704,7 @@ share/doc/postgresql/html/regress-varian share/doc/postgresql/html/regress.html share/doc/postgresql/html/release-14-1.html share/doc/postgresql/html/release-14-2.html +share/doc/postgresql/html/release-14-3.html share/doc/postgresql/html/release-14.html share/doc/postgresql/html/release-prior.html share/doc/postgresql/html/release.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/05/05 09:50:29 Modified files: devel/subversion: Makefile Log message: Update ruby subpackage to use default ruby version instead of 2.7 Use UPDATE_PLIST_ARGS to stop it rewriting PLIST-python with wrongness. Initial diff by me Looks fine to stsp@ (MAINTAINER) Better, committed diff by sthen@ OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2022/05/05 09:41:58 Modified files: databases/xapian-bindings: Makefile devel/gitsh: Makefile devel/ragel: Makefile devel/swig : Makefile devel/vim-command-t: Makefile editors/vim: Makefile graphics/inkscape: Makefile lang/mruby : Makefile mail/mew : Makefile misc/tpp : Makefile net/munin : Makefile multimedia/mkvtoolnix: Makefile net/ocserv : Makefile net/rrdtool: Makefile net/weechat: Makefile net/whatweb: Makefile print/texlive/texmf: Makefile security/arirang: Makefile security/openssl-ruby-tests: Makefile security/wpscan: Makefile sysutils/tmuxinator: Makefile textproc/asciidoctor: Makefile textproc/libmarisa: Makefile textproc/redland-bindings: Makefile www/nginx : Makefile www/sass : Makefile www/unit/unit-ruby: Makefile x11/kde-applications/kross-interpreters: Makefile Log message: Bump ports after switching default ruby version to 3.1 OK sthen@, tb@