Update ruby193 and related packages to 1.9.3p429 (Ruby 1.9.3 patchlevel 429).

pkgsrc changes:

  * Fix gem command creating extra directories.

Quote from release announce:

  This release includes a security fix about bundled DL / Fiddle.

  * Object taint bypassing in DL and Fiddle in Ruby (CVE-2013-2065)

	http://www.ruby-lang.org/en/news/2013/05/14/taint-bypass-dl-fiddle-cve-2013-2065/

  * And some small bugfixes are also included.

    See tickets:

	https://bugs.ruby-lang.org/projects/ruby-193/issues?set_filter=1&status_id=5
    ChangeLog for details.

	http://svn.ruby-lang.org/repos/ruby/tags/v1_9_3_426/ChangeLog

7 files changed, 56 insertions, 57 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 7ab6ba0996f..c3d9a2799f0 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.98 2013/05/14 15:18:05 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.99 2013/05/16 16:13:59 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -206,7 +206,7 @@ RUBY193_VERSION=	1.9.3
 
 # patch
 RUBY18_PATCHLEVEL=	pl371
-RUBY193_PATCHLEVEL=	p392
+RUBY193_PATCHLEVEL=	p429
 
 # current API compatible version; used for version of shared library
 RUBY18_API_VERSION=	1.8.7
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 171a6a1ac3f..d9ef8f6b16a 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/04/20 02:30:17 obache Exp $
+# $NetBSD: Makefile,v 1.30 2013/05/16 16:13:59 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -83,6 +83,9 @@ CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VERSION}
 CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc"
 .endif
 
+#
+# Win32 support (for Cygwin)
+#
 PLIST_VARS+=	win32
 .if ${OPSYS} == "Cygwin"
 PLIST.win32=	yes
@@ -104,7 +107,7 @@ CONFIGURE_ENV+=	ac_cv_header_ucontext_h=no
 .endif
 
 #
-# work around for Linux
+# work around for Linux and Cygwin
 #
 .if ${OPSYS} == "Linux" || ${OPSYS} == "Cygwin"
 CONFIGURE_ENV+=	MKDIR_P=${MKDIR:Q}
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 4b7c31ecb7a..843fa2f747e 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.19 2013/04/30 21:30:59 bsiegert Exp $
+$NetBSD: distinfo,v 1.20 2013/05/16 16:13:59 taca Exp $
 
-SHA1 (ruby-1.9.3-p392.tar.bz2) = de73455ff6500372d647fb49d24cc130fbd5815e
-RMD160 (ruby-1.9.3-p392.tar.bz2) = 4d12f62ce294a9c8fe27369413253097241e3fb0
-Size (ruby-1.9.3-p392.tar.bz2) = 10024221 bytes
-SHA1 (patch-configure) = 4b9c2ea8933345a06987ad9120341b2713669c95
-SHA1 (patch-configure.in) = 7812319d8286032f2ecf7ce22dc018ae2684f384
+SHA1 (ruby-1.9.3-p429.tar.bz2) = 18f464c49c857fad3b3b277c8ef5eb8c30a7794a
+RMD160 (ruby-1.9.3-p429.tar.bz2) = c39f2f713f6438c14e32f992d1e50e5624a84eba
+Size (ruby-1.9.3-p429.tar.bz2) = 10042323 bytes
+SHA1 (patch-Makefile.in) = 2d162718be709f8367b476148a2a68ebd527fb2f
+SHA1 (patch-configure) = 383a492bad17fa27d4aee8e68b360ac719c18dcd
+SHA1 (patch-configure.in) = ded6328a328a1ce79c937158e4ebbfecd7ca6db3
 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66
@@ -14,7 +15,7 @@ SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d0
 SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3
 SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c
 SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26
-SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad312d06819b6f1d7
+SHA1 (patch-lib_rubygems_dependency__installer.rb) = 2ad4854a4c226158d985b3a42861932676be31d3
 SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
 SHA1 (patch-lib_rubygems_installer.rb) = cec82bd0c5255a2a23799273c7a2835e2bef7e33
