[bro] update patches
Fabian Affolter
fab at fedoraproject.org
Mon Nov 24 13:54:08 UTC 2014
commit f8f7cb7d6a39ed5083585704e13bc94cff91c19c
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date: Mon Nov 24 14:51:05 2014 +0100
update patches
bro-2.3-broctl-configure.patch | 53 ++++++++++++++++++++++++
bro-2.3-broctl-disable-aux.patch | 48 +++++++++++++++++++++
bro-2.3-broctl-path.patch | 20 +++++++++
bro-2.3-configure.patch | 84 ++++++++++++++++++++++++++++++++++++++
bro-logrotate.conf | 10 +++++
5 files changed, 215 insertions(+), 0 deletions(-)
---
diff --git a/bro-2.3-broctl-configure.patch b/bro-2.3-broctl-configure.patch
new file mode 100644
index 0000000..ee7f02e
--- /dev/null
+++ b/bro-2.3-broctl-configure.patch
@@ -0,0 +1,53 @@
+--- bro-2.3/aux/broctl/configure 2014-08-17 11:02:49.848645878 +0200
++++ bro-2.3/aux/broctl/configure.new 2014-09-17 10:34:44.781882614 +0200
+@@ -80,6 +80,40 @@
+ echo "${usage}" 1>&2
+ exit 1
+ ;;
++ --build=*)
++ ;;
++ --host=*)
++ ;;
++ --program-prefix=*)
++ ;;
++ --disable-dependency-tracking)
++ ;;
++ --exec-prefix=*)
++ ;;
++ --bindir=*)
++ ;;
++ --sbindir=*)
++ ;;
++ --sysconfdir=*)
++ ;;
++ --datadir=*)
++ ;;
++ --includedir=*)
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ append_cache_entry INSTALL_LIB_DIR PATH $optarg
++ ;;
++ --libexecdir=*)
++ ;;
++ --localstatedir=*)
++ ;;
++ --sharedstatedir=*)
++ ;;
++ --mandir=*)
++ ;;
++ --infodir=*)
++ ;;
+ --builddir=*)
+ builddir=$optarg
+ ;;
+@@ -112,6 +146,9 @@
+ append_cache_entry PYTHON_INCLUDE_DIR PATH $optarg
+ append_cache_entry PYTHON_INCLUDE_PATH PATH $optarg
+ ;;
++ --python-install-dir=*)
++ append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg
++ ;;
+ --with-swig=*)
+ append_cache_entry SWIG_EXECUTABLE PATH $optarg
+ ;;
diff --git a/bro-2.3-broctl-disable-aux.patch b/bro-2.3-broctl-disable-aux.patch
new file mode 100644
index 0000000..2d3c2dd
--- /dev/null
+++ b/bro-2.3-broctl-disable-aux.patch
@@ -0,0 +1,48 @@
+--- bro-2.3/aux/broctl/CMakeLists.txt 2014-06-16 16:59:14.000000000 +0200
++++ bro-2.3/aux/broctl/CMakeLists.txt.new 2014-09-17 21:04:45.908841400 +0200
+@@ -14,27 +14,27 @@
+
+ include(FindRequiredPackage)
+
+-if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/pysubnettree/CMakeLists.txt)
+- add_subdirectory(aux/pysubnettree)
+- set(SUBNETTREE_FOUND true)
+- set(SUBNETTREE_PYTHON_MODULE "build from source aux/pysubnettree")
+-endif ()
+-
+-if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/capstats/CMakeLists.txt)
+- add_subdirectory(aux/capstats)
+-else ()
+- find_package(Capstats)
+-endif ()
+-
+-if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/trace-summary/CMakeLists.txt)
+- add_subdirectory(aux/trace-summary)
+-else ()
+- find_package(TraceSummary)
+-endif ()
++#if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/pysubnettree/CMakeLists.txt)
++# add_subdirectory(aux/pysubnettree)
++# set(SUBNETTREE_FOUND true)
++# set(SUBNETTREE_PYTHON_MODULE "build from source aux/pysubnettree")
++#endif ()
++
++#if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/capstats/CMakeLists.txt)
++# add_subdirectory(aux/capstats)
++#else ()
++# find_package(Capstats)
++#endif ()
++
++#if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/trace-summary/CMakeLists.txt)
++# add_subdirectory(aux/trace-summary)
++#else ()
++# find_package(TraceSummary)
++#endif ()
+
+ find_package(Bro)
+ FindRequiredPackage(PythonInterp)
+-FindRequiredPackage(SubnetTree)
++#FindRequiredPackage(SubnetTree)
+ find_package(PCAP)
+
+ if (HAVE_PF_RING)
diff --git a/bro-2.3-broctl-path.patch b/bro-2.3-broctl-path.patch
new file mode 100644
index 0000000..38d2289
--- /dev/null
+++ b/bro-2.3-broctl-path.patch
@@ -0,0 +1,20 @@
+--- bro-2.3/aux/broctl/bin/broctl.in 2014-06-16 16:59:14.000000000 +0200
++++ bro-2.3/aux/broctl/bin/broctl.in.path 2014-06-23 20:16:48.212196292 +0200
+@@ -39,7 +39,7 @@
+ BroScriptDir = tmpbroscriptdir
+
+ # Adjust the PYTHONPATH
+-sys.path = [os.path.join(BroBase, "lib/broctl")] + sys.path
++sys.path = [os.path.join(BroBase, "%{_libdir}/broctl")] + sys.path
+
+ # We need to add the directory of the Broccoli library files
+ # to the linker's runtime search path. This is hack which
+@@ -49,7 +49,7 @@
+ ldpath = "DYLD_LIBRARY_PATH"
+
+ old = os.environ.get(ldpath)
+-dir = os.path.join(BroBase, "lib")
++dir = "%{_libdir}"
+ if not old or dir not in old:
+ if old:
+ path = "%s:%s" % (dir, old)
diff --git a/bro-2.3-configure.patch b/bro-2.3-configure.patch
new file mode 100644
index 0000000..63a43f8
--- /dev/null
+++ b/bro-2.3-configure.patch
@@ -0,0 +1,84 @@
+--- bro-2.3/configure 2014-06-16 16:58:57.000000000 +0200
++++ bro-2.3/configure.new 2014-11-23 18:36:30.870544110 +0100
+@@ -25,6 +25,9 @@
+ --scriptdir=PATH root installation directory for Bro scripts
+ [PREFIX/share/bro]
+ --conf-files-dir=PATH config files installation directory [PREFIX/etc]
++ --python-install-dir the desired installation directory for
++ any auxiliary python modules (if present)
++ [PREFIX/lib/broctl]
+
+ Optional Features:
+ --enable-debug compile in debugging mode
+@@ -34,6 +37,7 @@
+ --enable-perftools-debug use Google's perftools for debugging
+ --enable-jemalloc link against jemalloc
+ --enable-ruby build ruby bindings for broccoli (deprecated)
++ --enable-binpac build binpac
+ --disable-broccoli don't build or install the Broccoli library
+ --disable-broctl don't install Broctl
+ --disable-auxtools don't build or install auxiliary tools
+@@ -129,6 +133,43 @@
+ echo "${usage}" 1>&2
+ exit 1
+ ;;
++ --build=*)
++ ;;
++ --host=*)
++ ;;
++ --program-prefix=*)
++ ;;
++ --disable-dependency-tracking)
++ ;;
++ --exec-prefix=*)
++ ;;
++ --bindir=*)
++ ;;
++ --sbindir=*)
++ ;;
++ --sysconfdir=*)
++ ;;
++ --datadir=*)
++ ;;
++ --includedir=*)
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ append_cache_entry INSTALL_LIB_DIR PATH $optarg
++ ;;
++ --libexecdir=*)
++ ;;
++ --localstatedir=*)
++ ;;
++ --sharedstatedir=*)
++ ;;
++ --mandir=*)
++ ;;
++ --infodir=*)
++ ;;
++ --disable-rpath)
++ append_cache_entry CMAKE_SKIP_RPATH BOOL true
++ ;;
+ --builddir=*)
+ builddir=$optarg
+ ;;
+@@ -149,6 +190,9 @@
+ append_cache_entry BRO_ETC_INSTALL_DIR PATH $optarg
+ user_set_conffilesdir="true"
+ ;;
++ --python-install-dir=*)
++ append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg
++ ;;
+ --enable-debug)
+ append_cache_entry ENABLE_DEBUG BOOL true
+ ;;
+@@ -165,6 +209,9 @@
+ --enable-jemalloc)
+ append_cache_entry ENABLE_JEMALLOC BOOL true
+ ;;
++ --enable-binpac)
++ append_cache_entry BinPAC_SKIP_INSTALL BOOL false
++ ;;
+ --disable-broccoli)
+ append_cache_entry INSTALL_BROCCOLI BOOL false
+ ;;
diff --git a/bro-logrotate.conf b/bro-logrotate.conf
new file mode 100644
index 0000000..1f325f0
--- /dev/null
+++ b/bro-logrotate.conf
@@ -0,0 +1,10 @@
+# Logrotate file for bro
+/var/log/bro/*.log {
+ compress
+ delaycompress
+ missingok
+ notifempty
+ rotate 4
+ create 0600 root root
+}
+
More information about the scm-commits
mailing list