- CVE-2009-4492 ruby WEBrick log escape sequence (bug 554485)
This commit is contained in:
parent
f6e0b7bfc3
commit
bbb75e646f
3 changed files with 179 additions and 4 deletions
38
ruby.spec
38
ruby.spec
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
Name: ruby
|
||||
Version: %{rubyver}%{?dotpatchlevel}
|
||||
Release: 4%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: Ruby or GPLv2
|
||||
URL: http://www.ruby-lang.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -47,8 +47,11 @@ Patch27: ruby-1.8.6-p287-CVE-2008-5189.patch
|
|||
Patch28: ruby-1.8.6-p287-remove-ssl-rand-range.patch
|
||||
Patch29: ruby-always-use-i386.patch
|
||||
Patch31: ruby-1.8.6-p369-ri-gem_multipath.patch
|
||||
# Patch from ruby_1_8 branch
|
||||
# Patch32 from ruby_1_8 branch
|
||||
Patch32: ruby-1.8head-irb-save-history.patch
|
||||
Patch33: ruby-1.8.6-p383-mkmf-use-shared.patch
|
||||
# Patch34 already applied in 1.8.6p388
|
||||
Patch34: ruby-1.8.6.x-CVE-2009-4492.patch
|
||||
|
||||
Summary: An interpreter of object-oriented scripting language
|
||||
Group: Development/Languages
|
||||
|
|
@ -79,12 +82,20 @@ This package includes the libruby, necessary to run Ruby.
|
|||
Summary: A Ruby development environment
|
||||
Group: Development/Languages
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Provides: %{name}-libs-static = %{version}-%{release}
|
||||
#Provides: %{name}-libs-static = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Header files and libraries for building a extension library for the
|
||||
Ruby or an application embedded Ruby.
|
||||
|
||||
%package static
|
||||
Summary: Static libraries for Ruby development environment
|
||||
Group: Development/Languages
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
|
||||
%description static
|
||||
Static libraries for for building a extension library for the
|
||||
Ruby or an application embedded Ruby.
|
||||
|
||||
%package tcltk
|
||||
Summary: Tcl/Tk interface for scripting language Ruby
|
||||
|
|
@ -180,6 +191,8 @@ pushd %{name}-%{arcver}
|
|||
%patch29 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p0
|
||||
%patch33 -p1
|
||||
%patch34 -p0
|
||||
popd
|
||||
|
||||
%build
|
||||
|
|
@ -206,6 +219,11 @@ export CFLAGS
|
|||
--disable-rpath \
|
||||
--with-ruby-prefix=%{_prefix}/lib
|
||||
|
||||
# For example ext/socket/extconf.rb uses try_run (for getaddrinfo test),
|
||||
# which executes conftest and setting LD_LIBRARY_PATH for libruby.so is
|
||||
# needed.
|
||||
export LD_LIBRARY_PATH=$(pwd)
|
||||
|
||||
make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} COPY="cp -p" %{?_smp_mflags}
|
||||
%ifarch ia64
|
||||
# Miscompilation? Buggy code?
|
||||
|
|
@ -397,9 +415,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc %{name}-%{arcver}/README.EXT
|
||||
%lang(ja) %doc %{name}-%{arcver}/README.EXT.ja
|
||||
%{_libdir}/libruby.so
|
||||
%{_libdir}/libruby-static.a
|
||||
#%%{_libdir}/libruby-static.a
|
||||
%{_libdir}/ruby/%{rubyxver}/*/*.h
|
||||
|
||||
%files static
|
||||
%defattr(-, root, root, -)
|
||||
%{_libdir}/libruby-static.a
|
||||
|
||||
%files libs
|
||||
%defattr(-, root, root, -)
|
||||
%doc %{name}-%{arcver}/README
|
||||
|
|
@ -542,6 +564,14 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_emacs_sitestartdir}/ruby-mode-init.el
|
||||
|
||||
%changelog
|
||||
* Wed Jan 13 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.383-6
|
||||
- CVE-2009-4492 ruby WEBrick log escape sequence (bug 554485)
|
||||
|
||||
* Wed Dec 9 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.383-5
|
||||
- Change mkmf.rb to use LIBRUBYARG_SHARED so that have_library() works
|
||||
without libruby-static.a (bug 428384)
|
||||
- And move libruby-static.a to -static subpackage
|
||||
|
||||
* Thu Oct 29 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.383-4
|
||||
- Use bison to regenerate parse.c to keep the original format of error
|
||||
messages (bug 530275 comment 4)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue