diff --git a/CHANGES b/CHANGES index 062c00961c..279636f907 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-71 | 2019-01-14 16:11:58 -0600 + + * GH-205: prioritize use of sigaction() over sigset() (Jon Siwek, Corelight) + 2.6-70 | 2019-01-14 15:34:18 -0600 * GH-188: fix crash when shutting down with pending reporter errors(Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index af59f39f6a..73adf66876 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-70 +2.6-71 diff --git a/aux/bifcl b/aux/bifcl index e836dcaa48..2a74bd5ad8 160000 --- a/aux/bifcl +++ b/aux/bifcl @@ -1 +1 @@ -Subproject commit e836dcaa48df69fccda3ddc2a64cd8be09333391 +Subproject commit 2a74bd5ad80601fa0b43fe10e07887d8e60fed28 diff --git a/aux/binpac b/aux/binpac index d0a89916c7..70b1361dec 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit d0a89916c77de69154a50339985d17fa0bf13823 +Subproject commit 70b1361dec59735029701580597948c2a4625d5d diff --git a/aux/broccoli b/aux/broccoli index 9bd910e88d..468b178801 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit 9bd910e88d412b00fbcd1e5301144aa0746923a5 +Subproject commit 468b1788014ccbabf22b815effad2fc100e50ff4 diff --git a/aux/broctl b/aux/broctl index 4808c07314..c7642534e8 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 4808c07314ced57ac38364ff60647cbc33e853b6 +Subproject commit c7642534e898cda9552dc372b9bb3baaf2f5c457 diff --git a/aux/broker b/aux/broker index f23cce74bc..790d0d3400 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit f23cce74bcd2f6e1a1affd593d6adf129e6c490e +Subproject commit 790d0d340041442abf643a6adeab41123e28841a diff --git a/aux/zeek-aux b/aux/zeek-aux index 22aac5f179..a5a2591df2 160000 --- a/aux/zeek-aux +++ b/aux/zeek-aux @@ -1 +1 @@ -Subproject commit 22aac5f17935c4d2ff2cab3ae37e95aaec8fa9a1 +Subproject commit a5a2591df2e81dee71415ceae484a03378d1c4c3 diff --git a/bro-config.h.in b/bro-config.h.in index 1b351e550f..356e790c8e 100644 --- a/bro-config.h.in +++ b/bro-config.h.in @@ -47,7 +47,7 @@ /* line editing & history powers */ #cmakedefine HAVE_READLINE -/* Define if you have the `sigaction' function, but not `sigset'. */ +/* Define if you have the `sigaction' function. */ #cmakedefine HAVE_SIGACTION /* Define if you have the `sigset' function. */ diff --git a/cmake b/cmake index 56143d2589..81a1a32e13 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 56143d25890f5f65a27761d35f154c63e5454ca3 +Subproject commit 81a1a32e1316a69fc7e6812e12cf89d12cc5ff3e