diff --git a/lang/ruby193-base/patches/patch-Makefile.in b/lang/ruby193-base/patches/patch-Makefile.in
new file mode 100644
index 00000000000..4a4fd9ee9fa
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/05/16 16:13:59 taca Exp $
+
+--- Makefile.in.orig	2013-04-08 20:27:01.000000000 +0000
++++ Makefile.in
+@@ -169,7 +169,6 @@ $(PROGRAM):
+ 		@$(RM) $@
+ 		$(ECHO) linking $@
+ 		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
+-		$(Q) $(POSTLINK)
+ 
+ # We must `rm' the library each time this rule is invoked because "updating" a
+ # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index bc86ea19e84..cc04e387052 100644
--- a/lang/ruby193-base/patches/patch-configure
+++ b/lang/ruby193-base/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
+$NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	Fri Feb 22 09:44:18 2013
+--- configure.orig	2013-05-14 11:40:01.000000000 +0000
 +++ configure
-@@ -10722,6 +10722,9 @@ esac
+@@ -10724,6 +10724,9 @@ esac
    superux*) :
      	ac_cv_func_setitimer=no
  		 ;; #(
@@ -15,8 +15,8 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
    *) :
      	LIBS="-lm $LIBS" ;;
  esac
-@@ -11325,7 +11328,13 @@ for ac_header in limits.h sys/file.h sys
- 		 net/socket.h sys/socket.h process.h
+@@ -11327,7 +11330,13 @@ for ac_header in limits.h sys/file.h sys
+ 		 net/socket.h sys/socket.h process.h atomic.h
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -12053,6 +12062,9 @@ fi
+@@ -12072,6 +12081,9 @@ fi
  ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
  #include <time.h>
  #endif
@@ -40,7 +40,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  "
  if test "x$ac_cv_type_struct_timespec" = xyes; then :
  
-@@ -13844,6 +13856,8 @@ else
+@@ -13863,6 +13875,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -49,7 +49,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -15784,7 +15798,7 @@ done
+@@ -15803,7 +15817,7 @@ done
      MAINLIBS="-pthread $MAINLIBS" ;; #(
    *) :
      case "$target_os" in #(
@@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
      LIBS="-pthread $LIBS" ;; #(
    *) :
      LIBS="-l$pthread_lib $LIBS" ;;
-@@ -16234,7 +16248,9 @@ esac ;; #(
+@@ -16253,7 +16267,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -68,7 +68,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -16246,7 +16262,7 @@ esac ;; #(
+@@ -16265,7 +16281,7 @@ esac ;; #(
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes ;; #(
@@ -77,7 +77,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
      	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -16775,7 +16791,7 @@ _ACEOF
+@@ -16796,7 +16812,7 @@ _ACEOF
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -86,7 +86,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -16792,7 +16808,7 @@ _ACEOF
+@@ -16813,7 +16829,7 @@ _ACEOF
  	   LIBRUBY_ALIASES=""
  	fi
  	 ;; #(
@@ -95,7 +95,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -16853,7 +16869,12 @@ esac
+@@ -16874,7 +16890,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -109,7 +109,7 @@ $NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
  	 ;; #(
    *) :
       ;;
-@@ -16916,11 +16937,7 @@ if test "$install_doc" != no; then
+@@ -16937,11 +16958,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
diff --git a/lang/ruby193-base/patches/patch-configure.in b/lang/ruby193-base/patches/patch-configure.in
index 8e39b6bf807..f960c3fcf38 100644
--- a/lang/ruby193-base/patches/patch-configure.in
+++ b/lang/ruby193-base/patches/patch-configure.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
+$NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.in.orig	Tue Nov 13 10:02:20 2012
+--- configure.in.orig	2013-05-14 02:23:27.000000000 +0000
 +++ configure.in
-@@ -1128,6 +1128,8 @@ main()
+@@ -1129,6 +1129,8 @@ main()
  		],
  [superux*], [	ac_cv_func_setitimer=no
  		],
@@ -14,12 +14,12 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  [	LIBS="-lm $LIBS"])
  AC_CHECK_LIB(crypt, crypt)
  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
