--- a/components/ksh93/Makefile Wed May 18 14:06:45 2016 -0700
+++ b/components/ksh93/Makefile Thu May 26 22:52:21 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -28,7 +28,7 @@
COMPONENT_PROJECT_URL= http://www2.research.att.com/sw/download/
# These are required if retrieving packages from the AT&T website.
-ATT_USERNAME= "I accept www.opensource.org/licenses/cpl"
+ATT_USERNAME= "I accept www.opensource.org/licenses/eclipse"
ATT_PASSWD= "."
# This flag controls the prep.mk behaviour to patch each archive individually
@@ -36,15 +36,15 @@
COMPONENT_NAME = ksh93
COMPONENT_SRC_NAME = INIT
-COMPONENT_VERSION = 2011-02-08
+COMPONENT_VERSION = 2012-08-01
COMPONENT_SRC = $(COMPONENT_SRC_NAME).$(COMPONENT_VERSION)
COMPONENT_ARCHIVE = $(COMPONENT_SRC).tgz
COMPONENT_ARCHIVE_HASH = \
- sha256:d692d476fe4bb933e7b6459c0cc99a2e9f428bfd81a495ed4201ec197e070f57
-COMPONENT_ARCHIVE_URL = http://www2.research.att.com/~gsf/download/tgz/$(COMPONENT_ARCHIVE)
+ sha256:c40cf57e9b2186271a9c362a560aa4a6e25ba911a8258ab931d2bbdbce44cfe5
+COMPONENT_ARCHIVE_URL = http://www2.research.att.com/~astopen/download/tgz/$(COMPONENT_ARCHIVE)
COMPONENT_PATCHES =
-TPNO= 9000
+TPNO= 16530
# Patch only required if building ksh93 only and not ast-base
# package-pax-suid.patch
@@ -54,34 +54,34 @@
NUM_EXTRA_ARCHIVES= 1
COMPONENT_NAME_1= ast-base
-COMPONENT_VERSION_1= 2011-02-08
+COMPONENT_VERSION_1= 2012-08-01
COMPONENT_SRC_1= $(COMPONENT_NAME_1).$(COMPONENT_VERSION_1)
COMPONENT_ARCHIVE_1= $(COMPONENT_NAME_1).$(COMPONENT_VERSION_1).tgz
COMPONENT_ARCHIVE_HASH_1= \
- sha256:44ae3913e6c0c8992c6c3cba16864fd4c4a18c6da8e7d87c85a23060cea7cd1a
-COMPONENT_ARCHIVE_URL_1= http://www2.research.att.com/~gsf/download/tgz/$(COMPONENT_ARCHIVE_1)
+ sha256:3bd668dbd922790f1d24c78e3522ef4816501e9cf80abf3c480f554c74f4dbac
+COMPONENT_ARCHIVE_URL_1= http://www2.research.att.com/~astopen/download/tgz/$(COMPONENT_ARCHIVE_1)
COMPONENT_PATCHES_1= compiler.patch path_utmp.patch\
- solaris_alias.patch \
- CR6919590.patch CR7033181.patch \
- CR7071431.patch CR7036535.patch \
- CRXXX_Error_Catalog.patch CR7025778.patch \
- CR7065478.patch CR7026179.patch \
- CR7065900.patch CR7110983.patch \
- CR7105086.patch multi_lang_arith.patch \
- CR7057565.patch CR7046434.patch \
- CR7032821.patch CR7009897.patch \
- CR6964621.patch CR7032068.patch \
- CR7061011.patch CR6934836.patch \
- CR7089799.patch CR6917338.patch \
- CR7019368.patch CR6729252.patch \
- MAP_TYPE_64_Bits.patch CR7167466.patch \
- CR7168611.patch CR7178717.patch \
- CR7175995.patch CR7128313.patch \
- Bug15794787,15819673.patch \
- Bug15808407.patch Bug17714341.patch \
- 17432413.patch 17824699.patch \
- 17435456.patch 17851169.patch \
- Bug15993811.patch 21547336.patch
+ solaris_alias.patch \
+ CR6919590.patch CR7036535.patch \
+ CRXXX_Error_Catalog.patch CR7025778.patch \
+ CR7065478.patch CR7026179.patch \
+ CR7065900.patch CR7110983.patch \
+ multi_lang_arith.patch \
+ CR7057565.patch \
+ CR6964621.patch CR7032068.patch \
+ CR7061011.patch CR6934836.patch \
+ CR7089799.patch CR6917338.patch \
+ CR7019368.patch CR6729252.patch \
+ MAP_TYPE_64_Bits.patch \
+ CR7168611.patch \
+ CR7175995.patch CR7186440_ksh93_disable_predictive_editing.patch \
+ Bug15808407.patch Bug17714341.patch \
+ 17432413.patch 17824699.patch \
+ 17435456.patch 17851169.patch \
+ Bug15993811.patch 21547336.patch \
+ 17777549.patch 17699248.patch \
+ 17817727.patch 18229654.patch \
+ 19907453.patch
# Fixup HOSTTYPE to match uname output and bits
HOSTTYPE32=sol11.$(shell uname -p)
@@ -145,14 +145,18 @@
# IPS Version number: 93.21.1.20110208
#
IPS_PKG_NAME= ksh93
-IPS_COMPONENT_VERSION= 93.21.0.20110208
-IPS_HUMAN_VERSION= "93u 2011-02-08"
+IPS_COMPONENT_VERSION= 93.21.1.20120801
+IPS_HUMAN_VERSION= "93u+ 2012-08-01"
# common targets
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
-
+ (for binary in msgcvt msgcpp msgget msggen ksh shcomp alias; do \
+ /usr/bin/elfedit -e 'dyn:delete RPATH' -e 'dyn:delete RUNPATH' \
+ "$(PROTO_DIR)/$(MACH64)/bin/$$binary" ; \
+ done )
+
test: $(TEST_32_and_64)