From dede6b114f0006c55f41063e73d4b28b29710b95 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 20 Jul 2017 16:06:27 +0200
Subject: asn1: Fix missing quotes of external encoding call

introduced by 8e4a9864385242b962ce7446f7daa4f58cfecca5.
---
 lib/asn1/src/asn1ct_gen_per.erl                 | 2 +-
 lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1  | 3 ++-
 lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/asn1')

diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 28b4e46b0c..82e9326294 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -101,7 +101,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) ->
 	#'Externaltypereference'{module=CurrMod,type=Etype} ->
             emit([{asis,enc_func(Etype)},"(Val).",nl]);
 	#'Externaltypereference'{module=Emod,type=Etype} ->
-            emit([{asis,Emod},":",enc_func(Etype),"(Val).",nl])
+            emit([{asis,Emod},":",{asis,enc_func(Etype)},"(Val).",nl])
     end.
 
 
diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1
index 32b8f75dde..dee3cd5048 100644
--- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1
@@ -1,8 +1,9 @@
 ImportsFrom DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
-IMPORTS Int FROM ImportsFrom2;
+IMPORTS Int, Quoted-Seq FROM ImportsFrom2;
 i Int ::= 42
+My-Seq ::= Quoted-Seq
 
 END
 
diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1
index b0c29d24ae..a8e619e215 100644
--- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1
@@ -2,6 +2,11 @@ ImportsFrom2 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 IMPORTS Int FROM ImportsFrom3;
 
+Quoted-Seq ::= SEQUENCE {
+  x	   INTEGER(0..17),
+  y	   INTEGER(0..666)
+}
+
 LocalDef ::= OCTET STRING
 
 END
-- 
cgit v1.2.3


From b43756a45f872255fbb82ce0c235b9aa4a1e01ae Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 26 Jul 2017 11:46:21 +0200
Subject: Update version numbers

---
 lib/asn1/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/asn1')

diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 7329a9f879..ec92d324eb 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0
+ASN1_VSN = 5.0.1
-- 
cgit v1.2.3


From 4c73c0b0fa607c5f1e0befec2efc36b940a08106 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 26 Jul 2017 11:46:38 +0200
Subject: Update release notes

---
 lib/asn1/doc/src/notes.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/asn1')

diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 26640acabc..03452648bb 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,23 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed compilation error of generated code caused by a
+	    missing quotation of function names as part of an
+	    external call for encoding.</p>
+          <p>
+	    Own Id: OTP-14519 Aux Id: ERIERL-49 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3