Hello community, here is the log from the commit of package ruby2.1 for openSUSE:Factory checked in at 2014-10-20 07:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby2.1 (Old) and /work/SRC/openSUSE:Factory/.ruby2.1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby2.1" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby2.1/ruby2.1.changes 2014-09-25 09:33:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby2.1.new/ruby2.1.changes 2014-10-20 07:26:58.000000000 +0200 @@ -1,0 +2,63 @@ +Wed Oct 15 10:57:27 UTC 2014 - [email protected] + +- added ruby-2.1.3-no_sse2_patch_configure_too.patch: avoid running + autoreconf +- drop BR on autoconf and libtool again + +------------------------------------------------------------------- +Mon Oct 13 16:19:44 UTC 2014 - [email protected] + +- turn on testsuite by default. we dont hard fail anyway. + +------------------------------------------------------------------- +Mon Oct 13 16:16:40 UTC 2014 - [email protected] + +- added rubygems-testsuite-handle_gem_loaderror.patch + This makes more test cases actually run. (backport from trunk) +- patch taken from fedora rpm: ruby-1.9.3-mkmf-verbose.patch + generate verbose make files by default. +- added testsuite workarounds found in fedora's spec file to ours. + +------------------------------------------------------------------- +Mon Oct 13 14:55:14 UTC 2014 - [email protected] + +- added ruby-no_sse2.patch: (boo# 872908) + Dont enable sse2 just because the compiler supports it. we still + want to support i586. The code was reverted in trunk as well. + - new BR: autoconf and libtool +- converted conditional for running the testsuite to a bcond +- added BR for procps and timezone for the testsuite +- clean up intree certs from the rubygems code base (boo# 900932) + +------------------------------------------------------------------- +Wed Oct 8 15:46:22 UTC 2014 - [email protected] + +- drop the ruby-stdlib provides in the versioned stdlib and add a + conflicts so we can finally upgrade + +------------------------------------------------------------------- +Wed Oct 8 15:31:39 UTC 2014 - [email protected] + +- update to 2.1.3 (bsc# 887877) CVE-2014-4975 + This update fixes among other things + - off-by-one stack-based buffer overflow in the encodes() + function + - change of full GC timing to reduce memory consumption (see Bug + #9607) + For all the details see /usr/share/doc/packages/ruby2.1/ChangeLog +- drop drop_content_size_check_in_xmlrpc.patch: included in update +- fixed shebang line fix in %prep + +------------------------------------------------------------------- +Wed Sep 24 14:39:25 UTC 2014 - [email protected] + +- also make the ghost files match what we generate in the rubygem + based packages + +------------------------------------------------------------------- +Wed Sep 24 13:47:09 UTC 2014 - [email protected] + +- also provide the %{_bindir}/$bin%{rb_binary_suffix} symlinks via + u-a to be consistent with what gem based packages do. + +------------------------------------------------------------------- @@ -5,0 +69,16 @@ + +------------------------------------------------------------------- +Mon Sep 22 09:44:38 UTC 2014 - [email protected] + +- instead of touch for the files in /etc/alternatives. use the + symlink pointing to itself. + +------------------------------------------------------------------- +Fri Sep 19 09:49:55 UTC 2014 - [email protected] + +- conflict with our own ruby abi + +------------------------------------------------------------------- +Wed Sep 17 16:44:09 UTC 2014 - [email protected] + +- only provide the rdoc and ri symlink on newer than sle11 Old: ---- drop_content_size_check_in_xmlrpc.patch ruby-2.1.2.tar.bz2 New: ---- ruby-1.9.3-mkmf-verbose.patch ruby-2.1.3-no_sse2_patch_configure_too.patch ruby-2.1.3.tar.bz2 ruby-no_sse2.patch rubygems-testsuite-handle_gem_loaderror.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby2.1.spec ++++++ --- /var/tmp/diff_new_pack.9bhdoU/_old 2014-10-20 07:26:59.000000000 +0200 +++ /var/tmp/diff_new_pack.9bhdoU/_new 2014-10-20 07:26:59.000000000 +0200 @@ -26,7 +26,7 @@ #### %define patch_level p0 -Version: 2.1.2 +Version: 2.1.3 Release: 0 # make the exported API version explicit %define api_version 2.1.0 @@ -58,11 +58,11 @@ %define use_valgrind 1 %endif # see https://bugs.ruby-lang.org/issues/8000 - might come back -%if %suse_version < 1230 +%if 0%{?suse_version} && 0%{?suse_version} < 1230 %define tk_version_supported 1 %endif -# the tests are unfortunately rather fishy -%define run_tests 0 +# turn on testsuite by default. we dont hard fail anyway. +%bcond_without run_tests # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,7 +73,9 @@ BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: pkg-config +BuildRequires: procps BuildRequires: readline-devel +BuildRequires: timezone BuildRequires: tk-devel BuildRequires: zlib-devel # this requires is needed as distros older than 11.3 have a buildignore on freetype2, without this the detection of the tk extension fails @@ -123,7 +125,10 @@ Patch0: rubygems-1.5.0_buildroot.patch Patch1: ruby-1.9.2p290_tcl_no_stupid_rpaths.patch -Patch2: drop_content_size_check_in_xmlrpc.patch +Patch2: ruby-no_sse2.patch +Patch3: rubygems-testsuite-handle_gem_loaderror.patch +Patch4: ruby-1.9.3-mkmf-verbose.patch +Patch5: ruby-2.1.3-no_sse2_patch_configure_too.patch # Summary: An Interpreted Object-Oriented Scripting Language License: BSD-2-Clause or Ruby @@ -175,7 +180,7 @@ %package stdlib Summary: The Ruby standard library Group: Development/Languages/Ruby -Provides: ruby-stdlib = %{version}-%{release} +Conflicts: ruby-stdlib ################################ # generate provides for embedded rubygems @@ -301,10 +306,13 @@ %setup -q -n ruby-%{pkg_version} %patch0 %patch1 -%patch2 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 find sample -type f -print0 | xargs -r0 chmod a-x grep -Erl '^#! */' benchmark bootstraptest ext lib sample test \ - | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby2.1$1|' + | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby%{rb_binary_suffix} $1|' %build # iseq.c needs -fno-strict-aliasing @@ -367,31 +375,52 @@ %endif for bin in rake rdoc ri; do # dummy - touch %{buildroot}%{_sysconfdir}/alternatives/$bin mv %{buildroot}%_bindir/${bin}%{rb_binary_suffix} %{buildroot}%_bindir/$bin.ruby%{rb_binary_suffix} + # + ln -s $bin %{buildroot}%{_sysconfdir}/alternatives/$bin ln -s %{_sysconfdir}/alternatives/$bin %{buildroot}%_bindir/$bin + # + ln -s ${bin}%{rb_binary_suffix} %{buildroot}%{_sysconfdir}/alternatives//$bin%{rb_binary_suffix} + ln -s %{_sysconfdir}/alternatives/$bin%{rb_binary_suffix} %{buildroot}%_bindir/$bin%{rb_binary_suffix} done install -dD %{buildroot}%{rb_extdir} %{buildroot}%{rb_extarchdir} %{buildroot}%{rb_extversionedarchdir} %{buildroot}%{rb_extarchdocdir} +# clean up intree certs boo# 900932 +rm -v %{buildroot}%{rb_libdir}/rubygems/ssl_certs/{Class3PublicPrimaryCertificationAuthority.pem,DigiCertHighAssuranceEVRootCA.pem,EntrustnetSecureServerCertificationAuthority.pem,GeoTrustGlobalCA.pem} + %post for bin in rake rdoc ri; do /usr/sbin/update-alternatives --install \ %{_bindir}/$bin $bin %{_bindir}/$bin.ruby%{rb_binary_suffix} 2 + /usr/sbin/update-alternatives --install \ + %{_bindir}/$bin%{rb_binary_suffix} $bin%{rb_binary_suffix} %{_bindir}/$bin.ruby%{rb_binary_suffix} 2 done %preun if [ "$1" = 0 ] ; then for bin in rake rdoc ri; do /usr/sbin/update-alternatives --remove $bin %{_bindir}/$bin.ruby%{rb_binary_suffix} + /usr/sbin/update-alternatives --remove $bin%{rb_binary_suffix} %{_bindir}/$bin.ruby%{rb_binary_suffix} done fi -%if 0%{?run_tests} - +%if %{with run_tests} %check +%ifarch armv7l armv7hl armv7hnl +# test_call_double(DL::TestDL) fails on ARM HardFP +# http://bugs.ruby-lang.org/issues/6592 +DISABLE_TESTS="-x test_dl2.rb $DISABLE_TESTS" + +# Workaround OpenSSL::TestPKeyRSA#test_sign_verify_memory_leak timeouts on ARM. +# https://bugs.ruby-lang.org/issues/9984 +sed -i -e 's|20_000|10_000|g' test/openssl/test_pkey_rsa.rb +%endif +# Allow MD5 in OpenSSL. +# https://bugs.ruby-lang.org/issues/9154 +export OPENSSL_ENABLE_MD5_VERIFY=1 export LD_LIBRARY_PATH="$PWD" # we know some tests will fail when they do not find a /usr/bin/ruby -make check V=1 ||: +make check V=1 $DISABLE_TESTS ||: %endif %post -n %{libname} @@ -402,9 +431,9 @@ %files %defattr(-,root,root,-) -%ghost %{_sysconfdir}/alternatives/rake -%ghost %{_sysconfdir}/alternatives/rdoc -%ghost %{_sysconfdir}/alternatives/ri +%ghost %{_sysconfdir}/alternatives/rake* +%ghost %{_sysconfdir}/alternatives/rdoc* +%ghost %{_sysconfdir}/alternatives/ri* %{_bindir}/erb* %{_bindir}/gem* %{_bindir}/irb* ++++++ ruby-1.9.3-mkmf-verbose.patch ++++++ >From 28cc0749d6729aa2444661ee7b411e183fe220b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <[email protected]> Date: Mon, 19 Nov 2012 15:14:51 +0100 Subject: [PATCH] Verbose mkmf. --- lib/mkmf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 682eb46..e6b1445 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1828,7 +1828,7 @@ SRC SHELL = /bin/sh # V=0 quiet, V=1 verbose. other values don't work. -V = 0 +V = 1 Q1 = $(V:1=) Q = $(Q1:0=@) ECHO1 = $(V:1=@#{CONFIG['NULLCMD']}) -- 1.8.3.1 ++++++ ruby-2.1.3-no_sse2_patch_configure_too.patch ++++++ Index: ruby-2.1.3/configure =================================================================== --- ruby-2.1.3.orig/configure +++ ruby-2.1.3/configure @@ -8091,131 +8091,6 @@ else fi done - case "$target" in #( - *-darwin*) : - - # doesn't seem necessary on Mac OS X - ;; #( - i[4-6]86*|i386*mingw*) : - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -msse2 -mfpmath=sse is accepted as CFLAGS" >&5 -$as_echo_n "checking whether -msse2 -mfpmath=sse is accepted as CFLAGS... " >&6; } - save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $rb_cv_warnflags" -if test "${ac_c_werror_flag+set}"; then - rb_c_werror_flag="$ac_c_werror_flag" -else - unset rb_c_werror_flag -fi -ac_c_werror_flag=yes - - CFLAGS="$CFLAGS -msse2 -mfpmath=sse" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - # RUBY_APPEND_OPTION(XCFLAGS) - case " ${XCFLAGS-} " in #( - *' -msse2 -mfpmath=sse '*) : - ;; #( - ' ') : - XCFLAGS="-msse2 -mfpmath=sse" ;; #( - *) : - XCFLAGS="$XCFLAGS -msse2 -mfpmath=sse" ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -CFLAGS="$save_CFLAGS" -save_CFLAGS= -if test "${rb_c_werror_flag+set}"; then - ac_c_werror_flag="$rb_c_werror_flag" -else - unset ac_c_werror_flag -fi - - case "$XCFLAGS" in #( - *-msse2*) : - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -mstackrealign is accepted as CFLAGS" >&5 -$as_echo_n "checking whether -mstackrealign is accepted as CFLAGS... " >&6; } - save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $rb_cv_warnflags" -if test "${ac_c_werror_flag+set}"; then - rb_c_werror_flag="$ac_c_werror_flag" -else - unset rb_c_werror_flag -fi -ac_c_werror_flag=yes - - CFLAGS="$CFLAGS -mstackrealign" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - # RUBY_APPEND_OPTION(XCFLAGS) - case " ${XCFLAGS-} " in #( - *' -mstackrealign '*) : - ;; #( - ' ') : - XCFLAGS="-mstackrealign" ;; #( - *) : - XCFLAGS="$XCFLAGS -mstackrealign" ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -CFLAGS="$save_CFLAGS" -save_CFLAGS= -if test "${rb_c_werror_flag+set}"; then - ac_c_werror_flag="$rb_c_werror_flag" -else - unset ac_c_werror_flag -fi - - ;; #( - *) : - ;; -esac - - ;; #( - *) : - ;; -esac fi ++++++ ruby-2.1.2.tar.bz2 -> ruby-2.1.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ruby2.1/ruby-2.1.2.tar.bz2 /work/SRC/openSUSE:Factory/.ruby2.1.new/ruby-2.1.3.tar.bz2 differ: char 11, line 1 ++++++ ruby-no_sse2.patch ++++++ commit f5e2b68a7de0c3a6d0e344732b121bf3212244e3 Author: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Sun Aug 10 04:48:12 2014 +0000 configure.in: remove SSE options git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/configure.in b/configure.in index 79a16bc..6e2af03 100644 --- a/configure.in +++ b/configure.in @@ -877,22 +877,6 @@ if test "$GCC" = yes; then for oflag in -fno-fast-math; do RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)]) done - AS_CASE(["$target"], - [*-darwin*], [ - # doesn't seem necessary on Mac OS X - ], - [[i[4-6]86*|i386*mingw*]], [ - RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [ - RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse) - ]) - AS_CASE(["$XCFLAGS"], - [[*-msse2*]], [ - RUBY_TRY_CFLAGS(-mstackrealign, [ - RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign) - ]) - ]) - ] - ) fi AC_ARG_WITH(opt-dir, ++++++ rubygems-testsuite-handle_gem_loaderror.patch ++++++ commit cc02a4ab7b71215de89c6bcfddc2fb2ef6f587be Author: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Fri Jun 27 06:32:59 2014 +0000 * lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase. because it's effected by removing minitest from stdlib. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 328731d..74cb4c9 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -2,7 +2,7 @@ begin gem 'minitest', '~> 4.0' -rescue NoMethodError +rescue NoMethodError, Gem::LoadError # for ruby tests end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
