 @@ -1,21 +1,21 @@
-# $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}
 COMMENT=	Ruby 1.8 based release minimum package
 RUBY_VERSION=	${RUBY18_VERSION}
 CONFLICTS=	${RUBY_PKGPREFIX}-dbm-[0-9]* \
 		${RUBY_PKGPREFIX}-digest-[0-9]* \
 		${RUBY_PKGPREFIX}-iconv-[0-9]* \
 		${RUBY_PKGPREFIX}-openssl-[0-9]* \
 		${RUBY_PKGPREFIX}-tcltk-[0-9]*
 @@ -25,27 +25,27 @@ USE_LANGUAGES=	c
 USE_TOOLS+=	pax yacc
 GNU_CONFIGURE=	yes
 TEST_TARGET=	test
 CONFIGURE_ARGS+= --enable-shared \
 		--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
 		--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
 WRKSRC=		${RUBY_WRKSRC}
 .include "../../mk/compiler.mk"
 .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
 .endif
 # Ruby build process depends on config.status's content
 CONFIG_STATUS_OVERRIDE=	# empty
 MAKE_DIRS+=	${RUBY_SITERIDIR}
 FILES_SUBST+=	DATE=${DATE:Q}
 .include "options.mk"

 @@ -1,27 +1,27 @@
-$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
 Size (ruby-1.8.7-p174.tar.bz2) = 4144807 bytes
 SHA1 (patch-aa) = 88e4a338c4ca40b32f9e3748eb825769631c3e76
 SHA1 (patch-ab) = 93a3dc95ee5e5cd6c7584240a285fa39b6f21efd
 SHA1 (patch-ac) = 77c3ba81bb65d13475bf7ea64328fbc35fe788bf
 SHA1 (patch-bd) = fb1a6a6724210c2fd84464d028932e78890ad7da
 SHA1 (patch-be) = 79cd592267068820fa2225242034819ba38aa0b1
 SHA1 (patch-dj) = 436c3c0704b878427d947b2e27e5ce0a057eebeb
 SHA1 (patch-dk) = 2d436ac4089aa7d818b337de81f405fc5836c9af
 SHA1 (patch-dl) = 687803dc966594479467fc4b5e7bd45e767daa2b
 SHA1 (patch-dm) = ab3063fecee241420a66d5d6f4ef8bf37440e70d
 SHA1 (patch-dn) = f63e0cb7dbd86b4a2c022156fddd22c1ccdd5666
 SHA1 (patch-do) = f9eda9e784da02dff203fd47e8f1ee6871a6a9d4
 SHA1 (patch-dp) = 0b50909072159937c62944a38763fd18ce3181db
 SHA1 (patch-dq) = f5a605c49afb29b2c3963a82d844ff4cdf3a8846
 SHA1 (patch-dr) = e0fa1dc8674c6412d73bc4ccd2cfc8b4acad744a
 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

 @@ -1,27 +1,27 @@
-$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.
 http://www.ruby-lang.org/en/news/2010/01/10/webrick-escape-sequence-injection/
 --- lib/webrick/accesslog.rb.orig	2007-02-12 23:01:19.000000000 +0000
 +++ lib/webrick/accesslog.rb
 @@ -53,15 +53,23 @@ module WEBrick
           when ?e, ?i, ?n, ?o
             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 ?%
             "%"
           else
 -           params[spec]
 +           escape(params[spec].to_s)
           end
+       }
      end
++
 +    def escape(data)
 +      if data.tainted?

 @@ -1,49 +1,50 @@
-$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.
 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
++    class Status < StandardError
-+      def initialize(message=self.class, *rest)
++      def initialize(*args)
-+        super(AccessLog.escape(message), *rest)
++        args[0] = AccessLog.escape(args[0]) unless args.empty?
 +        super(*args)
 +      end
 +      class << self
 +        attr_reader :code, :reason_phrase
 +      end
 +      def code() self::class::code end
 +      def reason_phrase() self::class::reason_phrase end
 +      alias to_i code
 +    end
      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|
 +      message.freeze
        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
 -      eval %-
 -        RC_#{var_name} = #{code}
 -        class #{err_name} < #{parent}
 -          def self.code() RC_#{var_name} end
 -          def self.reason_phrase() StatusMessage[code] end
 -          def code() self::class::code end
 -          def reason_phrase() self::class::reason_phrase end
 -          alias to_i code
 -        end
 -      -