CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/26 12:15:10 Modified files: lang/ruby/3.3 : Tag: OPENBSD_7_5 Makefile distinfo lang/ruby/3.3/patches: Tag: OPENBSD_7_5 patch-configure patch-ext_extmk_rb lang/ruby/3.3/pkg: Tag: OPENBSD_7_5 PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.3.1 Fixes: CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc CVE-2024-27280: Buffer overread vulnerability in StringIO Backport an upstream fix for ILP32 architectures. Switch check to test-all as the test target, as the previous check target fails before the main test suite runs due to a symbol visibility that doesn't handle retguard. Upstream fix identified by tb@ i386 testing by tb@ OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/26 12:14:20 Modified files: lang/ruby/3.2 : Tag: OPENBSD_7_5 Makefile distinfo lang/ruby/3.2/patches: Tag: OPENBSD_7_5 patch-compile_c patch-configure patch-coroutine_amd64_Context_S patch-lib_rubygems_commands_install_command_rb patch-lib_rubygems_dependency_installer_rb patch-lib_rubygems_ext_builder_rb patch-lib_rubygems_ext_ext_conf_builder_rb patch-template_Makefile_in lang/ruby/3.2/pkg: Tag: OPENBSD_7_5 PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.2.4 Fixes: CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc CVE-2024-27280: Buffer overread vulnerability in StringIO OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/26 12:13:28 Modified files: lang/ruby/3.1 : Tag: OPENBSD_7_5 Makefile distinfo lang/ruby/3.1/patches: Tag: OPENBSD_7_5 patch-compile_c patch-configure patch-coroutine_amd64_Context_S lang/ruby/3.1/pkg: Tag: OPENBSD_7_5 PLIST-main PLIST-ri_docs Added files: lang/ruby/3.1/patches: Tag: OPENBSD_7_5 patch-ext_fiddle_closure_c Log message: Update to Ruby 3.1.5 Fixes: CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc CVE-2024-27280: Buffer overread vulnerability in StringIO Fix a bad backport in the fiddle extension that breaks compilation. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/25 16:09:25 Modified files: lang/ruby/3.1 : Makefile distinfo lang/ruby/3.1/patches: patch-compile_c patch-configure patch-coroutine_amd64_Context_S lang/ruby/3.1/pkg: PLIST-main PLIST-ri_docs Added files: lang/ruby/3.1/patches: patch-ext_fiddle_closure_c Log message: Update to Ruby 3.1.5 Fix a bad backport in the fiddle extension that breaks compilation. OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/25 16:05:25 Modified files: lang/ruby/3.2 : Makefile distinfo lang/ruby/3.2/patches: patch-compile_c patch-configure patch-coroutine_amd64_Context_S patch-lib_rubygems_commands_install_command_rb patch-lib_rubygems_dependency_installer_rb patch-lib_rubygems_ext_builder_rb patch-lib_rubygems_ext_ext_conf_builder_rb patch-template_Makefile_in lang/ruby/3.2/pkg: PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.2.4 OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/25 16:04:30 Modified files: lang/ruby/3.3 : Makefile distinfo lang/ruby/3.3/patches: patch-configure patch-ext_extmk_rb lang/ruby/3.3/pkg: PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.3.1 Backport an upstream fix for ILP32 architectures. Switch check to test-all as the test target, as the previous check target fails before the main test suite runs due to a symbol visibility that doesn't handle retguard. Upstream fix identified by tb@ i386 testing by tb@ OK tb@
Update: suricata 7.0.5
Simple update to the latest suricata release. Release notes at:
https://forum.suricata.io/t/suricata-7-0-5-and-6-0-19-released/4617
Looks like a couple CVEs fixed based on the release announcement,
but I couldn't find details.
Tested briefly on amd64.
OKs?
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile27 Mar 2024 21:31:15 - 1.68
+++ Makefile24 Apr 2024 00:12:15 -
@@ -3,8 +3,8 @@ NOT_FOR_ARCHS = powerpc64 riscv64
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 7.0.4
-SUPDATE_V =1.3.2
+SURICATA_V = 7.0.5
+SUPDATE_V =1.3.3
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
Index: distinfo
===
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- distinfo27 Mar 2024 21:31:15 - 1.23
+++ distinfo24 Apr 2024 00:12:15 -
@@ -1,2 +1,2 @@
-SHA256 (suricata-7.0.4.tar.gz) = ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=
-SIZE (suricata-7.0.4.tar.gz) = 23610769
+SHA256 (suricata-7.0.5.tar.gz) = H/tWgVjyZcCFVEZL+4VOZWjvaDvwMxKSO1HyjFB5Ck4=
+SIZE (suricata-7.0.5.tar.gz) = 23612189
Ruby 3.1.5, 3.2.4, 3.3.1
This updates to the latest versions of Ruby, released today. Release
notes at:
* https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
* https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
* https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
These fix 3 CVEs:
*
https://www.ruby-lang.org/en/news/2024/04/23/arbitrary-memory-address-read-regexp-cve-2024-27282/
* https://www.ruby-lang.org/en/news/2024/03/21/rce-rdoc-cve-2024-27281/
* https://www.ruby-lang.org/en/news/2024/03/21/buffer-overread-cve-2024-27280/
There has already been a bug report filed that Ruby 3.3.1 does not
compile on Fedora/i686 (https://bugs.ruby-lang.org/issues/20447). Can
someone please test whether it compiles on OpenBSD/i386? If not, that
will have to be fixed before commit.
There has also been a report of a regression in ripper in Ruby 3.1.5
(https://bugs.ruby-lang.org/issues/20449). This issue seems fairly
minor and I don't think should block an update. There is an available
patch to fix it that we can use if we want.
Ports-wise, this is a version bump + regen patches + PLIST update,
with the exception of a new patch added for Ruby 3.1.5, to fix a
compiler error introduced by an upstream backport.
Tested briefly on amd64. I'll be doing additional tests later today.
Assuming that this doesn't cause problems on OpenBSD/i386, I plan to
commit in a couple days, and due to the security fixes, backport to
-stable.
Thanks,
Jeremy
Index: 3.1/Makefile
===
RCS file: /cvs/ports/lang/ruby/3.1/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- 3.1/Makefile9 Apr 2024 04:17:52 - 1.17
+++ 3.1/Makefile23 Apr 2024 16:49:41 -
@@ -1,10 +1,8 @@
-VERSION = 3.1.4
+VERSION = 3.1.5
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby31 0.0
NEXTVER = 3.2
PKGSPEC-main ?= ruby->=3.1.0,<${NEXTVER}
-
-REVISION-main =1
SITES.p1 ?=https://github.com/ruby/openssl/commit/
Index: 3.1/distinfo
===
RCS file: /cvs/ports/lang/ruby/3.1/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- 3.1/distinfo5 Feb 2024 20:51:41 - 1.9
+++ 3.1/distinfo23 Apr 2024 16:49:41 -
@@ -1,9 +1,9 @@
-SHA256 (ruby-3.1.4.tar.gz) = o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=
+SHA256 (ruby-3.1.5.tar.gz) = NoXFHu7hNSwx6gOXBtcZdvU9AKttdzEt5qoauvXNosU=
SHA256 (ruby-asn1time-fix-1.patch) =
n3v+hFVd72m+qOQYrHfnU8aKhypFTHkmbw1tdxoj6U4=
SHA256 (ruby-ed25519-fix-1.patch) =
6Cxx/FbYfJGbhKqdUbAmKvRmZEWpP1MPTZfWWzHoNfg=
SHA256 (ruby-enable-hkdf-1.patch) =
IUjVM4OMHs4KeZcXAdPW2iMy1voVDuAGtUZBMJovyFY=
SHA256 (ruby-octeon-fix-2.patch) = u3ETLnfgMRbVGa6X33NRjdToUT6X+xq5/K7hHrXQwQQ=
-SIZE (ruby-3.1.4.tar.gz) = 20917933
+SIZE (ruby-3.1.5.tar.gz) = 20884264
SIZE (ruby-asn1time-fix-1.patch) = 2279
SIZE (ruby-ed25519-fix-1.patch) = 1496
SIZE (ruby-enable-hkdf-1.patch) = 1471
Index: 3.1/patches/patch-compile_c
===
RCS file: /cvs/ports/lang/ruby/3.1/patches/patch-compile_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-compile_c
--- 3.1/patches/patch-compile_c 11 Mar 2022 19:29:14 - 1.2
+++ 3.1/patches/patch-compile_c 23 Apr 2024 16:49:41 -
@@ -4,7 +4,7 @@ segfaults.
Index: compile.c
--- compile.c.orig
+++ compile.c
-@@ -2906,6 +2906,10 @@ static int
+@@ -2934,6 +2934,10 @@ static int
iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int
do_tailcallopt)
{
INSN *const iobj = (INSN *)list;
Index: 3.1/patches/patch-configure
===
RCS file: /cvs/ports/lang/ruby/3.1/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-configure
--- 3.1/patches/patch-configure 1 Apr 2023 19:29:04 - 1.6
+++ 3.1/patches/patch-configure 23 Apr 2024 16:49:41 -
@@ -8,7 +8,7 @@ so ports don't have to be bumped when Op
Index: configure
--- configure.orig
+++ configure
-@@ -29567,6 +29567,10 @@ esac
+@@ -29577,6 +29577,10 @@ esac
coroutine_type=x86
;; #(
@@ -19,7 +19,7 @@ Index: configure
*-openbsd*) :
coroutine_type=pthread
-@@ -31827,7 +31831,7 @@ fi
+@@ -31837,7 +31841,7 @@ fi
;; #(
openbsd*|mirbsd*) :
@@ -28,7 +28,7 @@ Index: configure
;; #(
solaris*) :
-@@ -33529,7 +33533,7 @@ then :
+@@ -33539,7 +33543,7 @@ then :
else $as_nop
Index: 3.1/patches/patch-coroutine_amd64_Context_S
===
RCS file: /cvs/ports/lang/ruby/3.1/patches/patch-coroutine_amd64_Context_S,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-coroutine_amd64_Context_S
--- 3.1/patches/patch-coroutine_amd64_Context_S 9 Apr
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/22 10:06:13 Modified files: databases/ruby-sqlite3: Makefile distinfo databases/ruby-sqlite3/pkg: PLIST Log message: Update to ruby-sqlite3 2.0.0 Remove test code from port, as the gem no longer ships tests.
Update: databases/ruby-sqlite3 2.0.0
Update to the latest release of ruby sqlite3. Changelog located at
https://github.com/sparklemotion/sqlite3-ruby/blob/main/CHANGELOG.md
The gem no longer ships tests, so remove test code from the port.
Tested manually on amd64. I plan on committing this next week unless I
hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/databases/ruby-sqlite3/Makefile,v
diff -u -p -r1.49 Makefile
--- Makefile31 Dec 2023 21:25:22 - 1.49
+++ Makefile17 Apr 2024 18:39:17 -
@@ -1,6 +1,6 @@
COMMENT= access a SQLite3 database from ruby
-DISTNAME= sqlite3-1.7.0
+DISTNAME= sqlite3-2.0.0
CATEGORIES=databases
MAINTAINER = Jeremy Evans
@@ -17,12 +17,5 @@ LIB_DEPENDS= databases/sqlite3
CONFIGURE_STYLE= ruby gem ext
CONFIGURE_ARGS=--enable-system-libraries
-
-MODRUBY_TEST= rake
-TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}
-
-do-test:
- cd ${WRKSRC}/test && ${RUBY} -I . -e \
- "require 'sqlite3'; Dir['test_*.rb'].each{|f| load(f)}"
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-sqlite3/distinfo,v
diff -u -p -r1.22 distinfo
--- distinfo31 Dec 2023 21:25:22 - 1.22
+++ distinfo17 Apr 2024 18:34:08 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite3-1.7.0.gem) = iUtZZVkfstt9lVcuk5QvT93Rdi037E+8GYs2Qm/Nrjw=
-SIZE (sqlite3-1.7.0.gem) = 3277824
+SHA256 (sqlite3-2.0.0.gem) = 9ojkquE/YKu486SdP6I6gU08ZkO4n+yWuu8zYCyPTgc=
+SIZE (sqlite3-2.0.0.gem) = 3295232
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-sqlite3/pkg/PLIST,v
diff -u -p -r1.19 PLIST
--- pkg/PLIST 31 Dec 2023 21:25:23 - 1.19
+++ pkg/PLIST 17 Apr 2024 18:38:56 -
@@ -1,16 +1,11 @@
-${GEM_LIB}/build_info/${DISTNAME}.info
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/.gemtest
-${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}/FAQ.md
-${GEM_LIB}/gems/${DISTNAME}/Gemfile
${GEM_LIB}/gems/${DISTNAME}/INSTALLATION.md
${GEM_LIB}/gems/${DISTNAME}/LICENSE
-${GEM_LIB}/gems/${DISTNAME}/LICENSE-DEPENDENCIES
${GEM_LIB}/gems/${DISTNAME}/README.md
${GEM_LIB}/gems/${DISTNAME}/dependencies.yml
${GEM_LIB}/gems/${DISTNAME}/lib/
@@ -23,28 +18,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/
${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/resultset.rb
@so ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/sqlite3_native.so
${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/statement.rb
-${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}/test/
-${GEM_LIB}/gems/${DISTNAME}/test/helper.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_backup.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_collation.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_database.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_database_flags.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_database_readonly.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_database_readwrite.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_deprecated.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_encoding.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_integration.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_integration_aggregate.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_integration_open_close.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_integration_pending.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_integration_resultset.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_integration_statement.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_pragmas.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_result_set.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_sqlite3.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_statement.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_statement_execute.rb
+${GEM_LIB}/gems/${DISTNAME}/ports/
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/sqlite-autoconf-3450300.tar.gz
${GEM_LIB}/specifications/${DISTNAME}.gemspec
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org 2024/04/09 12:44:31
Modified files:
lang/ruby/3.1 : Tag: OPENBSD_7_5 Makefile
lang/ruby/3.2 : Tag: OPENBSD_7_5 Makefile
lang/ruby/3.3 : Tag: OPENBSD_7_5 Makefile
Added files:
lang/ruby/3.1/patches: Tag: OPENBSD_7_5
patch-coroutine_amd64_Context_S
lang/ruby/3.2/patches: Tag: OPENBSD_7_5
patch-coroutine_amd64_Context_S
lang/ruby/3.3/patches: Tag: OPENBSD_7_5
patch-coroutine_amd64_Context_S
Log message:
Add _CET_ENDBR to amd64 coroutine code
I originally thought this issue was post-7.5, but after getting
access to a 7.5 machine with IBT, I confirmed it affects 7.5.
This fixes SIGILL/ILL_BTCFI for the following example code:
mutex = Mutex.new
mutex.synchronize { Fiber.new { mutex.owned? }.resume }
Thanks to tb@ for following up with me regarding this.
Issue reported by jcs@
Tested by jcs@
OK jcs@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org 2024/04/08 22:17:52
Modified files:
lang/ruby/3.1 : Makefile
lang/ruby/3.2 : Makefile
lang/ruby/3.3 : Makefile
Added files:
lang/ruby/3.1/patches: patch-coroutine_amd64_Context_S
lang/ruby/3.2/patches: patch-coroutine_amd64_Context_S
lang/ruby/3.3/patches: patch-coroutine_amd64_Context_S
Log message:
Add _CET_ENDBR to amd64 coroutine code
This fixes SIGILL/ILL_BTCFI that started occurring after
recent changes (post 7.5), for the following example code:
mutex = Mutex.new
mutex.synchronize { Fiber.new { mutex.owned? }.resume
Issue reported by jcs@
Tested by jcs@
OK jcs@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/08 17:41:18 Modified files: security/suricata: Tag: OPENBSD_7_5 Makefile security/suricata/pkg: Tag: OPENBSD_7_5 PLIST Added files: security/suricata/patches: Tag: OPENBSD_7_5 patch-src_suricata_c patch-src_util-privs_c patch-src_util-privs_h Log message: Readd privdrop patches "probably automatically removed" by gonzalo@ in the 7.0.2 update OK gonzalo@ add various @sample to suricata's PLIST that were missed in the 7.0.2 update from sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/04/02 18:07:23 Modified files: audio : Makefile databases : Makefile devel : Makefile graphics : Makefile net: Makefile security : Makefile sysutils : Makefile textproc : Makefile www: Makefile x11: Makefile Log message: Stop building ruby31 ports by default Ruby 3.1 is now in security maintenance mode, so per our Ruby support policy, we will no longer build ruby31 packages by default.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/03/27 15:31:15 Modified files: security/suricata: Makefile distinfo security/suricata/patches: patch-src_suricata_c patch-suricata_yaml_in security/suricata/pkg: README Removed files: security/suricata/patches: patch-doc_userguide_Makefile_in Log message: Update to Suricata 7.0.4 Take co-maintainership. Drop unnecessary AUTOMAKE version and SUBST_CMD processing of configure and doc/userguide/Makefile.in. Drop empty line patch of doc/userguide/Makefile.in. Process suricata.yaml.in with SUBST_CMD, and patch it so all @e_*@ variables are replaced. As the pkg README recommends suricata-update for updates, make that the default in the config file. Fix the pkg README to set the path when calling suricata-update, as the default path is not the desired path (it would be best to fix the default path, but the current patches are insufficient). Following the instructions in the README to setup suricata now results in a working configuration without any configuration file modification. OK gonzalo@ (MAINTAINER) OK sthen@
Re: Update: Suricata 7.0.4 + fixes
On 03/26 09:38, Stuart Henderson wrote:
> On 2024/03/25 20:16, Jeremy Evans wrote:
> > Here's an update to Suricata 7.0.4, based on gonzalo's update
> > recently posted to ports@. After discussion with gonzalo@ and
> > sthen@, I'm adding myself as co-maintainer.
> >
> > In addition to the version update, this fixes the following issues:
> >
> > Package README recommends suricata-update, but default config is
> > overridden to not use suricata-update. Stop overriding default
> > config, so way recommended by package README does not require
> > suricata.yaml modification.
> >
> > Run SUBST_CMD on suricata.yaml.in to fix the ${LOCALSTATEDIR}
> > remaining in default installed configuration.
> >
> > suricata-update downloads to /var/lib/suricata instead of
> > /var/suricata by default, despite the local patches. Not sure yet
> > how to fix that easily, so updated package README to specify -D
> > flag so it updates the correct place. I checked OpenBSD 7.4
> > (Suricata 6.0.12) and suricata-update also defaulted to
> > /var/lib/suricata there.
> >
> > Remove now unnecessary patch for suricata/doc/Makefile.in. Remove
> > a couple unnecessary files in SUBST_CMD as well.
>
> OK.
>
> Some other possible tweaks:
>
> ${WRKSRC}/configure can be dropped from SUBST_CMD too.
I made that change.
> AUTOMAKE_VERSION is set but does nothing (the port does not use a
> CONFIGURE_STYLE which depends on automake) so probably better removed.
> Alternatively as e_rundir is only used to set the default pid path in
> suricata.yaml, that could be patched in suricata.yaml.in and avoid the
> need to re-run autoconf completely (-> CONFIGURE_STYLE=gnu and drop
> both AUTO*_VERSION lines).
I updated suricata.yaml.in to replace all of the autoconf related code
with make variables that will be updated by SUBST_CMD. I found that
suricata does not like our /etc/magic file, so I left that commented
out.
I found that autoconf is used by the build system. I made a few
attempts at patching it out, but was unsuccessful. So I left that in.
Here's a revised diff. I plan to commit this tomorrow unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile23 Mar 2024 13:26:40 - 1.67
+++ Makefile26 Mar 2024 19:44:49 -
@@ -3,9 +3,8 @@ NOT_FOR_ARCHS = powerpc64 riscv64
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 7.0.3
-SUPDATE_V =1.2.8
-REVISION = 1
+SURICATA_V = 7.0.4
+SUPDATE_V =1.3.2
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
@@ -13,7 +12,8 @@ SHARED_LIBS +=htp
HOMEPAGE = https://suricata.io/
-MAINTAINER = Gonzalo L. R.
+MAINTAINER = Gonzalo L. R. , \
+ Jeremy Evans
# GPLv2
PERMIT_PACKAGE=Yes
@@ -48,7 +48,6 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.71
-AUTOMAKE_VERSION = 1.15
CONFIGURE_ENV =ac_cv_path_HAVE_PDFLATEX= \
ac_cv_path_HAVE_GIT_CMD= \
@@ -67,9 +66,7 @@ CONFIGURE_ARGS = --disable-gccmarch-nati
SUBST_VARS = SURICATA_V SUPDATE_V
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/configure \
- ${WRKSRC}/doc/userguide/Makefile.in \
- ${WRKSRC}/suricata-update/doc/Makefile \
+ ${SUBST_CMD} ${WRKSRC}/suricata.yaml.in \
${WRKSRC}/suricata-update/suricata/update/config.py \
${WRKSRC}/suricata-update/suricata/update/parsers.py
# prevent generating revision.py
Index: distinfo
===
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo22 Feb 2024 09:49:35 - 1.22
+++ distinfo26 Mar 2024 19:44:49 -
@@ -1,2 +1,2 @@
-SHA256 (suricata-7.0.3.tar.gz) = 6gdC16mHg/GvSldmGvYGi8LYUKw+ygSzIE0ozhZeNf8=
-SIZE (suricata-7.0.3.tar.gz) = 23599903
+SHA256 (suricata-7.0.4.tar.gz) = ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=
+SIZE (suricata-7.0.4.tar.gz) = 23610769
Index: patches/patch-doc_userguide_Makefile_in
===
RCS file: patches/patch-doc_userguide_Makefile_in
diff -N patches/patch-doc_userguide_Makefile_in
--- patches/patch-doc_userguide_Makefile_in 16 Nov 2023 18:15:37 -
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-Index: doc/userguide/Makefile.in
doc/userguide/Makefile.in.orig
-+++ doc/userguide/Makefile.in
-@@ -1,3 +1,4 @@
-+
- # Makefile.in generated by automake 1.16.5 from Makefile
Update: Suricata 7.0.4 + fixes
Here's an update to Suricata 7.0.4, based on gonzalo's update
recently posted to ports@. After discussion with gonzalo@ and
sthen@, I'm adding myself as co-maintainer.
In addition to the version update, this fixes the following issues:
Package README recommends suricata-update, but default config is
overridden to not use suricata-update. Stop overriding default
config, so way recommended by package README does not require
suricata.yaml modification.
Run SUBST_CMD on suricata.yaml.in to fix the ${LOCALSTATEDIR}
remaining in default installed configuration.
suricata-update downloads to /var/lib/suricata instead of
/var/suricata by default, despite the local patches. Not sure yet
how to fix that easily, so updated package README to specify -D
flag so it updates the correct place. I checked OpenBSD 7.4
(Suricata 6.0.12) and suricata-update also defaulted to
/var/lib/suricata there.
Remove now unnecessary patch for suricata/doc/Makefile.in. Remove
a couple unnecessary files in SUBST_CMD as well.
Fix README to not recommend restarting suricata twice after updating
the rules with suricata-update (once in the suricata-update section
and once in the "After updating rules" section).
Index: Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile23 Mar 2024 13:26:40 - 1.67
+++ Makefile25 Mar 2024 20:09:24 -
@@ -3,9 +3,8 @@ NOT_FOR_ARCHS = powerpc64 riscv64
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 7.0.3
-SUPDATE_V =1.2.8
-REVISION = 1
+SURICATA_V = 7.0.4
+SUPDATE_V =1.3.2
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
@@ -13,7 +12,8 @@ SHARED_LIBS +=htp
HOMEPAGE = https://suricata.io/
-MAINTAINER = Gonzalo L. R.
+MAINTAINER = Gonzalo L. R. , \
+ Jeremy Evans
# GPLv2
PERMIT_PACKAGE=Yes
@@ -68,8 +68,7 @@ SUBST_VARS = SURICATA_V SUPDATE_V
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure \
- ${WRKSRC}/doc/userguide/Makefile.in \
- ${WRKSRC}/suricata-update/doc/Makefile \
+ ${WRKSRC}/suricata.yaml.in \
${WRKSRC}/suricata-update/suricata/update/config.py \
${WRKSRC}/suricata-update/suricata/update/parsers.py
# prevent generating revision.py
Index: distinfo
===
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo22 Feb 2024 09:49:35 - 1.22
+++ distinfo25 Mar 2024 20:09:24 -
@@ -1,2 +1,2 @@
-SHA256 (suricata-7.0.3.tar.gz) = 6gdC16mHg/GvSldmGvYGi8LYUKw+ygSzIE0ozhZeNf8=
-SIZE (suricata-7.0.3.tar.gz) = 23599903
+SHA256 (suricata-7.0.4.tar.gz) = ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=
+SIZE (suricata-7.0.4.tar.gz) = 23610769
Index: patches/patch-doc_userguide_Makefile_in
===
RCS file: patches/patch-doc_userguide_Makefile_in
diff -N patches/patch-doc_userguide_Makefile_in
--- patches/patch-doc_userguide_Makefile_in 16 Nov 2023 18:15:37 -
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-Index: doc/userguide/Makefile.in
doc/userguide/Makefile.in.orig
-+++ doc/userguide/Makefile.in
-@@ -1,3 +1,4 @@
-+
- # Makefile.in generated by automake 1.16.5 from Makefile.am.
- # @configure_input@
-
Index: patches/patch-src_suricata_c
===
RCS file: /cvs/ports/security/suricata/patches/patch-src_suricata_c,v
retrieving revision 1.14
diff -u -p -r1.14 patch-src_suricata_c
--- patches/patch-src_suricata_c18 Mar 2024 17:46:37 - 1.14
+++ patches/patch-src_suricata_c25 Mar 2024 20:09:24 -
@@ -4,7 +4,7 @@ Suricata uses libcap-ng on Linux and run
Index: src/suricata.c
--- src/suricata.c.orig
+++ src/suricata.c
-@@ -1600,7 +1600,7 @@ static TmEcode ParseCommandLine(int argc, char** argv,
+@@ -1597,7 +1597,7 @@ static TmEcode ParseCommandLine(int argc, char** argv,
return TM_ECODE_FAILED;
#endif /* UNITTESTS */
} else if (strcmp((long_opts[option_index]).name, "user") == 0) {
@@ -13,7 +13,7 @@ Index: src/suricata.c
SCLogError("libcap-ng is required to"
" drop privileges, but it was not compiled into
Suricata.");
return TM_ECODE_FAILED;
-@@ -1609,7 +1609,7 @@ static TmEcode ParseCommandLine(int argc, char** argv,
+@@ -1606,7 +1606,7 @@ static TmEcode ParseCommandLine(int argc, char** argv,
suri->do_setuid = TRUE;
#endif /* HAVE_LIBCAP_NG */
} else if (strcmp((long_opts[option_index]).name, "group&quo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/03/20 20:43:46 Modified files: x11/ruby-tk: Makefile distinfo x11/ruby-tk/pkg: PLIST Log message: Update to ruby-tk 0.5.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/03/18 11:46:37 Modified files: security/suricata: Makefile Added files: security/suricata/patches: patch-src_suricata_c patch-src_util-privs_c patch-src_util-privs_h Log message: Readd privdrop patches "probably automatically removed" by gonzalo@ in the 7.0.2 update OK gonzalo@
After Unlock: Restore privdrop in security/suricata
Suricata had local patches added in 2019 to support dropping privileges,
so the suricata daemon does not run as root. These patches were dropped
in the Suricata 7.0.2 update, without a rationale I could find.
Considering Suricata deals with potentially malicious traffic, it seems
like a bad idea to run it as root. It is pledged, but the pledge is
"stdio rpath wpath cpath fattr unix dns bpf", and it is not unveiled or
chrooted, which means a compromised process could modify any file on the
system.
This restores the local patches for dropping privileges that were
dropped in the 7.0.2 update, and updates them to fix the conflicts.
Tested briefly on amd64.
OKs to commit after unlock, and to commit to 7.5 -stable after it opens?
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
diff -u -p -r1.65 Makefile
--- Makefile22 Feb 2024 09:49:35 - 1.65
+++ Makefile15 Mar 2024 19:03:06 -
@@ -5,6 +5,7 @@ COMMENT = high performance network IDS,
SURICATA_V = 7.0.3
SUPDATE_V =1.2.8
+REVISION = 0
DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
Index: patches/patch-src_suricata_c
===
RCS file: patches/patch-src_suricata_c
diff -N patches/patch-src_suricata_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_suricata_c15 Mar 2024 19:17:33 -
@@ -0,0 +1,32 @@
+Use setresuid/gid() directly to change user and group. Otherwise
+Suricata uses libcap-ng on Linux and runs as root elsewhere.
+
+Index: src/suricata.c
+--- src/suricata.c.orig
src/suricata.c
+@@ -1600,7 +1600,7 @@ static TmEcode ParseCommandLine(int argc, char** argv,
+ return TM_ECODE_FAILED;
+ #endif /* UNITTESTS */
+ } else if (strcmp((long_opts[option_index]).name, "user") == 0) {
+-#ifndef HAVE_LIBCAP_NG
++#if 0
+ SCLogError("libcap-ng is required to"
+" drop privileges, but it was not compiled into
Suricata.");
+ return TM_ECODE_FAILED;
+@@ -1609,7 +1609,7 @@ static TmEcode ParseCommandLine(int argc, char** argv,
+ suri->do_setuid = TRUE;
+ #endif /* HAVE_LIBCAP_NG */
+ } else if (strcmp((long_opts[option_index]).name, "group") == 0) {
+-#ifndef HAVE_LIBCAP_NG
++#if 0
+ SCLogError("libcap-ng is required to"
+" drop privileges, but it was not compiled into
Suricata.");
+ return TM_ECODE_FAILED;
+@@ -3036,6 +3036,7 @@ int SuricataMain(int argc, char **argv)
+ SystemHugepageSnapshotDestroy(prerun_snap);
+ SystemHugepageSnapshotDestroy(postrun_snap);
+
++SCSetUserID(suricata.userid, suricata.groupid);
+ SCPledge();
+ SuricataMainLoop();
+
Index: patches/patch-src_util-privs_c
===
RCS file: patches/patch-src_util-privs_c
diff -N patches/patch-src_util-privs_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_util-privs_c 15 Mar 2024 19:13:13 -
@@ -0,0 +1,34 @@
+Use setresuid/gid() directly to change user and group. Otherwise
+Suricata uses libcap-ng on Linux and runs as root elsewhere.
+
+Index: src/util-privs.c
+--- src/util-privs.c.orig
src/util-privs.c
+@@ -244,6 +244,27 @@ void SCGetGroupID(const char *group_name, uint32_t *gi
+ *gid = grpid;
+ }
+
++int SCSetUserID(const uint32_t uid, const uint32_t gid)
++{
++int ret = setresgid(gid, gid, gid);
++
++if (ret != 0) {
++SCLogError("unable to set the group ID,"
++" check permissions!! gid=%u ret=%i errno=%i", gid, ret,
errno);
++exit(EXIT_FAILURE);
++}
++
++ret = setresuid(uid, uid, uid);
++
++if (ret != 0) {
++SCLogError("unable to set the user ID,"
++" check permissions!! uid=%u ret=%i errno=%i", uid, ret,
errno);
++exit(EXIT_FAILURE);
++}
++
++return 0;
++}
++
+ #ifdef __OpenBSD__
+ int SCPledge(void)
+ {
Index: patches/patch-src_util-privs_h
===
RCS file: patches/patch-src_util-privs_h
diff -N patches/patch-src_util-privs_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_util-privs_h 15 Mar 2024 19:02:38 -
@@ -0,0 +1,14 @@
+Use setresuid/gid() directly to change user and group. Otherwise
+Suricata uses libcap-ng on Linux and runs as root elsewhere.
+
+Index: src/util-privs.h
+--- src/util-privs.h.orig
src/util-privs.h
+@@ -92,6 +92,7 @@ void SCDropMainThreadCaps(uint32_t , uint32_t );
+
+ void SCGetUserID(const char *, const char *, uint32_t *, uint32_t *);
+ void SCGetGroupID(const char *, uint32_t *);
++int SCSetUserID(const uint32_t uid, const uint32_t gid);
+
+ #ifdef __OpenBSD__
+ int SCPledge(void);
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/02/23 10:29:53 Modified files: lang/jruby : Makefile distinfo lang/jruby/pkg : PLIST Log message: Update to JRuby 9.4.6.0
Update: JRuby 9.4.6.0
This updates to the latest version of JRuby, released today. Release
notes at: https://www.jruby.org/2024/02/20/jruby-9-4-6-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
diff -u -p -r1.113 Makefile
--- Makefile6 Nov 2023 16:53:37 - 1.113
+++ Makefile20 Feb 2024 20:49:02 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64
COMMENT = pure-Java implementation of the Ruby language
-V =9.4.5.0
+V =9.4.6.0
DISTNAME = jruby-dist-${V}-bin
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
diff -u -p -r1.77 distinfo
--- distinfo6 Nov 2023 16:53:37 - 1.77
+++ distinfo20 Feb 2024 20:49:08 -
@@ -1,6 +1,6 @@
SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw=
-SHA256 (jruby-dist-9.4.5.0-bin.tar.gz) =
pA94xGQczIZ1Lhay2iR/1ryfvPmkhkzxvjb3/3s1aEw=
+SHA256 (jruby-dist-9.4.6.0-bin.tar.gz) =
LaFN5BUrcf2/o1ukaHpG7xLNRldAM3tUnMH+bHwTmBM=
SHA256 (jruby-launcher-1.1.19-java.gem) =
LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo=
SIZE (jffi-1.3.10.tar.gz) = 3304571
-SIZE (jruby-dist-9.4.5.0-bin.tar.gz) = 31735329
+SIZE (jruby-dist-9.4.6.0-bin.tar.gz) = 31819131
SIZE (jruby-launcher-1.1.19-java.gem) = 64000
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
diff -u -p -r1.68 PLIST
--- pkg/PLIST 6 Nov 2023 16:53:37 - 1.68
+++ pkg/PLIST 20 Feb 2024 20:49:59 -
@@ -549,18 +549,19 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/find-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/forwardable-1.3.2.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/getoptlong-0.1.1.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/io-console-0.5.11-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/io-console-0.7.2-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/io-wait-0.3.0-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/ipaddr-1.2.4.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/irb-1.4.2.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.14.2-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.14.3-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.6.1-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/json-2.7.1-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/logger-1.5.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/mutex_m-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/net-http-0.3.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/net-protocol-0.1.2.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/nkf-0.2.0-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/observer-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/open-uri-0.3.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/open3-0.1.2.gemspec
@@ -573,7 +574,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/racc-1.6.0-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/rake-ant-1.0.6.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/rdoc-6.4.0.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/reline-0.3.5.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/reline-0.4.2.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/resolv-replace-0.1.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/rinda-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/ruby2_keywords-0.0.5.gemspec
@@ -582,7 +583,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/shellwords-0.1.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/singleton-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/stringio-3.0.8-java.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/strscan-3.0.7-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/strscan-3.1.0-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/subspawn-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/subspawn-posix-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/time-0.2.2.gemspec
@@ -1109,7 +1110,17 @@ jruby/lib/ruby/stdlib/ffi/enum.rb
jruby/lib/ruby/stdlib/ffi/errno.rb
jruby/lib/ruby/stdlib/ffi/ffi.rb
jruby/lib/ruby/stdlib/ffi/function.rb
+jruby/lib/ruby/stdlib/ffi/io/
jruby/lib/ruby/stdlib/ffi/io.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/02/12 15:56:15 Modified files: databases/postgresql: Tag: OPENBSD_7_4 Makefile distinfo databases/postgresql/pkg: Tag: OPENBSD_7_4 PLIST-docs PLIST-server Log message: Update to PostgreSQL 15.6 Fixes CVE-2024-0985: PostgreSQL non-owner REFRESH MATERIALIZED VIEW CONCURRENTLY executes arbitrary SQL
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/02/10 12:18:10 Modified files: databases/postgresql: Makefile distinfo databases/postgresql/patches: patch-src_bin_initdb_initdb_c databases/postgresql/pkg: PLIST-docs PLIST-server Log message: Update to PostgreSQL 16.2 Fixes CVE-2024-0985: PostgreSQL non-owner REFRESH MATERIALIZED VIEW CONCURRENTLY executes arbitrary SQL
Update: PostgreSQL 16.2
This updates PostgreSQL to 16.2. Release announcement at
https://www.postgresql.org/about/news/postgresql-162-156-1411-1314-and-1218-released-2807/
This fixes one CVE:
CVE-2024-0985: PostgreSQL non-owner REFRESH MATERIALIZED VIEW
CONCURRENTLY executes arbitrary SQL
Tested on amd64. Will be committing in a couple days unless I hear
objections. Will backport to -stable next week.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
diff -u -p -r1.300 Makefile
--- Makefile29 Nov 2023 23:41:15 - 1.300
+++ Makefile8 Feb 2024 15:43:27 -
@@ -5,7 +5,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 16.1
+VERSION= 16.2
PREV_MAJOR=15
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
diff -u -p -r1.99 distinfo
--- distinfo29 Nov 2023 23:41:15 - 1.99
+++ distinfo8 Feb 2024 15:45:09 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-16.1.tar.gz) = vwVkclYT98V/HD6/XJCbPsWLnPs9gbS7EgnYh2cGWoc=
-SIZE (postgresql-16.1.tar.gz) = 32433767
+SHA256 (postgresql-16.2.tar.gz) = K4IBBH7IGs0brSnbonjXiOeJG5w+gjLtoWuyneyBMcc=
+SIZE (postgresql-16.2.tar.gz) = 32558575
Index: patches/patch-src_bin_initdb_initdb_c
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_bin_initdb_initdb_c,v
diff -u -p -r1.1 patch-src_bin_initdb_initdb_c
--- patches/patch-src_bin_initdb_initdb_c 11 Sep 2023 20:04:47 -
1.1
+++ patches/patch-src_bin_initdb_initdb_c 8 Feb 2024 16:30:59 -
@@ -4,7 +4,7 @@ script handles.
Index: src/bin/initdb/initdb.c
--- src/bin/initdb/initdb.c.orig
+++ src/bin/initdb/initdb.c
-@@ -3152,6 +3152,16 @@ main(int argc, char *argv[])
+@@ -3411,6 +3411,16 @@ main(int argc, char *argv[])
if (!noinstructions)
{
@@ -21,7 +21,7 @@ Index: src/bin/initdb/initdb.c
/*
* Build up a shell command to tell the user how to start the
server
*/
-@@ -3183,6 +3193,7 @@ main(int argc, char *argv[])
+@@ -3442,6 +3452,7 @@ main(int argc, char *argv[])
start_db_cmd->data);
destroyPQExpBuffer(start_db_cmd);
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
diff -u -p -r1.112 PLIST-docs
--- pkg/PLIST-docs 29 Nov 2023 23:41:15 - 1.112
+++ pkg/PLIST-docs 8 Feb 2024 16:26:53 -
@@ -716,6 +716,7 @@ share/doc/postgresql/html/regress-tap.ht
share/doc/postgresql/html/regress-variant.html
share/doc/postgresql/html/regress.html
share/doc/postgresql/html/release-16-1.html
+share/doc/postgresql/html/release-16-2.html
share/doc/postgresql/html/release-16.html
share/doc/postgresql/html/release-prior.html
share/doc/postgresql/html/release.html
Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
diff -u -p -r1.49 PLIST-server
--- pkg/PLIST-server29 Nov 2023 23:41:15 - 1.49
+++ pkg/PLIST-server8 Feb 2024 16:27:24 -
@@ -575,6 +575,7 @@ include/postgresql/server/pgstat.h
include/postgresql/server/pgtar.h
include/postgresql/server/pgtime.h
include/postgresql/server/plperl.h
+include/postgresql/server/plperl_system.h
include/postgresql/server/plpgsql.h
include/postgresql/server/plpy_cursorobject.h
include/postgresql/server/plpy_elog.h
@@ -587,6 +588,7 @@ include/postgresql/server/plpy_resultobj
include/postgresql/server/plpy_spi.h
include/postgresql/server/plpy_subxactobject.h
include/postgresql/server/plpy_typeio.h
+include/postgresql/server/plpython_system.h
include/postgresql/server/port/
include/postgresql/server/port.h
include/postgresql/server/port/aix.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/22 10:44:08 Modified files: lang/ruby/3.2 : Tag: OPENBSD_7_4 Makefile distinfo lang/ruby/3.2/pkg: Tag: OPENBSD_7_4 MESSAGE-main UNMESSAGE-main PLIST-main PLIST-ri_docs Log message: Update to Ruby 3.2.3 Fixes CVE-2023-36617: ReDoS vulnerability in URI
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/20 13:20:50 Modified files: lang/ruby/3.2 : Makefile distinfo lang/ruby/3.2/pkg: MESSAGE-main PLIST-main PLIST-ri_docs UNMESSAGE-main Log message: Update to Ruby 3.2.3 Fixes CVE-2023-36617: ReDoS vulnerability in URI
Update: Ruby 3.2.3
This updates from Ruby 3.2.2 to Ruby 3.2.3. Release announcement at
https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
One security fix in this release:
CVE-2023-36617: ReDoS vulnerability in URI
Porting wise, the only unusual change is the addition of a new command
line tool (syntax_suggest32) in a tiny release. The command line tool
doesn't work, and I checked and Ruby 3.3 has the same issue. I filed
a bug upstream for that.
Tested on amd64.
Will be committing in a couple days unless I hear objections. Since this
has a security fix, I'll commit to -stable next week.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/ruby/3.2/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile1 Jan 2024 17:03:48 - 1.8
+++ Makefile18 Jan 2024 18:53:11 -
@@ -1,9 +1,8 @@
-VERSION = 3.2.2
+VERSION = 3.2.3
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby32 0.0
NEXTVER = 3.3
PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER}
-REVISION-main =2
PSEUDO_FLAVORS=no_ri_docs bootstrap
# Do not build the RI docs on slow arches
Index: distinfo
===
RCS file: /cvs/ports/lang/ruby/3.2/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo1 Apr 2023 19:28:25 - 1.3
+++ distinfo18 Jan 2024 18:53:11 -
@@ -1,2 +1,2 @@
-SHA256 (ruby-3.2.2.tar.gz) = lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w=
-SIZE (ruby-3.2.2.tar.gz) = 20467023
+SHA256 (ruby-3.2.3.tar.gz) = r38XV9ndtjA0WYgTkhHx/VcP9bqDDe8cx8Rorptlybo=
+SIZE (ruby-3.2.3.tar.gz) = 20577155
Index: pkg/MESSAGE-main
===
RCS file: /cvs/ports/lang/ruby/3.2/pkg/MESSAGE-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 MESSAGE-main
--- pkg/MESSAGE-main26 Dec 2022 03:03:57 - 1.1.1.1
+++ pkg/MESSAGE-main18 Jan 2024 18:53:11 -
@@ -13,6 +13,7 @@ create symbolic links like so (overwriti
ln -sf ${PREFIX}/bin/rdbg32 ${PREFIX}/bin/rdbg
ln -sf ${PREFIX}/bin/rdoc32 ${PREFIX}/bin/rdoc
ln -sf ${PREFIX}/bin/ri32 ${PREFIX}/bin/ri
+ ln -sf ${PREFIX}/bin/syntax_suggest32 ${PREFIX}/bin/syntax_suggest
ln -sf ${PREFIX}/bin/typeprof32 ${PREFIX}/bin/typeprof
The ruby-shims package is also available to automatically select an
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/ruby/3.2/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 1 Apr 2023 19:28:26 - 1.3
+++ pkg/PLIST-main 18 Jan 2024 18:53:11 -
@@ -13,6 +13,7 @@ bin/rdbg32
bin/rdoc32
bin/ri32
@bin bin/ruby32
+bin/syntax_suggest32
bin/typeprof32
include/ruby-${REV}/
include/ruby-${REV}/ruby/
@@ -221,7 +222,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-3.2.2.h
+include/ruby-${REV}/${SUB}/rb_mjit_min_header-3.2.3.h
include/ruby-${REV}/${SUB}/ruby/
include/ruby-${REV}/${SUB}/ruby/config.h
@so lib/libruby32.so
@@ -412,6 +413,7 @@ lib/ruby/${REV}/bundler/rubygems_ext.rb
lib/ruby/${REV}/bundler/rubygems_gem_installer.rb
lib/ruby/${REV}/bundler/rubygems_integration.rb
lib/ruby/${REV}/bundler/runtime.rb
+lib/ruby/${REV}/bundler/safe_marshal.rb
lib/ruby/${REV}/bundler/self_manager.rb
lib/ruby/${REV}/bundler/settings/
lib/ruby/${REV}/bundler/settings.rb
@@ -1225,7 +1227,12 @@ lib/ruby/${REV}/rubygems/ext/configure_b
lib/ruby/${REV}/rubygems/ext/ext_conf_builder.rb
lib/ruby/${REV}/rubygems/ext/rake_builder.rb
lib/ruby/${REV}/rubygems/gem_runner.rb
+lib/ruby/${REV}/rubygems/gemcutter_utilities/
lib/ruby/${REV}/rubygems/gemcutter_utilities.rb
+lib/ruby/${REV}/rubygems/gemcutter_utilities/webauthn_listener/
+lib/ruby/${REV}/rubygems/gemcutter_utilities/webauthn_listener.rb
+lib/ruby/${REV}/rubygems/gemcutter_utilities/webauthn_listener/response.rb
+lib/ruby/${REV}/rubygems/gemcutter_utilities/webauthn_poller.rb
lib/ruby/${REV}/rubygems/indexer.rb
lib/ruby/${REV}/rubygems/install_default_message.rb
lib/ruby/${REV}/rubygems/install_message.rb
@@ -1346,6 +1353,7 @@ lib/ruby/${REV}/rubygems/security/policy
lib/ruby/${REV}/rubygems/security/signer.rb
lib/ruby/${REV}/rubygems/security/trust_dir.rb
lib/ruby/${REV}/rubygems/security_option.rb
+lib/ruby/${REV}/rubygems/shellwords.rb
lib/ruby/${REV}/rubygems/source/
lib/ruby/${REV}/rubygems/source.rb
lib/ruby/${REV}/rubygems/source/git.rb
@@ -1393,6 +1401,9 @@ lib/ruby/${REV}/syntax_suggest.rb
lib/ruby/${REV}/syntax_suggest/api.rb
lib/ruby/${REV}/syntax_suggest/around_block_scan.rb
lib/ruby/${REV}/syntax_suggest/block_expand.rb
+lib/ruby/${REV}/syntax_suggest/capture/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/16 12:28:47 Modified files: lang/ruby/3.3 : Makefile Log message: Disable YJIT on arm64 This allows Ruby 3.3 to work on arm64. No bump as it did not build before on arm64, and the change only affects arm64. OK tb@, phessler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/09 17:32:04 Modified files: textproc/ruby-commonmarker: Makefile distinfo textproc/ruby-commonmarker/pkg: DESCR PLIST Added files: textproc/ruby-commonmarker: crates.inc Log message: Update to commonmarker 1.0.3 The backend switched to Rust, so this brings in the devel/cargo module, and a number of other changes to deal with the significantly more involved build. Initial version by me Many improvements from semarie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/09 17:26:20 Modified files: devel : Makefile Log message: Hookup ruby-rb_sys
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/09 17:24:30 Log message: Import rb_sys 0.9.85 Allows for easily building native extensions for Ruby using Rust. OK semarie@ Status: Vendor Tag: jeremy Release Tags: jeremy_2024-Jan-09 N ports/devel/ruby-rb_sys/Makefile N ports/devel/ruby-rb_sys/distinfo N ports/devel/ruby-rb_sys/pkg/DESCR N ports/devel/ruby-rb_sys/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2024/01/09 17:21:36 Modified files: lang/ruby : ruby.port.mk Log message: Do not change directory in EXTRACT_CASES Fixes interaction with devel/cargo module. >From semarie@
Update: ruby-commonmarker 1.0.3 (switch to Rust backend)
The commonmarker gem recently changed the backend they were using from a
C-based one (libcmark-gfm), to a Rust-based one (comrak). This required
a significant amount of work to get it to continue to build, because:
* cargo wants to download the crates at runtime, and the way the cargo
module wants to handle this doesn't work for the gem case.
* There is a dummy cargo.toml file shipped in top level folder, but it
is not the one used for building.
* One crate needs a source file that doesn't appear to ship in the crate
(or the cargo module removes it).
* The cargo module needs to modification (extra variable) to build this,
because either it or the ruby module puts the downloaded crates in a
different location than expected.
* This requires libclang for building, since it uses it to parse and
type check C/C++ header files. It does not link to it, so I have made
llvm a build depends.
* gmake must be used for building. I raised the issue upstream, since
almost all Ruby native gems will build with BSD make, but they think
that requiring gmake is acceptable.
To get around the last issue, I added MODCARGO_CRATE_EXTRACTDIR to the
cargo module. No backwards-incompatible changes for other ports
using the cargo module.
This also required a new dependency, ruby-rb_sys, which will likely
be used by any future Rust-based Ruby ports. Hopefully, the work
required to get this port updated will make it easier to get other
Rust-based Ruby ports working, should they show up.
This is my first time working on a port using Rust. Maybe there is an
easier way or I'm doing something wrong.
The use of Rust will probably knock out a few platforms. However, this
is a leaf port, so the affect on ports will be minimal.
Tested on amd64.
OKs for:
* cargo module change
* import ruby-rb_sys dependency
* commonmarker update
Thanks,
Jeremy
Index: devel/cargo/cargo.port.mk
===
RCS file: /cvs/ports/devel/cargo/cargo.port.mk,v
retrieving revision 1.45
diff -u -p -r1.45 cargo.port.mk
--- devel/cargo/cargo.port.mk 6 Jan 2024 08:02:52 - 1.45
+++ devel/cargo/cargo.port.mk 8 Jan 2024 20:43:52 -
@@ -56,6 +56,8 @@ DISTFILES += ${GH_DISTFILE}
DISTFILES.cargo +=
${_MODCARGO_DIST_SUBDIR}${_cratename}-${_cratever}.tar.gz{${_cratename}/${_cratever}/download}
.endfor
+MODCARGO_CRATE_EXTRACTDIR ?= ${WRKDIR}
+
# post-extract target for preparing crates directory.
# It will put all crates in the local crates directory.
MODCARGO_post-extract = \
@@ -63,7 +65,7 @@ MODCARGO_post-extract = \
mkdir -p ${MODCARGO_VENDOR_DIR} ;
.for _cratename _cratever in ${MODCARGO_CRATES}
MODCARGO_post-extract += \
- mv ${WRKDIR}/${_cratename}-${_cratever}
${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever} ;
+ mv ${MODCARGO_CRATE_EXTRACTDIR}/${_cratename}-${_cratever}
${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever} ;
.endfor
# post-extract target to provide clean environment for specific crates
Index: textproc/ruby-commonmarker/Makefile
===
RCS file: /cvs/ports/textproc/ruby-commonmarker/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- textproc/ruby-commonmarker/Makefile 1 Sep 2023 19:23:31 - 1.2
+++ textproc/ruby-commonmarker/Makefile 8 Jan 2024 20:43:52 -
@@ -1,14 +1,184 @@
-COMMENT = ruby wrapper for libcmark-gfm
+COMMENT = ruby wrapper for comrak rust crate
-DISTNAME = commonmarker-0.23.10
+DISTNAME = commonmarker-1.0.3
CATEGORIES = textproc
HOMEPAGE = https://github.com/gjtorikian/commonmarker
+ONIG_V = 6.9.9
+DISTFILES.onig =onig-${ONIG_V}.tar.gz
+SITES.onig = https://github.com/kkos/oniguruma/releases/download/v${ONIG_V}/
+
# MIT License
PERMIT_PACKAGE = Yes
-MODULES = lang/ruby
+MODULES = devel/cargo \
+ lang/ruby
+
+WANTLIB += ${MODCARGO_WANTLIB}
+
+BUILD_DEPENDS =devel/ruby-rb_sys,${MODRUBY_FLAVOR}>=0.9 \
+ devel/llvm/16,-main
CONFIGURE_STYLE = ruby gem ext
+
+MODCARGO_CRATE_EXTRACTDIR = ${WRKDIST}
+MODCARGO_VENDOR_DIR = ${WRKDIR}/modcargo-crates
+MODCARGO_BUILD = No
+MODCARGO_INSTALL = No
+
+USE_GMAKE = Yes
+CONFIGURE_ENV =MAKE=gmake
+MAKE_ENV = MAKE=gmake \
+ RUBY=${RUBY} \
+ HOME=${WRKSRC} \
+ LIBCLANG_PATH=${PREFIX}/llvm16/lib
+
+pre-configure:
+ mv ${WRKSRC}/onig-${ONIG_V} \
+ ${MODCARGO_VENDOR_DIR}/onig_sys-69.8.1/oniguruma
+ mkdir ${WRKSRC}/.cargo
+ echo '[source.crates-io]' > ${WRKSRC}/.cargo/config.toml
+ echo 'replace-with = "vendored-sources"' >> ${WRKSRC}/.cargo/config.toml
+ echo '[source.vendored-sources]' >> ${WRKSRC}/.cargo/config.toml
+ echo 'directory = "${MODCARGO_VENDOR_DIR}"' >>
${WRKSRC}/.cargo/config.toml
+
+# run: make modcargo-gen-crates-licenses
+MODCARGO_CRATES += adler 1.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/31 14:25:23 Modified files: databases/ruby-sqlite3: Makefile distinfo databases/ruby-sqlite3/pkg: PLIST Log message: Update to ruby-sqlite3 1.7.0 Remove unneeded sqlite3 source file from package.
Re: aarch64 bulk build report
On Sat, Dec 30, 2023 at 10:17 AM Peter Hessler wrote:
> :http://build-failures.rhaalovely.net/aarch64/2023-12-28/lang/ruby/3.3.log
>
> ./miniruby -I./lib -I. -I.ext/common -n -e
> 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' -e 'END{abort "UNICODE version
> mismatch: #{mis}" unless mis.empty?}' -e '(mis.delete(ARGF.path);
> ARGF.close) if /ONIG_UNICODE_VERSION_STRING
> +"#{Regexp.quote(version)}"/o' 15.0.0 ./enc/unicode/15.0.0/casefold.h
> ./enc/unicode/15.0.0/name2ctype.h
> Segmentation fault (core dumped)
> *** Error 139 in /usr/obj/ports/ruby-3.3.0/ruby-3.3.0 (Makefile:1626
> '.rbconfig.time')
>
Maybe this could be fixed by
https://github.com/ruby/ruby/commit/02973b78f499acc28c714a082c82a846314a911f,
but that's just a guess without seeing the backtrace.
Thanks,
Jeremy
Update: databases/ruby-sqlite3 1.7.0
This updates the ruby-sqlite3 port to the latest release. Changelog at
https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.md
Only change portswise is removing an unnecessary file from the package.
The file was used for building an embedded SQLite, but the port is
set to use system SQLite.
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
diff -u -p -r1.48 Makefile
--- Makefile1 Sep 2023 09:56:21 - 1.48
+++ Makefile29 Dec 2023 20:34:02 -
@@ -1,6 +1,6 @@
COMMENT= access a SQLite3 database from ruby
-DISTNAME= sqlite3-1.6.4
+DISTNAME= sqlite3-1.7.0
CATEGORIES=databases
MAINTAINER = Jeremy Evans
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-sqlite3/distinfo,v
diff -u -p -r1.21 distinfo
--- distinfo1 Sep 2023 09:56:21 - 1.21
+++ distinfo29 Dec 2023 20:34:09 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite3-1.6.4.gem) = +QimDfe/Gc9Vm6el2jaeXrGdSPrWOSJQN8cLJtZq9jU=
-SIZE (sqlite3-1.6.4.gem) = 3248640
+SHA256 (sqlite3-1.7.0.gem) = iUtZZVkfstt9lVcuk5QvT93Rdi037E+8GYs2Qm/Nrjw=
+SIZE (sqlite3-1.7.0.gem) = 3277824
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-sqlite3/pkg/PLIST,v
diff -u -p -r1.18 PLIST
--- pkg/PLIST 1 Sep 2023 09:56:21 - 1.18
+++ pkg/PLIST 29 Dec 2023 20:35:13 -
@@ -26,9 +26,6 @@ ${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}/ports/
-${GEM_LIB}/gems/${DISTNAME}/ports/archives/
-${GEM_LIB}/gems/${DISTNAME}/ports/archives/sqlite-autoconf-343.tar.gz
${GEM_LIB}/gems/${DISTNAME}/test/
${GEM_LIB}/gems/${DISTNAME}/test/helper.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_backup.rb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/27 16:43:12 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 ruby33 FLAVOR of ruby gem ext ports by default
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/27 13:08:05 Modified files: lang/ruby : Makefile Log message: Hookup Ruby 3.3 to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/27 13:07:31 Modified files: lang/ruby : ruby.port.mk Log message: Support ruby33 FLAVOR when building Ruby ports OK tb@, gkoehler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/27 13:06:42 Modified files: lang/ruby : Makefile.inc lang/ruby/3.2 : Makefile lang/ruby/3.1 : Makefile Log message: Fix WANTLIB for Ruby 3.1 and 3.2, other minor changes This sets PATCHORIG = .orig, because the build infrastructure handles that better and it requires less work when updating plists. This sets optflags="", so that the build infrastructure does not override the default optimization flags. This removes ncurses, readline, and yaml from WANTLIB, and adds yaml-0 to WANTLIB. For Ruby 3.1 and 3.2, ncurses and readline are added back. Ruby 3.3 drops the readline extension, so those libraries are no longer needed. This drops the gdbm subpackage code from Makefile.inc, since it is no longer used by any supported Ruby version. OK tb@, gkoehler@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/27 13:05:01 Log message: Import Ruby 3.3.0 OK tb@, gkoehler@ Status: Vendor Tag: jeremy Release Tags: jeremy_2023-Dec-27 N ports/lang/ruby/3.3/Makefile N ports/lang/ruby/3.3/distinfo N ports/lang/ruby/3.3/patches/patch-common_mk N ports/lang/ruby/3.3/patches/patch-ext_etc_etc_c N ports/lang/ruby/3.3/patches/patch-compile_c N ports/lang/ruby/3.3/patches/patch-configure N ports/lang/ruby/3.3/patches/patch-ext_ripper_depend N ports/lang/ruby/3.3/patches/patch-ext_extmk_rb N ports/lang/ruby/3.3/patches/patch-lib_rubygems_ext_builder_rb N ports/lang/ruby/3.3/patches/patch-lib_fileutils_rb N ports/lang/ruby/3.3/patches/patch-lib_mkmf_rb N ports/lang/ruby/3.3/patches/patch-lib_rubygems_commands_install_command_rb N ports/lang/ruby/3.3/patches/patch-lib_rubygems_dependency_installer_rb N ports/lang/ruby/3.3/patches/patch-lib_rubygems_ext_ext_conf_builder_rb N ports/lang/ruby/3.3/patches/patch-lib_rubygems_rb N ports/lang/ruby/3.3/patches/patch-template_Makefile_in N ports/lang/ruby/3.3/patches/patch-template_builtin_binary_inc_tmpl N ports/lang/ruby/3.3/pkg/DESCR-ri_docs N ports/lang/ruby/3.3/pkg/DESCR-main N ports/lang/ruby/3.3/pkg/MESSAGE-main N ports/lang/ruby/3.3/pkg/PLIST-main N ports/lang/ruby/3.3/pkg/PLIST-ri_docs N ports/lang/ruby/3.3/pkg/UNMESSAGE-main No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/08 10:04:07 Modified files: security/ruby-argon2: Makefile distinfo security/ruby-argon2/pkg: PLIST Log message: Update to argon2 2.3.0 Mostly from wen heping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/05 08:17:22 Modified files: www/ruby-passenger: Makefile www/ruby-passenger/pkg: PLIST Log message: Switch LDEP from pcre to pcre2 The passenger build system checks for the pcre header, and will fail if it is not present (even if pcre2 is installed). However, the only place pcre is used is for the embedded nginx, and that will pick pcre2 over pcre if both are installed. This switches the LDEP from pcre to pcre2 so that the embedded nginx will always use pcre2, and adds a BDEP on pcre so that the passenger build system still works. While here, comment out a file in the PLIST so updates using make update-plist are easier. Problem found by tb@ because dpb junked pcre2 while building passenger OK tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/12/04 10:22:17 Modified files: databases/postgresql: Tag: OPENBSD_7_4 Makefile distinfo databases/postgresql/pkg: Tag: OPENBSD_7_4 PLIST-docs Log message: Update to PostgreSQL 15.5
Re: security/ruby-argon2: Update to 2.3.0
On 12/04 08:49, wen heping wrote:
> Hi, all:
>
> Here is a simple patch for security/ruby-argon2 to
> update to 2.3.0.
>
> It build and run well on amd64-current system, no test
> defined and no other ports depend on it.
We don't add files under ${GEM_EXTENSIONS_DIR} or
${GEM_LIB}/gems/${DISTNAME}/ext/ to packages. Otherwise, this looks
good. I'll try to update the port this week.
Thanks,
Jeremy
>
>
> Cheers !
> wen
> Index: security/ruby-argon2/Makefile
> ===
> RCS file: /cvs/ports/security/ruby-argon2/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- security/ruby-argon2/Makefile 1 Sep 2023 17:11:35 - 1.3
> +++ security/ruby-argon2/Makefile 4 Dec 2023 08:47:03 -
> @@ -1,6 +1,6 @@
> COMMENT =Ruby binding for the argon2 password hashing algorithm
>
> -DISTNAME = argon2-2.2.0
> +DISTNAME = argon2-2.3.0
> CATEGORIES = security
>
> MAINTAINER = Jeremy Evans
> Index: security/ruby-argon2/distinfo
> ===
> RCS file: /cvs/ports/security/ruby-argon2/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- security/ruby-argon2/distinfo 1 Sep 2023 17:11:35 - 1.2
> +++ security/ruby-argon2/distinfo 4 Dec 2023 08:47:03 -
> @@ -1,2 +1,2 @@
> -SHA256 (argon2-2.2.0.gem) = jT+DbLLD6X/kgi+daw6JugNjbtiNFkSc/zagTDGjtPE=
> -SIZE (argon2-2.2.0.gem) = 1787904
> +SHA256 (argon2-2.3.0.gem) = mA72UXK/USrTe2y7DWHu9AttzKtqfbTnBVdSfh3OlVc=
> +SIZE (argon2-2.3.0.gem) = 1788928
> Index: security/ruby-argon2/pkg/PLIST
> ===
> RCS file: /cvs/ports/security/ruby-argon2/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- security/ruby-argon2/pkg/PLIST1 Sep 2023 17:11:35 - 1.3
> +++ security/ruby-argon2/pkg/PLIST4 Dec 2023 08:47:03 -
> @@ -1,4 +1,5 @@
> ${GEM_LIB}/cache/${DISTNAME}.gem
> +${GEM_EXTENSIONS_DIR}/gem_make.out
> ${GEM_LIB}/gems/${DISTNAME}/
> ${GEM_LIB}/gems/${DISTNAME}/.github/
> ${GEM_LIB}/gems/${DISTNAME}/.github/workflows/
> @@ -19,6 +20,112 @@ ${GEM_LIB}/gems/${DISTNAME}/bin/
> ${GEM_LIB}/gems/${DISTNAME}/bin/console
> ${GEM_LIB}/gems/${DISTNAME}/bin/setup
> ${GEM_LIB}/gems/${DISTNAME}/bin/test
> +${GEM_LIB}/gems/${DISTNAME}/ext/
> +${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/
> +${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/Makefile
> +${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/argon_wrap.c
> +${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/argon_wrap.o
> +${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/extconf.rb
> +@so ${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/libargon2_wrap.so
> +${GEM_LIB}/gems/${DISTNAME}/ext/argon2_wrap/test.c
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/.git
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/.gitattributes
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/.gitignore
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/.travis.yml
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/Argon2.sln
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/CHANGELOG.md
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/LICENSE
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/Makefile
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/Package.swift
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/README.md
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/appveyor.yml
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/argon2-specs.pdf
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/export.sh
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/include/
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/include/argon2.h
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2d
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2d.shasum
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2d_v16
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2d_v16.shasum
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2i
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2i.shasum
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2i_v16
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2i_v16.shasum
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2id
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2id.shasum
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-argon2/kats/argon2id_v16
> +${GEM_LIB}/gems/${DISTNAME}/ext/phc-winner-ar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/29 16:42:16 Modified files: geo/pgpointcloud: Makefile distinfo geo/pgpointcloud/pkg: PLIST Removed files: geo/pgpointcloud/patches: patch-pgsql_pc_pgsql_c Log message: Update to pgpointcloud 1.2.5, which supports PostgreSQL 16. Remove backported patch for PostgreSQL 16 support. OK tb@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/29 16:42:00 Modified files: databases/postgresql-pllua: Makefile distinfo Log message: Update to pllua 2.0.12 to work with PostgreSQL 16. OK tb@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/29 16:41:45 Modified files: databases/postgresql-odbc: Makefile distinfo Added files: databases/postgresql-odbc/patches: patch-psqlodbc_h Log message: Update to postgresql-odbc 16.00.. Add patch to work with PostgreSQL 16. OK tb@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/29 16:41:30 Modified files: databases/postgresql-previous: Makefile distinfo databases/postgresql-previous/patches: 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 15.4 following PostgreSQL update to 16.1 OK tb@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/29 16:41:15 Modified files: databases/postgresql: Makefile distinfo databases/postgresql/patches: patch-src_backend_libpq_ip_c patch-src_include_storage_s_lock_h patch-src_interfaces_ecpg_compatlib_Makefile patch-src_interfaces_ecpg_ecpglib_Makefile patch-src_interfaces_ecpg_pgtypeslib_Makefile patch-src_interfaces_libpq_Makefile databases/postgresql/pkg: PLIST-contrib PLIST-docs PLIST-server Log message: Update to PostgreSQL 16.1 This adds textproc/icu4c as a dependency, since PostgreSQL 16 requires that by default. This allows additional collations to work. Bulk testing by tb@ Input from tb@ and sthen@ OK tb@, sthen@
Re: Early Look: PostgreSQL 16.0
On 09/16 09:56, Theo Buehler wrote:
> On Thu, Sep 14, 2023 at 06:06:37PM +0000, Jeremy Evans wrote:
> > PostgreSQL 16.0 was released today:
> > https://www.postgresql.org/about/news/postgresql-16-released-2715/
> >
> > As usual, we don't plan to change the default version in ports until
> > 16.1, and after we have prepared updates all software that depends on
> > PostgreSQL to support the new version. However, for early testing,
> > here's a diff to test with.
>
> As mentioned elsewhwere, the diff needs an installed icu4c to configure
> as it is now. I ran a bulk with '--without-icu' added to CONFIGURE_ARGS.
>
> There are a few version checks that break some ports, as usual.
> There is at least one .so in the server that had changes amounting to a
> major bump, but for some reasone they aren't versioned. Should they be?
Patch below makes the ports tree ready for PostgreSQL 16.1:
databases/citus version
Citus since upgraded to 12.1.0, which works with PostgreSQL 16.
databases/pg_sqlite_fdw version
pg_sqlite_fdw since upgraded to 2.4.0, which works with PostgreSQL 16.
databases/postgresql-odbc ?
Needed stdarg.h include added to a header. Patch below also updates it
to 16.00., the most current version.
databases/postgresql-pllua version
Patch below updates to 2.0.12, which works with PostgreSQL 16.
databases/timescaledb version
PostgreSQL 16 support not yet ready, planned for future version. I
marked it BROKEN, same as in the last 2 PostgreSQL major upgrades.
geo/pgpointcloudAPI break in -server
Patch below updates to 1.2.5, which works with PostgreSQL 16 (might have
already worked with patch I removed).
Can someone test this in a bulk? Also, OKs to apply this if no fallout
from the bulk?
After updating -current, I'll update -stable to 15.5.
Thanks,
Jeremy
Index: databases/postgresql/Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
diff -u -p -r1.299 Makefile
--- databases/postgresql/Makefile 17 Nov 2023 17:46:55 - 1.299
+++ databases/postgresql/Makefile 19 Nov 2023 21:46:39 -
@@ -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= 15.4
-PREV_MAJOR=14
+VERSION= 16.1
+PREV_MAJOR=15
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
-REVISION= 1
DPB_PROPERTIES=parallel
@@ -17,7 +16,7 @@ CATEGORIES= databases
SHARED_LIBS= ecpg7.10 \
ecpg_compat 4.10 \
pgtypes 4.9 \
- pq 6.14
+ pq 6.15
HOMEPAGE= https://www.postgresql.org/
@@ -84,8 +83,9 @@ LIB_DEPENDS-main= textproc/libxml
WANTLIB-main= ${WANTLIB} execinfo xml2
LIB_DEPENDS-server=databases/postgresql=${VERSION} \
+ textproc/icu4c \
${LIB_DEPENDS-main}
-WANTLIB-server=${WANTLIB-main} perl pq
+WANTLIB-server=${WANTLIB-main} icudata icui18n icuuc perl pq
RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
Index: databases/postgresql/distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
diff -u -p -r1.98 distinfo
--- databases/postgresql/distinfo 13 Aug 2023 20:23:27 - 1.98
+++ databases/postgresql/distinfo 11 Nov 2023 04:30:27 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-15.4.tar.gz) = DhHu5yPdflmmNAUrwb/JvmBeVcHMo/Zun8JdOjlPsDA=
-SIZE (postgresql-15.4.tar.gz) = 29978353
+SHA256 (postgresql-16.1.tar.gz) = vwVkclYT98V/HD6/XJCbPsWLnPs9gbS7EgnYh2cGWoc=
+SIZE (postgresql-16.1.tar.gz) = 32433767
Index: databases/postgresql/patches/patch-src_backend_libpq_ip_c
===
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_backend_libpq_ip_c,v
diff -u -p -r1.4 patch-src_backend_libpq_ip_c
--- databases/postgresql/patches/patch-src_backend_libpq_ip_c 11 Mar 2022
18:31:37 - 1.4
+++ databases/postgresql/patches/patch-src_backend_libpq_ip_c 25 May 2023
15:08:40 -
@@ -4,12 +4,11 @@ since the latter is unreliable. Fixes "s
Index: src/backend/libpq/ifaddr.c
--- src/backend/libpq/ifaddr.c.orig
+++ src/backend/libpq/ifaddr.c
-@@ -200,17 +200,16 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *c
+@@ -189,16 +189,14 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *c
/* Check that the mask is valid */
if (mask)
{
- if (mask->sa_family != addr->sa_family
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/27 13:06:26 ports/databases/postgresql-odbc/patches Update of /cvs/ports/databases/postgresql-odbc/patches In directory cvs.openbsd.org:/tmp/cvs-serv8104/databases/postgresql-odbc/patches Log Message: Directory /cvs/ports/databases/postgresql-odbc/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/11/06 09:53:37 Modified files: lang/jruby : Makefile distinfo lang/jruby/pkg : PLIST Log message: Update to JRuby 9.4.5.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/10/22 16:43:43 Modified files: lang/jruby : Makefile distinfo lang/jruby/patches: patch-lib_ruby_stdlib_ffi_library_rb lang/jruby/pkg : PLIST Log message: Update to JRuby 9.4.4.0
Update: JRuby 9.4.4.0
This updates JRuby to the latest release. Release notes at:
https://www.jruby.org/2023/10/18/jruby-9-4-4-0.html
Tested on amd64, the only supported arch. Will be committing in a few
days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile10 Jun 2023 17:30:29 - 1.109
+++ Makefile18 Oct 2023 19:10:50 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64
COMMENT = pure-Java implementation of the Ruby language
-V =9.4.3.0
+V =9.4.4.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.75
diff -u -p -r1.75 distinfo
--- distinfo10 Jun 2023 17:30:29 - 1.75
+++ distinfo18 Oct 2023 19:10:55 -
@@ -1,6 +1,6 @@
SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw=
-SHA256 (jruby-dist-9.4.3.0-bin.tar.gz) =
sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk=
+SHA256 (jruby-dist-9.4.4.0-bin.tar.gz) =
arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA=
SHA256 (jruby-launcher-1.1.19-java.gem) =
LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo=
SIZE (jffi-1.3.10.tar.gz) = 3304571
-SIZE (jruby-dist-9.4.3.0-bin.tar.gz) = 29462176
+SIZE (jruby-dist-9.4.4.0-bin.tar.gz) = 31660522
SIZE (jruby-launcher-1.1.19-java.gem) = 64000
Index: patches/patch-lib_ruby_stdlib_ffi_library_rb
===
RCS file: /cvs/ports/lang/jruby/patches/patch-lib_ruby_stdlib_ffi_library_rb,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_ruby_stdlib_ffi_library_rb
--- patches/patch-lib_ruby_stdlib_ffi_library_rb11 Mar 2022 19:29:04
- 1.3
+++ patches/patch-lib_ruby_stdlib_ffi_library_rb18 Oct 2023 19:28:32
-
@@ -1,20 +1,17 @@
Index: lib/ruby/stdlib/ffi/library.rb
--- lib/ruby/stdlib/ffi/library.rb.orig
+++ lib/ruby/stdlib/ffi/library.rb
-@@ -96,6 +96,7 @@ module FFI
+@@ -90,10 +90,13 @@ module FFI
raise LoadError.new("library names list must not be empty") if
names.empty?
- lib_flags = defined?(@ffi_lib_flags) ? @ffi_lib_flags :
FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_LOCAL
+ lib_flags = defined?(@ffi_lib_flags) && @ffi_lib_flags
+ libc = FFI::DynamicLibrary.open('libc.so',
FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL)
- ffi_libs = names.map do |name|
- if name == FFI::CURRENT_PROCESS
-@@ -149,7 +150,7 @@ module FFI
- lib
- end
+ @ffi_libs = names.map do |name|
+ FFI::DynamicLibrary.send(:load_library, name, lib_flags)
end
--
-+ ffi_libs.unshift(libc)
- @ffi_libs = ffi_libs
++ @ffi_libs.unshift(libc)
++ @ffi_libs
end
+ # Set the calling convention for {#attach_function} and {#callback}
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.66
diff -u -p -r1.66 PLIST
--- pkg/PLIST 10 Jun 2023 17:30:29 - 1.66
+++ pkg/PLIST 18 Oct 2023 19:30:03 -
@@ -529,6 +529,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/abbrev-0.1.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/base64-0.1.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/benchmark-0.2.0.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/bigdecimal-3.1.4-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.3.26.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/cgi-0.3.6-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/csv-3.2.5.gemspec
@@ -541,7 +542,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/english-0.7.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/erb-2.2.3.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/error_highlight-0.3.0.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.15.5-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.16.3-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/ffi-binary-libfixposix-0.5.1.1-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/ffi-bindings-libfixposix-0.5.1.0.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/fileutils-1.6.0.gemspec
@@ -553,7 +554,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
jruby/lib/ruby/gems/1.8/specifications/default/ipaddr-1.2.4.gemspec
jruby/lib/ruby/gems/1.8/specifications/default/irb-1.4.2.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.14.1-java.gemspec
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/10/13 17:15:40 Modified files: lang/ruby : ruby.port.mk Log message: Remove support for building ruby30-* packages for Ruby ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/10/13 17:14:54 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Update quirk for ruby30-* ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/10/13 17:13:19 Removed files: lang/ruby/3.0 : Makefile distinfo lang/ruby/3.0/patches: patch-common_mk patch-compile_c patch-configure patch-ext_etc_etc_c patch-ext_extmk_rb patch-ext_openssl_extconf_rb patch-ext_openssl_ossl_ocsp_c patch-ext_openssl_ossl_pkey_ec_c patch-ext_ripper_depend patch-lib_cgi_cookie_rb patch-lib_fileutils_rb patch-lib_mkmf_rb patch-lib_rubygems_commands_install_command_rb patch-lib_rubygems_dependency_installer_rb patch-lib_rubygems_ext_ext_conf_builder_rb patch-template_builtin_binary_inc_tmpl patch-thread_pthread_h lang/ruby/3.0/pkg: DESCR-gdbm DESCR-main DESCR-ri_docs MESSAGE-main PLIST-gdbm PLIST-main PLIST-ri_docs UNMESSAGE-main Log message: Send Ruby 3.0 to the Attic
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/10/13 17:12:43 Modified files: lang/ruby : Makefile Log message: Unhook Ruby 3.0
Ruby 3.0 Removal
Per our standard Ruby support policy, I am planning to remove Ruby 3.0
from the ports tree, as it will be completely unsupported before the
release of OpenBSD 7.5. Nothing currently depends on it, so
this should cause no problems.
Here's the diff for ruby.port.mk. I also have diffs prepared for
ruby-module.5 and quirks.
Thanks,
Jeremy
Index: ruby.port.mk
===
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.116
diff -u -p -r1.116 ruby.port.mk
--- ruby.port.mk27 Sep 2023 21:41:16 - 1.116
+++ ruby.port.mk12 Oct 2023 17:09:41 -
@@ -25,7 +25,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
# If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
# for each ruby version.
.if !defined(FLAVORS)
-FLAVORS= ruby30 ruby31 ruby32
+FLAVORS= ruby31 ruby32
.endif
# Instead of adding flavors to the end of the package name, we use
@@ -49,11 +49,10 @@ FLAVOR =ruby32
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-.for i in ruby30 ruby31 ruby32
+.for i in ruby31 ruby32
. if ${FLAVOR:M$i}
MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
-.if ${FLAVOR:N$i:Mruby30} || \
-${FLAVOR:N$i:Mruby31} || \
+.if ${FLAVOR:N$i:Mruby31} || \
${FLAVOR:N$i:Mruby32}
ERRORS += "Fatal: Conflicting flavors used: ${FLAVOR}"
.endif
Re: BTI fix ruby 3.2.2
On 09/23 08:38, Mark Kettenis wrote: > The configure scripts adds
-mbranch-protection=pac-ret, which on > OpenBSD actually *downgrades* the
protection and makes things fail on > arm64 systems that implement BTI. >
> Use -mbranch-protection=standard instead. > > ok? OK jeremy@ > Index:
lang/ruby/3.2/Makefile >
=== > RCS
file: /cvs/ports/lang/ruby/3.2/Makefile,v > retrieving revision 1.5 >
diff -u -p -r1.5 Makefile > --- lang/ruby/3.2/Makefile 13 Jun 2023
05:00:23 - 1.5 > +++ lang/ruby/3.2/Makefile 23 Sep 2023 18:32:57
- > @@ -3,7 +3,7 @@ DISTNAME = ruby-${VERSION} > SHARED_LIBS = ruby32
0.0 > NEXTVER = 3.3 > PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER} >
-REVISION-main = 0 > +REVISION-main = 1 > > PSEUDO_FLAVORS= no_ri_docs
bootstrap > # Do not build the RI docs on slow arches > Index:
lang/ruby/3.2/patches/patch-configure >
=== > RCS
file: /cvs/ports/lang/ruby/3.2/patches/patch-configure,v > retrieving
revision 1.2 > diff -u -p -r1.2 patch-configure > ---
lang/ruby/3.2/patches/patch-configure 1 Apr 2023 19:28:26 - 1.2 > +++
lang/ruby/3.2/patches/patch-configure 23 Sep 2023 18:32:57 - > @@
-1,4 +1,5 @@ > Support arm64 coroutines. > +Don't downgrade arm64 branch
protection. > > Set correct shared library name. > > @@ -8,6 +9,15 @@ so
ports don't have to be bumped when Op > Index: configure > ---
configure.orig > +++ configure > +@@ -10897,7 +10897,7 @@ esac > + case
"$target_cpu" in #( > + aarch64) : > + > +- for opt in
-mbranch-protection=pac-ret -msign-return-address=all > ++ for opt in
-mbranch-protection=standard -msign-return-address=all > + do : > + > + >
@@ -29475,6 +29475,10 @@ esac > > coroutine_type=x86
Re: Early Look: PostgreSQL 16.0
On 09/16 09:56, Theo Buehler wrote: > On Thu, Sep 14, 2023 at 06:06:37PM +0000, Jeremy Evans wrote: > > PostgreSQL 16.0 was released today: > > https://www.postgresql.org/about/news/postgresql-16-released-2715/ > > > > As usual, we don't plan to change the default version in ports until > > 16.1, and after we have prepared updates all software that depends on > > PostgreSQL to support the new version. However, for early testing, > > here's a diff to test with. > > As mentioned elsewhwere, the diff needs an installed icu4c to configure > as it is now. I ran a bulk with '--without-icu' added to CONFIGURE_ARGS. Thanks! I've updated my copy to use --without-icu. If someone wants ICU support in PostgreSQL, please speak up and describe why. > There are a few version checks that break some ports, as usual. > There is at least one .so in the server that had changes amounting to a > major bump, but for some reasone they aren't versioned. Should they be? I believe the @so entries in PLIST-server are only designed for use by PostgreSQL itself via dlopen. I don't think external code should be linking to them, and therefore there is no reason to version them. > databases/citus version > databases/pg_sqlite_fdw version > databases/postgresql-odbc ? > databases/postgresql-plluaversion > databases/timescaledb version > geo/pgpointcloud API break in -server For these, it's best to wait a couple months till upstream has had a chance to update. After 16.1 is released, I'll take a look at these and see if upstream has released a new version compatible with PostgreSQL 16, or has at least committed fixes that can be backported. Thanks, Jeremy > > Not sure what's up with postgresql-odbc, maybe missing stdarg/stdbool > includes? > > > databases/citus: > configure: error: Citus is not compatible with the detected PostgreSQL > version 16. > > databases/pg_sqlite_fdw: > Makefile:40: *** PostgreSQL 11, 12, 13, 14 or 15 is required to compile this > extension. Stop. > > databases/postgresql-pllua: > ===> postgresql-pllua-2.0.10p0 depends on: postgresql-server->=15,<16 - > default postgresql-server-16.0 does not match > > databases/timescaledb: > CMake Error at CMakeLists.txt:349 (message): > TimescaleDB only supports PostgreSQL 12, 13, 14 and 15 > > databases/postgresql-odbc: > > cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include/postgresql > -I/usr/local/include/postgresql/internal -DUNICODE_SUPPORT -O2 -pipe -MT > psqlodbcw_la-info.lo -MD -MP -MF .deps/psqlodbcw_la-info.Tpo -c info.c -fPIC > -DPIC -o .libs/psqlodbcw_la-info.o > In file included from info.c:34: > In file included from ./connection.h:14: > /usr/local/include/postgresql/internal/pqexpbuffer.h:168:8: error: unknown > type name 'bool' > extern bool appendPQExpBufferVA(PQExpBuffer str, const char *fmt, va_list > args) pg_attribute_printf(2, 0); >^ > /usr/local/include/postgresql/internal/pqexpbuffer.h:168:67: error: unknown > type name 'va_list'; did you mean '__va_list'? > extern bool appendPQExpBufferVA(PQExpBuffer str, const char *fmt, va_list > args) pg_attribute_printf(2, 0); > ^~~ > __va_list > /usr/include/machine/_types.h:126:27: note: '__va_list' declared here > typedef __builtin_va_list __va_list; > ^ > 2 errors generated. > > geo/pgpointcloud: https://github.com/pgpointcloud/pointcloud/pull/339 > > pc_pgsql.c:47:50: error: too few arguments to function call, expected 2, have > 1 > List *names = stringToQualifiedNameList(proname); > ~^ > /usr/local/include/postgresql/server/utils/regproc.h:28:14: note: > 'stringToQualifiedNameList' declared here > extern List *stringToQualifiedNameList(const char *string, Node *escontext); > ^ > 1 error generated.
Early Look: PostgreSQL 16.0
PostgreSQL 16.0 was released today:
https://www.postgresql.org/about/news/postgresql-16-released-2715/
As usual, we don't plan to change the default version in ports until
16.1, and after we have prepared updates all software that depends on
PostgreSQL to support the new version. However, for early testing,
here's a diff to test with.
This also includes a diff for postgresql-previous to update it to 15.4.
I've been testing PostgreSQL 16 since beta1 and haven't experienced
any problems.
Thanks,
Jeremy
Index: postgresql/Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.297
diff -u -p -r1.297 Makefile
--- postgresql/Makefile 11 Sep 2023 20:04:47 - 1.297
+++ postgresql/Makefile 14 Sep 2023 18:01:41 -
@@ -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= 15.4
-PREV_MAJOR=14
+VERSION= 16.0
+PREV_MAJOR=15
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
-REVISION-server=0
DPB_PROPERTIES=parallel
@@ -17,7 +16,7 @@ CATEGORIES= databases
SHARED_LIBS= ecpg7.10 \
ecpg_compat 4.10 \
pgtypes 4.9 \
- pq 6.14
+ pq 6.15
HOMEPAGE= https://www.postgresql.org/
Index: postgresql/distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.98
diff -u -p -r1.98 distinfo
--- postgresql/distinfo 13 Aug 2023 20:23:27 - 1.98
+++ postgresql/distinfo 14 Sep 2023 18:01:41 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-15.4.tar.gz) = DhHu5yPdflmmNAUrwb/JvmBeVcHMo/Zun8JdOjlPsDA=
-SIZE (postgresql-15.4.tar.gz) = 29978353
+SHA256 (postgresql-16.0.tar.gz) = WL06JlonmidUkF3fBypU1k1iNtz3hvIPkrXTC5Ft9RY=
+SIZE (postgresql-16.0.tar.gz) = 32283370
Index: postgresql/patches/patch-src_backend_libpq_ip_c
===
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_backend_libpq_ip_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_backend_libpq_ip_c
--- postgresql/patches/patch-src_backend_libpq_ip_c 11 Mar 2022 18:31:37
- 1.4
+++ postgresql/patches/patch-src_backend_libpq_ip_c 14 Sep 2023 18:01:41
-
@@ -4,12 +4,11 @@ since the latter is unreliable. Fixes "s
Index: src/backend/libpq/ifaddr.c
--- src/backend/libpq/ifaddr.c.orig
+++ src/backend/libpq/ifaddr.c
-@@ -200,17 +200,16 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *c
+@@ -189,16 +189,14 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *c
/* Check that the mask is valid */
if (mask)
{
- if (mask->sa_family != addr->sa_family)
-+
+ /* mask->sa_family can be different from addr->sa_family. */
+
+ if (addr->sa_family == AF_INET)
@@ -21,7 +20,6 @@ Index: src/backend/libpq/ifaddr.c
if (((struct sockaddr_in *) mask)->sin_addr.s_addr ==
INADDR_ANY)
mask = NULL;
}
- #ifdef HAVE_IPV6
- else if (mask->sa_family == AF_INET6)
+ else if (addr->sa_family == AF_INET6)
{
Index: postgresql/patches/patch-src_include_storage_s_lock_h
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_include_storage_s_lock_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_include_storage_s_lock_h
--- postgresql/patches/patch-src_include_storage_s_lock_h 16 Nov 2022
02:59:23 - 1.10
+++ postgresql/patches/patch-src_include_storage_s_lock_h 14 Sep 2023
18:01:41 -
@@ -1,7 +1,7 @@
Index: src/include/storage/s_lock.h
--- src/include/storage/s_lock.h.orig
+++ src/include/storage/s_lock.h
-@@ -802,6 +802,29 @@ tas(volatile slock_t *lock)
+@@ -655,6 +655,29 @@ tas(volatile slock_t *lock)
do { __asm__ __volatile__("" : : : "memory"); *(lock) = 0; } while (0)
#endif
Index: postgresql/patches/patch-src_interfaces_ecpg_compatlib_Makefile
===
RCS file:
/cvs/ports/databases/postgresql/patches/patch-src_interfaces_ecpg_compatlib_Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 patch-src_interfaces_ecpg_compatlib_Makefile
--- postgresql/patches/patch-src_interfaces_ecpg_compatlib_Makefile 11 Mar
2022 18:31:37 - 1.14
+++ postgresql/patches/patch-src_interfaces_ecpg_compatlib_Makefile 14 Sep
2023 18:01:41 -
@@ -11,4 +11,4 @@ Index: src/interfaces/ecpg/compatlib/Mak
+SO_MINOR_VERSION= ${LIBecpg_compat_MINOR}
override CPPFLAGS := -I../include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/11 14:04:47 Modified files: databases/postgresql: Makefile Added files: databases/postgresql/patches: patch-src_bin_initdb_initdb_c Log message: Have initdb recommend use of rcctl if appropriate Requested by espie@ OK sthen@, espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/11 13:59:04 Modified files: lang/ruby : ruby.port.mk Log message: Further simplify ruby.port.mk * Remove variables not used by any ports in the tree: * MODRUBY_LIBDIR * MODRUBY_RELDOCDIR * MODRUBY_DOCDIR * MODRUBY_EXAMPLEDIR * MODRUBY_ADJ_REPLACE * MODRUBY_TEST_DIR * Prefix internal variables with an underscore. Any variable not currently used by any ports in the tree has been made internal. * Consolidate all SUBST_VARS and UPDATE_PLIST_ARGS setting to a single case. Tested by building all ports using lang/ruby module.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/09 21:21:19 Modified files: audio/aqualung : Makefile distinfo Log message: Backport upstream commits to work with audio/mac update As one of the commits affects configure.ac, add autoreconf CONFIGURE_STYLE.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/09 21:11:51 Modified files: audio/mac : Makefile distinfo audio/mac/pkg : PLIST Added files: audio/mac/patches: patch-Shared_All_h patch-Shared_NoWindows_h Removed files: audio/mac/patches: patch-configure patch-src_Console_Console_cpp patch-src_MACLib_APEDecompress_cpp patch-src_MACLib_APELink_cpp patch-src_MACLib_MACLib_h Log message: Update to Monkey's Audio Codec 10.20 This switches to using the upstream distfile, instead of what appears to be a Linux port of a quite old version (Monkey's Audio was previously Windows-only). The upstream distfile compiles without hanges. The shared library has changed from libmac to libMAC. The license has changed from a custom, non-open source license to a standard BSD-3-Clause license. All previous patches no longer necessary or apply. Add a couple new patches to the include files to make it easier to use the library.
Re: Update documentation for ruby-module.5
On 09/07 01:45, Ingo Schwarze wrote: > Hi Jeremy, > > Jeremy Evans wrote on Wed, Sep 06, 2023 at 09:42:09PM +: > > > This updates ruby-module.5 to update it for recent changes and > > make other improvements: > > > > * Sort the list of variables. > > > > * Remove mention of variables removed from ruby.port.mk, and > > mention of jruby now that jruby support has been removed. > > > > I plan on committing this after the ruby.port.mk diff I sent, > > assuming there are no objections. > > Definitely no objection here. > > When having a very brief look at the page, i noticed a very unusual > style: first there is a giant list of variables with no explanation, > then references to them scattered around the rest of the text. > > Wouldn't something like > > .Bl -tag -width Ds > .It Ev MODRUBY_REV > The ruby version for a non-gem port. > The default is 3.2. > The other supported values are 3.0 and 3.1. > For a gem port, use a > .Ev FLAVOR > like > .Ql ruby31 > instead. > > be easier to read, more concise, look more familiar, be easier > to maintain and easier to search at the same time? Right now, > for example, ":t MODUBY_REV" does not work, and making mandoc(1) > cope with the present style looks very difficult to me. Ingo, Thank you for the feedback. I agree with you. I will work on an updated patch that uses that style. Best regards, Jeremy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/07 15:29:04 Modified files: security : Makefile Log message: += ruby-ed25519
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/07 15:25:30 Log message: Import ruby-ed25519 A Ruby binding to the Ed25519 elliptic curve public-key signature system described in RFC 8032. Feedback and OK tb@ Status: Vendor Tag: jeremy Release Tags: jeremy_2023-Sep-07 N ports/security/ruby-ed25519/Makefile N ports/security/ruby-ed25519/distinfo N ports/security/ruby-ed25519/pkg/DESCR N ports/security/ruby-ed25519/pkg/PLIST No conflicts created by this import
New: ruby-ed25519 1.3.0
Here is a ruby binding for the Ed25519 elliptic curve public-key signature system described in RFC 8032. Tested briefly on amd64, work as described on the website: https://github.com/RubyCrypto/ed25519 OKs? Thanks, Jeremy ruby-ed25519.tar.gz Description: application/tar-gz
Update documentation for ruby-module.5
This updates ruby-module.5 to update it for recent changes and make other improvements: * Sort the list of variables. * Remove mention of variables removed from ruby.port.mk, and mention of jruby now that jruby support has been removed. I plan on committing this after the ruby.port.mk diff I sent, assuming there are no objections. Thanks, Jeremy Index: ruby-module.5 === RCS file: /cvs/src/share/man/man5/ruby-module.5,v retrieving revision 1.40 diff -u -p -u -p -r1.40 ruby-module.5 --- ruby-module.5 31 May 2023 15:27:45 - 1.40 +++ ruby-module.5 6 Sep 2023 17:33:24 - @@ -1,3 +1,4 @@ +m .\"$OpenBSD: ruby-module.5,v 1.40 2023/05/31 15:27:45 jeremy Exp $ .\" .\" Copyright (c) 2008 Marc Espie, Jeremy Evans @@ -38,48 +39,40 @@ in the tree. .Pp Sets -.Ev MODRUBY_REV , -.Ev RUBY , -.Ev RAKE , -.Ev RSPEC , -.Ev MODRUBY_BIN_TESTRB , -.Ev MODRUBY_BIN_RSPEC , -.Ev MODRUBY_WANTLIB , -.Ev MODRUBY_RUN_DEPENDS , -.Ev MODRUBY_LIB_DEPENDS , -.Ev MODRUBY_BUILD_DEPENDS , -.Ev MODRUBY_RSPEC_DEPENDS , -.Ev MODRUBY_RSPEC3_DEPENDS , -.Ev MODRUBY_RUBY_ADJ , +.Ev GEM , +.Ev GEM_BASE_BIN , +.Ev GEM_BASE_LIB , +.Ev GEM_BIN , +.Ev GEM_BIN_SUFFIX , +.Ev GEM_EXTENSIONS_DIR, +.Ev GEM_FLAGS , +.Ev GEM_LIB , +.Ev GEM_MAN_SUFFIX , .Ev MODRUBY_ADJ_FILES , -.Ev MODRUBY_LIBDIR , -.Ev MODRUBY_DOCDIR , -.Ev MODRUBY_SITEARCHDIR , -.Ev MODRUBY_SITEDIR , -.Ev MODRUBY_EXAMPLEDIR , .Ev MODRUBY_ARCH , -.Ev MODRUBY_LIBREV , .Ev MODRUBY_BINREV , +.Ev MODRUBY_BIN_RSPEC , +.Ev MODRUBY_BUILD_DEPENDS , +.Ev MODRUBY_BUILDDEP , +.Ev MODRUBY_FLAVOR , .Ev MODRUBY_HANDLE_FLAVORS , +.Ev MODRUBY_LIBREV , +.Ev MODRUBY_LIB_DEPENDS , .Ev MODRUBY_PKG_PREFIX , -.Ev MODRUBY_FLAVOR , +.Ev MODRUBY_RELEXAMPLEDIR , +.Ev MODRUBY_REV , +.Ev MODRUBY_RUBY_ADJ , +.Ev MODRUBY_RUN_DEPENDS , +.Ev MODRUBY_RUNDEP , +.Ev MODRUBY_SITEARCHDIR , +.Ev MODRUBY_SITEDIR , .Ev MODRUBY_TEST , -.Ev MODRUBY_TEST_TARGET , -.Ev MODRUBY_TEST_DIR , .Ev MODRUBY_TEST_ENV , -.Ev MODRUBY_BUILD_TARGET , -.Ev MODRUBY_INSTALL_TARGET , -.Ev MODRUBY_EXTRACT_TARGET , -.Ev GEM , -.Ev GEM_BIN , -.Ev GEM_LIB , -.Ev GEM_BASE_LIB , -.Ev GEM_ABS_PATH , -.Ev GEM_BASE_BIN , -.Ev GEM_BIN_SUFFIX , -.Ev GEM_MAN_SUFFIX , +.Ev MODRUBY_TEST_TARGET , +.Ev MODRUBY_WANTLIB , +.Ev RAKE , and -.Ev GEM_FLAGS . +.Ev RUBY . .Pp Appends to .Ev CATEGORIES @@ -98,23 +91,17 @@ unless .Ev MODRUBY_RUNDEP is set to No. .Pp -.Ev MODRUBY_RSPEC_DEPENDS -is set to the dependency line for the rspec 1 port for the version of ruby in -use. .Ev MODRUBY_RSPEC3_DEPENDS is set to the dependency line for the rspec 3 port for the version of ruby in use. .Ev RUBY , -.Ev RAKE , -and -.Ev MODRUBY_BIN_TESTRB -are the path to the ruby, rake, and -testrb binaries for the related ruby implementation. -.Ev RSPEC and +.Ev RAKE +are the path to the ruby and rake +binaries for the related ruby implementation. .Ev MODRUBY_BIN_RSPEC -are the path to the spec (rspec 1) and -rspec (rspec 3) binaries for the related ruby implementation. +is the path to the rspec (rspec 3) binaries for the related ruby +implementation. .Pp .Ev MODRUBY_RUBY_ADJ is a command that takes filename arguments and replaces @@ -129,14 +116,10 @@ Creates a do-test target if .Ev MODRUBY_TEST is used and one is not already defined. .Ev MODRUBY_TEST -can be set to ruby, rake, rspec, rspec3, or testrb to +can be set to ruby, rake, rspec3, or testrb to choose the appropriate binary to run the regress tests. .Ev MODRUBY_TEST_ENV can be used to set environment variables for the regress tests. -.Ev MODRUBY_TEST_DIR -can be used to set the directory in which to execute -the regress tests, it defaults to -.Ev WRKSRC . .Ev MODRUBY_TEST_TARGET sets the argument to the regress test program. .Pp @@ -152,7 +135,7 @@ The "ruby gem" should be used for pure ruby gems without C extensions. This adds .Ev PKG_ARCH -= * and adds ruby30, ruby31, ruby32, and jruby += * and adds ruby30, ruby31, and ruby32 .Ev FLAVOR Ns s to the port, so the same port can build packages for multiple versions of ruby. .It @@ -192,8 +175,7 @@ instead of ruby as the package prefix. Specifying .Ev MODRUBY_FLAVOR is necessary so that if a ruby x.y package is being built for the current -port, it depends on the ruby x.y package of the -dependencies. +port, it depends on the ruby x.y package of the dependencies. .Pp The ports system defaults to using ruby 3.2 if the version of ruby is not specified. @@ -202,7 +184,7 @@ If you want to specify a version for a g such as ruby31 to use ruby 3.1. If you want to specify a version for a non-gem port, set .Ev MODRUBY_REV -for the version of ruby you want to use (3.0, 3.1, 3.2, jruby). +for the version of ruby you want to use (3.0, 3.1, 3.2). .Pp If you do not want the ports system to automatically set up .Ev FLAVOR Ns s @@ -218,7 +200,7 @@ When .Ev MODRUBY_HANDLE_FLAVORS is Yes, the ports system automatically ad
More ruby.port.mk cleanup
This further simplifies ruby.port.mk:
* Remove variables not used by any ports in the tree:
* MODRUBY_LIBDIR
* MODRUBY_RELDOCDIR
* MODRUBY_DOCDIR
* MODRUBY_EXAMPLEDIR
* MODRUBY_ADJ_REPLACE
* MODRUBY_TEST_DIR
* Prefix internal variables with an underscore. Any variable
not currently used by any ports in the tree has been made
internal.
* Consolidate all SUBST_VARS and UPDATE_PLIST_ARGS setting to
a single case.
My full build of the ruby ports is mostly finished but has not
completed yet. Assuming no problems, I'll probably commit this
next week.
Thanks,
Jeremy
Index: ruby.port.mk
===
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.114
diff -u -p -u -p -r1.114 ruby.port.mk
--- ruby.port.mk5 Sep 2023 12:33:32 - 1.114
+++ ruby.port.mk6 Sep 2023 16:44:56 -
@@ -1,5 +1,9 @@
# ruby module
+# Variables defined in this file that prefixed with _ are designed for
+# internal use, not currently used in the ports tree outside this file,
+# and are purposely not documented.
+
CATEGORIES+= lang/ruby
# Whether the ruby module should automatically add FLAVORs.
@@ -71,17 +75,18 @@ MODRUBY_ARCH= ${MACHINE_ARCH:S/amd64/x8
MODRUBY_BINREV = ${MODRUBY_LIBREV:S/.//}
MODRUBY_BIN_RSPEC =${LOCALBASE}/bin/rspec${MODRUBY_BINREV}
MODRUBY_FLAVOR = ruby${MODRUBY_BINREV}
-MODRUBY_LIBDIR=${LOCALBASE}/lib/ruby
MODRUBY_LIBREV = ${MODRUBY_REV}
+MODRUBY_BUILD_DEPENDS= ${MODRUBY_RUN_DEPENDS}
MODRUBY_LIB_DEPENDS= ${MODRUBY_RUN_DEPENDS}
MODRUBY_RUN_DEPENDS= lang/ruby/${MODRUBY_REV}
MODRUBY_SITEARCHDIR = ${MODRUBY_SITEDIR}/${MODRUBY_ARCH}
MODRUBY_SITEDIR = lib/ruby/site_ruby/${MODRUBY_LIBREV}
+MODRUBY_RELEXAMPLEDIR= share/examples/${MODRUBY_PKG_PREFIX}
MODRUBY_WANTLIB= ruby${MODRUBY_BINREV}
RAKE= ${LOCALBASE}/bin/rake${MODRUBY_BINREV}
RUBY= ${LOCALBASE}/bin/ruby${MODRUBY_BINREV}
-MODRUBY_RSPEC3_DEPENDS = devel/ruby-rspec/3/rspec,${MODRUBY_FLAVOR}>=3.0
+_MODRUBY_RSPEC3_DEPENDS = devel/ruby-rspec/3/rspec,${MODRUBY_FLAVOR}>=3.0
.if defined(MODRUBY_TEST)
. if !${MODRUBY_TEST:L:Mrspec3} && !${MODRUBY_TEST:L:Mtestrb} && \
@@ -98,17 +103,6 @@ NO_TEST = Yes
MODRUBY_TEST?=
.endif
-MODRUBY_BUILD_DEPENDS= ${MODRUBY_RUN_DEPENDS}
-
-# common directories for ruby extensions
-# used to create docs and examples install path
-MODRUBY_RELDOCDIR= share/doc/${MODRUBY_PKG_PREFIX}
-MODRUBY_RELEXAMPLEDIR= share/examples/${MODRUBY_PKG_PREFIX}
-MODRUBY_DOCDIR=${PREFIX}/${MODRUBY_RELDOCDIR}
-MODRUBY_EXAMPLEDIR=${PREFIX}/${MODRUBY_RELEXAMPLEDIR}
-SUBST_VARS += MODRUBY_RELDOCDIR MODRUBY_RELEXAMPLEDIR
-UPDATE_PLIST_ARGS += -s MODRUBY_RELDOCDIR -s MODRUBY_RELEXAMPLEDIR
-
# Assume that we want to automatically add ruby to BUILD_DEPENDS
# and RUN_DEPENDS unless the port specifically requests not to.
MODRUBY_BUILDDEP?= Yes
@@ -122,7 +116,7 @@ RUN_DEPENDS+= ${MODRUBY_RUN_DEPENDS}
.endif
.if ${MODRUBY_TEST:L:Mrspec3}
-TEST_DEPENDS+= ${MODRUBY_RSPEC3_DEPENDS}
+TEST_DEPENDS+= ${_MODRUBY_RSPEC3_DEPENDS}
.endif
MODRUBY_RUBY_ADJ = perl -pi \
@@ -131,11 +125,10 @@ MODRUBY_RUBY_ADJ =perl -pi \
-e 'close ARGV if eof;'
MODRUBY_ADJ_FILES?=
.if !empty(MODRUBY_ADJ_FILES)
-MODRUBY_ADJ_REPLACE= for pat in ${MODRUBY_ADJ_FILES:QL}; do \
+MODRUBY_pre-configure +=for pat in ${MODRUBY_ADJ_FILES:QL}; do \
find ${WRKSRC} -type f -name "$$pat" \
-exec ${MODRUBY_RUBY_ADJ} {} + ; \
done
-MODRUBY_pre-configure += ${MODRUBY_ADJ_REPLACE}
.endif
MODRUBY_WANTLIB+= c gmp m pthread
@@ -168,7 +161,7 @@ COMPILER_LANGS ?= c
# Add build complete file to package so rubygems doesn't complain
# or build extensions at runtime
GEM_EXTENSIONS_DIR ?=
${GEM_LIB}/extensions/${MODRUBY_ARCH:S/i386/x86/}/${MODRUBY_REV}/${DISTNAME}
-GEM_EXTENSIONS_FILE ?= ${GEM_EXTENSIONS_DIR}/gem.build_complete
+_GEM_EXTENSIONS_FILE ?= ${GEM_EXTENSIONS_DIR}/gem.build_complete
SUBST_VARS+= GEM_EXTENSIONS_DIR
PKG_ARGS+= -f ${PORTSDIR}/lang/ruby/rubygems-ext.PLIST
. else
@@ -176,17 +169,12 @@ PKG_ARGS+=-f ${PORTSDIR}/lang/ruby/ruby
PKG_ARCH= *
. endif
-# PLIST magic. Set variables so that the same PLIST will work for
-# all ruby versions and implementations.
-SUBST_VARS+= GEM_LIB GEM_BIN DISTNAME
-UPDATE_PLIST_ARGS += -s GEM_LIB -s GEM_BIN
-
GEM= ${LOCALBASE}/bin/gem${MODRUBY_BINREV}
GEM_BIN = bin
GEM_LIB = lib/ruby/gems/${MODRUBY_LIBREV}
-GEM_BASE_LIB= ${GEM_BASE}/ruby/${MODRUBY_LIBREV}
-GEM_BASE= ${WRKDIR}/gem-tmp/.gem
-GEM_ABS_PATH= ${PREFIX}/${GEM_LIB}
+GEM_BASE_LIB= ${_GEM_BASE}/ruby/${MODRUBY_LIBREV}
+_GEM_BASE= ${WRKDIR}/gem-tmp/.gem
+_GEM_ABS_PATH= ${PREFIX}/${GEM_LIB}
GEM_BASE_BIN= ${GEM_BASE_LIB}/bin
# We
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:37:35 Removed files: misc/tpp : Makefile distinfo misc/tpp/patches: patch-doc_tpp_1 patch-tpp_rb misc/tpp/pkg : DESCR PLIST Log message: Remove tpp Barely updated since import back in 2010. OK kili@ (who imported it in 2010)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:35:13 Removed files: textproc/ruby-kramdown: Makefile distinfo textproc/ruby-kramdown/patches: patch-_metadata patch-test_run_tests_rb textproc/ruby-kramdown/pkg: DESCR PLIST Log message: Remove ruby-kramdown Broken in all supported Ruby versions due to a missing dependency on rexml (which was removed from the Ruby standard library in Ruby 3). Better to remove this than import and maintain a new port for rexml. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK kn@, tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:32:23 Removed files: security/ruby-openid: Makefile distinfo security/ruby-openid/pkg: DESCR PLIST Log message: Remove ruby-openid Last release 4 years ago, officially dead upstream. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:30:13 Removed files: net/ruby-stomp : Makefile distinfo net/ruby-stomp/pkg: DESCR PLIST Log message: Remove ruby-stomp Was only needed as a dependency of Puppet 5, which was removed earlier this year. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sebastia@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:25:36 Removed files: devel/ruby-systemu: Makefile distinfo devel/ruby-systemu/pkg: DESCR PLIST Log message: Remove ruby-systemu Last release was over 8 years ago, upstream appears dead. Was only needed as a dependency of ruby-macaddr, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:24:19 Removed files: net/ruby-macaddr: Makefile distinfo net/ruby-macaddr/pkg: DESCR PLIST Log message: Remove ruby-macaddr Last release was over 4 years ago, upstream appears dead. Was only needed as a dependency of ruby-uuid, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:23:03 Removed files: devel/ruby-uuid: Makefile distinfo devel/ruby-uuid/pkg: DESCR PLIST Log message: Remove ruby-uuid Last release was over 5 years ago, upstream appears dead. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:19:36 Removed files: mail/ruby-mime-types-data: Makefile distinfo mail/ruby-mime-types-data/pkg: DESCR PLIST Log message: Remove ruby-mime-types-data Was only needed as a dependency of ruby-mime-types, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:18:52 Removed files: mail/ruby-mime-types: Makefile distinfo mail/ruby-mime-types/pkg: DESCR PLIST Log message: Remove ruby-mime-types Was only needed as a test dependency of ruby-ethon, and that dependency was recently removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:17:45 Removed files: www/ruby-vegas : Makefile distinfo www/ruby-vegas/pkg: DESCR PLIST Log message: Remove ruby-vegas Last release was 11 years ago, upstream appears dead. Was only needed as a dependency of ruby-resque, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:16:11 Removed files: www/ruby-mustermann: Makefile distinfo www/ruby-mustermann/pkg: DESCR PLIST Log message: Remove ruby-mustermann Current version is 6 years old. Was only needed as a dependency of ruby-sinatra, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:15:12 Removed files: www/ruby-rack-protection: Makefile distinfo www/ruby-rack-protection/pkg: DESCR PLIST Log message: Remove ruby-rack-protection Current version is 6 years old. Was only needed as a dependency of ruby-sinatra, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:13:52 Removed files: www/ruby-sinatra: Makefile distinfo www/ruby-sinatra/pkg: DESCR PLIST Log message: Remove ruby-sinatra Current version is 6 years old. Was only needed as a dependency of ruby-resque, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:10:39 Removed files: www/ruby-sanitize: Makefile distinfo www/ruby-sanitize/pkg: DESCR PLIST Log message: Remove ruby-sanitize Current version is 10 years old. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:09:34 Removed files: www/ruby-rainbows: Makefile distinfo www/ruby-rainbows/patches: patch-_metadata www/ruby-rainbows/pkg: DESCR PLIST Log message: Remove ruby-rainbows Only three years old, but does not benefit from being packaged (imported and maintained by me). Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:06:05 Removed files: www/ruby-faraday_middleware-multi_json: Makefile distinfo www/ruby-faraday_middleware-multi_json/pkg: DESCR PLIST Log message: Remove ruby-faraday_middleware-multi_json Last release was over 9 years ago, upstream appears dead. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:04:16 Removed files: textproc/ruby-yard: Makefile distinfo textproc/ruby-yard/pkg: DESCR PLIST Log message: Remove ruby-yard Current version is 8 years old. Was only needed as a dependency of ruby-uuidtools and ruby-net-dns, which were both just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:03:03 Removed files: devel/ruby-rr : Makefile distinfo devel/ruby-rr/pkg: DESCR PLIST Log message: Remove ruby-rr Current version is 10 years old. Was only needed as a dependency of ruby-treetop, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:02:15 Removed files: devel/ruby-polyglot: Makefile distinfo devel/ruby-polyglot/pkg: DESCR PLIST Log message: Remove ruby-polyglot Last release was over 9 years ago, upstream appears dead. Was only needed as a dependency of ruby-treetop, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 05:00:49 Removed files: textproc/ruby-treetop: Makefile distinfo textproc/ruby-treetop/pkg: DESCR PLIST Log message: Remove ruby-treetop Current version is over 7 years old. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 04:59:43 Removed files: textproc/ruby-syntax: Makefile distinfo textproc/ruby-syntax/patches: patch-test_syntax_tc_yaml_rb textproc/ruby-syntax/pkg: DESCR PLIST Log message: Remove ruby-syntax Current version is 18 years old, last release was over 6 years ago, upstream appears dead. Was only needed as a dependency of ruby-maruku, which was just removed. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 04:57:26 Removed files: textproc/ruby-rexical: Makefile distinfo textproc/ruby-rexical/pkg: DESCR PLIST Log message: Remove ruby-rexical Current version is 12 years old, last release was over 4 years ago. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 04:55:54 Removed files: textproc/ruby-pygments.rb: Makefile distinfo textproc/ruby-pygments.rb/patches: patch-_metadata patch-lib_pygments_mentos_py textproc/ruby-pygments.rb/pkg: DESCR PLIST Log message: Remove ruby-pygments.rb Current version is 8 years old. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 04:54:43 Removed files: textproc/ruby-maruku: Makefile distinfo textproc/ruby-maruku/pkg: DESCR PLIST Log message: Remove ruby-maruku Current version is 11 years old, last release was over 6 years ago, upstream appears inactive. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 04:53:25 Removed files: textproc/ruby-liquid: Makefile distinfo textproc/ruby-liquid/pkg: DESCR PLIST Log message: Remove ruby-liquid Current version is 11 years old. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2023/09/06 04:52:43 Removed files: textproc/ruby-icalendar: Makefile distinfo textproc/ruby-icalendar/pkg: DESCR PLIST Log message: Remove ruby-icalendar Current version is 9 years old. Pure Ruby port, and nothing depends on it. If you need this, use gem install. OK sthen@ rsadowski@
