[illumos-gate merge]

commit 33392354a001a7e6e504717bd3f249456d36cc00
    4911 illumos-gate perl package version is fixed
commit 3253d86fb73285619825921040bf0262898cf3f8
    4917 libshare_nfs: s_rootnames leaks
commit 6020a1b764797bc75c5b6bb622762df54ebc0ff3
    4910 libshare_nfs: Memory leak in fill_security_from_secopts()

Conflicts:
	usr/src/cmd/perl/Makefile.perl
	usr/src/Makefile.master (perl)

13 files changed, 127 insertions, 104 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index f059d865e7..89d51299ed 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -164,6 +164,8 @@ CTFFINDMOD=	$(ONBLD_TOOLS)/bin/ctffindmod
 XREF=		$(ONBLD_TOOLS)/bin/xref
 FIND=		/usr/bin/find
 PERL=		/usr/bin/perl
+PERL_VERSION=	5.12
+PERL_PKGVERS=	-512
 PYTHON_26=	/usr/bin/python2.6
 PYTHON=		$(PYTHON_26)
 SORT=		/usr/bin/sort
diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl
index d3b203af15..3ee32fef0f 100644
--- a/usr/src/cmd/perl/Makefile.perl
+++ b/usr/src/cmd/perl/Makefile.perl
@@ -14,7 +14,9 @@
 
 include $(SRC)/lib/Makefile.lib
 
-PERL_VERSION = 5.12
+# PERL_VERSION used to be set here,
+# but as it is also needed in usr/src/pkg/Makefile, 
+# the definition was moved to usr/src/Makefile.master
 
 PERL_ARCH = i86pc-solaris-64int
 $(SPARC_BLD)PERL_ARCH = sun4-solaris-64int
diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c
index ccfd7f2990..3d781980ce 100644
--- a/usr/src/lib/libshare/nfs/libshare_nfs.c
+++ b/usr/src/lib/libshare/nfs/libshare_nfs.c
@@ -1042,14 +1042,17 @@ cleanup_export(struct exportdata *export)
 {
 	int i;
 
-	if (export->ex_index != NULL)
-		free(export->ex_index);
-	if (export->ex_secinfo != NULL) {
-		for (i = 0; i < export->ex_seccnt; i++)
-			if (export->ex_secinfo[i].s_rootnames != NULL)
-				free(export->ex_secinfo[i].s_rootnames);
-		free(export->ex_secinfo);
+	free(export->ex_index);
+
+	for (i = 0; i < export->ex_seccnt; i++) {
+		struct secinfo *s = &export->ex_secinfo[i];
+
+		while (s->s_rootcnt > 0)
+			free(s->s_rootnames[--s->s_rootcnt]);
+
+		free(s->s_rootnames);
 	}
+	free(export->ex_secinfo);
 }
 
 /*
@@ -1085,6 +1088,8 @@ get_rootnames(seconfig_t *sec, char *list, int *count)
 		for (i = 0; i < c; i++) {
 			host = strtok(list, ":");
 			if (!nfs_get_root_principal(sec, host, &a[i])) {
+				while (i > 0)
+					free(a[--i]);
 				free(a);
 				a = NULL;
 				break;
@@ -1151,7 +1156,7 @@ fill_security_from_secopts(struct secinfo *sp, sa_security_t secopts)
 			 * such as RO/RW
 			 */
 			if (sp->s_secinfo.sc_rpcnum == AUTH_UNIX)
-				continue;
+				break;
 			/* not AUTH_UNIX */
 			if (value != NULL) {
 				sp->s_rootnames = get_rootnames(&sp->s_secinfo,
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 9d4eaada49..db17d50104 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -175,7 +175,9 @@ PKGMOG_DEFINES= \
 	PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
 	PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 	PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
-	PKGVERS=$(PKGVERS)
+	PKGVERS=$(PKGVERS) \
+	PERL_VERSION=$(PERL_VERSION) \
+	PERL_PKGVERS=$(PERL_PKGVERS)
 
 PKGDEP_TOKENS_i386= \
 	'PLATFORM=i86hvm' \
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index 6b57ab5856..fa2467c01b 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -1856,7 +1856,11 @@ depend fmri=release/name type=require
 #
 # intrd and others use the illumos-defaulted perl interpreter
 #
-depend fmri=runtime/perl-510 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS) type=require
+#
+# intrd uses sun-solaris Perl modules
+#
+depend fmri=runtime/perl$(PERL_PKGVERS)/module/sun-solaris type=require
 #
 # The loadkeys binary needs the keytables.
 #
diff --git a/usr/src/pkg/manifests/developer-appcert.mf b/usr/src/pkg/manifests/developer-appcert.mf
index 8c706b3db4..b6937c12cb 100644
--- a/usr/src/pkg/manifests/developer-appcert.mf
+++ b/usr/src/pkg/manifests/developer-appcert.mf
@@ -54,4 +54,4 @@ legacy pkg=SUNWapct \
     name="ABI Application Certification Tools"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-depend fmri=runtime/perl-510 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS) type=require
diff --git a/usr/src/pkg/manifests/developer-object-file.mf b/usr/src/pkg/manifests/developer-object-file.mf
index 663b34ea3a..cfd7e34fa0 100644
--- a/usr/src/pkg/manifests/developer-object-file.mf
+++ b/usr/src/pkg/manifests/developer-object-file.mf
@@ -160,4 +160,4 @@ link path=usr/ccs/lib/llib-ly.ln target=../../lib/llib-ly.ln
 link path=usr/lib/elfedit/32 target=.
 link path=usr/lib/elfedit/64 target=$(ARCH64)
 depend fmri=developer/macro/cpp type=require
-depend fmri=runtime/perl-510 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS) type=require
diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
index 9632c7d614..aadabf0329 100644
--- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
+++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf
@@ -48,8 +48,7 @@ depend fmri=library/perl-5/xml-parser@0.5.11-0.133 type=require
 depend fmri=library/security/trousers@0.3.2-0.133 type=require
 depend fmri=print/cups@1.4.2-0.133 type=require
 depend fmri=print/filter/ghostscript@8.64-0.133 type=require
