diff --git a/build/ruby/build-30.sh b/build/ruby/build-30.sh index 24a533cae..086578cb2 100755 --- a/build/ruby/build-30.sh +++ b/build/ruby/build-30.sh @@ -58,6 +58,7 @@ init download_source $PROG $PROG $VER patch_source prep_build +run_autoconf -f build make_package clean_up diff --git a/build/ruby/build-31.sh b/build/ruby/build-31.sh index f1b5ee8bc..a1e25feec 100755 --- a/build/ruby/build-31.sh +++ b/build/ruby/build-31.sh @@ -58,6 +58,7 @@ init download_source $PROG $PROG $VER patch_source prep_build +run_autoconf -f build make_package clean_up diff --git a/build/ruby/build-32.sh b/build/ruby/build-32.sh index 904755e4f..5c8c08a42 100755 --- a/build/ruby/build-32.sh +++ b/build/ruby/build-32.sh @@ -17,7 +17,7 @@ . ../../lib/build.sh PROG=ruby -VER=3.2.5 +VER=3.2.6 PKG=ooce/runtime/ruby-32 SUMMARY="Ruby" DESC="A dynamic, open source programming language " @@ -61,6 +61,7 @@ init download_source $PROG $PROG $VER patch_source prep_build +run_autoconf -f build make_package clean_up diff --git a/build/ruby/build-33.sh b/build/ruby/build-33.sh index 0ea8882b4..fe196ae6e 100755 --- a/build/ruby/build-33.sh +++ b/build/ruby/build-33.sh @@ -17,7 +17,7 @@ . ../../lib/build.sh PROG=ruby -VER=3.3.5 +VER=3.3.6 PKG=ooce/runtime/ruby-33 SUMMARY="Ruby" DESC="A dynamic, open source programming language " @@ -61,6 +61,7 @@ init download_source $PROG $PROG $VER patch_source prep_build +run_autoconf -f build make_package clean_up diff --git a/build/ruby/patches-30/02-config.patch b/build/ruby/patches-30/02-config.patch index da709fab2..155e2456d 100644 --- a/build/ruby/patches-30/02-config.patch +++ b/build/ruby/patches-30/02-config.patch @@ -3,7 +3,7 @@ # Changes were developed in-house, are Solaris specific, # and are not suitable for upstream. -diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess +diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess --- a~/tool/config.guess 1970-01-01 00:00:00 +++ a/tool/config.guess 1970-01-01 00:00:00 @@ -409,19 +409,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM @@ -29,10 +29,10 @@ diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) -diff -wpruN '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub +diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub --- a~/tool/config.sub 1970-01-01 00:00:00 +++ a/tool/config.sub 1970-01-01 00:00:00 -@@ -1011,7 +1011,7 @@ case $cpu-$vendor in +@@ -1028,7 +1028,7 @@ case $cpu-$vendor in # Here we normalize CPU types irrespective of the vendor amd64-*) diff --git a/build/ruby/patches-30/no-_XOPEN_SOURCE-undefine.patch b/build/ruby/patches-30/no-_XOPEN_SOURCE-undefine.patch new file mode 100644 index 000000000..04d0ae4ca --- /dev/null +++ b/build/ruby/patches-30/no-_XOPEN_SOURCE-undefine.patch @@ -0,0 +1,12 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac +--- a~/configure.ac 1970-01-01 00:00:00 ++++ a/configure.ac 1970-01-01 00:00:00 +@@ -1064,8 +1064,6 @@ main() + AC_MSG_RESULT($define_xopen_source) + AS_IF([test x"$define_xopen_source" != xno], [ + RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source) +- # _XOPEN_SOURCE should not be defined for C++ on Solaris. +- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE) + ]) + ]) + ], diff --git a/build/ruby/patches-30/openssl-EAGAIN.patch b/build/ruby/patches-30/openssl-EAGAIN.patch index 69fef6f25..e4466628f 100644 --- a/build/ruby/patches-30/openssl-EAGAIN.patch +++ b/build/ruby/patches-30/openssl-EAGAIN.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c +diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c --- a~/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00 +++ a/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00 @@ -1893,6 +1893,7 @@ ossl_ssl_read_internal(int argc, VALUE * diff --git a/build/ruby/patches-30/openssl3.patch b/build/ruby/patches-30/openssl3.patch index 66aa8d724..7887311e0 100644 --- a/build/ruby/patches-30/openssl3.patch +++ b/build/ruby/patches-30/openssl3.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/ext/openssl/extconf.rb a/ext/openssl/extconf.rb +diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/extconf.rb a/ext/openssl/extconf.rb --- a~/ext/openssl/extconf.rb 1970-01-01 00:00:00 +++ a/ext/openssl/extconf.rb 1970-01-01 00:00:00 @@ -105,12 +105,11 @@ version_ok = if have_macro("LIBRESSL_VER @@ -17,7 +17,7 @@ diff -wpruN '--exclude=*.orig' a~/ext/openssl/extconf.rb a/ext/openssl/extconf.r end # Prevent wincrypt.h from being included, which defines conflicting macro with openssl/x509.h -diff -wpruN '--exclude=*.orig' a~/ext/openssl/ossl_pkey_rsa.c a/ext/openssl/ossl_pkey_rsa.c +diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/ossl_pkey_rsa.c a/ext/openssl/ossl_pkey_rsa.c --- a~/ext/openssl/ossl_pkey_rsa.c 1970-01-01 00:00:00 +++ a/ext/openssl/ossl_pkey_rsa.c 1970-01-01 00:00:00 @@ -947,7 +947,9 @@ Init_ossl_rsa(void) diff --git a/build/ruby/patches-30/series b/build/ruby/patches-30/series index 4560ca8b2..003770625 100644 --- a/build/ruby/patches-30/series +++ b/build/ruby/patches-30/series @@ -1,3 +1,4 @@ 02-config.patch openssl-EAGAIN.patch openssl3.patch +no-_XOPEN_SOURCE-undefine.patch diff --git a/build/ruby/patches-31/02-config.patch b/build/ruby/patches-31/02-config.patch index bb5849deb..155e2456d 100644 --- a/build/ruby/patches-31/02-config.patch +++ b/build/ruby/patches-31/02-config.patch @@ -3,7 +3,7 @@ # Changes were developed in-house, are Solaris specific, # and are not suitable for upstream. -diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess +diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess --- a~/tool/config.guess 1970-01-01 00:00:00 +++ a/tool/config.guess 1970-01-01 00:00:00 @@ -409,19 +409,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM @@ -29,7 +29,7 @@ diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) -diff -wpruN '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub +diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub --- a~/tool/config.sub 1970-01-01 00:00:00 +++ a/tool/config.sub 1970-01-01 00:00:00 @@ -1028,7 +1028,7 @@ case $cpu-$vendor in diff --git a/build/ruby/patches-31/no-_XOPEN_SOURCE-undefine.patch b/build/ruby/patches-31/no-_XOPEN_SOURCE-undefine.patch new file mode 100644 index 000000000..db215d3d7 --- /dev/null +++ b/build/ruby/patches-31/no-_XOPEN_SOURCE-undefine.patch @@ -0,0 +1,12 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac +--- a~/configure.ac 1970-01-01 00:00:00 ++++ a/configure.ac 1970-01-01 00:00:00 +@@ -1151,8 +1151,6 @@ main() + AC_MSG_RESULT($define_xopen_source) + AS_IF([test x"$define_xopen_source" != xno], [ + RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source) +- # _XOPEN_SOURCE should not be defined for C++ on Solaris. +- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE) + ]) + ]) + AC_CHECK_TYPES([caddr_t],[],[],[@%:@include ]) diff --git a/build/ruby/patches-31/openssl-EAGAIN.patch b/build/ruby/patches-31/openssl-EAGAIN.patch index e4f91f7f7..5d6982d55 100644 --- a/build/ruby/patches-31/openssl-EAGAIN.patch +++ b/build/ruby/patches-31/openssl-EAGAIN.patch @@ -1,4 +1,4 @@ -diff -wpruN '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c +diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c --- a~/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00 +++ a/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00 @@ -1850,6 +1850,7 @@ ossl_ssl_read_internal(int argc, VALUE * diff --git a/build/ruby/patches-31/series b/build/ruby/patches-31/series index 486f23b4e..6a0fc398c 100644 --- a/build/ruby/patches-31/series +++ b/build/ruby/patches-31/series @@ -1,2 +1,3 @@ 02-config.patch openssl-EAGAIN.patch +no-_XOPEN_SOURCE-undefine.patch diff --git a/build/ruby/patches-32/no-_XOPEN_SOURCE-undefine.patch b/build/ruby/patches-32/no-_XOPEN_SOURCE-undefine.patch new file mode 100644 index 000000000..be5b4578a --- /dev/null +++ b/build/ruby/patches-32/no-_XOPEN_SOURCE-undefine.patch @@ -0,0 +1,12 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac +--- a~/configure.ac 1970-01-01 00:00:00 ++++ a/configure.ac 1970-01-01 00:00:00 +@@ -1144,8 +1144,6 @@ main() + AC_MSG_RESULT($define_xopen_source) + AS_IF([test x"$define_xopen_source" != xno], [ + RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source) +- # _XOPEN_SOURCE should not be defined for C++ on Solaris. +- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE) + ]) + ]) + AC_CHECK_TYPES([caddr_t],[],[],[@%:@include ]) diff --git a/build/ruby/patches-32/series b/build/ruby/patches-32/series index 486f23b4e..6a0fc398c 100644 --- a/build/ruby/patches-32/series +++ b/build/ruby/patches-32/series @@ -1,2 +1,3 @@ 02-config.patch openssl-EAGAIN.patch +no-_XOPEN_SOURCE-undefine.patch diff --git a/build/ruby/patches-33/no-_XOPEN_SOURCE-undefine.patch b/build/ruby/patches-33/no-_XOPEN_SOURCE-undefine.patch new file mode 100644 index 000000000..44f902ad2 --- /dev/null +++ b/build/ruby/patches-33/no-_XOPEN_SOURCE-undefine.patch @@ -0,0 +1,12 @@ +diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac +--- a~/configure.ac 1970-01-01 00:00:00 ++++ a/configure.ac 1970-01-01 00:00:00 +@@ -1152,8 +1152,6 @@ main() + AC_MSG_RESULT($define_xopen_source) + AS_IF([test x"$define_xopen_source" != xno], [ + RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source) +- # _XOPEN_SOURCE should not be defined for C++ on Solaris. +- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE) + ]) + ]) + AC_CHECK_TYPES([caddr_t],[],[],[@%:@include ]) diff --git a/build/ruby/patches-33/series b/build/ruby/patches-33/series index 486f23b4e..6a0fc398c 100644 --- a/build/ruby/patches-33/series +++ b/build/ruby/patches-33/series @@ -1,2 +1,3 @@ 02-config.patch openssl-EAGAIN.patch +no-_XOPEN_SOURCE-undefine.patch diff --git a/doc/packages.md b/doc/packages.md index 9a5e38b17..5b679fb97 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -194,8 +194,8 @@ | ooce/runtime/node-22 | 22.12.0 | https://nodejs.org/download/release/index.json https://nodejs.org/en/download/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/ruby-30 | 3.0.7 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/ruby-31 | 3.1.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) -| ooce/runtime/ruby-32 | 3.2.5 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) -| ooce/runtime/ruby-33 | 3.3.5 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) +| ooce/runtime/ruby-32 | 3.2.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) +| ooce/runtime/ruby-33 | 3.3.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg) | ooce/runtime/tcl | 8.6.14 | https://sourceforge.net/projects/tcl/files/Tcl/ https://www.tcl.tk/software/tcltk/download.html | [omniosorg](https://github.com/omniosorg) | ooce/security/gnupg | 2.4.5 | https://gnupg.org/download/ | [omniosorg](https://github.com/omniosorg) | ooce/security/minisign | 0.11 | https://github.com/jedisct1/minisign/releases | [omniosorg](https://github.com/omniosorg)