Upgrade to version R14B, with a couple of fixes from the Erlang

mailing lists.

10 files changed, 114 insertions, 106 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index cad02fe8c8f2..ed279d026063 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r13b04
-PORTREVISION=	3
+PORTVERSION=	r14b
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -17,7 +16,7 @@ MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
 		${MASTER_SITE_LOCAL:S/$/:local/}
-DISTNAME=	otp_src_R13B04
+DISTNAME=	otp_src_R14B
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg			\
 		${ERLANG_DOCS}:erlangorg		\
@@ -93,9 +92,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R13B04.tar.gz
+ERLANG_MAN=	otp_doc_man_R14B.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R13B04.tar.gz
+ERLANG_DOCS=	otp_doc_html_R14B.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index c57f8d2c6b91..e6ab89aa1c50 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.7.5
-TOOLS_VSN=	2.6.5.1
-OTP_LIBS=	appmon-2.1.11 \
-		asn1-1.6.13 \
-		common_test-1.4.7 \
-		compiler-4.6.5 \
-		cosEvent-2.1.8 \
-		cosEventDomain-1.1.8 \
+ERTS_VSN=	5.8.1
+TOOLS_VSN=	2.6.6.1
+OTP_LIBS=	appmon-2.1.13 \
+		asn1-1.6.14.1 \
+		common_test-1.5.1 \
+		compiler-4.7.1 \
+		cosEvent-2.1.9 \
+		cosEventDomain-1.1.9 \
 		cosFileTransfer-1.1.10 \
-		cosNotification-1.1.13 \
-		cosProperty-1.1.11 \
-		cosTime-1.1.8 \
-		cosTransactions-1.2.9 \
-		crypto-1.6.4 \
-		debugger-3.2.2 \
-		dialyzer-2.2.0 \
-		docbuilder-0.9.8.7 \
-		edoc-0.7.6.6 \
-		erl_docgen-0.2 \
-		erl_interface-3.6.5 \
-		erts-5.7.5 \
-		et-1.4 \
+		cosNotification-1.1.14 \
+		cosProperty-1.1.12 \
+		cosTime-1.1.9 \
+		cosTransactions-1.2.10 \
+		crypto-2.0.1 \
+		debugger-3.2.4 \
+		dialyzer-2.3.1 \
+		docbuilder-0.9.8.8 \
+		edoc-0.7.6.7 \
+		erl_docgen-0.2.2 \
+		erl_interface-3.7.1 \
+		erts-5.8.1 \
+		et-1.4.1 \
 		eunit-2.1.5 \
-		gs-1.5.11 \
-		hipe-3.7.5 \
-		ic-4.2.24 \
-		inets-5.3 \
-		inviso-0.6.1 \
-		jinterface-1.5.3 \
-		kernel-2.13.5 \
-		megaco-3.14 \
-		mnesia-4.4.13 \
-		observer-0.9.8.2 \
-		odbc-2.10.7 \
-		orber-3.6.15 \
+		gs-1.5.13 \
+		hipe-3.7.7 \
+		ic-4.2.25 \
+		inets-5.5 \
+		inviso-0.6.2 \
+		jinterface-1.5.3.1 \
+		kernel-2.14.1 \
+		megaco-3.15 \
+		mnesia-4.4.15 \
+		observer-0.9.8.3 \
+		odbc-2.10.8 \
+		orber-3.6.17 \
 		os_mon-2.2.5 \
 		otp_mibs-1.0.6 \
-		parsetools-2.0.2 \
+		parsetools-2.0.4 \
 		percept-0.8.4 \
 		pman-2.7.1 \
-		public_key-0.5 \
-		reltool-0.5.3 \
-		runtime_tools-1.8.3 \
-		sasl-2.1.9 \
-		snmp-4.16 \
-		ssh-1.1.8 \
-		ssl-3.10.8 \
-		stdlib-1.16.5 \
-		syntax_tools-1.6.5 \
-		test_server-3.3.6 \
+		public_key-0.8 \
+		reltool-0.5.4 \
+		runtime_tools-1.8.4.1 \
+		sasl-2.1.9.2 \
+		snmp-4.18 \
+		ssh-2.0.1 \
+		ssl-4.0.1 \
+		stdlib-1.17.1 \
+		syntax_tools-1.6.6 \
+		test_server-3.4.1 \
 		toolbar-1.4.1 \
-                tools-2.6.5.1 \
-		tv-2.1.4.4 \
-		typer-0.1.7.4 \
-		webtool-0.8.6 \
-		wx-0.98.5 \
-		xmerl-1.2.4
+		tools-2.6.6.1 \
+		tv-2.1.4.6 \
+		typer-0.1.7.5 \
+		webtool-0.8.7 \
+		wx-0.98.7 \
+		xmerl-1.2.6
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 3fdac66edef3..ad5b90e5e138 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -89,6 +89,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	auth.3 \
 	base64.3 \
 	beam_lib.3 \
+	binary.3 \
 	c.3 \
 	calendar.3 \
 	code.3 \
