- Add RUBY_HAS_ARCHLIB.

- Merge some fixes from Ruby 1.8.2 bundled version.

Bump PKG_REVISION, ruby16-webric-1.3.1nb1.

6 files changed, 90 insertions, 2 deletions

diff --git a/www/ruby-webrick/Makefile b/www/ruby-webrick/Makefile
index 611cc6373ff..5d31cbc360c 100644
--- a/www/ruby-webrick/Makefile
+++ b/www/ruby-webrick/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/12/01 15:40:23 taca Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/28 14:20:44 taca Exp $
 #
 
 DISTNAME=	webrick-1.3.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.webrick.org/src/
 
diff --git a/www/ruby-webrick/distinfo b/www/ruby-webrick/distinfo
index 8d0bf8304c6..80261bd6736 100644
--- a/www/ruby-webrick/distinfo
+++ b/www/ruby-webrick/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/12/17 15:24:15 taca Exp $
+$NetBSD: distinfo,v 1.4 2005/01/28 14:20:44 taca Exp $
 
 SHA1 (ruby/webrick-1.3.1.tar.gz) = 86ced9c5f04ba43ba94d04e5109295f0923c370a
 Size (ruby/webrick-1.3.1.tar.gz) = 71575 bytes
+SHA1 (patch-aa) = b293f75397c5cdfb136471951d97f420949a3197
+SHA1 (patch-ab) = eb26b842823df8689931f9210a14dacc5ddd1679
+SHA1 (patch-ac) = c0db32acc9d8fbca572a9f53c5b1a067a4b7afdd
+SHA1 (patch-ad) = 4764ed11b875ce2cbb1e7b109d5c77394e22c907
diff --git a/www/ruby-webrick/patches/patch-aa b/www/ruby-webrick/patches/patch-aa
new file mode 100644
index 00000000000..e068ad8e1a8
--- /dev/null
+++ b/www/ruby-webrick/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2005/01/28 14:20:44 taca Exp $
+
+--- lib/webrick/httpauth.rb.orig	2003-07-23 04:20:42.000000000 +0900
++++ lib/webrick/httpauth.rb
+@@ -14,6 +14,7 @@ require 'webrick/httpauth/digestauth'
+ require 'webrick/httpauth/htpasswd'
+ require 'webrick/httpauth/htdigest'
+ require 'webrick/httpauth/htgroup'
++require 'base64'
+ 
+ module WEBrick
+   module HTTPAuth
+@@ -23,7 +24,7 @@ module WEBrick
+       user = pass = nil
+       if /^Basic\s+(.*)/o =~ req[req_field]
+         userpass = $1
+-        user, pass = decode64(userpass).split(":", 2)
++        user, pass = Base64.decode64(userpass).split(":", 2)
+       end
+       if block.call(user, pass)
+         req.user = user
diff --git a/www/ruby-webrick/patches/patch-ab b/www/ruby-webrick/patches/patch-ab
new file mode 100644
index 00000000000..0ae01917ca7
--- /dev/null
+++ b/www/ruby-webrick/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/01/28 14:20:44 taca Exp $
+
+--- lib/webrick/httpauth/basicauth.rb.orig	2003-02-20 16:15:47.000000000 +0900
++++ lib/webrick/httpauth/basicauth.rb
+@@ -35,7 +35,7 @@ module WEBrick
+         unless basic_credentials = check_scheme(req)
+           challenge(req, res)
+         end
+-        userid, password = decode64(basic_credentials).split(":", 2) 
++        userid, password = Base64.decode64(basic_credentials).split(":", 2) 
+         password ||= ""
+         if userid.empty?
+           error("user id was not given.")
diff --git a/www/ruby-webrick/patches/patch-ac b/www/ruby-webrick/patches/patch-ac
new file mode 100644
index 00000000000..a9ec4eddebc
--- /dev/null
+++ b/www/ruby-webrick/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2005/01/28 14:20:44 taca Exp $
+
+--- lib/webrick/httpauth/digestauth.rb.orig	2003-02-20 16:15:47.000000000 +0900
++++ lib/webrick/httpauth/digestauth.rb
+@@ -175,11 +175,11 @@ module WEBrick
+ 
+         if auth_req['qop'] == "auth" || auth_req['qop'] == nil
+           ha2 = hexdigest(req.request_method, auth_req['uri'])
+-          ha2_res = digest("", auth_req['uri'])
++          ha2_res = hexdigest("", auth_req['uri'])
+         elsif auth_req['qop'] == "auth-int"
+           ha2 = hexdigest(req.request_method, auth_req['uri'],
+                           hexdigest(req.body))
+-          ha2_res = digest("", auth_req['uri'], hexdigest(req.body))
++          ha2_res = hexdigest("", auth_req['uri'], hexdigest(res.body))
+         end
+ 
+         if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
+@@ -332,9 +332,6 @@ module WEBrick
+         @h.hexdigest(args.join(":"))
+       end
+ 
+-      def digest(*args)
+-        @h.digest(args.join(":"))
+-      end
+     end
+ 
+     class ProxyDigestAuth < DigestAuth
diff --git a/www/ruby-webrick/patches/patch-ad b/www/ruby-webrick/patches/patch-ad
new file mode 100644
index 00000000000..95144c597a8
--- /dev/null
+++ b/www/ruby-webrick/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2005/01/28 14:20:44 taca Exp $
+
+--- lib/webrick/httpauth/htpasswd.rb.orig	2003-07-23 04:20:45.000000000 +0900
++++ lib/webrick/httpauth/htpasswd.rb
+@@ -32,7 +32,15 @@ module WEBrick
+           open(@path){|io|
+             while line = io.gets
+               line.chomp!
+-              user, pass = line.split(":")
++              case line
++              when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
++                user, pass = line.split(":")
++              when /:\$/, /:{SHA}/
++                raise NotImplementedError,
++                      'MD5, SHA1 .htpasswd file not supported'
++              else
++                raise StandardError, 'bad .htpasswd file'
++              end
+               @passwd[user] = pass
+             end
+           }