diff options
| author |   Nguyen Thai Ngoc Duy <pclouds@gentoo.org> | 2007-01-27 15:38:37 +0000 |
|---|---|---|
| committer | Nguyen Thai Ngoc Duy <pclouds@gentoo.org> | 2007-01-27 15:38:37 +0000 |
| commit | 5ab2ed4feede383475d55793b0d271de49262cbf (patch) | |
| tree | dde7e36670a2b068010f3f795818016806d877fb /dev-ruby | |
| parent | fix menu-entry, patch by Pacho Ramos, bug #159756 (diff) | |
| download | gentoo-2-5ab2ed4feede383475d55793b0d271de49262cbf.tar.gz gentoo-2-5ab2ed4feede383475d55793b0d271de49262cbf.tar.bz2 gentoo-2-5ab2ed4feede383475d55793b0d271de49262cbf.zip | |
Fixed the patch not too sensitive about duplicated slashes, #163536
(Portage version: 2.1.2_rc4-r5)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/rubygems/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index 368cdb3f11be..7a41b5cc7e8e 100644 --- a/dev-ruby/rubygems/ChangeLog +++ b/dev-ruby/rubygems/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/rubygems # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.43 2007/01/26 15:59:37 pclouds Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.44 2007/01/27 15:38:37 pclouds Exp $ + + 27 Jan 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org> + files/0.8.11-install.rb.extract_files.patch: + Fixed the patch not too sensitive about duplicated slashes, #163536 26 Jan 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org> rubygems-0.8.11-r5.ebuild, rubygems-0.8.11-r6.ebuild, diff --git a/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch b/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch index d02a809874c0..d1e3779bf4ee 100644 --- a/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch +++ b/dev-ruby/rubygems/files/0.8.11-install.rb.extract_files.patch @@ -30,7 +30,7 @@ Index: lib/rubygems/installer.rb + "attempt to install file into #{entry['path'].inspect}" + end + path = File.expand_path File.join(directory, path) -+ if path !~ /\A#{Regexp.escape directory}/ then ++ if path !~ /\A#{Regexp.escape(File.expand_path(directory))}/ then + raise Gem::InstallError, + "attempt to install file into #{entry['path'].inspect}" + end |