-depend fmri=runtime/perl-510/extra@5.10.0-0.133 type=require
-depend fmri=runtime/perl-510@5.10.0-0.133 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS)@5.10.0-0.133 type=require
 depend fmri=system/header@0.5.11-0.133 type=require
 depend fmri=system/library/dbus@0.5.11-0.133 type=require
 depend fmri=system/library/install@0.5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/print-lp-print-client-commands.mf b/usr/src/pkg/manifests/print-lp-print-client-commands.mf
index 00c95a7972..3e8ef1e6d7 100644
--- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf
+++ b/usr/src/pkg/manifests/print-lp-print-client-commands.mf
@@ -81,4 +81,4 @@ link path=usr/sbin/lpmove target=./print-service
 link path=usr/sbin/reject target=./print-service
 link path=usr/share/man/man1/disable.1 target=enable.1
 link path=usr/share/man/man1m/reject.1m target=accept.1m
-depend fmri=runtime/perl-510 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS) type=require
diff --git a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf
deleted file mode 100644
index 74097f1b7e..0000000000
--- a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2014 Racktop Systems.
-#
-
-$(i386_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT i86pc>
-$(sparc_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT sun4>
-
-<transform file path=.*\.(pm|bs) -> default mode 0444>
-<transform file path=.*\.so -> default mode 0555>
-set name=pkg.fmri \
-    value=pkg:/runtime/perl-510/module/sun-solaris@0.5.11,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
-set name=pkg.summary value="Perl 5.10.0 Sun::Solaris Modules"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/Perl
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/perl5
-dir path=usr/perl5/5.10.0
-dir path=usr/perl5/5.10.0/lib
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils
-dir path=usr/perl5/5.10.0/lib/Sun
-dir path=usr/perl5/5.10.0/lib/Sun/Solaris
-dir path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM
-dir path=usr/share/man
-dir path=usr/share/man/man3perl
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Intrs.pm
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Kstat.pm
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Lgrp.pm
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Project.pm
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Task.pm
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Utils.pm
-file \
-    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so
-file \
-    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so
-file \
-    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so
-file \
-    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.so
-file \
-    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.so
-file \
-    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so
-file path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM/_BSMparse.pm
-file path=usr/perl5/5.10.0/lib/Sun/Solaris/Pg.pm
-file path=usr/share/man/man3perl/Kstat.3perl
-file path=usr/share/man/man3perl/Lgrp.3perl
-file path=usr/share/man/man3perl/Project.3perl
-file path=usr/share/man/man3perl/Task.3perl
-license cr_Sun license=cr_Sun
-license usr/src/cmd/perl/THIRDPARTYLICENSE \
-    license=usr/src/cmd/perl/THIRDPARTYLICENSE
-depend fmri=runtime/perl-510/extra type=require
diff --git a/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf b/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf
new file mode 100644
index 0000000000..4174d35fe5
--- /dev/null
+++ b/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf
@@ -0,0 +1,95 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014 Racktop Systems.
+#
+
+$(i386_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT i86pc>
+$(sparc_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT sun4>
+
+<transform file path=.*\.(pm|bs) -> default mode 0444>
+<transform file path=.*\.so -> default mode 0555>
+set name=pkg.fmri \
+    value=pkg:/runtime/perl$(PERL_PKGVERS)/module/sun-solaris@0.5.11,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+set name=pkg.summary value="Perl $(PERL_VERSION) Sun::Solaris Modules"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Perl
+set name=variant.arch value=$(ARCH)
+dir path=usr group=sys
+dir path=usr/perl5
+dir path=usr/perl5/$(PERL_VERSION)
+dir path=usr/perl5/$(PERL_VERSION)/lib
+dir path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int
+dir path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun
+dir path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris
+dir path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto
+dir path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun
+dir path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris
+dir \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs
+dir \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat
+dir \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp
+dir \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project
+dir \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task
+dir \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils
+dir path=usr/perl5/$(PERL_VERSION)/lib/Sun
+dir path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris
+dir path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris/BSM
+dir path=usr/share/man
+dir path=usr/share/man/man3perl
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris/Intrs.pm
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris/Kstat.pm
+file path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris/Lgrp.pm
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris/Project.pm
+file path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris/Task.pm
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/Sun/Solaris/Utils.pm
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.so
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.so
+file \
+    path=usr/perl5/$(PERL_VERSION)/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so
+file path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris/BSM/_BSMparse.pm
+file path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris/Pg.pm
+file path=usr/share/man/man3perl/Kstat.3perl
+file path=usr/share/man/man3perl/Lgrp.3perl
+file path=usr/share/man/man3perl/Project.3perl
+file path=usr/share/man/man3perl/Task.3perl
+license cr_Sun license=cr_Sun
+license usr/src/cmd/perl/THIRDPARTYLICENSE \
+    license=usr/src/cmd/perl/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf
index 8917751377..436742d3e6 100644
--- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf
+++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf
@@ -232,4 +232,4 @@ link path=usr/share/man/man4/addresses.4 target=aliases.4
 link path=usr/share/man/man4/forward.4 target=aliases.4
 link path=usr/share/man/man4/sendmail.cf.4 target=sendmail.4
 link path=usr/share/man/man4/submit.cf.4 target=sendmail.4
-depend fmri=runtime/perl-510 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS) type=require
diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf
index 31565de192..22b4f5a26f 100644
--- a/usr/src/pkg/manifests/system-extended-system-utilities.mf
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf
@@ -278,4 +278,4 @@ link path=usr/share/man/man1/uncompress.1 target=compress.1
 link path=usr/share/man/man1/unexpand.1 target=expand.1
 link path=usr/share/man/man1/unpack.1 target=pack.1
 link path=usr/share/man/man1/zcat.1 target=compress.1
-depend fmri=runtime/perl-510 type=require
+depend fmri=runtime/perl$(PERL_PKGVERS) type=require