-@@ -1168,7 +1170,12 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys
+@@ -1169,7 +1171,12 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys
  		 syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
  		 sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \
  		 ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
--		 net/socket.h sys/socket.h process.h)
-+		 net/socket.h sys/socket.h process.h,,,[
+-		 net/socket.h sys/socket.h process.h atomic.h)
++		 net/socket.h sys/socket.h process.h atomic.h,,,[
 +@%:@include <sys/types.h>
 +@%:@ifdef HAVE_SYS_TIME_H
 +@%:@include <sys/time.h>
@@ -28,7 +28,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  
  AC_TYPE_SIZE_T
  RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
-@@ -1194,6 +1201,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens
+@@ -1202,6 +1209,9 @@ AC_CHECK_TYPES([struct timeval], [], [],
  
  AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
  @%:@include <time.h>
@@ -38,7 +38,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  @%:@endif])
  
  AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@@ -1786,7 +1796,7 @@ if test x"$enable_pthread" = xyes; then
+@@ -1794,7 +1804,7 @@ if test x"$enable_pthread" = xyes; then
  	[root], [],
  	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
  	        [AS_CASE(["$target_os"],
@@ -47,7 +47,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  		    [LIBS="-l$pthread_lib $LIBS"])])
      else
  	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-@@ -2017,7 +2027,9 @@ if test "$with_dln_a_out" != yes; then
+@@ -2025,7 +2035,9 @@ if test "$with_dln_a_out" != yes; then
  			rb_cv_dlopen=yes],
  	[interix*], [	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -57,7 +57,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  			rb_cv_dlopen=yes],
  	[freebsd*|dragonfly*], [
  			: ${LDSHARED='$(CC) -shared'}
-@@ -2028,7 +2040,7 @@ if test "$with_dln_a_out" != yes; then
+@@ -2036,7 +2048,7 @@ if test "$with_dln_a_out" != yes; then
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes],
@@ -66,7 +66,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
  			fi
-@@ -2327,7 +2339,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2337,7 +2349,7 @@ AS_CASE("$enable_shared", [yes], [
  	],
      [freebsd*|dragonfly*], [
  	SOLIBS='$(LIBS)'
@@ -75,7 +75,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -2343,7 +2355,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2353,7 +2365,7 @@ AS_CASE("$enable_shared", [yes], [
  	   LIBRUBY_ALIASES=""
  	fi
  	],
@@ -84,7 +84,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
  	],
-@@ -2393,7 +2405,12 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2403,7 +2415,12 @@ AS_CASE("$enable_shared", [yes], [
  	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
  	],
      [interix*], [
@@ -98,7 +98,7 @@ $NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
  	])
  ], [
    LIBRUBYARG_SHARED=
-@@ -2438,11 +2455,7 @@ if test "$install_doc" != no; then
+@@ -2448,11 +2465,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb b/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb
index 0877d617942..7dda9927cc1 100644
--- a/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb
+++ b/lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.2 2013/05/16 16:13:59 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
@@ -12,23 +12,6 @@ Add install_root option for pkgsrc's rubygems support.
    # :prerelease:: Allow prerelease versions.  See #install.
    # :security_policy:: See Gem::Installer::new and Gem::Security.
    # :user_install:: See Gem::Installer.new
-@@ -45,11 +46,14 @@ class Gem::DependencyInstaller
- 
-   def initialize(options = {})
-     if options[:install_dir] then
--      @gem_home = options[:install_dir]
-+      if options[:install_root].nil? or options[:install_root] == "" then
-+        @gem_home = options[:install_dir].dup
-+      else
-+        @gem_home = options[:install_root].dup
-+      end
- 
-       Gem::Specification.dirs = @gem_home
-       Gem.ensure_gem_subdirectories @gem_home
--      options[:install_dir] = @gem_home # FIX: because we suck and reuse below
-     end
- 
-     options = DEFAULT_OPTIONS.merge options
 @@ -69,7 +73,12 @@ class Gem::DependencyInstaller
      @installed_gems = []