6862850 OSnet sharable object versioning cleanup

8 files changed, 48 insertions, 27 deletions

diff --git a/usr/src/lib/libc/i386/mapfile-vers b/usr/src/lib/libc/i386/mapfile-vers
index c54c1b3d14..3a722f9aef 100644
--- a/usr/src/lib/libc/i386/mapfile-vers
+++ b/usr/src/lib/libc/i386/mapfile-vers
@@ -49,7 +49,6 @@ SUNW_1.23 {
 	aio_waitn64;
 	aio_write64;
 	aiowrite64;
-	enable_extended_FILE_stdio;
 	lio_listio64;
 	mkstemps64;
 	posix_fadvise64;
@@ -66,6 +65,8 @@ SUNW_1.22.1 {
 	atomic_dec_64_nv =		NODYNSORT;
 	atomic_inc_64_nv =		NODYNSORT;
 	atomic_or_64_nv =		NODYNSORT;
+
+	enable_extended_FILE_stdio;
 } SUNW_1.22;
 
 SUNW_1.22 {
diff --git a/usr/src/lib/libc/sparc/mapfile-vers b/usr/src/lib/libc/sparc/mapfile-vers
index fa441961d4..8ab81fe11f 100644
--- a/usr/src/lib/libc/sparc/mapfile-vers
+++ b/usr/src/lib/libc/sparc/mapfile-vers
@@ -49,7 +49,6 @@ SUNW_1.23 {
 	aio_waitn64;
 	aio_write64;
 	aiowrite64;
-	enable_extended_FILE_stdio;
 	lio_listio64;
 	mkstemps64;
 	posix_fadvise64;
@@ -79,6 +78,8 @@ SUNW_1.22.1 {
 	atomic_or_16_nv =		NODYNSORT;
 	atomic_or_32_nv =		NODYNSORT;
 	atomic_or_64_nv =		NODYNSORT;
+
+	enable_extended_FILE_stdio;
 } SUNW_1.22;
 
 
diff --git a/usr/src/lib/libcontract/common/mapfile-vers b/usr/src/lib/libcontract/common/mapfile-vers
index 2c51c15003..b7f4279213 100644
--- a/usr/src/lib/libcontract/common/mapfile-vers
+++ b/usr/src/lib/libcontract/common/mapfile-vers
@@ -37,11 +37,34 @@
 # MAPFILE HEADER END
 #
 
+SUNW_1.2 {
+    global:
+	ct_ctl_nack;
+	ct_dev_status_get_aset;
+	ct_dev_status_get_dev_state;
+	ct_dev_status_get_minor;
+	ct_dev_status_get_noneg;
+	ct_dev_tmpl_clear_noneg;
+	ct_dev_tmpl_get_aset;
+	ct_dev_tmpl_get_minor;
+	ct_dev_tmpl_get_noneg;
+	ct_dev_tmpl_set_aset;
+	ct_dev_tmpl_set_minor;
+	ct_dev_tmpl_set_noneg;
+	ct_pr_status_get_svc_aux;
+	ct_pr_status_get_svc_creator;
+	ct_pr_status_get_svc_ctid;
+	ct_pr_status_get_svc_fmri;
+	ct_pr_tmpl_get_svc_aux;
+	ct_pr_tmpl_get_svc_fmri;
+	ct_pr_tmpl_set_svc_aux;
+	ct_pr_tmpl_set_svc_fmri;
+} SUNW_1.1;
+
 SUNW_1.1 {
     global:
 	ct_ctl_abandon;
 	ct_ctl_ack;
-	ct_ctl_nack;
 	ct_ctl_adopt;
 	ct_ctl_newct;
 	ct_ctl_qack;
@@ -69,20 +92,12 @@ SUNW_1.1 {
 	ct_pr_status_get_fatal;
 	ct_pr_status_get_members;
 	ct_pr_status_get_param;
-	ct_pr_status_get_svc_fmri;
-	ct_pr_status_get_svc_aux;
-	ct_pr_status_get_svc_ctid;
-	ct_pr_status_get_svc_creator;
 	ct_pr_tmpl_get_fatal;
 	ct_pr_tmpl_get_param;
 	ct_pr_tmpl_get_transfer;
-	ct_pr_tmpl_get_svc_fmri;
-	ct_pr_tmpl_get_svc_aux;
 	ct_pr_tmpl_set_fatal;
 	ct_pr_tmpl_set_param;
 	ct_pr_tmpl_set_transfer;
-	ct_pr_tmpl_set_svc_fmri;
-	ct_pr_tmpl_set_svc_aux;
 	ct_status_free;
 	ct_status_get_cookie;
 	ct_status_get_critical;
@@ -106,17 +121,6 @@ SUNW_1.1 {
 	ct_tmpl_set_cookie;
 	ct_tmpl_set_critical;
 	ct_tmpl_set_informative;
-	ct_dev_tmpl_set_minor;
-	ct_dev_tmpl_set_aset;
-	ct_dev_tmpl_set_noneg;
-	ct_dev_tmpl_clear_noneg;
-	ct_dev_tmpl_get_minor;
-	ct_dev_tmpl_get_aset;
-	ct_dev_tmpl_get_noneg;
-	ct_dev_status_get_aset;
-	ct_dev_status_get_noneg;
-	ct_dev_status_get_dev_state;
-	ct_dev_status_get_minor;
 };
 
 SUNWprivate_1.1 {
diff --git a/usr/src/lib/libefi/common/mapfile-vers b/usr/src/lib/libefi/common/mapfile-vers
index 7cc22d4e3d..937b2f966f 100644
--- a/usr/src/lib/libefi/common/mapfile-vers
+++ b/usr/src/lib/libefi/common/mapfile-vers
@@ -37,12 +37,16 @@
 # MAPFILE HEADER END
 #
 
+SUNW_1.2 {
+    global:
+	efi_use_whole_disk;
+} SUNW_1.1;
+
 SUNW_1.1 {
     global:
 	efi_alloc_and_init;
 	efi_alloc_and_read;
 	efi_free;
-	efi_use_whole_disk;
 	efi_write;
 };
 
diff --git a/usr/src/lib/libnvpair/mapfile-vers b/usr/src/lib/libnvpair/mapfile-vers
index 9cd9682bf0..979dce062c 100644
--- a/usr/src/lib/libnvpair/mapfile-vers
+++ b/usr/src/lib/libnvpair/mapfile-vers
@@ -39,11 +39,15 @@
 
 SUNW_1.3 {
     global:
-	nvlist_exists;
 	nvlist_lookup_nvpair;
 	nvlist_add_double;
 	nvlist_lookup_double;
 	nvpair_value_double;
+} SUNW_1.2.1;
+
+SUNW_1.2.1 {
+    global:
+	nvlist_exists;
 } SUNW_1.2;
 
 SUNW_1.2 {
diff --git a/usr/src/lib/libscf/common/mapfile-vers b/usr/src/lib/libscf/common/mapfile-vers
index 0022b7cef5..8b8f131ee1 100644
--- a/usr/src/lib/libscf/common/mapfile-vers
+++ b/usr/src/lib/libscf/common/mapfile-vers
@@ -91,7 +91,7 @@ SUNW_1.2 {
 	scf_tmpl_visibility_to_string;
 	scf_type_to_string;
 	scf_values_destroy;
-};
+} SUNW_1.1;
 
 SUNW_1.1 {
     global:
diff --git a/usr/src/lib/libsip/common/mapfile-vers b/usr/src/lib/libsip/common/mapfile-vers
index f426c0961f..fa9448b04a 100644
--- a/usr/src/lib/libsip/common/mapfile-vers
+++ b/usr/src/lib/libsip/common/mapfile-vers
@@ -37,6 +37,12 @@
 # MAPFILE HEADER END
 #
 
+SUNW_1.2 {
+    global:
+	sip_create_dialog_req_nocontact;
+	sip_get_dialog_local_contact_uri;
+} SUNW_1.1;
+
 SUNW_1.1 {
     global:
 	sip_init_conn_object;
@@ -84,7 +90,6 @@ SUNW_1.1 {
 	sip_hold_trans;
 	sip_release_trans;
 	sip_create_dialog_req;
-	sip_create_dialog_req_nocontact;
 	sip_hold_dialog;
 	sip_release_dialog;
 	sip_delete_dialog;
@@ -97,7 +102,6 @@ SUNW_1.1 {
 	sip_get_dialog_local_uri;
 	sip_get_dialog_remote_uri;
 	sip_get_dialog_remote_target_uri;
-	sip_get_dialog_local_contact_uri;
 	sip_get_dialog_route_set;
 	sip_is_dialog_secure;
 	sip_get_dialog_local_cseq;
diff --git a/usr/src/tools/abi/etc/exceptions b/usr/src/tools/abi/etc/exceptions
index 7891a75e3b..720d0452c9 100644
--- a/usr/src/tools/abi/etc/exceptions
+++ b/usr/src/tools/abi/etc/exceptions
@@ -141,6 +141,9 @@ PSARC 2006/477: RULE E3: usr/lib/amd64/watchmalloc.so.1: _valloc
 # ERRORs exempted from RULE E5 (See RULES section of intf_check manpage)
 # exempts symbols which have invalid new versions
 #############################################
+6862850: RULE E5: usr/lib/libsip.so.1
+6862850: RULE E5: usr/lib/amd64/libsip.so.1
+6862850: RULE E5: usr/lib/sparcv9/libsip.so.1
 
 #############################################
 # ERRORs exempted from RULE E6 (See RULES section of intf_check manpage)