commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2020-04-29 20:44:20
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.2738 (New)
Package is "ruby2.6"
Wed Apr 29 20:44:20 2020 rev:11 rq:798714 version:2.6.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2020-04-15
20:07:38.714152084 +0200
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.2738/ruby2.6.changes
2020-04-29 20:44:21.563951919 +0200
@@ -1,0 +2,11 @@
+Tue Apr 28 17:52:01 UTC 2020 - Marcus Rueckert
+
+- make sure that update-alternative weight for the default
+ distribution is always greater than our normal weight
+
+---
+Tue Apr 28 17:25:52 UTC 2020 - Marcus Rueckert
+
+- make the update-alternative weight based on the ruby version
+
+---
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.wPZQkq/_old 2020-04-29 20:44:22.123953379 +0200
+++ /var/tmp/diff_new_pack.wPZQkq/_new 2020-04-29 20:44:22.127953390 +0200
@@ -32,6 +32,7 @@
%define api_version 2.6.0
%define rb_binary_suffix .ruby2.6
%define rb_soname ruby2.6
+%define _rb_ua_weight 26
# ruby-macros and ruby-common version
%define rpm_macros_version 3
@@ -52,6 +53,9 @@
%if "%{rb_default_ruby_suffix}" == "%{rb_soname}"
%define is_default_ruby 1
+%define rb_ua_weight 1%{_rb_ua_weight}
+%else
+%define rb_ua_weight %{_rb_ua_weight}
%endif
%define ua_binaries rake rdoc ri bundle bundler
@@ -362,9 +366,9 @@
%post
for bin in %{ua_binaries}; do
/usr/sbin/update-alternatives --install \
-%{_bindir}/$bin $bin %{_bindir}/$bin.ruby%{rb_binary_suffix} 3
+%{_bindir}/$bin $bin %{_bindir}/$bin.ruby%{rb_binary_suffix}
%{rb_ua_weight}
/usr/sbin/update-alternatives --install \
-%{_bindir}/$bin%{rb_binary_suffix} $bin%{rb_binary_suffix}
%{_bindir}/$bin.ruby%{rb_binary_suffix} 3
+%{_bindir}/$bin%{rb_binary_suffix} $bin%{rb_binary_suffix}
%{_bindir}/$bin.ruby%{rb_binary_suffix} %{rb_ua_weight}
done
%preun
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2020-04-15 20:05:11
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.2738 (New)
Package is "ruby2.6"
Wed Apr 15 20:05:11 2020 rev:10 rq:792507 version:2.6.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2020-01-20
22:47:28.287159481 +0100
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.2738/ruby2.6.changes
2020-04-15 20:07:38.714152084 +0200
@@ -1,0 +2,18 @@
+Tue Apr 7 22:56:23 UTC 2020 - Marcus Rueckert
+
+- Update 2.6.6 (boo#1167244 boo#1168938)
+ - CVE-2020-10663: Unsafe Object Creation Vulnerability in JSON
+(Additional fix)
+ - CVE-2020-10933: Heap exposure vulnerability in the socket
+library
+
+ https://github.com/ruby/ruby/compare/v2_6_5...v2_6_6
+- drop CVE-2020-8130.patch and rake-12.3.2.gem again: fix included
+
+---
+Fri Mar 6 14:56:41 UTC 2020 - Marcus Rueckert
+
+- Fix CVE-2020-8130 (boo# 1164804) for the intree copy of rake:
+ - add CVE-2020-8130.patch and rake-12.3.2.gem
+
+---
Old:
ruby-2.6.5.tar.xz
New:
ruby-2.6.6.tar.xz
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.lBx82u/_old 2020-04-15 20:07:39.494152615 +0200
+++ /var/tmp/diff_new_pack.lBx82u/_new 2020-04-15 20:07:39.494152615 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ruby2.6
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
%define patch_level p0
-Version:2.6.5
+Version:2.6.6
Release:0
%define pkg_version %{version}
# make the exported API version explicit
@@ -73,7 +73,7 @@
%bcond_withseparate_stdlib
#
-Url:https://www.ruby-lang.org/
+URL:https://www.ruby-lang.org/
Source:
https://cache.ruby-lang.org/pub/ruby/2.6/ruby-%{pkg_version}.tar.xz
#
Source3:%{name}.macros
++ ruby-2.6.5.tar.xz -> ruby-2.6.6.tar.xz ++
/work/SRC/openSUSE:Factory/ruby2.6/ruby-2.6.5.tar.xz
/work/SRC/openSUSE:Factory/.ruby2.6.new.2738/ruby-2.6.6.tar.xz differ: char 26,
line 1
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2020-01-20 22:47:25
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.26092 (New)
Package is "ruby2.6"
Mon Jan 20 22:47:25 2020 rev:9 rq:764203 version:2.6.5
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-10-18
14:30:30.840695586 +0200
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.26092/ruby2.6.changes
2020-01-20 22:47:28.287159481 +0100
@@ -1,0 +2,12 @@
+Wed Oct 30 15:27:11 UTC 2019 - Stefan Brüns
+
+- Fix mangling of shebangs, do not replace shell invocations with
+ ruby, correcly replace "/usr/bin/env ruby".
+- Cleanup spec file:
+ * Drop support for obsolete distro versions
+ * use license macro, remove defattr
+- Use valgrind-client-headers instead of full valgrind-devel package
+ where available, reducing build package footprint.
+- Remove unused libX11-devel BuildRequires.
+
+---
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.wkgZYd/_old 2020-01-20 22:47:29.359159894 +0100
+++ /var/tmp/diff_new_pack.wkgZYd/_new 2020-01-20 22:47:29.363159895 +0100
@@ -105,25 +105,16 @@
BuildRequires: readline-devel
BuildRequires: timezone
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
-BuildRequires: freetype2-devel
-%if 0%{?suse_version} > 1010
-BuildRequires: xorg-x11-libX11-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
%if 0%{?use_valgrind}
-%if 0%{?suse_version} > 1021
+%if 0%{?suse_version} < 1550
BuildRequires: valgrind-devel
%else
-BuildRequires: valgrind
+BuildRequires: valgrind-client-headers
%endif
%endif
BuildRequires: xz
Provides: ruby(abi) = %{rb_ver}
-%if 0%{?suse_version} > 1130
Conflicts: ruby(abi) = %{rb_ver}
-%endif
Provides: ruby26 = %{version}-%{release}
%if 0%{?is_default_ruby}
Provides: ruby-default = %{version}-%{release}
@@ -225,9 +216,7 @@
Summary:Ruby Interactive Documentation
Group: Development/Languages/Ruby
Requires: %{name} = %{version}
-%if 0%{?suse_version} >= 1121
BuildArch: noarch
-%endif
%description doc-ri
This package contains the RI docs for ruby
@@ -236,9 +225,7 @@
Summary:This package contains the HTML docs for ruby
Group: Development/Languages/Ruby
Requires: %{name} = %{version}
-%if 0%{?suse_version} >= 1121
BuildArch: noarch
-%endif
%description doc-html
This package contains the HTML docs for ruby
@@ -247,9 +234,7 @@
Summary:Example scripts for ruby
Group: Development/Languages/Ruby
Requires: %{name} = %{version}
-%if 0%{?suse_version} >= 1121
BuildArch: noarch
-%endif
%description examples
Example scripts for ruby
@@ -258,9 +243,7 @@
Requires: %{name} = %{version}
Summary:An Interpreted Object-Oriented Scripting Language
Group: Development/Languages/Ruby
-%if 0%{?suse_version} >= 1121
BuildArch: noarch
-%endif
%description test-suite
Ruby is an interpreted scripting language for object-oriented programming. It
@@ -291,12 +274,12 @@
%setup -q -n ruby-%{pkg_version}
#setup -q -n snapshot
%patch -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/ruby%{rb_binary_suffix} $1|'
+find sample -type f -perm /a=x -ls -exec chmod a-x \{\} \+
+# replace "/usr/bin/env ruby" and "/usr/local/bin/ruby" with correct path
+grep -Erl '^#! */.*ruby' benchmark bootstraptest ext lib sample test \
+ | xargs -r perl -p -i -e
's|^#!\s*\S+\s*ruby\S*(\s+.*)?$|#!/usr/bin/ruby%{rb_binary_suffix} $1|'
%build
-# iseq.c needs -fno-strict-aliasing
export LANG="en_US.UTF-8"
export LC_ALL="en_US.UTF-8"
export LC_CTYPE="en_US.UTF-8"
@@ -305,6 +288,7 @@
export CXX="clang++"
export LD="ld.gold"
%endif
+# iseq.c needs -fno-strict-aliasing
export CFLAGS="%{optflags} -fno-strict-aliasing -std=gnu99"
%configure \
%if %{with jemalloc}
@@ -320,7 +304,7 @@
%if 0%{?use_valgrind}
--with-valgrind \
%endif
- %if ! %{with build_docs}
+ %if %{without build_docs}
--disable-install-doc \
--disable-install-rdoc \
--disable-install-capi \
@@ -415,7 +399,6 @@
%postun -n %{libname} -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%ghost %{_sysconfdir}/alternatives/rake*
%ghost %{_sysconfdir}/alternatives/rdoc*
%ghost %{_sysconfdir}/alternatives/ri*
@@ -435,12 +418,16 @@
%{_mandir}/man1/ri*.1*
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2019-10-18 14:30:29
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.2352 (New)
Package is "ruby2.6"
Fri Oct 18 14:30:29 2019 rev:8 rq:738578 version:2.6.5
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-07-21
11:30:14.412818901 +0200
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.2352/ruby2.6.changes
2019-10-18 14:30:30.840695586 +0200
@@ -1,0 +2,17 @@
+Tue Oct 8 09:42:13 UTC 2019 - Marcus Rueckert
+
+- update to 2.6.5
+ - https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/
+- CVE-2019-16255: A code injection vulnerability of Shell#[]
+ and Shell#test
+- CVE-2019-16254: HTTP response splitting in WEBrick
+ (Additional fix)
+- CVE-2019-15845: A NUL injection vulnerability of File.fnmatch
+ and File.fnmatch?
+- CVE-2019-16201: Regular Expression Denial of Service
+ vulnerability of WEBrick’s Digest access authentication
+ - https://www.ruby-lang.org/en/news/2019/08/28/ruby-2-6-4-released/
+- Multiple jQuery vulnerabilities in RDoc (CVE-2012-6708
+ CVE-2015-9251)
+
+---
Old:
ruby-2.6.3.tar.xz
New:
ruby-2.6.5.tar.xz
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.xhm2DC/_old 2019-10-18 14:30:31.720693295 +0200
+++ /var/tmp/diff_new_pack.xhm2DC/_new 2019-10-18 14:30:31.724693284 +0200
@@ -25,9 +25,9 @@
%define patch_level p0
-Version:2.6.3
+Version:2.6.5
Release:0
-%define pkg_version 2.6.3
+%define pkg_version %{version}
# make the exported API version explicit
%define api_version 2.6.0
%define rb_binary_suffix .ruby2.6
++ ruby-2.6.3.tar.xz -> ruby-2.6.5.tar.xz ++
/work/SRC/openSUSE:Factory/ruby2.6/ruby-2.6.3.tar.xz
/work/SRC/openSUSE:Factory/.ruby2.6.new.2352/ruby-2.6.5.tar.xz differ: char 25,
line 1
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2019-07-21 11:30:13
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.4126 (New)
Package is "ruby2.6"
Sun Jul 21 11:30:13 2019 rev:7 rq:715762 version:2.6.3
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-05-27
08:36:44.419109452 +0200
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.4126/ruby2.6.changes
2019-07-21 11:30:14.412818901 +0200
@@ -1,0 +2,12 @@
+Tue Jul 9 14:16:36 UTC 2019 - Marcus Rueckert
+
+- fix running tests (boo#1140844)
+ just passing the DISABLED_TESTS variable is wrong. probably a
+ relict from calling the test scripts directly. use TESTOPTS now.
+
+---
+Sun Jun 23 03:01:14 UTC 2019 - Marcus Rueckert
+
+- add BR for gmp-devel
+
+---
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.Sjs9Uw/_old 2019-07-21 11:30:15.164818774 +0200
+++ /var/tmp/diff_new_pack.Sjs9Uw/_new 2019-07-21 11:30:15.172818772 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -90,6 +90,7 @@
BuildRequires: llvm-devel
%endif
BuildRequires: gdbm-devel
+BuildRequires: gmp-devel
%if %{with jemalloc}
BuildRequires: jemalloc-devel
%endif
@@ -392,7 +393,7 @@
%if %{with run_tests}
%check
-DISABLE_TESTS="-x resolv/test_mdns.rb"
+DISABLE_TESTS=""
%ifarch armv7l armv7hl armv7hnl
# test_call_double(DL::TestDL) fails on ARM HardFP
# http://bugs.ruby-lang.org/issues/6592
@@ -407,7 +408,7 @@
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 TESTOPTS="$DISABLE_TESTS" ||:
%endif
%post -n %{libname} -p /sbin/ldconfig
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2019-05-27 08:36:40
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.5148 (New)
Package is "ruby2.6"
Mon May 27 08:36:40 2019 rev:6 rq:704999 version:2.6.3
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-04-21
09:03:22.746551062 +0200
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.5148/ruby2.6.changes
2019-05-27 08:36:44.419109452 +0200
@@ -1,0 +2,5 @@
+Fri May 10 09:35:54 UTC 2019 - Dominique Leuenberger
+
+- Move RPM macros to %_rpmmacrodir.
+
+---
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.eKliVm/_old 2019-05-27 08:36:45.407109067 +0200
+++ /var/tmp/diff_new_pack.eKliVm/_new 2019-05-27 08:36:45.407109067 +0200
@@ -346,10 +346,10 @@
%define rb_binary %{buildroot}/usr/bin/ruby -I %{buildroot}%{rb_libdir} -I
%{buildroot}%{rb_archdir}
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
-install -D -m 0644 %{S:3} %{buildroot}/etc/rpm/macros.suse-ruby2.6
+install -D -m 0644 %{S:3} %{buildroot}%{_rpmmacrodir}/macros.suse-ruby2.6
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
%if 0%{?is_default_ruby}
- install -D -m 0644 %{S:4} %{buildroot}/etc/rpm/macros.suse-ruby2.6-default
+ install -D -m 0644 %{S:4}
%{buildroot}%{_rpmmacrodir}/macros.suse-ruby2.6-default
for bin in %{buildroot}%{_bindir}/{erb,gem,irb,ruby}%{rb_binary_suffix} ; do
# yes really hard links
ln $bin ${bin%%%{rb_binary_suffix}}
@@ -435,7 +435,7 @@
%{_mandir}/man1/ruby*.1*
%{_mandir}/man5/gemfile*.5*
%doc ChangeLog COPYING COPYING.ja GPL KNOWNBUGS.rb LEGAL NEWS README*
-%config /etc/rpm/macros.suse-ruby2.6*
+%{_rpmmacrodir}/macros.suse-ruby2.6*
%if %{with separate_stdlib}
%files stdlib
commit ruby2.6 for openSUSE:Factory
Hello community, here is the log from the commit of package ruby2.6 for openSUSE:Factory checked in at 2019-04-21 09:03:18 Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old) and /work/SRC/openSUSE:Factory/.ruby2.6.new.5536 (New) Package is "ruby2.6" Sun Apr 21 09:03:18 2019 rev:5 rq:695946 version:2.6.3 Changes: --- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-03-28 22:46:35.815075774 +0100 +++ /work/SRC/openSUSE:Factory/.ruby2.6.new.5536/ruby2.6.changes 2019-04-21 09:03:22.746551062 +0200 @@ -1,0 +2,9 @@ +Thu Apr 18 22:44:18 UTC 2019 - Marcus Rueckert + +- update to 2.6.3 + This release adds support for New Japanese Era “令和” (Reiwa). It + updates the Unicode version to 12.1 beta (#15195), and updates + date library (#15742). + https://github.com/ruby/ruby/compare/v2_6_2...v2_6_3 + +--- Old: ruby-2.6.2.tar.xz New: ruby-2.6.3.tar.xz Other differences: -- ++ ruby2.6.spec ++ --- /var/tmp/diff_new_pack.dkFraz/_old 2019-04-21 09:03:24.886553605 +0200 +++ /var/tmp/diff_new_pack.dkFraz/_new 2019-04-21 09:03:24.890553609 +0200 @@ -25,9 +25,9 @@ %define patch_level p0 -Version:2.6.2 +Version:2.6.3 Release:0 -%define pkg_version 2.6.2 +%define pkg_version 2.6.3 # make the exported API version explicit %define api_version 2.6.0 %define rb_binary_suffix .ruby2.6 ++ ruby-2.6.2.tar.xz -> ruby-2.6.3.tar.xz ++ /work/SRC/openSUSE:Factory/ruby2.6/ruby-2.6.2.tar.xz /work/SRC/openSUSE:Factory/.ruby2.6.new.5536/ruby-2.6.3.tar.xz differ: char 25, line 1
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2019-03-28 22:46:27
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.25356 (New)
Package is "ruby2.6"
Thu Mar 28 22:46:27 2019 rev:4 rq:689157 version:2.6.2
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-03-01
20:29:38.482008160 +0100
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.25356/ruby2.6.changes
2019-03-28 22:46:35.815075774 +0100
@@ -1,0 +2,13 @@
+Wed Mar 27 17:11:10 UTC 2019 - Marcus Rueckert
+
+- for some reason the --enable-pie option does not work as
+ expected. Fix this for now with a patch that just injects the
+ -pie flag in the Makefile (adds use-pie.patch) (boo#1130028)
+
+---
+Fri Mar 15 15:34:15 UTC 2019 - Marcus Rueckert
+
+- update to 2.6.2
+ https://www.ruby-lang.org/en/news/2019/03/13/ruby-2-6-2-released/
+
+---
Old:
ruby-2.6.1.tar.xz
New:
ruby-2.6.2.tar.xz
series
use-pie.patch
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.4GVVyh/_old 2019-03-28 22:46:36.559075660 +0100
+++ /var/tmp/diff_new_pack.4GVVyh/_new 2019-03-28 22:46:36.563075660 +0100
@@ -25,9 +25,9 @@
%define patch_level p0
-Version:2.6.1
+Version:2.6.2
Release:0
-%define pkg_version 2.6.1
+%define pkg_version 2.6.2
# make the exported API version explicit
%define api_version 2.6.0
%define rb_binary_suffix .ruby2.6
@@ -78,7 +78,9 @@
#
Source3:%{name}.macros
Source4:%{name}-default.macros
+Source98: series
Source99: %{name}-rpmlintrc
+Patch: use-pie.patch
#
BuildRequires: ruby-bundled-gems-rpmhelper
@@ -287,6 +289,7 @@
%prep
%setup -q -n ruby-%{pkg_version}
#setup -q -n snapshot
+%patch -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/ruby%{rb_binary_suffix} $1|'
@@ -302,7 +305,6 @@
export LD="ld.gold"
%endif
export CFLAGS="%{optflags} -fno-strict-aliasing -std=gnu99"
-autoconf
%configure \
%if %{with jemalloc}
--with-jemalloc \
++ ruby-2.6.1.tar.xz -> ruby-2.6.2.tar.xz ++
/work/SRC/openSUSE:Factory/ruby2.6/ruby-2.6.1.tar.xz
/work/SRC/openSUSE:Factory/.ruby2.6.new.25356/ruby-2.6.2.tar.xz differ: char
26, line 1
++ series ++
use-pie.patch
++ use-pie.patch ++
Index: ruby-2.6.2/Makefile.in
===
--- ruby-2.6.2.orig/Makefile.in
+++ ruby-2.6.2/Makefile.in
@@ -268,7 +268,7 @@ miniruby$(EXEEXT):
$(PROGRAM):
@$(RM) $@
$(ECHO) linking $@
- $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ)
$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+ $(Q) $(PURIFY) $(CC) -pie $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ)
$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
$(Q) $(POSTLINK)
PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(exec) $(RM)
$(LIBRUBY_EXTS)
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2019-03-01 20:29:37
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.28833 (New)
Package is "ruby2.6"
Fri Mar 1 20:29:37 2019 rev:3 rq:679514 version:2.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-02-08
12:02:31.573722180 +0100
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.28833/ruby2.6.changes
2019-03-01 20:29:38.482008160 +0100
@@ -1,0 +2,15 @@
+Thu Feb 7 23:43:07 UTC 2019 - Marcus Rueckert
+
+- replace the awk based provides generation with the new file-attr
+ handler in ruby-bundled-gems-rpmhelper
+
+ This kills one provides rubygem-name = version
+
+ But this should not have be used since a while anymore.
+
+---
+Thu Feb 7 18:33:53 UTC 2019 - Marcus Rueckert
+
+- allow bundler bin stubs to be handled by update-alternative
+
+---
Old:
dump-versions.rb
generate_rubygemprovides.awk
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.U4iwAi/_old 2019-03-01 20:29:39.582007895 +0100
+++ /var/tmp/diff_new_pack.U4iwAi/_new 2019-03-01 20:29:39.582007895 +0100
@@ -54,7 +54,7 @@
%define is_default_ruby 1
%endif
-%define ua_binaries rake rdoc ri
+%define ua_binaries rake rdoc ri bundle bundler
# keep in sync with macro file!
#
# from valgrind.spec
@@ -75,15 +75,13 @@
#
Url:https://www.ruby-lang.org/
Source:
https://cache.ruby-lang.org/pub/ruby/2.6/ruby-%{pkg_version}.tar.xz
-Source1:generate_rubygemprovides.awk
-Source2:dump-versions.rb
#
Source3:%{name}.macros
Source4:%{name}-default.macros
Source99: %{name}-rpmlintrc
#
-BuildRequires: awk
+BuildRequires: ruby-bundled-gems-rpmhelper
%if %{with clang}
BuildRequires: binutils-gold
BuildRequires: clang
@@ -129,64 +127,9 @@
Conflicts: otherproviders(ruby-default)
%endif
Requires: %{libname} = %{version}
-
-# generate provides for embedded rubygems
-# must be 'manually' generated since
-# - the final .gemspec files are created during %build and %install
-# - the usual means to generate provides for rubygems is using ruby
-# and ruby is not available while building ruby :-/
-
-%define gen_embedded_provides3() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3)
-%define gen_embedded_provides4() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3 %4)
-%define gen_embedded_provides5() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3 %4 %5)
-
%if %{with separate_stdlib}
Requires: %{name}-stdlib = %{version}
%else
-%gen_embedded_provides4 bigdecimal 1 4 1
-%gen_embedded_provides4 date 2 0 0
-%gen_embedded_provides4 dbm 1 0 0
-%gen_embedded_provides4 etc 1 0 1
-%gen_embedded_provides4 fcntl 1 0 0
-%gen_embedded_provides4 fiddle 1 0 0
-%gen_embedded_provides4 gdbm 2 0 0
-%gen_embedded_provides4 io-console 0 4 7
-%gen_embedded_provides4 json 2 1 0
-%gen_embedded_provides4 openssl 2 1 2
-%gen_embedded_provides4 psych 3 1 0
-%gen_embedded_provides4 sdbm 1 0 0
-%gen_embedded_provides4 stringio 0 0 2
-%gen_embedded_provides4 strscan 1 0 0
-%gen_embedded_provides4 zlib 1 0 0
-%gen_embedded_provides4 did_you_mean 1 3 0
-%gen_embedded_provides4 minitest 5 11 3
-%gen_embedded_provides4 net-telnet 0 2 0
-%gen_embedded_provides4 power_assert 1 1 3
-%gen_embedded_provides4 rake 12 3 2
-%gen_embedded_provides4 test-unit 3 2 9
-%gen_embedded_provides4 xmlrpc 0 3 0
-%gen_embedded_provides4 bundler 1 17 2
-%gen_embedded_provides4 cmath 1 0 0
-%gen_embedded_provides4 csv 3 0 4
-%gen_embedded_provides4 e2mmap 0 1 0
-%gen_embedded_provides4 fileutils 1 1 0
-%gen_embedded_provides4 forwardable 1 2 0
-%gen_embedded_provides4 ipaddr 1 2 2
-%gen_embedded_provides4 irb 1 0 0
-%gen_embedded_provides4 logger 1 3 0
-%gen_embedded_provides4 matrix 0 1 0
-%gen_embedded_provides4 mutex_m 0 1 0
-%gen_embedded_provides4 ostruct 0 1 0
-%gen_embedded_provides4 prime 0 1 0
-%gen_embedded_provides4 rdoc 6 1 0
-%gen_embedded_provides4 rexml 3 1 9
-%gen_embedded_provides4 rss 0 2 7
-%gen_embedded_provides4 scanf 1 0 0
-%gen_embedded_provides3 shell 0 7
-%gen_embedded_provides4 sync 0 5 0
-%gen_embedded_provides4 thwait 0 1 0
-%gen_embedded_provides4 tracer 0 1 0
-%gen_embedded_provides4 webrick 1 4 2
Provides: %{name}-stdlib = %{version}-%{release}
Obsoletes: %{name}-stdlib < %{version}-%{release}
%endif
@@ -250,53 +193,6 @@
Provides: ruby-stdlib = %{version}-%{release}
Requires: %{libname} = %{version}
-%gen_embedded_provides4 bigdecimal 1 4 1
commit ruby2.6 for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby2.6 for openSUSE:Factory checked
in at 2019-02-08 12:02:26
Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old)
and /work/SRC/openSUSE:Factory/.ruby2.6.new.28833 (New)
Package is "ruby2.6"
Fri Feb 8 12:02:26 2019 rev:2 rq:672001 version:2.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-01-28
20:49:54.093813005 +0100
+++ /work/SRC/openSUSE:Factory/.ruby2.6.new.28833/ruby2.6.changes
2019-02-08 12:02:31.573722180 +0100
@@ -1,0 +2,25 @@
+Tue Feb 5 17:16:36 UTC 2019 - Marcus Rueckert
+
+- the last change was in the wrong %if branch
+- add option to build without docs for testing
+
+---
+Tue Feb 5 16:14:44 UTC 2019 - Marcus Rueckert
+
+- until we have a nicer solution duplicate the intree gem provides
+ for the non seperated stdlib path
+
+---
+Tue Feb 5 12:47:00 UTC 2019 - Marcus Rueckert
+
+- enable jemalloc by default on 15.0 and newer
+- undo the split of the stdlib. you can still build the old style
+ by passing --with=separate_stdlib
+
+---
+Tue Feb 5 12:12:39 UTC 2019 - Marcus Rueckert
+
+- update to 2.6.1
+ http://www.ruby-lang.org/en/news/2019/01/30/ruby-2-6-1-released/
+
+---
Old:
ruby-2.6.0.tar.xz
New:
ruby-2.6.1.tar.xz
Other differences:
--
++ ruby2.6.spec ++
--- /var/tmp/diff_new_pack.JtxOq9/_old 2019-02-08 12:02:33.997721075 +0100
+++ /var/tmp/diff_new_pack.JtxOq9/_new 2019-02-08 12:02:34.009721069 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby2.6
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,13 @@
%define patch_level p0
-Version:2.6.0
+Version:2.6.1
Release:0
+%define pkg_version 2.6.1
# make the exported API version explicit
%define api_version 2.6.0
%define rb_binary_suffix .ruby2.6
%define rb_soname ruby2.6
-%define pkg_version 2.6.0
# ruby-macros and ruby-common version
%define rpm_macros_version 3
@@ -63,15 +63,26 @@
%endif
# turn on testsuite by default. we dont hard fail anyway.
%bcond_without run_tests
-%if 0%{?is_opensuse} || 0%{?sle_version} >= 15
-%bcond_withjemalloc
+%bcond_without build_docs
+%if 0%{?sle_version} >= 15
+%bcond_without jemalloc
%else
%bcond_withjemalloc
%endif
%bcond_withclang
+%bcond_withseparate_stdlib
+
+#
+Url:https://www.ruby-lang.org/
+Source:
https://cache.ruby-lang.org/pub/ruby/2.6/ruby-%{pkg_version}.tar.xz
+Source1:generate_rubygemprovides.awk
+Source2:dump-versions.rb
+#
+Source3:%{name}.macros
+Source4:%{name}-default.macros
+Source99: %{name}-rpmlintrc
#
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: awk
%if %{with clang}
BuildRequires: binutils-gold
@@ -82,17 +93,17 @@
%if %{with jemalloc}
BuildRequires: jemalloc-devel
%endif
+BuildRequires: autoconf
BuildRequires: libffi-devel
BuildRequires: libyaml-devel
BuildRequires: ncurses-devel
+BuildRequires: netcfg
BuildRequires: openssl-devel
BuildRequires: pkg-config
BuildRequires: procps
BuildRequires: readline-devel
-BuildRequires: netcfg
BuildRequires: timezone
BuildRequires: zlib-devel
-BuildRequires: autoconf
# this requires is needed as distros older than 11.3 have a buildignore on
freetype2, without this the detection of the tk extension fails
BuildRequires: freetype2-devel
%if 0%{?suse_version} > 1010
@@ -118,22 +129,72 @@
Conflicts: otherproviders(ruby-default)
%endif
Requires: %{libname} = %{version}
+
+# generate provides for embedded rubygems
+# must be 'manually' generated since
+# - the final .gemspec files are created during %build and %install
+# - the usual means to generate provides for rubygems is using ruby
+# and ruby is not available while building ruby :-/
+
+%define gen_embedded_provides3() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3)
+%define gen_embedded_provides4() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3 %4)
+%define gen_embedded_provides5() %(awk -f %{S:1} -- %api_version %arch %1 %2
%3 %4 %5)
+
+%if %{with separate_stdlib}
Requires: %{name}-stdlib = %{version}
+%else
+%gen_embedded_provides4 bigdecimal 1 4 1
+%gen_embedded_provides4 date 2 0 0
