diff --git a/CHANGES b/CHANGES index f06f9edcbf..69b4b26f96 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,12 @@ +3.2.0-dev.478 | 2020-05-08 11:47:38 -0700 + + * Added examples to set_to_regex comments (James Lagermann, Corelight) + + * Unbreak build on Fedora 32 (gcc 10.0.1) (Johanna Amann, Corelight) + + It requires cstdint in a few more headers. + 3.2.0-dev.475 | 2020-05-07 17:15:23 -0700 * GH-958: Fix crash when trying to redef non-existing enum (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index 79c497927d..37c79c0fa6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.475 +3.2.0-dev.478 diff --git a/doc b/doc index 850c5bea87..73cce33f7a 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 850c5bea8787c315cddc9079a29a17d89db055ec +Subproject commit 73cce33f7ab3a08ee8c92bf7815a092eae7ad031 diff --git a/scripts/base/utils/patterns.zeek b/scripts/base/utils/patterns.zeek index fc2ee6ba61..7890a6e111 100644 --- a/scripts/base/utils/patterns.zeek +++ b/scripts/base/utils/patterns.zeek @@ -4,7 +4,14 @@ module GLOBAL; ## Given a pattern as a string with two tildes (~~) contained in it, it will ## return a pattern with string set's elements OR'd together where the -## double-tilde was given. +## double-tilde was given. Examples: +## +## .. sourcecode:: zeek +## +## global r1 = set_to_regex(set("a", "b", "c"), "~~"); +## # r1 = /^?(a|b|c)$?/ +## global r2 = set_to_regex(set("a.com", "b.com", "c.com"), "\\.(~~)"); +## # r2 = /^?(\.(a\.com|b\.com|c\.com))$?/ ## ## ss: a set of strings to OR together. ##