rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/f18' into f17

Browse Source
This commit is contained in:
TASAKA Mamoru 2013-05-16 17:19:00 +09:00
commit a20c473b1b
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz
/ruby-1.9.3-p374.tar.gz /ruby-1.9.3-p374.tar.gz
/ruby-1.9.3-p385.tar.gz /ruby-1.9.3-p385.tar.gz
/ruby-1.9.3-p392.tar.gz /ruby-1.9.3-p392.tar.gz
/ruby-1.9.3-p429.tar.gz

13
ruby.spec
View File

@ -1,7 +1,7 @@
%global major_version 1 %global major_version 1
%global minor_version 9 %global minor_version 9
%global teeny_version 3 %global teeny_version 3
%global patch_level 392 %global patch_level 429
%global major_minor_version %{major_version}.%{minor_version} %global major_minor_version %{major_version}.%{minor_version}
@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
# we cannot reset the release number to 1 even when the main (ruby) version # we cannot reset the release number to 1 even when the main (ruby) version
# is updated - because it may be that the versions of sub-components don't # is updated - because it may be that the versions of sub-components don't
# change. # change.
Release: 29%{?dist} Release: 30%{?dist}
Group: Development/Languages Group: Development/Languages
# Public Domain for example for: include/ruby/st.h, strftime.c, ... # Public Domain for example for: include/ruby/st.h, strftime.c, ...
License: (Ruby or BSD) and Public Domain License: (Ruby or BSD) and Public Domain
@ -78,9 +78,6 @@ Patch4: ruby-1.9.3-fix-s390x-build.patch
# Fix the uninstaller, so that it doesn't say that gem doesn't exist # Fix the uninstaller, so that it doesn't say that gem doesn't exist
# when it exists outside of the GEM_HOME (already fixed in the upstream) # when it exists outside of the GEM_HOME (already fixed in the upstream)
Patch5: ruby-1.9.3-rubygems-1.8.11-uninstaller.patch Patch5: ruby-1.9.3-rubygems-1.8.11-uninstaller.patch
# Already fixed upstream:
# https://github.com/ruby/ruby/commit/f212df564a4e1025f9fb019ce727022a97bfff53
Patch7: ruby-1.9.3-bignum-test-fix.patch
# Allows to install RubyGems into custom directory, outside of Ruby's tree. # Allows to install RubyGems into custom directory, outside of Ruby's tree.
# http://redmine.ruby-lang.org/issues/5617 # http://redmine.ruby-lang.org/issues/5617
Patch8: ruby-1.9.3-custom-rubygems-location.patch Patch8: ruby-1.9.3-custom-rubygems-location.patch
@ -348,7 +345,6 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
@ -361,6 +357,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
autoconf autoconf
%configure \ %configure \
--disable-werror \
--with-rubylibprefix='%{ruby_libdir}' \ --with-rubylibprefix='%{ruby_libdir}' \
--with-archdir='%{ruby_libarchdir}' \ --with-archdir='%{ruby_libarchdir}' \
--with-sitedir='%{ruby_sitelibdir}' \ --with-sitedir='%{ruby_sitelibdir}' \
@ -778,6 +775,10 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Thu May 16 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.429-30
- Update to 1.9.3 p429
- Fix object taint bypassing in DL and Fiddle (CVE-2013-2065)
* Mon Feb 25 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.392-29 * Mon Feb 25 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.392-29
- Update to 1.9.3 p392 - Update to 1.9.3 p392
- Fix entity expansion DoS vulnerability in REXML (bug 914716) - Fix entity expansion DoS vulnerability in REXML (bug 914716)

2
sources
View File

@ -1 +1 @@
f689a7b61379f83cbbed3c7077d83859 ruby-1.9.3-p392.tar.gz 993c72f7f805a9eb453f90b0b7fe0d2b ruby-1.9.3-p429.tar.gz