Revision: 103423 https://trac.macports.org/changeset/103423 Author: kimuraw@macports.org Date: 2013-02-25 06:46:30 -0800 (Mon, 25 Feb 2013) Log Message: ----------- lang/ruby19: upgrade to 1.9.3-p392. fixed CVE-2013-0269. http://www.ruby-lang.org/en/news/2013/02/22/ruby-1-9-3-p392-is-released/ Modified Paths: -------------- trunk/dports/lang/ruby19/Portfile Added Paths: ----------- trunk/dports/lang/ruby19/files/patch-clang31.diff Modified: trunk/dports/lang/ruby19/Portfile =================================================================== --- trunk/dports/lang/ruby19/Portfile 2013-02-25 12:06:33 UTC (rev 103422) +++ trunk/dports/lang/ruby19/Portfile 2013-02-25 14:46:30 UTC (rev 103423) @@ -3,7 +3,7 @@ PortSystem 1.0 name ruby19 -version 1.9.3-p385 +version 1.9.3-p392 revision 0 categories lang ruby @@ -26,10 +26,10 @@ use_bzip2 yes distname ruby-${version} -checksums md5 5ec9aff670f4912b0f6f0e11e855ef6c \ - rmd160 b2fbe56de1295659aa54c0a2d9f77a1212f62a02 \ - sha1 54e8d08103e915e2b07dcfcea88ab7fc42d40b0a \ - sha256 f991ee50414dc795696bad0fc5c7b0b94d93b9b38fed943326d20ce4e9dda42b +checksums md5 a810d64e2255179d2f334eb61fb8519c \ + rmd160 4d12f62ce294a9c8fe27369413253097241e3fb0 \ + sha1 de73455ff6500372d647fb49d24cc130fbd5815e \ + sha256 5a7334dfdf62966879bf539b8a9f0b889df6f3b3824fb52a9303c3c3d3a58391 use_parallel_build no depends_lib port:libiconv \ @@ -46,7 +46,10 @@ # lib-rubygems-specification.rb: fix 'Invalid gemspec in [... json-1.6.1.gemspec]: invalid date # format in specification: "2011-09-18 00:00:00.000000000Z"' # https://github.com/rubygems/rubygems/pull/196 -patchfiles patch-lib-rubygems-specification.rb.diff +# clang31.diff: build fails with Xcode-4.6 (clang-3.1) +# https://bugs.ruby-lang.org/issues/7946 +patchfiles patch-lib-rubygems-specification.rb.diff \ + patch-clang31.diff # ruby-1.9.3 supports Xcode-4.2 clang and gcc-4.2. # ruby built with llvm-gcc will be broken. @@ -141,7 +144,7 @@ variant tk conflicts mactk description "Build using MacPorts Tk" { configure.args-delete --without-tk - configure.args-append --with-tk + configure.args-append --with-tk --disable-tcltk-framework depends_lib-append port:tcl \ port:tk } Added: trunk/dports/lang/ruby19/files/patch-clang31.diff =================================================================== --- trunk/dports/lang/ruby19/files/patch-clang31.diff (rev 0) +++ trunk/dports/lang/ruby19/files/patch-clang31.diff 2013-02-25 14:46:30 UTC (rev 103423) @@ -0,0 +1,26 @@ +Index: st.c +=================================================================== +--- st.c (revision 39495) ++++ st.c (working copy) +@@ -515,7 +515,7 @@ + st_index_t hash_val, bin_pos; + + if (table->entries_packed) { +- int i; ++ st_index_t i; + if (MORE_PACKABLE_P(table)) { + i = table->num_entries++; + table->bins[i*2] = (struct st_table_entry*)key; +Index: thread.c +=================================================================== +--- thread.c (revision 39495) ++++ thread.c (working copy) +@@ -2161,7 +2161,7 @@ + static int + vm_living_thread_num(rb_vm_t *vm) + { +- return vm->living_threads->num_entries; ++ return (int)vm->living_threads->num_entries; + } + + int