[packages/ruby] up to 2.0.0.643. Mitigation for CVE-2015-0235 (GHOST)

glen glen at pld-linux.org
Fri Mar 20 23:02:13 CET 2015


commit 1b39e8e22a3dd0b855f903aac5744de6864ab6b1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Mar 20 21:27:19 2015 +0000

    up to 2.0.0.643. Mitigation for CVE-2015-0235 (GHOST)

 DESTDIR.patch | 73 -----------------------------------------------------------
 ruby.spec     |  8 +++----
 2 files changed, 3 insertions(+), 78 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 242ceff..cdfb2a2 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -16,10 +16,10 @@
 %bcond_without	default_ruby	# use this Ruby as default system Ruby
 %bcond_with	bootstrap	# build bootstrap version
 
-%define		rel		6
+%define		rel		1
 %define		ruby_version	2.0
 %define		basever		2.0.0
-%define		patchlevel	598
+%define		patchlevel	643
 
 %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define		doc_version	2_0_0
@@ -49,7 +49,7 @@ Epoch:		1
 License:	(Ruby or BSD) and Public Domain
 Group:		Development/Languages
 Source0:	https://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5:	a3f3908103a7d209d1d1cf4712e3953c
+# Source0-md5:	1390888cac6cd175e6f164eff378cdde
 Source1:	http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
 # Source1-md5:	ad1af0043be98ba1a4f6d0185df63876
 Source2:	http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
@@ -67,7 +67,6 @@ Patch2:		fix-bison-invocation.patch
 Patch3:		mkmf-verbose.patch
 Patch4:		strip-ccache.patch
 Patch5:		duplicated-paths.patch
-Patch6:		DESTDIR.patch
 Patch7:		empty-ruby-version.patch
 Patch8:		rubygems-2.0.0-binary-extensions.patch
 Patch9:		custom-rubygems-location.patch
@@ -431,7 +430,6 @@ Biblioteka JSON dla języka Ruby.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
diff --git a/DESTDIR.patch b/DESTDIR.patch
deleted file mode 100644
index 93ef17a..0000000
--- a/DESTDIR.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 28e8a4ad0146fef37b514bde9a27ba5b6f7c34c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
-Date: Tue, 2 Jul 2013 11:51:50 +0200
-Subject: [PATCH] Revert "mkmf.rb: prefix install_dirs only with DESTDIR"
-
-Fixes issues with DESTDIR.
-https://bugs.ruby-lang.org/issues/8115
-
-This reverts commit 7e1d5045943835ff906850e7b3bc71f985ae5f36.
----
- lib/mkmf.rb | 29 ++++++++++++++---------------
- 1 file changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index ee89198..cca487e 100644
---- a/lib/mkmf.rb
-+++ b/lib/mkmf.rb
-@@ -189,21 +189,21 @@ module MakeMakefile
-       ]
-     elsif $configure_args.has_key?('--vendor')
-       dirs = [
--        ['BINDIR',        '$(DESTDIR)$(bindir)'],
--        ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'],
--        ['RUBYLIBDIR',    '$(DESTDIR)$(vendorlibdir)$(target_prefix)'],
--        ['RUBYARCHDIR',   '$(DESTDIR)$(vendorarchdir)$(target_prefix)'],
--        ['HDRDIR',        '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
--        ['ARCHHDRDIR',    '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
-+        ['BINDIR',        '$(bindir)'],
-+        ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
-+        ['RUBYLIBDIR',    '$(vendorlibdir)$(target_prefix)'],
-+        ['RUBYARCHDIR',   '$(vendorarchdir)$(target_prefix)'],
-+        ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
-+        ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
-       ]
-     else
-       dirs = [
--        ['BINDIR',        '$(DESTDIR)$(bindir)'],
--        ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'],
--        ['RUBYLIBDIR',    '$(DESTDIR)$(sitelibdir)$(target_prefix)'],
--        ['RUBYARCHDIR',   '$(DESTDIR)$(sitearchdir)$(target_prefix)'],
--        ['HDRDIR',        '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
--        ['ARCHHDRDIR',    '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
-+        ['BINDIR',        '$(bindir)'],
-+        ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
-+        ['RUBYLIBDIR',    '$(sitelibdir)$(target_prefix)'],
-+        ['RUBYARCHDIR',   '$(sitearchdir)$(target_prefix)'],
-+        ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
-+        ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
-       ]
-     end
-     dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
-@@ -1728,7 +1728,6 @@ SRC
-   end
- 
-   def with_destdir(dir)
--    return dir unless $extmk
-     dir = dir.sub($dest_prefix_pattern, '')
-     /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
-   end
-@@ -1787,8 +1786,8 @@ ECHO = $(ECHO1:0=@echo)
- #### Start of system configuration section. ####
- #{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
- srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}}
--topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}
--hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}
-+topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace}
-+hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace}
- arch_hdrdir = #{$arch_hdrdir.quote}
- PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
- VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
--- 
-1.8.2.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/1b39e8e22a3dd0b855f903aac5744de6864ab6b1



More information about the pld-cvs-commit mailing list