# HG changeset patch # User April Chin # Date 1391629445 28800 # Node ID ff5a4be7be4aa014e081801200d6365b03992bf4 # Parent e38748989807045476dfa16ac2258d928775a8bc 17885116 Update ruby 1.9 to 1.9.3-p484 17883327 problem in UTILITY/RUBY diff -r e38748989807 -r ff5a4be7be4a components/ruby/ruby-19/Makefile --- a/components/ruby/ruby-19/Makefile Fri Jan 17 17:43:13 2014 +0100 +++ b/components/ruby/ruby-19/Makefile Wed Feb 05 11:44:05 2014 -0800 @@ -20,20 +20,20 @@ # # -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk COMPONENT_NAME= ruby COMPONENT_VERSION= 1.9.3 -COMPONENT_PATCH_VERSION= 448 +COMPONENT_PATCH_VERSION= 484 COMPONENT_PROJECT_URL= http://www.ruby-lang.org/ COMPONENT_SRC= \ $(COMPONENT_NAME)-$(COMPONENT_VERSION)-p$(COMPONENT_PATCH_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:2f35e186543a03bec5e603296d6d8828b94ca58bab049b67b1ceb61d381bc8a7 + sha256:d684bc3a5ba72cda9ef30039f783c0f8cdc325bae5c8738c7bf05577cbe8f31d COMPONENT_ARCHIVE_URL= \ http://ftp.ruby-lang.org/pub/ruby/1.9/$(COMPONENT_ARCHIVE) IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION) @@ -128,6 +128,10 @@ # 17349280 - libffi is missing ffi_raw_size() CFLAGS += -DFFI_NO_RAW_API +# keep ASLR disabled; +# miniruby may core dump on sparc during build +ASLR_MODE = $(ASLR_DISABLE) + CLEAN_PATHS += Solaris/gem.1 Solaris/rbconfig.sedscript.mod \ Solaris/ruby.1.sedscript.mod diff -r e38748989807 -r ff5a4be7be4a components/ruby/ruby-19/ruby-19-tk.p5m --- a/components/ruby/ruby-19/ruby-19-tk.p5m Fri Jan 17 17:43:13 2014 +0100 +++ b/components/ruby/ruby-19/ruby-19-tk.p5m Wed Feb 05 11:44:05 2014 -0800 @@ -18,21 +18,21 @@ # # CDDL HEADER END # -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/runtime/ruby-19/ruby-tk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="Ruby Tk libraries" set name=com.oracle.info.description value="the Ruby 1.9 Tk libraries" -set name=com.oracle.info.tpno value=12694 +set name=com.oracle.info.tpno value=15969 set name=info.classification \ value=org.opensolaris.category.2008:Development/Ruby set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2013/269 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - +# file \ path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/ruby/$(RUBY_LIB_VER)/$(MACH)-solaris$(SOLARIS_VERSION)/tcltklib.so file \ @@ -688,6 +688,6 @@ file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/dee/tkutil_8c_source.html file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d19/structtcltkip.html - +# license ruby-19.license \ license="Ruby License, GPLv2, LGPLv2.1, Artistic, BSD, PD, BSD-like, MIT, Unicode, MPL1.1" diff -r e38748989807 -r ff5a4be7be4a components/ruby/ruby-19/ruby-19.p5m --- a/components/ruby/ruby-19/ruby-19.p5m Fri Jan 17 17:43:13 2014 +0100 +++ b/components/ruby/ruby-19/ruby-19.p5m Wed Feb 05 11:44:05 2014 -0800 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> @@ -26,21 +26,13 @@ value=pkg:/runtime/ruby-19@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="Ruby, RubyGems, and Rake" set name=com.oracle.info.description value="Ruby, including RubyGems and Rake" -set name=com.oracle.info.tpno value=12694 +set name=com.oracle.info.tpno value=15969 set name=info.classification \ value=org.opensolaris.category.2008:Development/Ruby set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2013/269 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - -# Note that some html documentation files for trans.db and encdb.h -# are not being included in the S11 Update -# because the html doc generation on S11 Update on i386 is creating -# these files with pathnames embedded in them, including the -# workspace name, which is inappropriate, and which could vary from build -# to build, also causing such files to be hashed and installed onto -# inconsistent directory locations. # dir path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/ruby/gems/$(RUBY_LIB_VER)/cache dir path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/ruby/gems/$(RUBY_LIB_VER)/doc @@ -2988,7 +2980,7 @@ dir path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/df/df8 dir path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/df/dfe dir path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/df/dff - +# file path=usr/ruby/$(RUBY_VER)/bin/erb file path=usr/ruby/$(RUBY_VER)/bin/gem file path=usr/ruby/$(RUBY_VER)/bin/irb @@ -4617,6 +4609,10 @@ file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/ddc/openssl__missing_8h__dep__incl.png file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/ddd/structst__table.html +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de0/ruby-1_89_83-p484_2transdb_8h.html +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de0/ruby-1_89_83-p484_2transdb_8h_source.html file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de1/object_8c.html file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de1/object_8c_source.html @@ -5649,6 +5645,12 @@ file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d6b/structioinfo.html file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d71/st_8c.html file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d71/st_8c_source.html +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d7b/build_2sparcv9_2transdb_8h.html \ + variant.arch=sparc +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d7b/build_2sparcv9_2transdb_8h_source.html \ + variant.arch=sparc file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d7f/regex_8h__incl.map file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d7f/regex_8h__incl.md5 file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/d7f/regex_8h__incl.png @@ -6238,6 +6240,15 @@ file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d75/iso2022_8c__incl.md5 file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d75/iso2022_8c__incl.png file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d78/build_2amd64_2encdb_8h__dep__incl.map \ + variant.arch=i386 +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d78/build_2amd64_2encdb_8h__dep__incl.md5 \ + variant.arch=i386 +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d78/build_2amd64_2encdb_8h__dep__incl.png \ + variant.arch=i386 +file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d79/ossl__pkey__dh_8c__incl.map file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d6/d79/ossl__pkey__dh_8c__incl.md5 @@ -7039,6 +7050,15 @@ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d23/enc__associate_8c__incl.md5 file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d23/enc__associate_8c__incl.png +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d25/build_2sparcv9_2encdb_8h__dep__incl.map \ + variant.arch=sparc +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d25/build_2sparcv9_2encdb_8h__dep__incl.md5 \ + variant.arch=sparc +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d25/build_2sparcv9_2encdb_8h__dep__incl.png \ + variant.arch=sparc file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d27/yamlbyte_8h.html file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/d27/yamlbyte_8h_source.html @@ -7432,6 +7452,12 @@ file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da7/dbm_8c__incl.map file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da7/dbm_8c__incl.md5 file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da7/dbm_8c__incl.png +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da8/build_2sparcv9_2encdb_8h.html \ + variant.arch=sparc +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da8/build_2sparcv9_2encdb_8h_source.html \ + variant.arch=sparc file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da9/unicode_8c__incl.map file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da9/unicode_8c__incl.md5 file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/da/da9/unicode_8c__incl.png @@ -7578,6 +7604,10 @@ file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3c/ossl__pkey_8h_source.html file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3d/ruby-1_89_83-p484_2encdb_8h.html +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3d/ruby-1_89_83-p484_2encdb_8h_source.html +file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3f/structnkf__state__t.html file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d41/struct__syck__parser.html @@ -7869,6 +7899,8 @@ file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d57/pathname_2extconf_8h_source.html file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d57/structbufread__arg.html +file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d5d/emoji__sjis__docomo_8c__incl.map file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d5d/emoji__sjis__docomo_8c__incl.md5 @@ -7989,6 +8021,15 @@ file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/dda/id_8h__incl.md5 file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/dda/id_8h__incl.png file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/ddb/build_2sparcv9_2transdb_8h__dep__incl.map \ + variant.arch=sparc +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/ddb/build_2sparcv9_2transdb_8h__dep__incl.md5 \ + variant.arch=sparc +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/ddb/build_2sparcv9_2transdb_8h__dep__incl.png \ + variant.arch=sparc +file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/ddf/digest_8h__dep__incl.map file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/ddf/digest_8h__dep__incl.md5 @@ -8134,6 +8175,12 @@ file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d69/rubyext_8c.html file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d69/rubyext_8c_source.html +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d73/build_2amd64_2encdb_8h.html \ + variant.arch=i386 +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d73/build_2amd64_2encdb_8h_source.html \ + variant.arch=i386 file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d74/iseq_8c.html file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d74/iseq_8c_source.html file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/d78/sdbm_8h.html @@ -8218,6 +8265,12 @@ file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/dab/structrmatch__offset.html file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/dad/build_2amd64_2transdb_8h.html \ + variant.arch=i386 +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/dad/build_2amd64_2transdb_8h_source.html \ + variant.arch=i386 +file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/db3/digest_2extconf_8h.html file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dd/db3/digest_2extconf_8h_source.html @@ -8567,6 +8620,15 @@ file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/de/dfb/ossl__x509cert_8c__incl.png file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/de/dfe/build_2amd64_2transdb_8h__dep__incl.map \ + variant.arch=i386 +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/de/dfe/build_2amd64_2transdb_8h__dep__incl.md5 \ + variant.arch=i386 +file \ + path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/de/dfe/build_2amd64_2transdb_8h__dep__incl.png \ + variant.arch=i386 +file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/de/dff/constant_8h__dep__incl.map file \ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/de/dff/constant_8h__dep__incl.md5 @@ -28339,6 +28401,16 @@ file \ path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Bag/Li/required_uri-c.ri file \ + path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Bag/cdesc-Bag.ri +file \ + path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Bag/full_name-i.ri +file \ + path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Bag/new-c.ri +file \ + path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Bag/required_uri-c.ri +file \ + path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Bag/setup_maker-i.ri +file \ path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Channel/Image/cdesc-Image.ri file \ path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/RSS/RDF/Channel/Image/new-c.ri @@ -35164,36 +35236,25 @@ file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/created.rid file \ path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/fatal/cdesc-fatal.ri - +# license ruby-19.license \ license="Ruby License, GPLv2, LGPLv2.1, Artistic, BSD, PD, BSD-like, MIT, Unicode, MPL1.1" - -# Remove dupaction010.2=true once mediated links for ruby -# make it into the repo; a few man1 symlinks (erb.1, irb.1, -# ri.1) & a usr/bin symlink (rake) did not exist in ruby 1.8, so -# they won't get dupaction errors -link path=usr/bin/erb mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./erb19 +# +link path=usr/bin/erb mediator=ruby mediator-version=1.9 target=./erb19 link path=usr/bin/erb19 target=../ruby/$(RUBY_VER)/bin/erb -link path=usr/bin/gem mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./gem19 +link path=usr/bin/gem mediator=ruby mediator-version=1.9 target=./gem19 link path=usr/bin/gem19 target=../ruby/$(RUBY_VER)/bin/gem -link path=usr/bin/irb mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./irb19 +link path=usr/bin/irb mediator=ruby mediator-version=1.9 target=./irb19 link path=usr/bin/irb19 target=../ruby/$(RUBY_VER)/bin/irb link path=usr/bin/rake mediator=ruby mediator-version=1.9 target=./rake19 link path=usr/bin/rake19 target=../ruby/$(RUBY_VER)/bin/rake -link path=usr/bin/rdoc mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./rdoc19 +link path=usr/bin/rdoc mediator=ruby mediator-version=1.9 target=./rdoc19 link path=usr/bin/rdoc19 target=../ruby/$(RUBY_VER)/bin/rdoc -link path=usr/bin/ri mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./ri19 +link path=usr/bin/ri mediator=ruby mediator-version=1.9 target=./ri19 link path=usr/bin/ri19 target=../ruby/$(RUBY_VER)/bin/ri -link path=usr/bin/ruby mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./ruby19 +link path=usr/bin/ruby mediator=ruby mediator-version=1.9 target=./ruby19 link path=usr/bin/ruby19 target=../ruby/$(RUBY_VER)/bin/ruby -link path=usr/bin/testrb mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true target=./testrb19 +link path=usr/bin/testrb mediator=ruby mediator-version=1.9 target=./testrb19 link path=usr/bin/testrb19 target=../ruby/$(RUBY_VER)/bin/testrb # this symlink in the default location allows vim to # find the ruby library without linking against it @@ -35211,23 +35272,17 @@ link path=usr/share/man/man1/erb.1 mediator=ruby mediator-version=1.9 \ target=../../../ruby/$(RUBY_VER)/share/man/man1/erb.1 link path=usr/share/man/man1/gem.1 mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true \ target=../../../ruby/$(RUBY_VER)/share/man/man1/gem.1 link path=usr/share/man/man1/irb.1 mediator=ruby mediator-version=1.9 \ target=../../../ruby/$(RUBY_VER)/share/man/man1/irb.1 link path=usr/share/man/man1/rake.1 mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true \ target=../../../ruby/$(RUBY_VER)/share/man/man1/rake.1 link path=usr/share/man/man1/ri.1 mediator=ruby mediator-version=1.9 \ target=../../../ruby/$(RUBY_VER)/share/man/man1/ri.1 link path=usr/share/man/man1/ruby.1 mediator=ruby mediator-version=1.9 \ - pkg.linted.pkglint.dupaction010.2=true \ target=../../../ruby/$(RUBY_VER)/share/man/man1/ruby.1 # Force a dependency on the ruby-18 package, if it's installed # (type=optional), to ensure that older ruby-18 packages with unmediated # symlinks are replaced with ruby-18 containing mediated symlinks. -# For now we put $(BUILD_VERSION), the same build version as -# ruby-19, but later change this to be the specific build version -# in which ruby-18 with mediated symlinks is integrated. -depend fmri=pkg:/runtime/ruby-18@1.8.7.374,$(BUILD_VERSION) type=optional +depend fmri=pkg:/runtime/ruby-18@1.8.7.374,5.11.75.2.0.0.28.0 type=optional