From 55f822b7d5373a9c82abdbbae72b8a2a054c2b32 Mon Sep 17 00:00:00 2001 From: Nguyen Thai Ngoc Duy Date: Sat, 27 Jan 2007 15:38:37 +0000 Subject: [PATCH] Fixed the patch not too sensitive about duplicated slashes, #163536 Package-Manager: portage-2.1.2_rc4-r5 --- dev-ruby/rubygems/ChangeLog | 6 +++++- dev-ruby/rubygems/Manifest | 16 ++++++++-------- .../files/0.8.11-install.rb.extract_files.patch | 2 +- 3 files changed, 14 insertions(+), 10 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 + 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 rubygems-0.8.11-r5.ebuild, rubygems-0.8.11-r6.ebuild, diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest index 7a90ac4554c3..07d00b368d06 100644 --- a/dev-ruby/rubygems/Manifest +++ b/dev-ruby/rubygems/Manifest @@ -1,7 +1,7 @@ -AUX 0.8.11-install.rb.extract_files.patch 1397 RMD160 1a204e3555318b9d83ef8d1a8fe3dff185ef8aed SHA1 b7cac69eeed99e43e99bbb2c6920987de0429ba1 SHA256 d46ef2483352a162742f111e1c378442b03d7dc87b186ac6139cf87249c99872 -MD5 31e3bacd1821de0272864c153b7c0dca files/0.8.11-install.rb.extract_files.patch 1397 -RMD160 1a204e3555318b9d83ef8d1a8fe3dff185ef8aed files/0.8.11-install.rb.extract_files.patch 1397 -SHA256 d46ef2483352a162742f111e1c378442b03d7dc87b186ac6139cf87249c99872 files/0.8.11-install.rb.extract_files.patch 1397 +AUX 0.8.11-install.rb.extract_files.patch 1416 RMD160 1af89ae0536a8139a849e66a71e27c205b1a5a0a SHA1 f7feb72e775ddaf48b455f66a719575306e4e09b SHA256 801106efb151be063fca60dd3eed4a981424e4a7ce65f60eb97606453ebffde2 +MD5 3b30b6d6252ec0148863e438db59c8a3 files/0.8.11-install.rb.extract_files.patch 1416 +RMD160 1af89ae0536a8139a849e66a71e27c205b1a5a0a files/0.8.11-install.rb.extract_files.patch 1416 +SHA256 801106efb151be063fca60dd3eed4a981424e4a7ce65f60eb97606453ebffde2 files/0.8.11-install.rb.extract_files.patch 1416 AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833 MD5 15ffbd574f0d1b8f0e79d060c92749b4 files/10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 files/10rubygems 21 @@ -53,10 +53,10 @@ EBUILD rubygems-0.9.1.ebuild 2194 RMD160 3f60414a8907c6f5927e590ac158fd110496da1 MD5 5b4a1d949e3d6389de177529da7b3dc5 rubygems-0.9.1.ebuild 2194 RMD160 3f60414a8907c6f5927e590ac158fd110496da18 rubygems-0.9.1.ebuild 2194 SHA256 d6818215f5e13c1d2793bd40c2cbc2968fd9701418a171a0dc4c479847f1512c rubygems-0.9.1.ebuild 2194 -MISC ChangeLog 7080 RMD160 bc2d7d3aeb2a4abec76f3266936ac57060640655 SHA1 3290bdff50eea46a312cc8a493cba3e28ebb0afd SHA256 2e0f0591559d9b43dce55936cdf73e35fb44a12d8e5090cfcccc315effd21555 -MD5 f56d70011fb186b287768d437ad19589 ChangeLog 7080 -RMD160 bc2d7d3aeb2a4abec76f3266936ac57060640655 ChangeLog 7080 -SHA256 2e0f0591559d9b43dce55936cdf73e35fb44a12d8e5090cfcccc315effd21555 ChangeLog 7080 +MISC ChangeLog 7260 RMD160 cfdfa1b2d9033d3331f70b2aba16026677a4f272 SHA1 ace5f188854c5c5adf88e8e5732643174d759ecb SHA256 303fb28f21162bc42a69a803cdb4393d79e05313ba8396c2cc5ee37940ec4504 +MD5 5299e654ad5f5b66492543671f608867 ChangeLog 7260 +RMD160 cfdfa1b2d9033d3331f70b2aba16026677a4f272 ChangeLog 7260 +SHA256 303fb28f21162bc42a69a803cdb4393d79e05313ba8396c2cc5ee37940ec4504 ChangeLog 7260 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 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 -- 2.26.2