Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' into maint

* raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066:
  [snmp/compiler] Refinement of type Opaque was not allowed MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.

4 files changed, 71 insertions, 1 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index bbe6438f04..fd307ef824 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -33,6 +33,69 @@
   </header>
 
 
+  <section>
+    <title>SNMP Development Toolkit 5.1.1</title>
+    <p>Version 5.1.1 supports code replacement in runtime from/to
+    version 5.1. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[compiler] Refinement of type Opaque was not allowed. </p>
+          <p>MIB constructs such as '<c>SYNTAX Opaque (SIZE(0..65535))</c>' 
+	  was previously not allowed, 
+	  see the standard <c>ALARM-MIB</c> for eaxmple. </p>
+          <p>Own Id: OTP-12066</p>
+          <p>Aux Id: Seq 12669</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] 
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso>. </p>
+          <p>Own Id: OTP-11216</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+-->
+    </section>
+  </section> <!-- 5.1.1 -->
+
+
+
   <section><title>SNMP 5.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 1cc1a17b1d..e7e54f5b7e 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -28,9 +28,12 @@
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
+  {"5.1", [ % Only compiler changes
+  ]},
   {"5.0", [{restart_application, snmp}]},
   {"4.25.1", [{restart_application, snmp}]},
   {"4.25.0.1", [{restart_application, snmp}]},
+  {"4.25.0.0.1", [{restart_application, snmp}]},
   {"4.25",   [{restart_application, snmp}]}, 
   {"4.24.2", [{restart_application, snmp}]}, 
   {"4.24.1", [{restart_application, snmp}]}, 
@@ -43,9 +46,12 @@
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
 
  [
+  {"5.1", [ % Only compiler changes
+  ]},
   {"5.0", [{restart_application, snmp}]},
   {"4.25.1", [{restart_application, snmp}]},
   {"4.25.0.1", [{restart_application, snmp}]},
+  {"4.25.0.0.1", [{restart_application, snmp}]},
   {"4.25",   [{restart_application, snmp}]}, 
   {"4.24.2", [{restart_application, snmp}]}, 
   {"4.24.1", [{restart_application, snmp}]}, 
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 5a661cf194..0f6393eeef 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -139,6 +139,7 @@ allow_size_rfc1902('Integer32') -> true;
 allow_size_rfc1902('Unsigned32') -> true;
 allow_size_rfc1902('OCTET STRING') -> true;
 allow_size_rfc1902('Gauge32') -> true;
+allow_size_rfc1902('Opaque') -> true;
 allow_size_rfc1902(_) -> false.
 
 guess_integer_type() ->
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index b436a79076..345cc790f2 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.1
+SNMP_VSN    = 5.1.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"