OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Dec-2006 18:03:26
Branch: HEAD Handle: 2006120417032600
Modified files:
openpkg-src/ruby ruby.patch ruby.spec
Log:
upgrading package: ruby 1.8.5 -> 1.8.5p2
Summary:
Revision Changes Path
1.10 +0 -17 openpkg-src/ruby/ruby.patch
1.47 +9 -5 openpkg-src/ruby/ruby.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ruby/ruby.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 ruby.patch
--- openpkg-src/ruby/ruby.patch 4 Nov 2006 13:17:39 -0000 1.9
+++ openpkg-src/ruby/ruby.patch 4 Dec 2006 17:03:26 -0000 1.10
@@ -22,20 +22,3 @@
db_check(dblib) and break
end
end
-
------------------------------------------------------------------------------
-
-Security Fix (CVE-2006-5467)
-
-Index: lib/cgi.rb
---- lib/cgi.rb.orig 2006-08-22 11:38:19 +0200
-+++ lib/cgi.rb 2006-11-04 14:11:46 +0100
-@@ -1018,7 +1018,7 @@
- else
- stdinput.read(content_length)
- end
-- if c.nil?
-+ if c.nil? || c.empty?
- raise EOFError, "bad content body"
- end
- buf.concat(c)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ruby/ruby.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 ruby.spec
--- openpkg-src/ruby/ruby.spec 4 Nov 2006 13:17:39 -0000 1.46
+++ openpkg-src/ruby/ruby.spec 4 Dec 2006 17:03:26 -0000 1.47
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package versions
+%define V_dst 1.8.5-p2
+%define V_opkg 1.8.5p2
+
# package information
Name: ruby
Summary: The Ruby Scripting Language
@@ -32,11 +36,11 @@
Class: BASE
Group: Language
License: GPL
-Version: 1.8.5
-Release: 20061104
+Version: %{V_opkg}
+Release: 20061204
# list of sources
-Source0: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{version}.tar.gz
+Source0: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{V_dst}.tar.gz
Patch0: ruby.patch
# build information
@@ -55,13 +59,13 @@
%track
prog ruby = {
- version = %{version}
+ version = %{V_dst}
url = ftp://ftp.ruby-lang.org/pub/ruby/
regex = ruby-(__VER__)\.tar\.gz
}
%prep
- %setup -q
+ %setup -q -n ruby-%{V_dst}
%patch -p0
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
