From fc0fbc1a95c811e324bce51c58ed069fb3b4921b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 2 Aug 2010 02:38:02 +0900 Subject: [PATCH 01/12] * Mon Aug 2 2010 Mamoru Tasaka - 1.8.7.299-5 - More cleanup of spec file, expecially for rpmlint issue - build ri files in %build --- ruby.spec | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/ruby.spec b/ruby.spec index 144339d..cc8af8f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -16,7 +16,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 4%{?dist} +Release: 5%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -229,6 +229,14 @@ make OPT=-O0 RUBY_INSTALL_NAME=ruby \ %{?_smp_mflags} %endif +# Generate ri doc +rm -rf .ext/rdoc +rm -rf ./RI_TMPDIR +mkdir ./RI_TMPDIR +make \ + DESTDIR=$(pwd)/RI_TMPDIR \ + install-doc + popd %check @@ -261,9 +269,9 @@ cd ruby-libs cd ../../%{name}-%{arcver} ; \ find ext \ -mindepth 1 \ - \( -path '*/sample/*' -o -path '*/demo/*' \) -o \ + \( -path '*/sample/*' -o -path '*/demo/*' \) -o \ \( -name '*.rb' -not -path '*/lib/*' -not -name extconf.rb \) -o \ - \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \) \ + \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \) \ \ | xargs tar cf - ) \ @@ -275,7 +283,10 @@ find -type f | xargs chmod 0644 # Fix shebang grep -rl '#![ \t]*%{_prefix}/local/bin' . | \ - xargs sed -i -e 's|\(#![ \t]*\)%{_prefix}/local/bin|\1%{_bindir}|' + xargs sed -i -e '1s|\(#![ \t]*\)%{_prefix}/local/bin|\1%{_bindir}|' +grep -rl '#![ \t]*\./ruby' . | \ + xargs sed -i -e '1s|\(#![ \t]*\)\./ruby|%{_bindir}/ruby|' + # Fix encoding # Suppress message set +x @@ -323,25 +334,20 @@ make \ DESTDIR=$RPM_BUILD_ROOT \ install -# generate ri doc -rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver} -rm -rf %{name}-%{arcver}/.ext/rdoc -env \ - LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \ - RUBYLIB=$RPM_BUILD_ROOT%{vendorarchbase}/%{rubyxver}:$RPM_BUILD_ROOT%{vendorarchbase}/%{rubyxver}/%{_normalized_cpu}-%{_target_os} \ - make \ - -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT \ - install-doc +# install ri doc +cp -a ./%{name}-%{arcver}/RI_TMPDIR/* $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{sitelibbase}/%{rubyxver} mkdir -p $RPM_BUILD_ROOT%{sitearchbase}/%{rubyxver}/%{_normalized_cpu}-%{_target_os} # remove shebang for i in \ - $RPM_BUILD_ROOT%{vendorlibbase}/1.8/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; \ + $RPM_BUILD_ROOT%{vendorlibbase}/%{rubyxver}/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; \ do sed -i -e '/^#!.*/,1D' $i done +# The following can be executable +chmod 0755 $RPM_BUILD_ROOT%{vendorlibbase}/%{rubyxver}/tkextlib/pkg_checker.rb chmod 0644 $RPM_BUILD_ROOT%{vendorarchbase}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/*.h find $RPM_BUILD_ROOT/ -name "*.so" -exec chmod 755 {} \; @@ -499,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Mon Aug 2 2010 Mamoru Tasaka - 1.8.7.299-5 +- More cleanup of spec file, expecially for rpmlint issue +- build ri files in %%build + * Mon Jul 26 2010 Mamoru Tasaka - 1.8.7.299-4 - Cleanup spec file - Make -irb, -rdoc subpackage noarch From a99c84603d32e3f27ddc8a430621620ba2a0521d Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 23 Aug 2010 02:27:15 +0900 Subject: [PATCH 02/12] - Update to 1.8.7.302 - CVE-2010-0541 (bug 587731) is fixed in this version - Update ext/tk to the latest head --- .gitignore | 2 ++ ruby.spec | 12 +++++++++--- sources | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 89ca5b2..8c2f352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ ruby-1.8.7-p299.tar.bz2 ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz +/ruby-1.8.7-p302.tar.bz2 +/ruby-rev54f344095916f83a2755a177f94e65a1c390a612-ext_tk.tar.gz diff --git a/ruby.spec b/ruby.spec index cc8af8f..bc837f5 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 299 +%global _patchlevel 302 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -12,11 +12,12 @@ %{!?sitearchbase: %global sitearchbase %{vendorarchbase}/site_ruby} %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/') -%global ruby_tk_git_revision 415a3ef9ab82c65a7abc +# Sun Aug 22 15:24:07 2010 +0000 +%global ruby_tk_git_revision 54f344095916f83a2755a177f94e65a1c390a612 Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 5%{?dist} +Release: 1%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -505,6 +506,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Mon Aug 23 2010 Mamoru Tasaka - 1.8.7.302-1 +- Update to 1.8.7.302 +- CVE-2010-0541 (bug 587731) is fixed in this version +- Update ext/tk to the latest head + * Mon Aug 2 2010 Mamoru Tasaka - 1.8.7.299-5 - More cleanup of spec file, expecially for rpmlint issue - build ri files in %%build diff --git a/sources b/sources index bc9abd7..f5fb30a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -244439a87d75ab24170a9c2b451ce351 ruby-1.8.7-p299.tar.bz2 -b49ba42587b06e5f23501456e29a6d18 ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz +a6a9e37079ed8cf8726b455dad3de939 ruby-1.8.7-p302.tar.bz2 +8f0b8b855f6b18592ac7a76a73c8ec6c ruby-rev54f344095916f83a2755a177f94e65a1c390a612-ext_tk.tar.gz From c94d90b46b1006c919cd42962e9bd8670bef77cd Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 4 Nov 2010 04:26:13 +0900 Subject: [PATCH 03/12] - Avoid multilib conflict on -libs subpackage (bug 649174) --- ruby.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index bc837f5..ae34854 100644 --- a/ruby.spec +++ b/ruby.spec @@ -17,7 +17,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 1%{?dist} +Release: 2%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -230,6 +230,22 @@ make OPT=-O0 RUBY_INSTALL_NAME=ruby \ %{?_smp_mflags} %endif +# Avoid multilib conflict on -libs (bug 649174) +# Maybe dlconfig.rb is unneeded anyway, however for now moving +# dlconfig.rb and add wrapper (need checking) +CONFIGARCH=$(./miniruby -rrbconfig -e "puts Config::CONFIG['arch']") +[ -z "$CONFIGARCH" ] && exit 1 +pushd ext/dl +mkdir $CONFIGARCH +mv dlconfig.rb $CONFIGARCH/ +cat > dlconfig.rb < - 1.8.7.302-2 +- Avoid multilib conflict on -libs subpackage (bug 649174) + * Mon Aug 23 2010 Mamoru Tasaka - 1.8.7.302-1 - Update to 1.8.7.302 - CVE-2010-0541 (bug 587731) is fixed in this version From 06b3a6fcb79e975063365701c359742b5f5d3de7 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 26 Dec 2010 03:12:47 +0900 Subject: [PATCH 04/12] - Update to 1.8.7 p330 - ext/tk updated to the newest header --- .gitignore | 2 ++ ruby-1.8.7-p330-multilib.patch | 33 +++++++++++++++++++++++++++++++++ ruby.spec | 14 +++++++++----- sources | 4 ++-- 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 ruby-1.8.7-p330-multilib.patch diff --git a/.gitignore b/.gitignore index 8c2f352..543c5bd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ ruby-1.8.7-p299.tar.bz2 ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-1.8.7-p302.tar.bz2 /ruby-rev54f344095916f83a2755a177f94e65a1c390a612-ext_tk.tar.gz +/ruby-1.8.7-p330.tar.bz2 +/ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz diff --git a/ruby-1.8.7-p330-multilib.patch b/ruby-1.8.7-p330-multilib.patch new file mode 100644 index 0000000..481e6a8 --- /dev/null +++ b/ruby-1.8.7-p330-multilib.patch @@ -0,0 +1,33 @@ +--- ruby-1.8.7-p330/mkconfig.rb.multilib 2010-11-24 16:38:41.000000000 +0900 ++++ ruby-1.8.7-p330/mkconfig.rb 2010-12-26 02:16:32.000000000 +0900 +@@ -40,6 +40,7 @@ + has_patchlevel = false + continued_name = nil + continued_line = nil ++lib_64 = '' + File.foreach "config.status" do |line| + next if /^#/ =~ line + name = nil +@@ -102,13 +103,21 @@ + when "PATCHLEVEL" + has_patchlevel = true + end ++ ++ # If the target architecture is one of the following, ++ # ppc64 s390x sparc64 x86_64 ++ # then use "lib64", not "lib" in prefix. ++ if name == "target_cpu" and (/64"$/ =~ val or val == '"s390x"') ++ lib_64 = '64' ++ end + end + # break if /^CEOF/ + end + + drive = File::PATH_SEPARATOR == ';' + +-prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM ++prefix = "/lib#{lib_64}/ruby/" \ ++ + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM + print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" + print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" + print " CONFIG = {}\n" diff --git a/ruby.spec b/ruby.spec index ae34854..2ca27e6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 302 +%global _patchlevel 330 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -12,12 +12,12 @@ %{!?sitearchbase: %global sitearchbase %{vendorarchbase}/site_ruby} %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/') -# Sun Aug 22 15:24:07 2010 +0000 -%global ruby_tk_git_revision 54f344095916f83a2755a177f94e65a1c390a612 +# Sun Dec 25 17:00:00 2010 +0000 +%global ruby_tk_git_revision f30eca26639ce538339bc488c7ed1fd397b0c13f Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 1%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -52,7 +52,7 @@ Source100: ruby-rev%{ruby_tk_git_revision}-ext_tk.tar.gz # Patches 23, 29, and 33 brought over from ruby 1.8.6 # (updated to apply against 1.8.7 source) # If building against a 64bit arch, use 64bit libdir -Patch23: ruby-1.8.7-multilib.patch +Patch23: ruby-1.8.7-p330-multilib.patch # Mark all i.86 arch's (eg i586, i686, etc) as i386 Patch29: ruby-1.8.7-always-use-i386.patch # Use shared libs as opposed to static for mkmf @@ -522,6 +522,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Sun Dec 26 2010 Mamoru Tasaka - 1.8.7.330-1 +- Update to 1.8.7 p330 +- ext/tk updated to the newest header + * Thu Nov 4 2010 Mamoru Tasaka - 1.8.7.302-2 - Avoid multilib conflict on -libs subpackage (bug 649174) diff --git a/sources b/sources index f5fb30a..66a9c0f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a6a9e37079ed8cf8726b455dad3de939 ruby-1.8.7-p302.tar.bz2 -8f0b8b855f6b18592ac7a76a73c8ec6c ruby-rev54f344095916f83a2755a177f94e65a1c390a612-ext_tk.tar.gz +2689719fb42c8cf0aa336f8c8933f413 ruby-1.8.7-p330.tar.bz2 +fcc35655da3047f64650a526c179ade8 ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz From bdf97b9aa0f7b901035a7efc103ff4ccdd55d0e5 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 19 Feb 2011 19:33:45 +0900 Subject: [PATCH 05/12] Update to 1.8.7 p334 --- .gitignore | 1 + ruby.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 543c5bd..c944fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-rev54f344095916f83a2755a177f94e65a1c390a612-ext_tk.tar.gz /ruby-1.8.7-p330.tar.bz2 /ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz +/ruby-1.8.7-p334.tar.bz2 diff --git a/ruby.spec b/ruby.spec index 9286b78..d2f385d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 330 +%global _patchlevel 334 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -17,7 +17,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 3%{?dist} +Release: 1%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -522,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Sat Feb 19 2011 Mamoru Tasaka - 1.8.7.334-1 +- Update to 1.8.7 p334 + * Wed Feb 09 2011 Fedora Release Engineering - 1.8.7.330-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 66a9c0f..0b3c463 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2689719fb42c8cf0aa336f8c8933f413 ruby-1.8.7-p330.tar.bz2 fcc35655da3047f64650a526c179ade8 ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz +2f14f604bf981bb938ab5fc8b09eb1a6 ruby-1.8.7-p334.tar.bz2 From 70c10be3b2f000b5fefae4381124596eb233c644 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 19 Feb 2011 19:34:14 +0900 Subject: [PATCH 06/12] Update to 1.8.7 p334 --- .gitignore | 1 + ruby.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 543c5bd..c944fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-rev54f344095916f83a2755a177f94e65a1c390a612-ext_tk.tar.gz /ruby-1.8.7-p330.tar.bz2 /ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz +/ruby-1.8.7-p334.tar.bz2 diff --git a/ruby.spec b/ruby.spec index 2ca27e6..d2f385d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 330 +%global _patchlevel 334 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -11,7 +11,7 @@ %{!?sitelibbase: %global sitelibbase %{vendorlibbase}/site_ruby} %{!?sitearchbase: %global sitearchbase %{vendorarchbase}/site_ruby} -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/') +%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/') # Sun Dec 25 17:00:00 2010 +0000 %global ruby_tk_git_revision f30eca26639ce538339bc488c7ed1fd397b0c13f @@ -522,6 +522,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Sat Feb 19 2011 Mamoru Tasaka - 1.8.7.334-1 +- Update to 1.8.7 p334 + +* Wed Feb 09 2011 Fedora Release Engineering - 1.8.7.330-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jan 02 2011 Dennis Gilmore - 1.8.7.330-2 +- nomalise the 32 bit sparc archs to sparc + * Sun Dec 26 2010 Mamoru Tasaka - 1.8.7.330-1 - Update to 1.8.7 p330 - ext/tk updated to the newest header diff --git a/sources b/sources index 66a9c0f..0b3c463 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2689719fb42c8cf0aa336f8c8933f413 ruby-1.8.7-p330.tar.bz2 fcc35655da3047f64650a526c179ade8 ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz +2f14f604bf981bb938ab5fc8b09eb1a6 ruby-1.8.7-p334.tar.bz2 From 5c73b3c93160f5597fada66d1a53d7e7acdd4d78 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 11 Jul 2011 17:44:01 -0500 Subject: [PATCH 07/12] normalise arm cpu names to arm --- ruby.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index d2f385d..422a00f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -11,13 +11,13 @@ %{!?sitelibbase: %global sitelibbase %{vendorlibbase}/site_ruby} %{!?sitearchbase: %global sitearchbase %{vendorarchbase}/site_ruby} -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/') +%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') # Sun Dec 25 17:00:00 2010 +0000 %global ruby_tk_git_revision f30eca26639ce538339bc488c7ed1fd397b0c13f Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 1%{?dist} +Release: 2%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -522,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Mon Jul 11 2011 Dennis Gilmore - 1.8.7.334-2 +- normalise arm cpu names + * Sat Feb 19 2011 Mamoru Tasaka - 1.8.7.334-1 - Update to 1.8.7 p334 From 5fa073837c334b28c9b6a69dca5cbf7eed259617 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 14 Jul 2011 01:23:49 +0900 Subject: [PATCH 08/12] Once fix FTBFS (bug 716021) --- ruby.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/ruby.spec b/ruby.spec index 422a00f..1d9f8bd 100644 --- a/ruby.spec +++ b/ruby.spec @@ -17,7 +17,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 4%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -189,6 +189,11 @@ pushd %{name}-%{arcver} popd +# Once fix FTBTS issue (bug 716021). Remove the below +# when it is no longer needed. +sed -i.redirect -e '\@RUBY@s@\.rb >@\.rb | cat >@' %{name}-%{arcver}/ext/dl/depend + + %build pushd %{name}-%{arcver} for i in config.sub config.guess; do @@ -425,7 +430,10 @@ rm -rf $RPM_BUILD_ROOT %ifarch ppc64 s390x sparc64 x86_64 %dir %{vendorarchbase} %dir %{vendorarchbase}/%{rubyxver} +%dir %{vendorarchbase}/%{rubyxver}/%{_normalized_cpu}-%{_target_os} %{sitearchbase} +%else +%dir %{vendorlibbase}/%{rubyxver}/%{_normalized_cpu}-%{_target_os} %endif ## the following files should goes into ruby-tcltk package. %exclude %{vendorlibbase}/%{rubyxver}/*tk.rb @@ -522,8 +530,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog -* Mon Jul 11 2011 Dennis Gilmore - 1.8.7.334-2 -- normalise arm cpu names +* Thu Jul 14 2011 Mamoru Tasaka - 1.8.7.334-4 +- Once fix FTBFS (bug 716021) + +* Mon Jul 11 2011 Dennis Gilmore - 1.8.7.334-3 +- normalise arm cpus to arm + +* Mon May 30 2011 Mamoru Tasaka - 1.8.7.334-2 +- Own %%{_normalized_cpu}-%%{_target_os} directory (bug 708816) * Sat Feb 19 2011 Mamoru Tasaka - 1.8.7.334-1 - Update to 1.8.7 p334 From 02db486693f736208011436cc56af970d8191810 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 16 Jul 2011 10:31:49 +0900 Subject: [PATCH 09/12] Update to 1.8.7 p352 CVE-2011-2686 is fixed in this version (bug 722415) Update ext/tk to the latest git Remove duplicate path entry (bug 718695) --- .gitignore | 2 ++ ruby-1.8.7-p352-path-uniq.patch | 54 +++++++++++++++++++++++++++++++++ ruby.spec | 21 ++++++++++--- sources | 2 ++ 4 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 ruby-1.8.7-p352-path-uniq.patch diff --git a/.gitignore b/.gitignore index c944fa7..a4c19e9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-1.8.7-p330.tar.bz2 /ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz /ruby-1.8.7-p334.tar.bz2 +/ruby-1.8.7-p352.tar.bz2 +/ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz diff --git a/ruby-1.8.7-p352-path-uniq.patch b/ruby-1.8.7-p352-path-uniq.patch new file mode 100644 index 0000000..f930de1 --- /dev/null +++ b/ruby-1.8.7-p352-path-uniq.patch @@ -0,0 +1,54 @@ +--- ruby-1.8.7-p352/array.c.pathuniq 2009-02-05 08:55:33.000000000 +0900 ++++ ruby-1.8.7-p352/array.c 2011-07-16 09:44:35.000000000 +0900 +@@ -2954,7 +2954,7 @@ + * b.uniq! #=> nil + */ + +-static VALUE ++GCC_VISIBILITY_HIDDEN VALUE + rb_ary_uniq_bang(ary) + VALUE ary; + { +@@ -2987,7 +2987,7 @@ + * a.uniq #=> ["a", "b", "c"] + */ + +-static VALUE ++GCC_VISIBILITY_HIDDEN VALUE + rb_ary_uniq(ary) + VALUE ary; + { +--- ruby-1.8.7-p352/intern.h.pathuniq 2011-05-23 13:49:40.000000000 +0900 ++++ ruby-1.8.7-p352/intern.h 2011-07-16 09:43:10.000000000 +0900 +@@ -18,6 +18,11 @@ + */ + + #define ID_ALLOCATOR 1 ++#ifdef __GNUC__ ++#define GCC_VISIBILITY_HIDDEN __attribute__ ((visibility("hidden"))) ++#else ++#define GCC_VISIBILITY_HIDDEN ++#endif + + /* array.c */ + void rb_mem_clear _((register VALUE*, register long)); +@@ -44,6 +49,8 @@ + VALUE rb_ary_reverse _((VALUE)); + VALUE rb_ary_sort _((VALUE)); + VALUE rb_ary_sort_bang _((VALUE)); ++GCC_VISIBILITY_HIDDEN VALUE rb_ary_uniq _((VALUE)); ++GCC_VISIBILITY_HIDDEN VALUE rb_ary_uniq_bang _((VALUE)); + VALUE rb_ary_delete _((VALUE, VALUE)); + VALUE rb_ary_delete_at _((VALUE, long)); + VALUE rb_ary_clear _((VALUE)); +--- ruby-1.8.7-p352/ruby.c.pathuniq 2011-07-16 08:54:11.000000000 +0900 ++++ ruby-1.8.7-p352/ruby.c 2011-07-16 09:36:13.000000000 +0900 +@@ -341,6 +341,8 @@ + if (rb_safe_level() == 0) { + incpush("."); + } ++ ++ rb_load_path = rb_ary_uniq(rb_load_path); + } + + struct req_list { diff --git a/ruby.spec b/ruby.spec index 1d9f8bd..f8c992b 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 334 +%global _patchlevel 352 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -12,12 +12,12 @@ %{!?sitearchbase: %global sitearchbase %{vendorarchbase}/site_ruby} %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') -# Sun Dec 25 17:00:00 2010 +0000 -%global ruby_tk_git_revision f30eca26639ce538339bc488c7ed1fd397b0c13f +# Fri Jul 15 21:28:10 2011 +0000 +%global ruby_tk_git_revision c2dfaa7d40531aef3706bcc16f38178b0c6633ee Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 4%{?dist} +Release: 1%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -58,6 +58,9 @@ Patch29: ruby-1.8.7-always-use-i386.patch # Use shared libs as opposed to static for mkmf # See bug 428384 Patch33: ruby-1.8.7-p249-mkmf-use-shared.patch +# Remove duplicate path entry +# bug 718695 +Patch34: ruby-1.8.7-p352-path-uniq.patch # Change ruby load path to conform to Fedora/ruby # library placement (various 1.8.6 patches consolidated into this) Patch100: ruby-1.8.7-lib-paths.patch @@ -178,6 +181,7 @@ pushd %{name}-%{arcver} %patch23 -p1 %patch29 -p1 %patch33 -p1 +%patch34 -p1 %patch100 -p1 ( @@ -185,6 +189,9 @@ pushd %{name}-%{arcver} rm -rf tk cp -a ../../ext/tk tk find tk -type d -name \.svn | sort -r | xargs rm -rf + +# Remove rpath + sed -i.rpath -e 's|-Wl,-R|-L|g' tk/extconf.rb ) popd @@ -530,6 +537,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Sat Jul 16 2011 Mamoru Tasaka - 1.8.7.352-1 +- Update to 1.8.7 p352 +- CVE-2011-2686 is fixed in this version (bug 722415) +- Update ext/tk to the latest git +- Remove duplicate path entry (bug 718695) + * Thu Jul 14 2011 Mamoru Tasaka - 1.8.7.334-4 - Once fix FTBFS (bug 716021) diff --git a/sources b/sources index 0b3c463..e7e916e 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ fcc35655da3047f64650a526c179ade8 ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz 2f14f604bf981bb938ab5fc8b09eb1a6 ruby-1.8.7-p334.tar.bz2 +0c61ea41d1b1183b219b9afe97f18f52 ruby-1.8.7-p352.tar.bz2 +01b1053cf357459349bf74363756ad41 ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz From a709459b87d4b0a4a1fcca3743ba8e55d691cf8d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 23 Dec 2011 12:39:18 -0600 Subject: [PATCH 10/12] dont normalise arm cpus to arm there is something weird about how ruby choses where to put bits --- ruby.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index f8c992b..efc0ebf 100644 --- a/ruby.spec +++ b/ruby.spec @@ -11,13 +11,13 @@ %{!?sitelibbase: %global sitelibbase %{vendorlibbase}/site_ruby} %{!?sitearchbase: %global sitearchbase %{vendorarchbase}/site_ruby} -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') +%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/') # Fri Jul 15 21:28:10 2011 +0000 %global ruby_tk_git_revision c2dfaa7d40531aef3706bcc16f38178b0c6633ee Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 1%{?dist} +Release: 2%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ @@ -537,6 +537,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Fri Dec 23 2011 Dennis Gilmore - 1.8.7.352-2 +- dont normalise arm cpus to arm +- there is something weird about how ruby choses where to put bits + * Sat Jul 16 2011 Mamoru Tasaka - 1.8.7.352-1 - Update to 1.8.7 p352 - CVE-2011-2686 is fixed in this version (bug 722415) From 6b2b12b8b2718d865d52f6ec0602c6de34f459b0 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 30 Dec 2011 00:37:59 +0900 Subject: [PATCH 11/12] Update to 1.8.7p357 Randomize hash on process startup (CVE-2011-4815, bug 750564) --- .gitignore | 1 + ruby.spec | 21 +++++++++++++++++++-- sources | 4 +--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a4c19e9..c1f83dd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-1.8.7-p334.tar.bz2 /ruby-1.8.7-p352.tar.bz2 /ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz +/ruby-1.8.7-p357.tar.bz2 diff --git a/ruby.spec b/ruby.spec index efc0ebf..78519d7 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 352 +%global _patchlevel 357 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -17,14 +17,16 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 1%{?dist} # Please check if ruby upstream changes this to "Ruby or GPLv2+" License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRequires: compat-readline5-devel BuildRequires: db4-devel +%if 0%{?fedora} < 17 BuildRequires: gdbm-devel +%endif BuildRequires: libX11-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel @@ -200,6 +202,11 @@ popd # when it is no longer needed. sed -i.redirect -e '\@RUBY@s@\.rb >@\.rb | cat >@' %{name}-%{arcver}/ext/dl/depend +# Disable gdbm support on F-17 for now +%if 0%{?fedora} >= 17 +sed -i '\@dblib =@s|gdbm[^ ]*||g' %{name}-%{arcver}/ext/dbm/extconf.rb +%endif + %build pushd %{name}-%{arcver} @@ -537,10 +544,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Thu Dec 29 2011 Mamoru Tasaka - 1.8.7.357-1 +- Update to 1.8.7p357 +- Randomize hash on process startup (CVE-2011-4815, bug 750564) + * Fri Dec 23 2011 Dennis Gilmore - 1.8.7.352-2 - dont normalise arm cpus to arm - there is something weird about how ruby choses where to put bits +* Thu Nov 16 2011 Mamoru Tasaka - 1.8.7.352-3 +- F-17: kill gdbm support for now due to licensing compatibility issue + +* Sat Oct 1 2011 Mamoru Tasaka - 1.8.7.352-2 +- F-17: rebuild against new gdbm + * Sat Jul 16 2011 Mamoru Tasaka - 1.8.7.352-1 - Update to 1.8.7 p352 - CVE-2011-2686 is fixed in this version (bug 722415) diff --git a/sources b/sources index e7e916e..1d94212 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -fcc35655da3047f64650a526c179ade8 ruby-revf30eca26639ce538339bc488c7ed1fd397b0c13f-ext_tk.tar.gz -2f14f604bf981bb938ab5fc8b09eb1a6 ruby-1.8.7-p334.tar.bz2 -0c61ea41d1b1183b219b9afe97f18f52 ruby-1.8.7-p352.tar.bz2 +3abd9e2a29f756a0d30c7bfca578cdeb ruby-1.8.7-p357.tar.bz2 01b1053cf357459349bf74363756ad41 ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz From 2ddc85f788fa968c5ec89017cea0c6608e711d3a Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Fri, 13 Apr 2012 16:01:06 +0900 Subject: [PATCH 12/12] Update to 1.8.7p358 --- .gitignore | 1 + ruby.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c1f83dd..50fe66a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-1.8.7-p352.tar.bz2 /ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz /ruby-1.8.7-p357.tar.bz2 +/ruby-1.8.7-p358.tar.bz2 diff --git a/ruby.spec b/ruby.spec index 78519d7..3d7eb64 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global rubyxver 1.8 %global rubyver 1.8.7 -%global _patchlevel 357 +%global _patchlevel 358 %global dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %global patchlevel %{?_patchlevel:-p%{_patchlevel}} @@ -544,6 +544,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ri %changelog +* Fri Apr 13 2012 Mamoru Tasaka - 1.8.7.358-1 +- Update to 1.8.7p358 + * Thu Dec 29 2011 Mamoru Tasaka - 1.8.7.357-1 - Update to 1.8.7p357 - Randomize hash on process startup (CVE-2011-4815, bug 750564) diff --git a/sources b/sources index 1d94212..91e1a36 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 3abd9e2a29f756a0d30c7bfca578cdeb ruby-1.8.7-p357.tar.bz2 01b1053cf357459349bf74363756ad41 ruby-revc2dfaa7d40531aef3706bcc16f38178b0c6633ee-ext_tk.tar.gz +de35f00997f4ccee3e22dff0f2d01b8a ruby-1.8.7-p358.tar.bz2