summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/ruby18-base/PLIST3
-rw-r--r--lang/ruby18-base/distinfo12
-rw-r--r--lang/ruby18-base/patches/patch-ae15
-rw-r--r--lang/ruby18-base/patches/patch-cq80
-rw-r--r--lang/ruby18-base/patches/patch-es15
-rw-r--r--lang/ruby18-base/patches/patch-ex18
6 files changed, 6 insertions, 137 deletions
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index 4eac5f9d745..4a439dd318f 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2010/11/17 14:27:09 taca Exp $
+@comment $NetBSD: PLIST,v 1.19 2010/12/26 12:31:20 taca Exp $
bin/erb${RUBY_VER}
bin/h2rb${RUBY_VER}
bin/irb${RUBY_VER}
@@ -174,6 +174,7 @@ ${RUBY_LIB}/openssl.rb
${RUBY_LIB}/openssl/bn.rb
${RUBY_LIB}/openssl/buffering.rb
${RUBY_LIB}/openssl/cipher.rb
+${RUBY_LIB}/openssl/config.rb
${RUBY_LIB}/openssl/digest.rb
${RUBY_LIB}/openssl/pkcs7.rb
${RUBY_LIB}/openssl/ssl-internal.rb
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 0f0563e149a..c27008aa010 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,18 +1,16 @@
-$NetBSD: distinfo,v 1.45 2010/09/10 03:29:00 taca Exp $
+$NetBSD: distinfo,v 1.46 2010/12/26 12:31:20 taca Exp $
-SHA1 (ruby-1.8.7-p302.tar.bz2) = d93bd2f1099f3473b496cda2422b27a8da2beb00
-RMD160 (ruby-1.8.7-p302.tar.bz2) = 763bc840316cb1080d46445cdc3ca7722d576591
-Size (ruby-1.8.7-p302.tar.bz2) = 4184764 bytes
+SHA1 (ruby-1.8.7-p330.tar.bz2) = 92a7eddcfe41f8c10013cbd8122eeb88624eb335
+RMD160 (ruby-1.8.7-p330.tar.bz2) = abe8eb36618e0b3d005a883d73887686177795c2
+Size (ruby-1.8.7-p330.tar.bz2) = 4191156 bytes
SHA1 (patch-aa) = 4c1572b5a1eb65e89a98c60540433a69cb96dd23
SHA1 (patch-ab) = b56b6c2ba182414492c803d36433730602e0a591
SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b
-SHA1 (patch-ae) = 00a74c7bf9578868bc3c0aabc284bbaf1c1d127c
SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044
SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550
SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99
SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45
-SHA1 (patch-cq) = db4a3927a7e0f8fdf004dd198734ce2a4dc39edd
SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106
SHA1 (patch-dk) = ee85c9489f6074e6818713746691ce99ef778159
SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630
@@ -44,11 +42,9 @@ SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27
SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1
SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657
SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7
-SHA1 (patch-es) = 79ca11360ae94753f972a420f7c6968b07b239df
SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac
SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625
SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
SHA1 (patch-ew) = ddb8066a3e63b049e43c569e8d95b872eea0c247
-SHA1 (patch-ex) = 146eadb2ea1bab3c450f181da986702041912ec9
SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
diff --git a/lang/ruby18-base/patches/patch-ae b/lang/ruby18-base/patches/patch-ae
deleted file mode 100644
index 6e867ef050d..00000000000
--- a/lang/ruby18-base/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2010/09/10 03:29:00 taca Exp $
-
-Suppress warnings.
-
---- ext/openssl/ossl_config.c.orig 2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_config.c
-@@ -449,7 +449,7 @@ static VALUE
- ossl_config_inspect(VALUE self)
- {
- VALUE str, ary = ossl_config_get_sections(self);
-- char *cname = rb_class2name(rb_obj_class(self));
-+ const char *cname = rb_class2name(rb_obj_class(self));
-
- str = rb_str_new2("#<");
- rb_str_cat2(str, cname);
diff --git a/lang/ruby18-base/patches/patch-cq b/lang/ruby18-base/patches/patch-cq
deleted file mode 100644
index 062b93a838c..00000000000
--- a/lang/ruby18-base/patches/patch-cq
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-cq,v 1.1 2010/09/10 03:29:00 taca Exp $
-
-* r26209: rename {addr,name}info functions to ensure those are used on darwin.
-
---- ext/socket/extconf.rb.orig 2009-02-25 06:06:08.000000000 +0000
-+++ ext/socket/extconf.rb
-@@ -119,8 +119,8 @@ if have_func("sendmsg") | have_func("rec
- have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
- end
-
--getaddr_info_ok = enable_config("wide-getaddrinfo") do
-- checking_for("wide getaddrinfo") {try_run(<<EOF)}
-+getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
-+ (checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
- #{cpp_include(headers)}
- #include <stdlib.h>
-
-@@ -222,7 +222,6 @@ main()
- exit(EXIT_FAILURE);
- }
- EOF
--end
- if ipv6 and not getaddr_info_ok
- abort <<EOS
-
-@@ -247,11 +246,32 @@ Fatal: invalid value for --with-lookup-o
- EOS
- end
-
-+have_type("struct addrinfo", headers)
-+have_func("freehostent")
-+have_func("freeaddrinfo")
-+if have_func("gai_strerror")
-+ if checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)}
-+#{cpp_include(headers)}
-+#include <stdlib.h>
-+void
-+conftest_gai_strerror_is_const()
-+{
-+ *gai_strerror(0) = 0;
-+}
-+EOF
-+ $defs << "-DGAI_STRERROR_CONST"
-+ end
-+end
-+
- $objs = ["socket.#{$OBJEXT}"]
-
--unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("getaddrinfo", "netdb.h")
-+if getaddr_info_ok == :wide or
-+ !have_func("getnameinfo", headers) or !have_func("getaddrinfo", headers)
- if have_struct_member("struct in6_addr", "s6_addr8", headers)
-- $defs[-1] = "-DHAVE_ADDR8"
-+ $defs[-1] = "s6_addr=s6_addr8"
-+ end
-+ if ipv6 == "kame" && have_struct_member("struct in6_addr", "s6_addr32", headers)
-+ $defs[-1] = "-DFAITH"
- end
- $CPPFLAGS="-I. "+$CPPFLAGS
- $objs += ["getaddrinfo.#{$OBJEXT}"]
-@@ -259,19 +279,6 @@ unless getaddr_info_ok and have_func("ge
- have_func("inet_ntop") or have_func("inet_ntoa")
- have_func("inet_pton") or have_func("inet_aton")
- have_func("getservbyport")
-- if have_func("gai_strerror")
-- unless checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)}
--#{cpp_include(headers)}
--#include <stdlib.h>
--void
--conftest_gai_strerror_is_const()
--{
-- *gai_strerror(0) = 0;
--}
--EOF
-- $defs << "-DGAI_STRERROR_CONST"
-- end
-- end
- have_header("arpa/nameser.h")
- have_header("resolv.h")
- end
diff --git a/lang/ruby18-base/patches/patch-es b/lang/ruby18-base/patches/patch-es
deleted file mode 100644
index f0cc1bc5c9e..00000000000
--- a/lang/ruby18-base/patches/patch-es
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-es,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26140: (strio_getline): fix for "" as separator.
-
---- ext/stringio/stringio.c.orig 2009-12-24 08:54:26.000000000 +0000
-+++ ext/stringio/stringio.c
-@@ -933,7 +933,7 @@ strio_getline(argc, argv, ptr)
- s = p;
- while ((p = memchr(p, '\n', e - p)) && (p != e)) {
- if (*++p == '\n') {
-- e = p;
-+ e = p + 1;
- break;
- }
- }
diff --git a/lang/ruby18-base/patches/patch-ex b/lang/ruby18-base/patches/patch-ex
deleted file mode 100644
index 61a9a0dad6e..00000000000
--- a/lang/ruby18-base/patches/patch-ex
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ex,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r17429: (Net::POP3#set_all_uids): speed up.
-
---- lib/net/pop.rb.orig 2009-02-03 05:35:56.000000000 +0000
-+++ lib/net/pop.rb
-@@ -683,9 +683,8 @@ module Net
- end
-
- def set_all_uids #:nodoc: internal use only (called from POPMail#uidl)
-- command().uidl.each do |num, uid|
-- @mails.find {|m| m.number == num }.uid = uid
-- end
-+ uidl = command().uidl
-+ @mails.each {|m| m.uid = uidl[m.number] }
- end
-
- def logging(msg)