Merge remote-tracking branch 'origin/topic/jsiwek/gh-1080-error-on-enum-redefinition-conflict'

* origin/topic/jsiwek/gh-1080-error-on-enum-redefinition-conflict:
  Fix incorrect conflict detection of namespaced-enum-names
  Improve error message for an enum name conflicting with non-enum ID
  GH-1080: Treat enum name re-use across different enum types as an error
  GH-1080: Rename conflicting NetControl::DROP enum definitions

Fixes GH-1080

NEWS

@@ -6,14 +6,38 @@ release. For an exhaustive list of changes, see the ``CHANGES`` file
 Zeek 4.0.0
 ==========
 
+New Functionality
+-----------------
+
 TODO: nothing notable yet
 
+Changed Functionality
+---------------------
+
+- ``NetControl::DROP`` had 3 conflicting definitions that could potentially
+  be used incorrectly without any warnings or type-checking errors.
+  Such enum redefinition conflicts are now caught and treated as errors,
+  so the ``NetControl::DROP`` enums had to be renamed:
+
+  - The use as enum of type ``Log::ID`` is renamed to ``NetControl::DROP_LOG``
+
+  - The use as enum of type ``NetControl::CatchReleaseInfo`` is renamed to
+    ``NetControl::DROP_REQUESTED``
+
+  - The use as enum of type ``NetControl::RuleType`` is unchanged and still
+    named ``NetControl::DROP``
+
 Removed Functionality
 ---------------------
 
 - The counter type was removed. This type was never fully functional/used
   anywhere.
 
+Deprecated Functionality
+------------------------
+
+TODO: nothing notable yet
+
 Zeek 3.2.0
 ==========