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

This commit is contained in:
Mamoru Tasaka 2012-11-10 15:06:58 +09:00
commit 0ce13e852b

View File

@ -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: 20%{?dist} Release: 21%{?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
@ -739,7 +739,7 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Sat Nov 10 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.327-20 * Sat Nov 10 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.327-21
- Update to 1.9.3.327 - Update to 1.9.3.327
- Fix Hash-flooding DoS vulnerability on MurmurHash function - Fix Hash-flooding DoS vulnerability on MurmurHash function
(CVE-2012-5371) (CVE-2012-5371)