From 9736182fbcff3ec52bdaa4eb4c5c712e5a6bcae6 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Fri, 7 Dec 2018 16:36:35 -0600 Subject: [PATCH] Update github/download links --- CHANGES | 4 ++++ README | 33 +++++++++++++++++++-------------- VERSION | 2 +- aux/binpac | 2 +- aux/broccoli | 2 +- aux/broctl | 2 +- aux/btest | 2 +- aux/netcontrol-connectors | 2 +- doc/frameworks/logging.rst | 2 +- doc/frameworks/netcontrol.rst | 2 +- doc/install/install.rst | 10 +++++----- testing/btest/README | 4 ++-- 12 files changed, 38 insertions(+), 29 deletions(-) diff --git a/CHANGES b/CHANGES index 62e8fd0dad..91bbce365f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-20 | 2018-12-07 16:36:35 -0600 + + * Update github/download links (Jon Siwek, Corelight) + 2.6-19 | 2018-12-07 07:26:51 -0600 * Fix Travis git clone command (Jon Siwek, Corelight) diff --git a/README b/README index f841ddd3d8..2c71e11c0b 100644 --- a/README +++ b/README @@ -1,29 +1,34 @@ -============================ -Bro Network Security Monitor -============================ +============================= +Zeek Network Security Monitor +============================= -Bro is a powerful framework for network analysis and security -monitoring. Please see the INSTALL file for installation instructions -and pointers for getting started. NEWS contains release notes for the -current version, and CHANGES has the complete history of changes. -Please see COPYING for licensing information. +Zeek is a powerful framework for network analysis and security +monitoring. + +(Zeek is the new name for the long-established Bro system. Note that +parts of the system retain the "Bro" name, and it also often appears in +the documentation and distributions.) + +Please see the INSTALL file for installation instructions and pointers +for getting started. NEWS contains release notes for the current +version, and CHANGES has the complete history of changes. Please see +COPYING for licensing information. You can download source and binary releases on: - http://www.bro.org/download + https://www.zeek.org/download To get the current development version, clone our master git repository: - git clone --recursive git://git.bro.org/bro + git clone --recursive https://github.com/zeek/zeek For more documentation, research publications, and community contact -information, please see Bro's home page: +information, please see the home page: - http://www.bro.org + https://www.zeek.org - -On behalf of the Bro Development Team, +On behalf of the Zeek Development Team, Vern Paxson & Robin Sommer, International Computer Science Institute & diff --git a/VERSION b/VERSION index 78583567cd..867192887e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-19 +2.6-20 diff --git a/aux/binpac b/aux/binpac index 2c1f0d88c8..8d0c0f874f 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit 2c1f0d88c889690f840d6918cebcc3f51d9b7108 +Subproject commit 8d0c0f874f9dbf3cb87f2f76579508693c8ff051 diff --git a/aux/broccoli b/aux/broccoli index d6a6f5e5d9..494fe25456 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit d6a6f5e5d90f3f89552b0cd8e2ef25b007a36f3b +Subproject commit 494fe254562e68842adfa35bc93a618e90fbad68 diff --git a/aux/broctl b/aux/broctl index e0ae3fcb54..64dd162ad7 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit e0ae3fcb549ed7875e15a655f6b8c50853260b3f +Subproject commit 64dd162ad7b8a9624c491a836062957efbb73cc9 diff --git a/aux/btest b/aux/btest index 5a93b2c704..6ece47ba64 160000 --- a/aux/btest +++ b/aux/btest @@ -1 +1 @@ -Subproject commit 5a93b2c7042ce1bf14f5d7db2047c1abad28d76f +Subproject commit 6ece47ba6438e7a6db5c7b85a68b3c16f0911871 diff --git a/aux/netcontrol-connectors b/aux/netcontrol-connectors index 29900864db..6501fef1ff 160000 --- a/aux/netcontrol-connectors +++ b/aux/netcontrol-connectors @@ -1 +1 @@ -Subproject commit 29900864dba939aad8dcbd55e16c1fc51221ec10 +Subproject commit 6501fef1fffc0b49dda59b3716b03034edcfeee6 diff --git a/doc/frameworks/logging.rst b/doc/frameworks/logging.rst index bcd84dde2b..10e0b8fc16 100644 --- a/doc/frameworks/logging.rst +++ b/doc/frameworks/logging.rst @@ -533,4 +533,4 @@ Bro supports the following additional built-in output formats: logging-input-sqlite Additional writers are available as external plugins through the `Bro -Package Manager `_. +Package Manager `_. diff --git a/doc/frameworks/netcontrol.rst b/doc/frameworks/netcontrol.rst index aeea6a70ec..ccb659c223 100644 --- a/doc/frameworks/netcontrol.rst +++ b/doc/frameworks/netcontrol.rst @@ -584,7 +584,7 @@ communicate with the Switch. NetControl and OpenFlow architecture (click to enlarge). The Python scripts that are used to interface with the available NetControl -plugins are contained in the `bro-netcontrol` repository (`github link `_). +plugins are contained in the `zeek-netcontrol` repository (`github link `_). The repository contains scripts for the OpenFlow as well as the acld plugin. Furthermore, it contains a script for the broker plugin which can be used to call configureable command-line programs when used with the broker plugin. diff --git a/doc/install/install.rst b/doc/install/install.rst index 87b84d7fda..ecc24671c3 100644 --- a/doc/install/install.rst +++ b/doc/install/install.rst @@ -147,17 +147,17 @@ available on the `bro downloads page`_. Alternatively, the latest Bro development version can be obtained through git repositories -hosted at ``git.bro.org``. See our `git development documentation -`_ for comprehensive +hosted at https://github.com/zeek. See our `git development documentation +`_ for comprehensive information on Bro's use of git revision control, but the short story for downloading the full source code experience for Bro via git is: .. console:: - git clone --recursive git://git.bro.org/bro + git clone --recursive https://github.com/zeek/zeek -.. note:: If you choose to clone the ``bro`` repository - non-recursively for a "minimal Bro experience", be aware that +.. note:: If you choose to clone the ``zeek`` repository + non-recursively for a "minimal Zeek experience", be aware that compiling it depends on several of the other submodules as well. The typical way to build and install from source is (for more options, diff --git a/testing/btest/README b/testing/btest/README index b9f5f7d338..200d1a3e0e 100644 --- a/testing/btest/README +++ b/testing/btest/README @@ -1,7 +1,7 @@ This a test suite of small "unit tests" that verify individual pieces of Bro functionality. They all utilize BTest, a simple framework/driver for writing unit tests. More information about BTest can be found at -https://github.com/bro/btest +https://github.com/zeek/btest The test suite's BTest configuration is handled through the ``btest.cfg`` file. Of particular interest is the "TestDirs" settings, @@ -61,7 +61,7 @@ Adding Tests ============= See either the `BTest documentation -`_ or the existing unit +`_ or the existing unit tests for examples of what they actually look like. The essential components of a new test include: