diff options
author | taca <taca@pkgsrc.org> | 2013-06-27 16:35:43 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2013-06-27 16:35:43 +0000 |
commit | 6984746c6d981b459b9503916ad1b5966b60e3f1 (patch) | |
tree | e56eaf160d63ff9721253acb34c4aba3ef530331 /lang | |
parent | cb243a00b33e3ad43f9ff09469e27dd2c2b080b9 (diff) | |
download | pkgsrc-6984746c6d981b459b9503916ad1b5966b60e3f1.tar.gz |
Update ruby193-base to 1.9.3p448 (Ruby 1.9.3-p448).
Now Ruby 1.9.3-p448 is released.
This release includes a security fix about bundled OpenSSL:
* Hostname check bypassing vulnerability in SSL client (CVE-2013-4073)
http://www.ruby-lang.org/en/news/2013/06/27/hostname-check-bypassing-vulnerability-in-openssl-client-cve-2013-4073/
And some bugfixes are also included.
Please refer ChangeLog for full changes.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby193-base/distinfo | 15 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-Makefile.in | 12 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-configure | 26 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-configure.in | 24 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-lib_rubygems_dependency__installer.rb | 6 |
5 files changed, 35 insertions, 48 deletions
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo index cf597d08e5c..8edbe7bac43 100644 --- a/lang/ruby193-base/distinfo +++ b/lang/ruby193-base/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.21 2013/05/18 07:39:36 taca Exp $ +$NetBSD: distinfo,v 1.22 2013/06/27 16:35:43 taca Exp $ -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) = 635457438255f1ef2359739e80c95e066d2d54c7 -SHA1 (patch-configure.in) = cec3db9f3ec245f13515059102cb3c66449b26aa +SHA1 (ruby-1.9.3-p448.tar.bz2) = 4bd9140bd4760409f771d4dd55138c22d3ff2995 +RMD160 (ruby-1.9.3-p448.tar.bz2) = e012b5b506092406a4e35711d57290932ba557c6 +Size (ruby-1.9.3-p448.tar.bz2) = 10052488 bytes +SHA1 (patch-configure) = 5d1af2b62784cf09999aa31dad54664d7ee123b4 +SHA1 (patch-configure.in) = cef794d185fa41cd144d55558fcee320f9385f94 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66 @@ -15,7 +14,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) = 2ad4854a4c226158d985b3a42861932676be31d3 +SHA1 (patch-lib_rubygems_dependency__installer.rb) = 5b86f3baae2181253230a35cd53481f7207cfa56 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 deleted file mode 100644 index 4a4fd9ee9fa..00000000000 --- a/lang/ruby193-base/patches/patch-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -$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 287b516f3c0..f092c2a8ed3 100644 --- a/lang/ruby193-base/patches/patch-configure +++ b/lang/ruby193-base/patches/patch-configure @@ -1,11 +1,11 @@ -$NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ +$NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. ---- configure.orig 2013-05-14 16:42:05.000000000 +0000 +--- configure.orig 2013-06-27 11:31:36.000000000 +0000 +++ configure -@@ -10738,6 +10738,9 @@ esac +@@ -10741,6 +10741,9 @@ esac superux*) : ac_cv_func_setitimer=no ;; #( @@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ *) : LIBS="-lm $LIBS" ;; esac -@@ -11341,7 +11344,13 @@ for ac_header in limits.h sys/file.h sys +@@ -11344,7 +11347,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` @@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca 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 -@@ -12086,6 +12095,9 @@ fi +@@ -12089,6 +12098,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.9 2013/05/18 07:39:36 taca Exp $ " if test "x$ac_cv_type_struct_timespec" = xyes; then : -@@ -13877,6 +13889,8 @@ else +@@ -13880,6 +13892,8 @@ else # ifdef _MSC_VER # include <malloc.h> # define alloca _alloca @@ -49,7 +49,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ # else # ifdef HAVE_ALLOCA_H # include <alloca.h> -@@ -15817,7 +15831,7 @@ done +@@ -15820,7 +15834,7 @@ done MAINLIBS="-pthread $MAINLIBS" ;; #( *) : case "$target_os" in #( @@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ LIBS="-pthread $LIBS" ;; #( *) : LIBS="-l$pthread_lib $LIBS" ;; -@@ -16267,7 +16281,9 @@ esac ;; #( +@@ -16270,7 +16284,9 @@ esac ;; #( interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" @@ -68,7 +68,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : -@@ -16279,7 +16295,7 @@ esac ;; #( +@@ -16282,7 +16298,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.9 2013/05/18 07:39:36 taca Exp $ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" -@@ -16810,7 +16826,7 @@ _ACEOF +@@ -16813,7 +16829,7 @@ _ACEOF freebsd*|dragonfly*) : SOLIBS='$(LIBS)' @@ -86,7 +86,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' -@@ -16827,7 +16843,7 @@ _ACEOF +@@ -16830,7 +16846,7 @@ _ACEOF LIBRUBY_ALIASES="" fi ;; #( @@ -95,7 +95,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` -@@ -16888,7 +16904,12 @@ esac +@@ -16891,7 +16907,12 @@ esac ;; #( interix*) : @@ -109,7 +109,7 @@ $NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $ ;; #( *) : ;; -@@ -16951,11 +16972,7 @@ if test "$install_doc" != no; then +@@ -16954,11 +16975,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 a77779c4f94..b19f9bd3728 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.8 2013/05/18 07:39:36 taca Exp $ +$NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. ---- configure.in.orig 2013-05-14 15:26:08.000000000 +0000 +--- configure.in.orig 2013-05-29 12:05:44.000000000 +0000 +++ configure.in -@@ -1136,6 +1136,8 @@ main() +@@ -1138,6 +1138,8 @@ main() ], [superux*], [ ac_cv_func_setitimer=no ], @@ -14,7 +14,7 @@ $NetBSD: patch-configure.in,v 1.8 2013/05/18 07:39:36 taca Exp $ [ LIBS="-lm $LIBS"]) AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV -@@ -1176,7 +1178,12 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys +@@ -1178,7 +1180,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 \ @@ -28,7 +28,7 @@ $NetBSD: patch-configure.in,v 1.8 2013/05/18 07:39:36 taca Exp $ AC_TYPE_SIZE_T RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>]) -@@ -1209,6 +1216,9 @@ AC_CHECK_TYPES([struct timeval], [], [], +@@ -1211,6 +1218,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.8 2013/05/18 07:39:36 taca Exp $ @%:@endif]) AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H -@@ -1801,7 +1811,7 @@ if test x"$enable_pthread" = xyes; then +@@ -1803,7 +1813,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.8 2013/05/18 07:39:36 taca Exp $ [LIBS="-l$pthread_lib $LIBS"])]) else AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled") -@@ -2032,7 +2042,9 @@ if test "$with_dln_a_out" != yes; then +@@ -2034,7 +2044,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.8 2013/05/18 07:39:36 taca Exp $ rb_cv_dlopen=yes], [freebsd*|dragonfly*], [ : ${LDSHARED='$(CC) -shared'} -@@ -2043,7 +2055,7 @@ if test "$with_dln_a_out" != yes; then +@@ -2045,7 +2057,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.8 2013/05/18 07:39:36 taca Exp $ if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi -@@ -2344,7 +2356,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2346,7 +2358,7 @@ AS_CASE("$enable_shared", [yes], [ ], [freebsd*|dragonfly*], [ SOLIBS='$(LIBS)' @@ -75,7 +75,7 @@ $NetBSD: patch-configure.in,v 1.8 2013/05/18 07:39:36 taca Exp $ if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' -@@ -2360,7 +2372,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2362,7 +2374,7 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_ALIASES="" fi ], @@ -84,7 +84,7 @@ $NetBSD: patch-configure.in,v 1.8 2013/05/18 07:39:36 taca Exp $ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` ], -@@ -2410,7 +2422,12 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2412,7 +2424,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.8 2013/05/18 07:39:36 taca Exp $ ]) ], [ LIBRUBYARG_SHARED= -@@ -2455,11 +2472,7 @@ if test "$install_doc" != no; then +@@ -2457,11 +2474,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 7dda9927cc1..3603820a3ca 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.2 2013/05/16 16:13:59 taca Exp $ +$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.3 2013/06/27 16:35:44 taca Exp $ Add install_root option for pkgsrc's rubygems support. @@ -12,7 +12,7 @@ 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 -@@ -69,7 +73,12 @@ class Gem::DependencyInstaller +@@ -69,7 +70,12 @@ class Gem::DependencyInstaller @installed_gems = [] @install_dir = options[:install_dir] || Gem.dir @@ -26,7 +26,7 @@ Add install_root option for pkgsrc's rubygems support. # Set with any errors that SpecFetcher finds while search through # gemspecs for a dep -@@ -290,6 +299,7 @@ class Gem::DependencyInstaller +@@ -290,6 +296,7 @@ class Gem::DependencyInstaller :format_executable => @format_executable, :ignore_dependencies => @ignore_dependencies, :install_dir => @install_dir, |