@@ -112,6 +113,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	ct_ftp.3 \
 	ct_master.3 \
 	ct_rpc.3 \
+	ct_slave.3 \
 	ct_snmp.3 \
 	ct_ssh.3 \
 	ct_telnet.3 \
@@ -156,6 +158,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	erl_lint.3 \
 	erl_malloc.3 \
 	erl_marshal.3 \
+	erl_nif.3 \
 	erl_parse.3 \
 	erl_pp.3 \
 	erl_prettypr.3 \
@@ -262,9 +265,9 @@ MAN3=	CosEventChannelAdmin.3 \
 	ms_transform.3 \
 	net_adm.3 \
 	net_kernel.3 \
-	new_ssl.3 \
 	nteventlog.3 \
 	odbc.3 \
+	old_ssl.3 \
 	orber.3 \
 	orber_acl.3 \
 	orber_diagnostics.3 \
@@ -342,6 +345,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	ssh_sftp.3 \
 	ssh_sftpd.3 \
 	ssl.3 \
+	ssl_session_cache_api.3 \
 	string.3 \
 	supervisor.3 \
 	supervisor_bridge.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 75a0a469f2d0..01bab8fd77de 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,12 +1,12 @@
-MD5 (erlang/otp_src_R13B04.tar.gz) = ca6da4921e438891967900aa6a084341
-SHA256 (erlang/otp_src_R13B04.tar.gz) = e2694383b3857f5edfc242b8c3acbfba4683e448387fa124d8e587cba234af43
-SIZE (erlang/otp_src_R13B04.tar.gz) = 59060560
-MD5 (erlang/otp_doc_man_R13B04.tar.gz) = 681aaef70affc64743f4e8c0675034af
-SHA256 (erlang/otp_doc_man_R13B04.tar.gz) = 3646198b64bbea0f3760987d20d3392b0b5b2955394a917b92a2c6664a310dd6
-SIZE (erlang/otp_doc_man_R13B04.tar.gz) = 1033584
-MD5 (erlang/otp_doc_html_R13B04.tar.gz) = d69ce51bfabbdd0808461d86dfc95689
-SHA256 (erlang/otp_doc_html_R13B04.tar.gz) = fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
-SIZE (erlang/otp_doc_html_R13B04.tar.gz) = 27440785
+MD5 (erlang/otp_src_R14B.tar.gz) = 5292a04556d17ad528d570e02357dfbb
+SHA256 (erlang/otp_src_R14B.tar.gz) = b35af03c69c40c0e4758ee011f71e28ce92783368afec764ce46e6e54cb05d9f
+SIZE (erlang/otp_src_R14B.tar.gz) = 59800980
+MD5 (erlang/otp_doc_man_R14B.tar.gz) = 011530a24fbcc194be9bd01f779325a2
+SHA256 (erlang/otp_doc_man_R14B.tar.gz) = 4c43ef799c29ef488959ffdfb8a8fc1d1e7756c2c7dccb4cc81061de5ac40c8a
+SIZE (erlang/otp_doc_man_R14B.tar.gz) = 1067515
+MD5 (erlang/otp_doc_html_R14B.tar.gz) = 2294757773a0cf4c036f602fbb9fc4fb
+SHA256 (erlang/otp_doc_html_R14B.tar.gz) = 0189a784a4ea0c192c857835b20fa97a0c9f85054ae5b9868061574f329842a5
+SIZE (erlang/otp_doc_html_R14B.tar.gz) = 27735095
 MD5 (erlang/armstrong_thesis_2003.pdf) = 2196a214fd7eccc6292adb96602f5827
 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
diff --git a/lang/erlang/files/patch-erts_emulator_beam_erl__time__sup.c b/lang/erlang/files/patch-erts_emulator_beam_erl__time__sup.c
deleted file mode 100644
index 1e84d40d27ec..000000000000
--- a/lang/erlang/files/patch-erts_emulator_beam_erl__time__sup.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/beam/erl_time_sup.c.orig
-+++ erts/emulator/beam/erl_time_sup.c
-@@ -648,6 +648,9 @@
-     t.tm_sec = *second;
-     t.tm_isdst = isdst;
-     the_clock = mktime(&t);
-+    if (the_clock == -1) {
-+      return 0;
-+    }
- #ifdef HAVE_GMTIME_R
-     gmtime_r(&the_clock, (tm = &tmbuf));
- #else
diff --git a/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c b/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
index 1841e34f3b68..655d49087df7 100644
--- a/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
+++ b/lang/erlang/files/patch-erts_emulator_drivers_common_inet__drv.c
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- erts/emulator/drivers/common/inet_drv.c.orig
 +++ erts/emulator/drivers/common/inet_drv.c
-@@ -3490,17 +3490,9 @@
+@@ -3452,17 +3452,9 @@
      /* Check the size of SCTP AssocID -- currently both this driver and the
         Erlang part require 32 bit: */
      ASSERT(sizeof(sctp_assoc_t)==ASSOC_ID_LEN);
