Skip to content
Permalink
Browse files

Update Postgres plugin to compile with 3.1

  • Loading branch information
0xxon committed Feb 12, 2020
1 parent 49dcb7e commit 5d52e0a677e261011cdf9f8bae5ac44bde732aec

This file was deleted.

114 configure
@@ -14,23 +14,20 @@ if [ -e `dirname $0`/configure.plugin ]; then
. `dirname $0`/configure.plugin
fi

# Check for `cmake` command.
type cmake > /dev/null 2>&1 || {
echo "\
This package requires CMake, please install it first, then you may
use this configure script to access CMake equivalent functionality.\
" >&2;
exit 1;
}

usage() {

cat 1>&2 <<EOF
Usage: $0 [OPTIONS]
Plugin Options:
--bro-dist=DIR Path to Bro source tree
--cmake=PATH Path to CMake binary
--zeek-dist=DIR Path to Zeek source tree
--install-root=DIR Path where to install plugin into
--with-binpac=DIR Path to BinPAC installation root
--with-broker=DIR Path to Broker installation root
--with-caf=DIR Path to CAF installation root
--with-bifcl=PATH Path to bifcl executable
--enable-debug Compile in debugging mode
EOF

if type plugin_usage >/dev/null 2>&1; then
@@ -53,7 +50,7 @@ append_cache_entry () {

# set defaults
builddir=build
brodist=`cd ../../.. && pwd`
zeekdist=""
installroot="default"
CMakeCacheEntries=""

@@ -68,14 +65,41 @@ while [ $# -ne 0 ]; do
usage
;;

--bro-dist=*)
brodist=`cd $optarg && pwd`
--cmake=*)
CMakeCommand=$optarg
;;

--zeek-dist=*)
zeekdist=`cd $optarg && pwd`
;;

--install-root=*)
installroot=$optarg
;;

--with-binpac=*)
append_cache_entry BinPAC_ROOT_DIR PATH $optarg
binpac_root=$optarg
;;

--with-broker=*)
append_cache_entry BROKER_ROOT_DIR PATH $optarg
broker_root=$optarg
;;

--with-caf=*)
append_cache_entry CAF_ROOT_DIR PATH $optarg
caf_root=$optarg
;;

--with-bifcl=*)
append_cache_entry BifCl_EXE PATH $optarg
;;

--enable-debug)
append_cache_entry BRO_PLUGIN_ENABLE_DEBUG BOOL true
;;

*)
if type plugin_option >/dev/null 2>&1; then
plugin_option $1 && shift && continue;
@@ -88,26 +112,76 @@ while [ $# -ne 0 ]; do
shift
done

if [ ! -e "$brodist/bro-path-dev.in" ]; then
echo "Cannot determine Bro source directory, use --bro-dist=DIR."
exit 1
if [ -z "$CMakeCommand" ]; then
# prefer cmake3 over "regular" cmake (cmake == cmake2 on RHEL)
if command -v cmake3 >/dev/null 2>&1 ; then
CMakeCommand="cmake3"
elif command -v cmake >/dev/null 2>&1 ; then
CMakeCommand="cmake"
else
echo "This package requires CMake, please install it first."
echo "Then you may use this script to configure the CMake build."
echo "Note: pass --cmake=PATH to use cmake in non-standard locations."
exit 1;
fi
fi

append_cache_entry BRO_DIST PATH $brodist
append_cache_entry CMAKE_MODULE_PATH PATH $brodist/cmake
if [ -z "$zeekdist" ]; then
if type zeek-config >/dev/null 2>&1; then
zeek_config="zeek-config"
else
echo "Either 'zeek-config' must be in PATH or '--zeek-dist=<path>' used"
exit 1
fi

append_cache_entry BRO_CONFIG_PREFIX PATH `${zeek_config} --prefix`
append_cache_entry BRO_CONFIG_INCLUDE_DIR PATH `${zeek_config} --include_dir`
append_cache_entry BRO_CONFIG_PLUGIN_DIR PATH `${zeek_config} --plugin_dir`
append_cache_entry BRO_CONFIG_CMAKE_DIR PATH `${zeek_config} --cmake_dir`
append_cache_entry CMAKE_MODULE_PATH PATH `${zeek_config} --cmake_dir`

build_type=`${zeek_config} --build_type`

if [ "$build_type" = "debug" ]; then
append_cache_entry BRO_PLUGIN_ENABLE_DEBUG BOOL true
fi

if [ -z "$binpac_root" ]; then
append_cache_entry BinPAC_ROOT_DIR PATH `${zeek_config} --binpac_root`
fi

if [ -z "$broker_root" ]; then
append_cache_entry BROKER_ROOT_DIR PATH `${zeek_config} --broker_root`
fi

if [ -z "$caf_root" ]; then
append_cache_entry CAF_ROOT_DIR PATH `${zeek_config} --caf_root`
fi
else
if [ ! -e "$zeekdist/zeek-path-dev.in" ]; then
echo "$zeekdist does not appear to be a valid Zeek source tree."
exit 1
fi

# BRO_DIST is the canonical/historical name used by plugin CMake scripts
# ZEEK_DIST doesn't serve a function at the moment, but set/provided anyway
append_cache_entry BRO_DIST PATH $zeekdist
append_cache_entry ZEEK_DIST PATH $zeekdist
append_cache_entry CMAKE_MODULE_PATH PATH $zeekdist/cmake
fi

if [ "$installroot" != "default" ]; then
mkdir -p $installroot
append_cache_entry BRO_PLUGIN_INSTALL_ROOT PATH $installroot
fi

echo "Build Directory : $builddir"
echo "Bro Source Directory : $brodist"
echo "Zeek Source Directory : $zeekdist"

mkdir -p $builddir
cd $builddir

cmake $CMakeCacheEntries ..
"$CMakeCommand" $CMakeCacheEntries ..

echo "# This is the command used to configure this build" > config.status
echo $command >> config.status
File renamed without changes.

This file was deleted.

@@ -0,0 +1,13 @@
#
# This is loaded unconditionally at Zeek startup. Include scripts here that should
# always be loaded.
#
# Normally, that will be only code that initializes built-in elements. Load
# your standard scripts in
# scripts/<plugin-namespace>/<plugin-name>/__load__.zeek instead.
#

@load ./init.zeek



@@ -1,12 +1,12 @@
#
# This is loaded unconditionally at Bro startup before any of the BiFs that the
# This is loaded unconditionally at Zeek startup before any of the BiFs that the
# plugin defines become available.
#
# This is primarily for defining types that BiFs already depend on. If you need
# to do any other unconditional initialization (usually that's just for other BiF
# elemets), that should go into __load__.bro instead.
# elemets), that should go into __load__.zeek instead.
#

@load ./types.bro
@load ./types.zeek


File renamed without changes.
File renamed without changes.
@@ -5,7 +5,7 @@
#include <sys/stat.h>
#include <unistd.h>

#include "bro-config.h"
#include "zeek-config.h"

#include "NetVar.h"
#include "threading/SerialTypes.h"
@@ -5,7 +5,7 @@
#include <vector>
#include <regex>

#include "bro-config.h"
#include "zeek-config.h"

#include "NetVar.h"
#include "threading/SerialTypes.h"

0 comments on commit 5d52e0a

Please sign in to comment.
You can’t perform that action at this time.