Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ruby-build for openSUSE:Factory checked in at 2023-03-07 16:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-build (Old) and /work/SRC/openSUSE:Factory/.ruby-build.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby-build" Tue Mar 7 16:50:18 2023 rev:24 rq:1069768 version:20230306 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-build/ruby-build.changes 2023-02-23 18:00:36.153279367 +0100 +++ /work/SRC/openSUSE:Factory/.ruby-build.new.31432/ruby-build.changes 2023-03-07 16:50:46.805725324 +0100 @@ -1,0 +2,8 @@ +Tue Mar 7 00:10:05 UTC 2023 - Lukas Müller <expee...@outlook.com> + +- Update to version 20230306. + Changelog: https://github.com/rbenv/ruby-build/releases/tag/v20230306 + * Add mruby-3.2.0 by @hasumikin in #2155 + * Automatically detect and link to Homebrew's libyaml by @dreyks in #1929 + +------------------------------------------------------------------- Old: ---- ruby-build-20230222.tar.gz New: ---- ruby-build-20230306.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-build.spec ++++++ --- /var/tmp/diff_new_pack.d0Mnkz/_old 2023-03-07 16:50:47.313727998 +0100 +++ /var/tmp/diff_new_pack.d0Mnkz/_new 2023-03-07 16:50:47.317728019 +0100 @@ -24,7 +24,7 @@ %endif Name: ruby-build -Version: 20230222 +Version: 20230306 Release: 0 BuildArch: noarch License: MIT ++++++ fix-test-requiring-git-repository.patch ++++++ --- /var/tmp/diff_new_pack.d0Mnkz/_old 2023-03-07 16:50:47.349728187 +0100 +++ /var/tmp/diff_new_pack.d0Mnkz/_new 2023-03-07 16:50:47.353728208 +0100 @@ -12,5 +12,5 @@ +If the version you need is missing, try upgrading ruby-build. OUT - unstub ruby-build + unstub brew ++++++ ruby-build-20230222.tar.gz -> ruby-build-20230306.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/bin/ruby-build new/ruby-build-20230306/bin/ruby-build --- old/ruby-build-20230222/bin/ruby-build 2023-02-22 17:09:20.000000000 +0100 +++ new/ruby-build-20230306/bin/ruby-build 2023-03-06 20:28:55.000000000 +0100 @@ -14,7 +14,7 @@ # --version Show version of ruby-build # -RUBY_BUILD_VERSION="20230222" +RUBY_BUILD_VERSION="20230306" OLDIFS="$IFS" @@ -558,8 +558,21 @@ local PACKAGE_CFLAGS="${package_var_name}_CFLAGS" if [ "$package_var_name" = "RUBY" ]; then - use_homebrew_readline || use_freebsd_pkg ||true + if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-readline-dir=* ]]; then + use_homebrew_readline || use_freebsd_readline || true + fi + if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-libyaml-dir=* ]]; then + use_homebrew_yaml || true + fi + if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-gmp-dir=* ]]; then use_homebrew_gmp || true + fi + if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-openssl-dir=* ]]; then + if [ "FreeBSD" = "$(uname -s)" ] && [ -f /usr/local/include/openssl/ssl.h ]; then + # use openssl installed from Ports Collection + package_option ruby configure --with-openssl-dir="/usr/local" + fi + fi fi ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then @@ -1037,18 +1050,10 @@ fi } -use_freebsd_pkg() { - # check if FreeBSD +use_freebsd_readline() { if [ "FreeBSD" = "$(uname -s)" ]; then - # use openssl if installed from Ports Collection - if [ -f /usr/local/include/openssl/ssl.h ]; then - package_option ruby configure --with-openssl-dir="/usr/local" - fi - - # check if 11-R or later - release="$(uname -r)" + local release="$(uname -r)" if [ "${release%%.*}" -ge 11 ]; then - # prefers readline to compile most of ruby versions if pkg info -e readline > /dev/null; then # use readline from Ports Collection package_option ruby configure --with-readline-dir="/usr/local" @@ -1062,14 +1067,12 @@ } use_homebrew_readline() { - if [[ "$RUBY_CONFIGURE_OPTS" != *--with-readline-dir=* ]]; then - local libdir="$(brew --prefix readline 2>/dev/null || true)" - if [ -d "$libdir" ]; then - echo "ruby-build: using readline from homebrew" - package_option ruby configure --with-readline-dir="$libdir" - else - return 1 - fi + local libdir="$(brew --prefix readline 2>/dev/null || true)" + if [ -d "$libdir" ]; then + echo "ruby-build: using readline from homebrew" + package_option ruby configure --with-readline-dir="$libdir" + else + return 1 fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/share/ruby-build/mruby-3.2.0 new/ruby-build-20230306/share/ruby-build/mruby-3.2.0 --- old/ruby-build-20230222/share/ruby-build/mruby-3.2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-build-20230306/share/ruby-build/mruby-3.2.0 2023-03-06 20:28:55.000000000 +0100 @@ -0,0 +1 @@ +install_package "mruby-3.2.0" "https://github.com/mruby/mruby/archive/3.2.0.tar.gz#3c198e4a31d31fe8524013066fac84a67fe6cd6067d92c25a1c79089744cb608"; mruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/test/build.bats new/ruby-build-20230306/test/build.bats --- old/ruby-build-20230222/test/build.bats 2023-02-22 17:09:20.000000000 +0100 +++ new/ruby-build-20230306/test/build.bats 2023-03-06 20:28:55.000000000 +0100 @@ -61,8 +61,8 @@ cached_tarball "yaml-0.1.6" cached_tarball "ruby-2.0.0" - stub uname '-s : echo Linux' - stub brew false + stub_repeated uname '-s : echo Linux' + stub_repeated brew false stub_make_install stub_make_install @@ -70,6 +70,7 @@ assert_success unstub uname + unstub brew unstub make assert_build_log <<OUT @@ -86,8 +87,8 @@ cached_tarball "yaml-0.1.6" cached_tarball "ruby-2.0.0" - stub uname '-s : echo Linux' - stub brew false + stub_repeated uname '-s : echo Linux' + stub_repeated brew false stub_make_install stub_make_install stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log' @@ -100,6 +101,7 @@ assert_success unstub uname + unstub brew unstub make unstub patch @@ -118,8 +120,8 @@ cached_tarball "yaml-0.1.6" cached_tarball "ruby-2.0.0" - stub uname '-s : echo Linux' - stub brew false + stub_repeated uname '-s : echo Linux' + stub_repeated brew false stub_make_install stub_make_install stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log' @@ -132,6 +134,7 @@ assert_success unstub uname + unstub brew unstub make unstub patch @@ -150,8 +153,8 @@ cached_tarball "yaml-0.1.6" cached_tarball "ruby-2.0.0" - stub uname '-s : echo Linux' - stub brew false + stub_repeated uname '-s : echo Linux' + stub_repeated brew false stub_make_install stub_make_install stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log' @@ -165,6 +168,7 @@ assert_success unstub uname + unstub brew unstub make unstub patch @@ -185,11 +189,13 @@ brew_libdir="$TMP/homebrew-yaml" mkdir -p "$brew_libdir" - stub uname '-s : echo Linux' - stub brew "--prefix libyaml : echo '$brew_libdir'" false false + stub_repeated uname '-s : echo Linux' + stub_repeated brew "--prefix libyaml : echo '$brew_libdir'" stub_make_install - install_fixture definitions/needs-yaml + run_inline_definition <<DEF +install_package "ruby-2.0.0" "http://ruby-lang.org/ruby/2.0/ruby-2.0.0.tar.gz"; +DEF assert_success unstub uname @@ -209,7 +215,7 @@ gmp_libdir="$TMP/homebrew-gmp" mkdir -p "$gmp_libdir" - stub brew false "--prefix gmp : echo '$gmp_libdir'" + stub_repeated brew "--prefix gmp : echo '$gmp_libdir'" stub_make_install run_inline_definition <<DEF @@ -233,7 +239,7 @@ readline_libdir="$TMP/homebrew-readline" mkdir -p "$readline_libdir" - stub brew "--prefix readline : echo '$readline_libdir'" false + stub_repeated brew "--prefix readline : echo '$readline_libdir'" stub_make_install run_inline_definition <<DEF @@ -254,7 +260,7 @@ @test "readline is not linked from Homebrew when explicitly defined" { cached_tarball "ruby-2.0.0" - stub brew false + stub_repeated brew false stub_make_install export RUBY_CONFIGURE_OPTS='--with-readline-dir=/custom' @@ -276,7 +282,7 @@ @test "number of CPU cores defaults to 2" { cached_tarball "ruby-2.0.0" - stub uname '-s : echo Darwin' false + stub_repeated uname '-s : echo Darwin' stub sysctl false stub_make_install @@ -299,7 +305,7 @@ @test "number of CPU cores is detected on Mac" { cached_tarball "ruby-2.0.0" - stub uname '-s : echo Darwin' false + stub_repeated uname '-s : echo Darwin' stub sysctl '-n hw.ncpu : echo 4' stub_make_install @@ -323,7 +329,7 @@ @test "number of CPU cores is detected on FreeBSD" { cached_tarball "ruby-2.0.0" - stub uname '-s : echo FreeBSD' false + stub_repeated uname '-s : echo FreeBSD' stub sysctl '-n hw.ncpu : echo 1' stub_make_install @@ -347,7 +353,7 @@ @test "setting RUBY_MAKE_INSTALL_OPTS to a multi-word string" { cached_tarball "ruby-2.0.0" - stub uname '-s : echo Linux' + stub_repeated uname '-s : echo Linux' stub_make_install export RUBY_MAKE_INSTALL_OPTS="DOGE=\"such wow\"" @@ -369,7 +375,7 @@ @test "setting MAKE_INSTALL_OPTS to a multi-word string" { cached_tarball "ruby-2.0.0" - stub uname '-s : echo Linux' + stub_repeated uname '-s : echo Linux' stub_make_install export MAKE_INSTALL_OPTS="DOGE=\"such wow\"" @@ -400,7 +406,7 @@ @test "make on FreeBSD defaults to gmake" { cached_tarball "ruby-2.0.0" - stub uname "-s : echo FreeBSD" false + stub_repeated uname "-s : echo FreeBSD" MAKE=gmake stub_make_install MAKE= install_fixture definitions/vanilla-ruby @@ -419,7 +425,7 @@ exec ./configure "\$@" CONF - stub uname '-s : echo Linux' + stub_repeated uname '-s : echo Linux' stub apply 'echo apply "$@" >> build.log' stub_make_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/test/compiler.bats new/ruby-build-20230306/test/compiler.bats --- old/ruby-build-20230222/test/compiler.bats 2023-02-22 17:09:20.000000000 +0100 +++ new/ruby-build-20230306/test/compiler.bats 2023-03-06 20:28:55.000000000 +0100 @@ -8,9 +8,9 @@ export -n RUBY_CONFIGURE_OPTS @test "require_gcc on OS X 10.9" { - stub uname '-s : echo Darwin' + stub_repeated uname '-s : echo Darwin' stub sw_vers '-productVersion : echo 10.9.5' - stub gcc '--version : echo 4.2.1' '--version : echo 4.2.1' + stub_repeated gcc '--version : echo 4.2.1' run_inline_definition <<DEF require_gcc @@ -22,12 +22,16 @@ CC=${TMP}/bin/gcc MACOSX_DEPLOYMENT_TARGET=no OUT + + unstub uname + unstub sw_vers + unstub gcc } @test "require_gcc on OS X 10.10" { - stub uname '-s : echo Darwin' + stub_repeated uname '-s : echo Darwin' stub sw_vers '-productVersion : echo 10.10' - stub gcc '--version : echo 4.2.1' '--version : echo 4.2.1' + stub_repeated gcc '--version : echo 4.2.1' run_inline_definition <<DEF require_gcc @@ -39,6 +43,10 @@ CC=${TMP}/bin/gcc MACOSX_DEPLOYMENT_TARGET=10.9 OUT + + unstub uname + unstub sw_vers + unstub gcc } @test "require_gcc silences warnings" { @@ -55,13 +63,10 @@ mkdir -p "$INSTALL_ROOT" cd "$INSTALL_ROOT" - stub uname '-s : echo Darwin' '-s : echo Darwin' + stub_repeated uname '-s : echo Darwin' stub sw_vers '-productVersion : echo 10.10' - stub cc 'false' - stub brew 'false' - stub make \ - 'echo make $@' \ - 'echo make $@' + stub_repeated brew 'false' + stub_repeated make 'echo make $@' cat > ./configure <<CON #!${BASH} @@ -83,4 +88,9 @@ make -j 2 make install OUT + + unstub uname + unstub sw_vers + unstub brew + unstub make } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/test/rbenv.bats new/ruby-build-20230306/test/rbenv.bats --- old/ruby-build-20230222/test/rbenv.bats 2023-02-22 17:09:20.000000000 +0100 +++ new/ruby-build-20230306/test/rbenv.bats 2023-03-06 20:28:55.000000000 +0100 @@ -77,7 +77,7 @@ } @test "nonexistent version" { - stub brew false + stub_repeated brew false stub_ruby_build 'echo ERROR >&2 && exit 2' \ "--definitions : echo 1.8.7 1.9.3-p0 1.9.3-p194 2.1.2 | tr ' ' $'\\n'" @@ -97,6 +97,7 @@ git -C ${BATS_TEST_DIRNAME}/.. pull OUT + unstub brew unstub ruby-build } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/test/stubs/stub new/ruby-build-20230306/test/stubs/stub --- old/ruby-build-20230222/test/stubs/stub 2023-02-22 17:09:20.000000000 +0100 +++ new/ruby-build-20230306/test/stubs/stub 2023-03-06 20:28:55.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -status=0 +status=127 program="${0##*/}" PROGRAM="$(echo "$program" | tr a-z- A-Z_)" [ -n "$TMPDIR" ] || TMPDIR="/tmp" @@ -9,6 +9,7 @@ _STUB_PLAN="${PROGRAM}_STUB_PLAN" _STUB_RUN="${PROGRAM}_STUB_RUN" _STUB_INDEX="${PROGRAM}_STUB_INDEX" +_STUB_NOINDEX="${PROGRAM}_STUB_NOINDEX" _STUB_RESULT="${PROGRAM}_STUB_RESULT" _STUB_END="${PROGRAM}_STUB_END" _STUB_DEBUG="${PROGRAM}_STUB_DEBUG" @@ -32,7 +33,7 @@ while IFS= read -r line; do index=$(($index + 1)) - if [ -z "${!_STUB_END}" ] && [ $index -eq "${!_STUB_INDEX}" ]; then + if [[ -z "${!_STUB_END}" && -n "${!_STUB_NOINDEX}" || $index -eq "${!_STUB_INDEX}" ]]; then # We found the plan line we're interested in. # Start off by assuming success. result=0 @@ -72,7 +73,8 @@ ( eval "$command" ) status="$?" set -e - else + [ -z "${!_STUB_NOINDEX}" ] || break + elif [ -z "${!_STUB_NOINDEX}" ]; then eval "${_STUB_RESULT}"=1 fi fi @@ -95,7 +97,7 @@ else # If the requested index is larger than the number # of lines in the plan file, we failed. - if [ "${!_STUB_INDEX}" -gt $index ]; then + if [[ -z "${!_STUB_NOINDEX}" && "${!_STUB_INDEX}" -gt $index ]]; then eval "${_STUB_RESULT}"=1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-build-20230222/test/test_helper.bash new/ruby-build-20230306/test/test_helper.bash --- old/ruby-build-20230222/test/test_helper.bash 2023-02-22 17:09:20.000000000 +0100 +++ new/ruby-build-20230306/test/test_helper.bash 2023-03-06 20:28:55.000000000 +0100 @@ -36,6 +36,7 @@ stub() { local program="$1" + # shellcheck disable=SC2155 local prefix="$(echo "$program" | tr a-z- A-Z_)" shift @@ -50,8 +51,17 @@ for arg in "$@"; do printf "%s\n" "$arg" >> "${TMP}/${program}-stub-plan"; done } +stub_repeated() { + local program="$1" + # shellcheck disable=SC2155 + local prefix="$(echo "$program" | tr a-z- A-Z_)" + export "${prefix}_STUB_NOINDEX"=1 + stub "$@" +} + unstub() { local program="$1" + # shellcheck disable=SC2155 local prefix="$(echo "$program" | tr a-z- A-Z_)" local path="${TMP}/bin/${program}"
