Fix a small problem by precious webrick security fix from Ruby's

repositry (r26281).

Also use COMPILER_RPATH_FLAG in Makefile.

Bump PKGREVISION.

4 files changed, 16 insertions, 15 deletions

diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 77c7da2d6dd..f1ebd080308 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.53 2010/01/10 15:33:28 taca Exp $
+# $NetBSD: Makefile,v 1.54 2010/01/14 15:07:28 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
-PKGREVISION=	3
+PKGREVISION=	4
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
@@ -35,7 +35,7 @@ WRKSRC=		${RUBY_WRKSRC}
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
 LIBS.SunOS+=	-B static -lsunmath -B dynamic -lm
-LDFLAGS.SunOS+=	-L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib
+LDFLAGS.SunOS+=	-L${SUNWSPROBASE}/lib ${COMPILER_RPATH_FLAG}${SUNWSPROBASE}/lib
 CONFIGURE_ENV+=	LDSHARED="${CC} -G"
 .else
 LIBS.SunOS+=	-lm
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index f053fdb04cb..0651b4a2251 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2010/01/10 15:33:28 taca Exp $
+$NetBSD: distinfo,v 1.42 2010/01/14 15:07:28 taca Exp $
 
 SHA1 (ruby-1.8.7-p174.tar.bz2) = 9e84b49ad545ad54b8e7dc3c227eaaefeb1041aa
 RMD160 (ruby-1.8.7-p174.tar.bz2) = f854d456003af1e31d50330c88c3cb152c434249
@@ -21,7 +21,7 @@ SHA1 (patch-ds) = 5344a63980b88d83e279cee50398312b90d5c2da
 SHA1 (patch-dt) = 3dd34a91cbffcb8e432d926c9490372f238e7f2e
 SHA1 (patch-du) = 55f021e2eb780743e35ecf70141f7738b04f4b62
 SHA1 (patch-dv) = 25e779444c16717c7aaf800ebf68988878ed636f
-SHA1 (patch-dw) = 4937ee0f2b79cfc93f378b415d1a81cbf997b8d4
+SHA1 (patch-dw) = 51ad1f521713af85be9ae192049930285e89be41
 SHA1 (patch-dx) = d25267d700f997b951a65c016f45347a8b1a1517
-SHA1 (patch-dy) = 6c2f978b1803d2939377a4904cfc71e71a3b5fea
+SHA1 (patch-dy) = 7c57240a1447346c8e6f2e4e9c7104b1a7d9dbc9
 SHA1 (patch-dz) = 52af1fbf17b6e6df6112d08c291215d54a25af67
diff --git a/lang/ruby18-base/patches/patch-dw b/lang/ruby18-base/patches/patch-dw
index 1866e6bb5dc..014888aa75b 100644
--- a/lang/ruby18-base/patches/patch-dw
+++ b/lang/ruby18-base/patches/patch-dw
@@ -1,4 +1,4 @@
-$NetBSD: patch-dw,v 1.1 2010/01/10 15:33:28 taca Exp $
+$NetBSD: patch-dw,v 1.2 2010/01/14 15:07:28 taca Exp $
 
 webrick security fix.
 
@@ -11,7 +11,7 @@ http://www.ruby-lang.org/en/news/2010/01/10/webrick-escape-sequence-injection/
             raise AccessLogError,
               "parameter is required for \"#{spec}\"" unless param
 -           params[spec][param] || "-"
-+           param = params[spec][param] ? escape(param) : "-"
++           (param = params[spec][param]) ? escape(param) : "-"
           when ?t
             params[spec].strftime(param || CLF_TIME_FORMAT)
           when ?%
diff --git a/lang/ruby18-base/patches/patch-dy b/lang/ruby18-base/patches/patch-dy
index 279c053ccb1..bdbc0f2b70c 100644
--- a/lang/ruby18-base/patches/patch-dy
+++ b/lang/ruby18-base/patches/patch-dy
@@ -1,4 +1,4 @@
-$NetBSD: patch-dy,v 1.1 2010/01/10 15:33:28 taca Exp $
+$NetBSD: patch-dy,v 1.2 2010/01/14 15:07:28 taca Exp $
 
 webrick security fix.
 
@@ -6,14 +6,15 @@ http://www.ruby-lang.org/en/news/2010/01/10/webrick-escape-sequence-injection/
 
 --- lib/webrick/httpstatus.rb.orig	2007-02-12 23:01:19.000000000 +0000
 +++ lib/webrick/httpstatus.rb
-@@ -12,7 +12,17 @@ module WEBrick
+@@ -12,7 +12,18 @@ module WEBrick
  
    module HTTPStatus
  
 -    class Status      < StandardError; end
-+    class Status      < StandardError
-+      def initialize(message=self.class, *rest)
-+        super(AccessLog.escape(message), *rest)
++    class Status < StandardError
++      def initialize(*args)
++        args[0] = AccessLog.escape(args[0]) unless args.empty?
++        super(*args)
 +      end
 +      class << self
 +        attr_reader :code, :reason_phrase
@@ -25,7 +26,7 @@ http://www.ruby-lang.org/en/news/2010/01/10/webrick-escape-sequence-injection/
      class Info        < Status; end
      class Success     < Status; end
      class Redirect    < Status; end
-@@ -68,6 +78,7 @@ module WEBrick
+@@ -68,6 +79,7 @@ module WEBrick
      CodeToError = {}
  
      StatusMessage.each{|code, message|
@@ -33,7 +34,7 @@ http://www.ruby-lang.org/en/news/2010/01/10/webrick-escape-sequence-injection/
        var_name = message.gsub(/[ \-]/,'_').upcase
        err_name = message.gsub(/[ \-]/,'')
  
-@@ -79,18 +90,12 @@ module WEBrick
+@@ -79,18 +91,12 @@ module WEBrick
        when 500...600; parent = ServerError
        end