--- a/components/ruby/Makefile	Fri Aug 02 11:53:04 2013 -0700
+++ b/components/ruby/Makefile	Mon Aug 05 09:57:35 2013 -0700
@@ -20,19 +20,19 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ruby
 COMPONENT_VERSION=	1.8.7
-COMPONENT_PATCH_VERSION=	357
+COMPONENT_PATCH_VERSION=	374
 COMPONENT_PROJECT_URL=	http://www.ruby-lang.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-p$(COMPONENT_PATCH_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:5c64b63a597b4cb545887364e1fd1e0601a7aeb545e576e74a6d8e88a2765a37
+    sha256:b4e34703137f7bfb8761c4ea474f7438d6ccf440b3d35f39cc5e4d4e239c07e3
 COMPONENT_ARCHIVE_URL=	http://ftp.ruby-lang.org/pub/ruby/1.8/$(COMPONENT_ARCHIVE)
 IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
 COMPONENT_BUGDB=	utility/ruby
@@ -119,6 +119,15 @@
 # unreferenced symbol tgetent in libreadline, similar to CR #6919344
 LD_Z_IGNORE=
 
+# Several of the drb tests will leave stray ruby processes behind;
+# move these tests aside so they won't be run by the test target.
+# They aren't needed by the build or packages, so we keep them 
+# renamed.
+COMPONENT_PRE_TEST_ACTION += \
+	if [ -e $(SOURCE_DIR)/test/drb/test_drbssl.rb ]; then \
+		$(MV) $(SOURCE_DIR)/test/drb/test_drbssl.rb $(SOURCE_DIR)/test/drb/test_drbssl.rb-save; \
+	fi
+
 CONFIGURE_PREFIX =	$(USRDIR)/$(COMPONENT_NAME)/$(RUBY_VER)
 CONFIGURE_OPTIONS += $(DTRACE_FLAG)
 CONFIGURE_OPTIONS += --enable-shared

--- a/components/ruby/ruby-18.p5m	Fri Aug 02 11:53:04 2013 -0700
+++ b/components/ruby/ruby-18.p5m	Mon Aug 05 09:57:35 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri value=pkg:/runtime/ruby-18@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Ruby & RubyGems"
 set name=com.oracle.info.description value="Ruby & RubyGems"
-set name=com.oracle.info.tpno value=8863
+set name=com.oracle.info.tpno value=14356
 set name=info.classification value="org.opensolaris.category.2008:Development/Ruby"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -7416,6 +7416,10 @@
     path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/entity_expansion_limit%3d-c.yaml
 file \
     path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/entity_expansion_limit-c.yaml
+file \
+    path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/entity_expansion_text_limit-c.yaml
+file \
+    path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/entity_expansion_text_limit%3d-c.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/expanded_name-i.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/name-i.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Document/new-c.yaml
@@ -8023,6 +8027,7 @@
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/cdesc-Text.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/clone-i.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/empty%3f-i.yaml
+file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/expand-c.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/indent_text-i.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/inspect-i.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/Text/new-c.yaml
@@ -8216,6 +8221,8 @@
 file \
     path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/XPathParser/variables%3d-i.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/cdesc-REXML.yaml
+file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/entity_expansion_text_limit-c.yaml
+file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/REXML/entity_expansion_text_limit%3d-c.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/RI/AliasName/cdesc-AliasName.yaml
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_VER)/system/RI/AnsiFormatter/bold_print-i.yaml
 file \