Fixed insecure permission issue when using CGI::Session. See bug #60525.

6 files changed, 46 insertions, 7 deletions

diff --git a/dev-ruby/shim-ruby18/ChangeLog b/dev-ruby/shim-ruby18/ChangeLog
index eadd7dc72fd8..3e9ee0dd0001 100644
--- a/dev-ruby/shim-ruby18/ChangeLog
+++ b/dev-ruby/shim-ruby18/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/shim-ruby18
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/ChangeLog,v 1.7 2004/06/25 02:04:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/ChangeLog,v 1.8 2004/08/19 17:29:00 usata Exp $
+
+*shim-ruby18-1.8.1_pre3-r1 (20 Aug 2004)
+
+  20 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/shim-ruby18-CGI::Session.patch, -shim-ruby18-1.8.1_pre2.ebuild,
+  +shim-ruby18-1.8.1_pre3-r1.ebuild:
+  Fixed insecure permission issue when using CGI::Session. See bug #60525.
 
   17 Apr 2004; David Holm <dholm@gentoo.org> shim-ruby18-1.8.1_pre3.ebuild:
   Added to ~ppc.
diff --git a/dev-ruby/shim-ruby18/Manifest b/dev-ruby/shim-ruby18/Manifest
index b447997243e8..56a5d2984cdb 100644
--- a/dev-ruby/shim-ruby18/Manifest
+++ b/dev-ruby/shim-ruby18/Manifest
@@ -1,6 +1,7 @@
-MD5 fbb7516508561a1d464afb6a32d581ed shim-ruby18-1.8.1_pre2.ebuild 766
-MD5 9c1a0e66537af645f07ac3b0e8f15f2c ChangeLog 1122
+MD5 bc85ef2f99e86a5670556b272c19929e ChangeLog 1396
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 8fec2d13b91f57f32e13420619ae7083 shim-ruby18-1.8.1_pre3.ebuild 778
-MD5 5bf2aa03e12c37d6908b1714ebef9109 files/digest-shim-ruby18-1.8.1_pre2 82
+MD5 737bc10b850b1aea430dbef33b7aed4c shim-ruby18-1.8.1_pre3-r1.ebuild 864
+MD5 be3f217345935eb32d0a72b3b2686636 files/shim-ruby18-CGI::Session.patch 853
 MD5 1bee4786a6d10dd4fcad55da02c4a06b files/digest-shim-ruby18-1.8.1_pre3 82
+MD5 1bee4786a6d10dd4fcad55da02c4a06b files/digest-shim-ruby18-1.8.1_pre3-r1 82
diff --git a/dev-ruby/shim-ruby18/files/digest-shim-ruby18-1.8.1_pre2 b/dev-ruby/shim-ruby18/files/digest-shim-ruby18-1.8.1_pre2
deleted file mode 100644
index afd905c49e97..000000000000
--- a/dev-ruby/shim-ruby18/files/digest-shim-ruby18-1.8.1_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ca549e31eb526686ae89bc976a11d82 shim-ruby16_18-1.8.1-preview2.tar.bz2 476916
diff --git a/dev-ruby/shim-ruby18/files/digest-shim-ruby18-1.8.1_pre3-r1 b/dev-ruby/shim-ruby18/files/digest-shim-ruby18-1.8.1_pre3-r1
new file mode 100644
index 000000000000..70f12327d307
--- /dev/null
+++ b/dev-ruby/shim-ruby18/files/digest-shim-ruby18-1.8.1_pre3-r1
@@ -0,0 +1 @@
+MD5 5226e1abc45b167c6b508c692355f38f shim-ruby16_18-1.8.1-preview3.tar.bz2 543885
diff --git a/dev-ruby/shim-ruby18/files/shim-ruby18-CGI::Session.patch b/dev-ruby/shim-ruby18/files/shim-ruby18-CGI::Session.patch
new file mode 100644
index 000000000000..863a78470953
--- /dev/null
+++ b/dev-ruby/shim-ruby18/files/shim-ruby18-CGI::Session.patch
@@ -0,0 +1,25 @@
+diff -urN shim.orig/ruby16/lib/cgi/session/pstore.rb shim/ruby16/lib/cgi/session/pstore.rb
+--- shim.orig/ruby16/lib/cgi/session/pstore.rb	2003-11-01 01:38:20.000000000 +0900
++++ shim/ruby16/lib/cgi/session/pstore.rb	2004-08-20 02:16:59.000000000 +0900
+@@ -70,6 +70,9 @@
+ 	  @hash = {}
+ 	end
+ 	@p = ::PStore.new(path)
++	@p.transaction do |p|
++	  File.chmod(0600, p.path)
++	end
+       end
+ 
+       # Restore session state from the session's PStore file.
+diff -urN shim.orig/ruby16/lib/cgi/session.rb shim/ruby16/lib/cgi/session.rb
+--- shim.orig/ruby16/lib/cgi/session.rb	2003-11-01 01:38:20.000000000 +0900
++++ shim/ruby16/lib/cgi/session.rb	2004-08-20 02:15:46.000000000 +0900
+@@ -372,7 +372,7 @@
+ 	begin
+ 	  @f = open(path, "r+")
+ 	rescue Errno::ENOENT
+-	  @f = open(path, "w+")
++	  @f = File.open(path, File::CREAT|File::RDWR, 0600)
+ 	end
+       end
+ 
diff --git a/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild b/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3-r1.ebuild
index 35856c9b3646..d185f3430ebd 100644
--- a/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild
+++ b/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild,v 1.5 2004/06/25 02:04:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3-r1.ebuild,v 1.1 2004/08/19 17:29:00 usata Exp $
 
 inherit ruby
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/shim/${MY_P}.tar.bz2"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~sparc ~ppc"
 
 IUSE=""
 # don't define USE_RUBY since shim-ruby only supports ruby16
@@ -22,6 +22,12 @@ DEPEND="~dev-lang/ruby-1.6.8"
 
 S="${WORKDIR}/shim/ruby16"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-CGI::Session.patch
+}
+
 src_install() {
 
 	einstall || die