@@ -21,15 +21,14 @@ $FreeBSD$
 +    p_sctp_bindx = sctp_bindx;
 +    inet_init_sctp();
 +    add_driver_entry(&sctp_inet_driver_entry);
- #  endif
- #endif /* _OSE_ */
+ #endif
+ 
      /* remove the dummy inet driver */
-@@ -5305,12 +5297,15 @@
+@@ -5293,12 +5285,14 @@
  	    if (pmtud_enable)			cflags |= SPP_PMTUD_ENABLE;
  	    if (pmtud_disable)			cflags |= SPP_PMTUD_DISABLE;
  
 +#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
-+	    /* The followings are missing in FreeBSD 7.1 */
  	    sackdelay_enable =eflags& SCTP_FLAG_SACDELAY_ENABLE;
  	    sackdelay_disable=eflags& SCTP_FLAG_SACDELAY_DISABLE;
  	    if (sackdelay_enable && sackdelay_disable)
@@ -40,13 +39,11 @@ $FreeBSD$
  
  	    arg.pap.spp_flags  = cflags;
  #	    endif
-@@ -6211,13 +6206,15 @@
- 	    
+@@ -6200,12 +6194,14 @@
  	    if (ap.spp_flags & SPP_PMTUD_DISABLE)
  		{ i = LOAD_ATOM (spec, i, am_pmtud_disable);         n++; }
--	    
+ 	    
 +#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
-+	    /* SPP_SACKDELAY_* not in FreeBSD 7.1 */
  	    if (ap.spp_flags & SPP_SACKDELAY_ENABLE)
  		{ i = LOAD_ATOM (spec, i, am_sackdelay_enable);      n++; }
  	    
diff --git a/lang/erlang/files/patch-lib_public__key_src_pubkey__cert.erl b/lang/erlang/files/patch-lib_public__key_src_pubkey__cert.erl
new file mode 100644
index 000000000000..414f1f9279b8
--- /dev/null
+++ b/lang/erlang/files/patch-lib_public__key_src_pubkey__cert.erl
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- lib/public_key/src/pubkey_cert.erl.orig
++++ lib/public_key/src/pubkey_cert.erl
+@@ -223,10 +223,15 @@
+ %%--------------------------------------------------------------------	
+ validate_extensions(OtpCert, ValidationState, UserState, VerifyFun) ->
+     TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+-    Extensions = TBSCert#'OTPTBSCertificate'.extensions,
+-    validate_extensions(OtpCert, Extensions, ValidationState, no_basic_constraint,
+-			is_self_signed(OtpCert), UserState, VerifyFun).
+-
++    case TBSCert#'OTPTBSCertificate'.version of
++       N when N >= 3 ->
++           Extensions = TBSCert#'OTPTBSCertificate'.extensions,
++           validate_extensions(OtpCert, Extensions,
++                               ValidationState, no_basic_constraint,
++                               is_self_signed(OtpCert), UserState, VerifyFun);
++       _ -> %% Extensions not present in versions 1 & 2
++           {ValidationState, UserState}
++    end.
+ %%--------------------------------------------------------------------
+ -spec normalize_general_name({rdnSequence, term()}) -> {rdnSequence, term()}. 
+ %%
diff --git a/lang/erlang/files/patch-lib_public__key_src_public__key.erl b/lang/erlang/files/patch-lib_public__key_src_public__key.erl
new file mode 100644
index 000000000000..7db7a1582858
--- /dev/null
+++ b/lang/erlang/files/patch-lib_public__key_src_public__key.erl
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/public_key/src/public_key.erl.orig
++++ lib/public_key/src/public_key.erl
+@@ -576,7 +576,7 @@
+ %%--------------------------------------------------------------------
+ pem_to_der(CertSource) ->
+     {ok, Bin} = file:read_file(CertSource),
+-    pubkey_pem:decode(Bin).
++    {ok, pubkey_pem:decode(Bin)}.
+ 
+ decode_private_key(KeyInfo) ->
+     decode_private_key(KeyInfo, no_passwd).
diff --git a/lang/erlang/files/patch-lib_tools_emacs_Makefile b/lang/erlang/files/patch-lib_tools_emacs_Makefile
deleted file mode 100644
index 2654026704d3..000000000000
--- a/lang/erlang/files/patch-lib_tools_emacs_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- lib/tools/emacs/Makefile.orig
-+++ lib/tools/emacs/Makefile
-@@ -39,7 +39,10 @@
- EMACS_FILES= \
- 	erlang-start \
- 	erlang-eunit \
--	erlang
-+	erlang \
-+	erlang_appwiz \
-+	erlang-skels \
-+	erlang-skels-old
- 
- README_FILES= README
- 
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index a1ab120e8594..4ba9e69b47e5 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -5,6 +5,7 @@ bin/erl_call
 bin/erlc
 bin/escript
 bin/run_erl
+bin/run_test
 bin/to_erl
 bin/typer
 @comment Insert PLIST here