* [gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/
@ 2013-02-18 0:16 Mike Auty
0 siblings, 0 replies; 4+ messages in thread
From: Mike Auty @ 2013-02-18 0:16 UTC (permalink / raw
To: gentoo-commits
commit: 4dbe1442fa40282bc346b8598454c7534d34e19c
Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Thu Jul 19 14:57:41 2012 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 14:57:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=4dbe1442
Fix up bro ebuild to remove a few warnings.
---
net-analyzer/bro/Manifest | 8 ++---
net-analyzer/bro/bro-2.0.ebuild | 1 +
net-analyzer/bro/files/bro-broccoli.patch | 16 ---------
net-analyzer/bro/files/bro-broctl.patch | 24 --------------
net-analyzer/bro/files/bro-config-root.patch | 26 +++++++++++++++
.../bro/files/bro-installpackageconfig.patch | 23 ++++++++++++-
net-analyzer/bro/files/bro-siteinstall.patch | 33 --------------------
7 files changed, 51 insertions(+), 80 deletions(-)
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index 78a6f12..06f6310 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -1,7 +1,5 @@
-AUX bro-broccoli.patch 537 SHA256 701e6eb42d3d52120d30a517c0c927f5ba9eab4fd93418d5785272ace91a4ed7 SHA512 1a4dd0095b2099d3dc93ddd7edc7239ebaa6c1ddb35dae1d7dcee6622644e46b163b620f41839b57d3d3ee5a42ac45c96009fa5f8cb4eae59b186b393fea2f50 WHIRLPOOL 6ad23118367378c06210e2cbbb9a42caa7680d24b6e5c3be6a9d3db2741aa52085c281551ca59213d4a31b18b1f3fe2b52de415e1831a1cf6d21066014232321
-AUX bro-broctl.patch 697 SHA256 40ab97266a4d5d4b58fed177d3f9e336af23b6764130d77dd66019b6d775e347 SHA512 a71fe3b081ea3602ed7fd24051ecc7af1f89a3ac6e125808d865679dbb723273503602519c023b4edad9e1299c207b2c519892bbbc6712e0992101de011053fe WHIRLPOOL 646862f3711e1536ae8b9f880a7a3b316e5f579fce3b113d7f8f29dc6ae9c183a705f68ca95506fc96c8aaae1c6a80b11009ddfa08b031fa397603c81e2d49fb
-AUX bro-installpackageconfig.patch 2573 SHA256 d4943011e46aa0560ff5f905d3738f34346ab70b302e10de5d6ff50e6174253e SHA512 2355014f0af007096df9cdd81dce54466d8fecd74a6d2e82f712cdd260eead04a3dd01d28e7d0d35863127b7b7b6c0425ed6d03d6b3cff186ab575e8666ead36 WHIRLPOOL 59e06c854ecef4bf4e92da70c45b920cecb85b235be32f8d3b39e50190707544f7ba3ac7187c735df4d860a1e365c8c9fc39474078407b75d38f9079b89a9857
-AUX bro-siteinstall.patch 1092 SHA256 68ac5e1160e9bcc8a4527b14884c66e67f19ebd8cd4f1d0d0e7e123f32aaa551 SHA512 d9e0f5078a473dbbac906251b2ac78a816238818fe1f7af68c7b80493325e5e4e2594e2bfc596d30a4be7ed5da36d829f47d7a656c146723049b806fe91a74e6 WHIRLPOOL 007c5a3283055ed721e8dc3554da1cc9f11f2ff7231134a1fef3104444360cefd2235e00525e1ad5dcfc86deab8ed7824e6b08280af1a0220db5e9ea40355ec2
+AUX bro-config-root.patch 1253 SHA256 75ad35abbd86eea9ded72f4800f399ee202f701752a3d9852bfc0ce15644bcfe SHA512 ddcf943942cd3ad7aa7abeb463b602b4c1ca74e93d7ae98d889ae4ef9fb764610c537b151e8fe7075622a9c6faf707a6eef3fc3a534a65bd0439b3839296dfe2 WHIRLPOOL dbcca88dfabd0ad7e94bbeef5bcf16f812993afc2d0b201335ab044d126d63db2e381a2a73d872520816277ee4a1862a76ef04a21f35848e4cc3ed6e7d170104
+AUX bro-installpackageconfig.patch 3516 SHA256 e9a94b06200ea29a8d8aded24ed79003eab79f443d696e32dda5ffcd433f2db4 SHA512 5f08a9a7b56c37e67c404a63cb03edf2acfae3cc1b4f5eb855b931cf2bb195f834b87863886919623b3ce324fb8e63261c917c450a30d25d155efa6a54a7d73b WHIRLPOOL ec8d59e1cae1d47ae7a2223582a845b8f40797e7e1f8101d3651e35280c4d0d532c89018fc68874c821eb9db8e8911436e1de1d6d3bed02576abe8c59c1abc19
AUX bro-userchanged.patch 3371 SHA256 d6c88b218cb77dc89410ff08648d18ee157d28be4b75b65176f7cb06bd4b389a SHA512 f0139af55ee1d05a36aa3827ecfb3f04be4041b0c0d5be6a5f0cf706a6f6542f9c994c49fc758a7d544276e67243606ed7dc4a8632194e93d8d4735ccbd44fd5 WHIRLPOOL 4bbb938bdf066ffc58684550a69306e0b6d986b30c6d59bcfafbcc35fca85443686aa8a323748bb4acc031c97f4a6a1855cc5cb04285c1417228a1dcf1a6c1e0
DIST bro-2.0.tar.gz 3652838 SHA256 52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947 SHA512 d01c39dc716190dc67f57b2ca5833c4fe7f53ec9b912061c8d3ab7d334f10a2172524a1670086b8b6e514e7a0e43a96541a304c0117569b93ac9f72b06ea6e60 WHIRLPOOL 7f45446fe0151d6572f99115f43675ffde74e635e14513684c3b46eeb364d84a5a9ee91f9406df14cc79001a07efdadd19c200ca70bef043e9f301ef7ecbe333
-EBUILD bro-2.0.ebuild 1584 SHA256 a3ca15ac923539899e0aa83a08be6c6c6a9307bd6571df7fa0c4d3a9fc30ae4e SHA512 7fefcbfa301687844f08acc6e30050d8cfcdafcbd87a6f7c6b487429d2cf4e4ef2b1a6edf6366b8f17c081a2ec76f62c5098b3849161535434809f408c523f65 WHIRLPOOL 7af8b13e98fb2b40868cc15c3a96984b4747f5a78611c2679fcf997d7f9b08fea3142cdc5c5beaee959639b94f5dfddd9ea72a3122476ac681dd84c70b58b3e7
+EBUILD bro-2.0.ebuild 1628 SHA256 4f12d04ec520c19d44af99b320033e7d1c4c50cba4b2946a1b598532775be34e SHA512 951084830379718d6d81ddae43f37ba6ee8061e169618f15251f3cdb6b7bfea619e0f57f5d27a35a4b6c8d10f30e61eea8a72c995380bb0d2fc3433a9c9092e9 WHIRLPOOL 92220df150621e9c60631b6cedce482bd1826c337ad742b2519b8e7cd5985940eb17ca65d694d0e83a96fd01d385dcdddcc8e91a237ddbd3c1fca4ddb4a49f3f
diff --git a/net-analyzer/bro/bro-2.0.ebuild b/net-analyzer/bro/bro-2.0.ebuild
index 3e0dfda..ee79126 100644
--- a/net-analyzer/bro/bro-2.0.ebuild
+++ b/net-analyzer/bro/bro-2.0.ebuild
@@ -27,6 +27,7 @@ DEPEND="dev-libs/geoip
RDEPEND="$DEPEND"
src_prepare() {
+ epatch "${FILESDIR}/bro-config-root.patch"
epatch "${FILESDIR}/bro-userchanged.patch"
epatch "${FILESDIR}/bro-installpackageconfig.patch"
}
diff --git a/net-analyzer/bro/files/bro-broccoli.patch b/net-analyzer/bro/files/bro-broccoli.patch
deleted file mode 100644
index 98c3c1a..0000000
--- a/net-analyzer/bro/files/bro-broccoli.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/aux/broccoli/CMakeLists.txt b/aux/broccoli/CMakeLists.txt
-index 72151d4..4a98500 100644
---- a/aux/broccoli/CMakeLists.txt
-+++ b/aux/broccoli/CMakeLists.txt
-@@ -105,11 +105,6 @@ add_definitions(-DHAVE_CONFIG_H)
-
- include(InstallPackageConfigFile)
-
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf
-- ${BRO_SYSCONF_DIR}
-- broccoli.conf)
--
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/broccoli-config DESTINATION bin)
-
- ########################################################################
diff --git a/net-analyzer/bro/files/bro-broctl.patch b/net-analyzer/bro/files/bro-broctl.patch
deleted file mode 100644
index cb83328..0000000
--- a/net-analyzer/bro/files/bro-broctl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
-index a7b98fa..b2428ce 100644
---- a/aux/broctl/CMakeLists.txt
-+++ b/aux/broctl/CMakeLists.txt
-@@ -206,19 +206,6 @@ endif ()
- configure_file(etc/broctl.cfg.in
- ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg)
-
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg
-- ${ETC}
-- broctl.cfg)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/etc/networks.cfg
-- ${ETC}
-- networks.cfg)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/etc/node.cfg
-- ${ETC}
-- node.cfg)
--
- ########################################################################
- ## Packaging Setup
-
diff --git a/net-analyzer/bro/files/bro-config-root.patch b/net-analyzer/bro/files/bro-config-root.patch
new file mode 100644
index 0000000..174b0e3
--- /dev/null
+++ b/net-analyzer/bro/files/bro-config-root.patch
@@ -0,0 +1,26 @@
+diff --git a/aux/broctl/BroControl/options.py b/aux/broctl/BroControl/options.py
+index d3b6de5..3919410 100644
+--- a/aux/broctl/BroControl/options.py
++++ b/aux/broctl/BroControl/options.py
+@@ -127,7 +127,7 @@ options = [
+ "Directory for log postprocessors."),
+ Option("HelperDir", "${BroBase}/share/broctl/scripts/helpers", "string", Option.AUTOMATIC, False,
+ "Directory for broctl helper scripts."),
+- Option("CfgDir", "${BroBase}/etc", "string", Option.AUTOMATIC, False,
++ Option("CfgDir", "/etc", "string", Option.AUTOMATIC, False,
+ "Directory for configuration files."),
+ Option("SpoolDir", "${BroBase}/spool", "string", Option.AUTOMATIC, False,
+ "Directory for run-time data."),
+diff --git a/aux/broctl/bin/broctl.in b/aux/broctl/bin/broctl.in
+index 910cbbd..0b9b2b7 100755
+--- a/aux/broctl/bin/broctl.in
++++ b/aux/broctl/bin/broctl.in
+@@ -863,7 +863,7 @@ def saveState(loop):
+ print >>sys.stderr, "abnormal termination, saving state ..."
+ Config.writeState()
+
+-Config = config.Configuration("etc/broctl.cfg", BroBase, Version)
++Config = config.Configuration("etc/broctl.cfg", "/", Version)
+
+ for dir in Config.sitepluginpath.split(":") + [Config.plugindir]:
+ if dir:
diff --git a/net-analyzer/bro/files/bro-installpackageconfig.patch b/net-analyzer/bro/files/bro-installpackageconfig.patch
index 9a87c63..047832b 100644
--- a/net-analyzer/bro/files/bro-installpackageconfig.patch
+++ b/net-analyzer/bro/files/bro-installpackageconfig.patch
@@ -15,10 +15,29 @@ index 72151d4..ffb0dec 100644
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/broccoli-config DESTINATION bin)
diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
-index a7b98fa..8445889 100644
+index a7b98fa..3e25025 100644
--- a/aux/broctl/CMakeLists.txt
+++ b/aux/broctl/CMakeLists.txt
-@@ -206,18 +206,9 @@ endif ()
+@@ -191,33 +191,24 @@ if (NOT APPLE AND (${CMAKE_INSTALL_PREFIX} STREQUAL /usr OR
+ set(EMPTY_WORLD_DIRS
+ "${EMPTY_WORLD_DIRS} ${SPOOL} ${SPOOL}/tmp ${SPOOL}/scripts ${LOGS}"
+ CACHE STRING "" FORCE)
+- InstallSymlink(${SPOOL}/broctl-config.sh
+- ${PREFIX}/share/broctl/scripts/broctl-config.sh)
++ # InstallSymlink(${SPOOL}/broctl-config.sh
++ # ${PREFIX}/share/broctl/scripts/broctl-config.sh)
+ else ()
+ install(DIRECTORY DESTINATION spool)
+ install(DIRECTORY DESTINATION spool/tmp)
+ install(DIRECTORY DESTINATION spool/scripts)
+ install(DIRECTORY DESTINATION logs)
+- InstallSymlink(${PREFIX}/spool/broctl-config.sh
+- ${PREFIX}/share/broctl/scripts/broctl-config.sh)
++ # InstallSymlink(${PREFIX}/spool/broctl-config.sh
++ # ${PREFIX}/share/broctl/scripts/broctl-config.sh)
+ endif ()
+
+ # A couple of configuration options that are needed are placed in here.
configure_file(etc/broctl.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg)
diff --git a/net-analyzer/bro/files/bro-siteinstall.patch b/net-analyzer/bro/files/bro-siteinstall.patch
deleted file mode 100644
index 9e94440..0000000
--- a/net-analyzer/bro/files/bro-siteinstall.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 6d6faf7..ad14918 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -1,28 +1,8 @@
- include(InstallPackageConfigFile)
-
- install(DIRECTORY ./ DESTINATION ${BRO_SCRIPT_INSTALL_PATH} FILES_MATCHING
-- PATTERN "site/local*" EXCLUDE
- PATTERN "test-all-policy.bro" EXCLUDE
- PATTERN "*.bro"
- PATTERN "*.sig"
- PATTERN "*.fp"
- )
--
--# Install all local* scripts as config files since they are meant to be
--# user modify-able.
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local.bro)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-manager.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local-manager.bro)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-proxy.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local-proxy.bro)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-worker.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local-worker.bro)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/
@ 2013-02-18 0:16 Mike Auty
0 siblings, 0 replies; 4+ messages in thread
From: Mike Auty @ 2013-02-18 0:16 UTC (permalink / raw
To: gentoo-commits
commit: e0c95cb82d849809ff1e680d064bc226b49c8d86
Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Thu Jul 19 22:14:40 2012 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 22:14:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=e0c95cb8
A few additional minor fixes for bro.
---
net-analyzer/bro/Manifest | 4 ++--
net-analyzer/bro/bro-2.0.ebuild | 5 +++++
net-analyzer/bro/files/bro-config-root.patch | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index 06f6310..f5a8175 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -1,5 +1,5 @@
-AUX bro-config-root.patch 1253 SHA256 75ad35abbd86eea9ded72f4800f399ee202f701752a3d9852bfc0ce15644bcfe SHA512 ddcf943942cd3ad7aa7abeb463b602b4c1ca74e93d7ae98d889ae4ef9fb764610c537b151e8fe7075622a9c6faf707a6eef3fc3a534a65bd0439b3839296dfe2 WHIRLPOOL dbcca88dfabd0ad7e94bbeef5bcf16f812993afc2d0b201335ab044d126d63db2e381a2a73d872520816277ee4a1862a76ef04a21f35848e4cc3ed6e7d170104
+AUX bro-config-root.patch 1259 SHA256 9835baf4979e871adfed779d49e8158a20a6e8ecf20c0c2434658190fc5159e9 SHA512 a8b173e4d65ef9610e65256ed79fc1ac4593a9994ea43e7ea8c24403354f6dd65c1137a890c2f925daf0d4865951250f3b7cfbec971dfd1867521ce0f703d49b WHIRLPOOL a5255dbe48910f65eba27490d9ce803daa1923abe584906c2b4a8b12bbe102f651156e4d74239ab7ebfa93075c409c66ab3472ebd7087016d51ceba13d9fdca3
AUX bro-installpackageconfig.patch 3516 SHA256 e9a94b06200ea29a8d8aded24ed79003eab79f443d696e32dda5ffcd433f2db4 SHA512 5f08a9a7b56c37e67c404a63cb03edf2acfae3cc1b4f5eb855b931cf2bb195f834b87863886919623b3ce324fb8e63261c917c450a30d25d155efa6a54a7d73b WHIRLPOOL ec8d59e1cae1d47ae7a2223582a845b8f40797e7e1f8101d3651e35280c4d0d532c89018fc68874c821eb9db8e8911436e1de1d6d3bed02576abe8c59c1abc19
AUX bro-userchanged.patch 3371 SHA256 d6c88b218cb77dc89410ff08648d18ee157d28be4b75b65176f7cb06bd4b389a SHA512 f0139af55ee1d05a36aa3827ecfb3f04be4041b0c0d5be6a5f0cf706a6f6542f9c994c49fc758a7d544276e67243606ed7dc4a8632194e93d8d4735ccbd44fd5 WHIRLPOOL 4bbb938bdf066ffc58684550a69306e0b6d986b30c6d59bcfafbcc35fca85443686aa8a323748bb4acc031c97f4a6a1855cc5cb04285c1417228a1dcf1a6c1e0
DIST bro-2.0.tar.gz 3652838 SHA256 52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947 SHA512 d01c39dc716190dc67f57b2ca5833c4fe7f53ec9b912061c8d3ab7d334f10a2172524a1670086b8b6e514e7a0e43a96541a304c0117569b93ac9f72b06ea6e60 WHIRLPOOL 7f45446fe0151d6572f99115f43675ffde74e635e14513684c3b46eeb364d84a5a9ee91f9406df14cc79001a07efdadd19c200ca70bef043e9f301ef7ecbe333
-EBUILD bro-2.0.ebuild 1628 SHA256 4f12d04ec520c19d44af99b320033e7d1c4c50cba4b2946a1b598532775be34e SHA512 951084830379718d6d81ddae43f37ba6ee8061e169618f15251f3cdb6b7bfea619e0f57f5d27a35a4b6c8d10f30e61eea8a72c995380bb0d2fc3433a9c9092e9 WHIRLPOOL 92220df150621e9c60631b6cedce482bd1826c337ad742b2519b8e7cd5985940eb17ca65d694d0e83a96fd01d385dcdddcc8e91a237ddbd3c1fca4ddb4a49f3f
+EBUILD bro-2.0.ebuild 1758 SHA256 0372b873997080d9ffb27f8e44984d10a794d6ac1763770dc0a56cd1f7cfee0a SHA512 10d8a00d279af7a29eff8d4ff53cb710c59c22ade5c8f0273213c82faab860df8da49ed5f38026a8cc482b88aad72725f43f555afb660d4eab25b49815a903d5 WHIRLPOOL d35b1c78e4e29733bb4c948e35dc6d9c8680bd69b2b89f0dd69d1e62099dc14c56f2cae9c6077923212f6b0cebfaf26d335075246dd43275341cf5087fef81df
diff --git a/net-analyzer/bro/bro-2.0.ebuild b/net-analyzer/bro/bro-2.0.ebuild
index ee79126..b96d847 100644
--- a/net-analyzer/bro/bro-2.0.ebuild
+++ b/net-analyzer/bro/bro-2.0.ebuild
@@ -59,3 +59,8 @@ src_configure() {
cmake-utils_src_configure
}
+
+src_install() {
+ cmake-utils_src_install
+ dosym "/var/spool/bro/broctl-config.sh" "/usr/share/broctl/scripts/broctl-config.sh"
+}
diff --git a/net-analyzer/bro/files/bro-config-root.patch b/net-analyzer/bro/files/bro-config-root.patch
index 174b0e3..7fabdab 100644
--- a/net-analyzer/bro/files/bro-config-root.patch
+++ b/net-analyzer/bro/files/bro-config-root.patch
@@ -20,7 +20,7 @@ index 910cbbd..0b9b2b7 100755
Config.writeState()
-Config = config.Configuration("etc/broctl.cfg", BroBase, Version)
-+Config = config.Configuration("etc/broctl.cfg", "/", Version)
++Config = config.Configuration("../etc/broctl.cfg", "/usr", Version)
for dir in Config.sitepluginpath.split(":") + [Config.plugindir]:
if dir:
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/
@ 2013-02-18 0:16 Mike Auty
0 siblings, 0 replies; 4+ messages in thread
From: Mike Auty @ 2013-02-18 0:16 UTC (permalink / raw
To: gentoo-commits
commit: df6cfa573df7c7853e196263e8182ab6fa4d1f2b
Author: Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Thu Jul 19 14:41:48 2012 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 14:41:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=df6cfa57
Add in bro-ids ebuild.
---
net-analyzer/bro/Manifest | 7 ++
net-analyzer/bro/bro-2.0.ebuild | 60 +++++++++++++
net-analyzer/bro/files/bro-broccoli.patch | 16 ++++
net-analyzer/bro/files/bro-broctl.patch | 24 +++++
.../bro/files/bro-installpackageconfig.patch | 75 ++++++++++++++++
net-analyzer/bro/files/bro-siteinstall.patch | 33 +++++++
net-analyzer/bro/files/bro-userchanged.patch | 91 ++++++++++++++++++++
7 files changed, 306 insertions(+), 0 deletions(-)
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
new file mode 100644
index 0000000..78a6f12
--- /dev/null
+++ b/net-analyzer/bro/Manifest
@@ -0,0 +1,7 @@
+AUX bro-broccoli.patch 537 SHA256 701e6eb42d3d52120d30a517c0c927f5ba9eab4fd93418d5785272ace91a4ed7 SHA512 1a4dd0095b2099d3dc93ddd7edc7239ebaa6c1ddb35dae1d7dcee6622644e46b163b620f41839b57d3d3ee5a42ac45c96009fa5f8cb4eae59b186b393fea2f50 WHIRLPOOL 6ad23118367378c06210e2cbbb9a42caa7680d24b6e5c3be6a9d3db2741aa52085c281551ca59213d4a31b18b1f3fe2b52de415e1831a1cf6d21066014232321
+AUX bro-broctl.patch 697 SHA256 40ab97266a4d5d4b58fed177d3f9e336af23b6764130d77dd66019b6d775e347 SHA512 a71fe3b081ea3602ed7fd24051ecc7af1f89a3ac6e125808d865679dbb723273503602519c023b4edad9e1299c207b2c519892bbbc6712e0992101de011053fe WHIRLPOOL 646862f3711e1536ae8b9f880a7a3b316e5f579fce3b113d7f8f29dc6ae9c183a705f68ca95506fc96c8aaae1c6a80b11009ddfa08b031fa397603c81e2d49fb
+AUX bro-installpackageconfig.patch 2573 SHA256 d4943011e46aa0560ff5f905d3738f34346ab70b302e10de5d6ff50e6174253e SHA512 2355014f0af007096df9cdd81dce54466d8fecd74a6d2e82f712cdd260eead04a3dd01d28e7d0d35863127b7b7b6c0425ed6d03d6b3cff186ab575e8666ead36 WHIRLPOOL 59e06c854ecef4bf4e92da70c45b920cecb85b235be32f8d3b39e50190707544f7ba3ac7187c735df4d860a1e365c8c9fc39474078407b75d38f9079b89a9857
+AUX bro-siteinstall.patch 1092 SHA256 68ac5e1160e9bcc8a4527b14884c66e67f19ebd8cd4f1d0d0e7e123f32aaa551 SHA512 d9e0f5078a473dbbac906251b2ac78a816238818fe1f7af68c7b80493325e5e4e2594e2bfc596d30a4be7ed5da36d829f47d7a656c146723049b806fe91a74e6 WHIRLPOOL 007c5a3283055ed721e8dc3554da1cc9f11f2ff7231134a1fef3104444360cefd2235e00525e1ad5dcfc86deab8ed7824e6b08280af1a0220db5e9ea40355ec2
+AUX bro-userchanged.patch 3371 SHA256 d6c88b218cb77dc89410ff08648d18ee157d28be4b75b65176f7cb06bd4b389a SHA512 f0139af55ee1d05a36aa3827ecfb3f04be4041b0c0d5be6a5f0cf706a6f6542f9c994c49fc758a7d544276e67243606ed7dc4a8632194e93d8d4735ccbd44fd5 WHIRLPOOL 4bbb938bdf066ffc58684550a69306e0b6d986b30c6d59bcfafbcc35fca85443686aa8a323748bb4acc031c97f4a6a1855cc5cb04285c1417228a1dcf1a6c1e0
+DIST bro-2.0.tar.gz 3652838 SHA256 52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947 SHA512 d01c39dc716190dc67f57b2ca5833c4fe7f53ec9b912061c8d3ab7d334f10a2172524a1670086b8b6e514e7a0e43a96541a304c0117569b93ac9f72b06ea6e60 WHIRLPOOL 7f45446fe0151d6572f99115f43675ffde74e635e14513684c3b46eeb364d84a5a9ee91f9406df14cc79001a07efdadd19c200ca70bef043e9f301ef7ecbe333
+EBUILD bro-2.0.ebuild 1584 SHA256 a3ca15ac923539899e0aa83a08be6c6c6a9307bd6571df7fa0c4d3a9fc30ae4e SHA512 7fefcbfa301687844f08acc6e30050d8cfcdafcbd87a6f7c6b487429d2cf4e4ef2b1a6edf6366b8f17c081a2ec76f62c5098b3849161535434809f408c523f65 WHIRLPOOL 7af8b13e98fb2b40868cc15c3a96984b4747f5a78611c2679fcf997d7f9b08fea3142cdc5c5beaee959639b94f5dfddd9ea72a3122476ac681dd84c70b58b3e7
diff --git a/net-analyzer/bro/bro-2.0.ebuild b/net-analyzer/bro/bro-2.0.ebuild
new file mode 100644
index 0000000..3e0dfda
--- /dev/null
+++ b/net-analyzer/bro/bro-2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit cmake-utils
+
+DESCRIPTION="An advanced intrusion detection system"
+HOMEPAGE="http://bro-ids.org/"
+SRC_URI="http://www.bro-ids.org/downloads/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug perftools +geoip +broctl +broaux +broccoli"
+
+DEPEND="dev-libs/geoip
+ dev-libs/openssl
+ sys-apps/file
+ sys-libs/zlib
+ net-libs/libpcap
+ dev-lang/swig
+ app-shells/bash
+ geoip? ( dev-libs/geoip )
+ perftools? ( dev-util/google-perftools )"
+RDEPEND="$DEPEND"
+
+src_prepare() {
+ epatch "${FILESDIR}/bro-userchanged.patch"
+ epatch "${FILESDIR}/bro-installpackageconfig.patch"
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use geoip USE_GEOIP)
+ $(cmake-utils_use perftools USE_PERFTOOLS)
+ $(cmake-utils_use broctl INSTALL_BROCTL)
+ $(cmake-utils_use broaux INSTALL_AUX_TOOLS)
+ $(cmake-utils_use broccoli INSTALL_BROCCOLI)
+ )
+
+ mylibchanges="aux/broccoli/src
+ aux/binpac/lib
+ aux/broctl
+ aux/broccoli/bindings/broccoli-ruby
+ aux/broccoli/bindings/broccoli-python
+ aux/broctl/aux/pysubnettree"
+
+ for i in ${mylibchanges};
+ do
+ einfo "Apply sed changes to ${i}"
+ sed -e "s#{CMAKE_INSTALL_PREFIX}/lib/#{CMAKE_INSTALL_PREFIX}/$(get_libdir)/#" \
+ -e "s#PY_MOD_INSTALL_DIR lib/#PY_MOD_INSTALL_DIR $(get_libdir)/#" \
+ -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+ -i "${i}/CMakeLists.txt"
+ done
+
+ cmake-utils_src_configure
+}
diff --git a/net-analyzer/bro/files/bro-broccoli.patch b/net-analyzer/bro/files/bro-broccoli.patch
new file mode 100644
index 0000000..98c3c1a
--- /dev/null
+++ b/net-analyzer/bro/files/bro-broccoli.patch
@@ -0,0 +1,16 @@
+diff --git a/aux/broccoli/CMakeLists.txt b/aux/broccoli/CMakeLists.txt
+index 72151d4..4a98500 100644
+--- a/aux/broccoli/CMakeLists.txt
++++ b/aux/broccoli/CMakeLists.txt
+@@ -105,11 +105,6 @@ add_definitions(-DHAVE_CONFIG_H)
+
+ include(InstallPackageConfigFile)
+
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf
+- ${BRO_SYSCONF_DIR}
+- broccoli.conf)
+-
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/broccoli-config DESTINATION bin)
+
+ ########################################################################
diff --git a/net-analyzer/bro/files/bro-broctl.patch b/net-analyzer/bro/files/bro-broctl.patch
new file mode 100644
index 0000000..cb83328
--- /dev/null
+++ b/net-analyzer/bro/files/bro-broctl.patch
@@ -0,0 +1,24 @@
+diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
+index a7b98fa..b2428ce 100644
+--- a/aux/broctl/CMakeLists.txt
++++ b/aux/broctl/CMakeLists.txt
+@@ -206,19 +206,6 @@ endif ()
+ configure_file(etc/broctl.cfg.in
+ ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg)
+
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg
+- ${ETC}
+- broctl.cfg)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/etc/networks.cfg
+- ${ETC}
+- networks.cfg)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/etc/node.cfg
+- ${ETC}
+- node.cfg)
+-
+ ########################################################################
+ ## Packaging Setup
+
diff --git a/net-analyzer/bro/files/bro-installpackageconfig.patch b/net-analyzer/bro/files/bro-installpackageconfig.patch
new file mode 100644
index 0000000..9a87c63
--- /dev/null
+++ b/net-analyzer/bro/files/bro-installpackageconfig.patch
@@ -0,0 +1,75 @@
+diff --git a/aux/broccoli/CMakeLists.txt b/aux/broccoli/CMakeLists.txt
+index 72151d4..ffb0dec 100644
+--- a/aux/broccoli/CMakeLists.txt
++++ b/aux/broccoli/CMakeLists.txt
+@@ -105,10 +105,7 @@ add_definitions(-DHAVE_CONFIG_H)
+
+ include(InstallPackageConfigFile)
+
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf
+- ${BRO_SYSCONF_DIR}
+- broccoli.conf)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf DESTINATION ${BRO_SYSCONF_DIR})
+
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/broccoli-config DESTINATION bin)
+
+diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
+index a7b98fa..8445889 100644
+--- a/aux/broctl/CMakeLists.txt
++++ b/aux/broctl/CMakeLists.txt
+@@ -206,18 +206,9 @@ endif ()
+ configure_file(etc/broctl.cfg.in
+ ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg)
+
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg
+- ${ETC}
+- broctl.cfg)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/etc/networks.cfg
+- ${ETC}
+- networks.cfg)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/etc/node.cfg
+- ${ETC}
+- node.cfg)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg DESTINATION ${ETC})
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/networks.cfg DESTINATION ${ETC})
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/node.cfg DESTINATION ${ETC})
+
+ ########################################################################
+ ## Packaging Setup
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 6d6faf7..ad14918 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -1,28 +1,8 @@
+ include(InstallPackageConfigFile)
+
+ install(DIRECTORY ./ DESTINATION ${BRO_SCRIPT_INSTALL_PATH} FILES_MATCHING
+- PATTERN "site/local*" EXCLUDE
+ PATTERN "test-all-policy.bro" EXCLUDE
+ PATTERN "*.bro"
+ PATTERN "*.sig"
+ PATTERN "*.fp"
+ )
+-
+-# Install all local* scripts as config files since they are meant to be
+-# user modify-able.
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local.bro)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-manager.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local-manager.bro)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-proxy.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local-proxy.bro)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-worker.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local-worker.bro)
diff --git a/net-analyzer/bro/files/bro-siteinstall.patch b/net-analyzer/bro/files/bro-siteinstall.patch
new file mode 100644
index 0000000..9e94440
--- /dev/null
+++ b/net-analyzer/bro/files/bro-siteinstall.patch
@@ -0,0 +1,33 @@
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 6d6faf7..ad14918 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -1,28 +1,8 @@
+ include(InstallPackageConfigFile)
+
+ install(DIRECTORY ./ DESTINATION ${BRO_SCRIPT_INSTALL_PATH} FILES_MATCHING
+- PATTERN "site/local*" EXCLUDE
+ PATTERN "test-all-policy.bro" EXCLUDE
+ PATTERN "*.bro"
+ PATTERN "*.sig"
+ PATTERN "*.fp"
+ )
+-
+-# Install all local* scripts as config files since they are meant to be
+-# user modify-able.
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local.bro)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-manager.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local-manager.bro)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-proxy.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local-proxy.bro)
+-InstallPackageConfigFile(
+- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-worker.bro
+- ${BRO_SCRIPT_INSTALL_PATH}/site
+- local-worker.bro)
diff --git a/net-analyzer/bro/files/bro-userchanged.patch b/net-analyzer/bro/files/bro-userchanged.patch
new file mode 100644
index 0000000..12a18d1
--- /dev/null
+++ b/net-analyzer/bro/files/bro-userchanged.patch
@@ -0,0 +1,91 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 241a5b2..42a41c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -186,5 +186,3 @@ message(
+ "\n"
+ "\n================================================================\n"
+ )
+-
+-include(UserChangedWarning)
+diff --git a/aux/binpac/CMakeLists.txt b/aux/binpac/CMakeLists.txt
+index de5768d..a25803d 100644
+--- a/aux/binpac/CMakeLists.txt
++++ b/aux/binpac/CMakeLists.txt
+@@ -61,4 +61,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/bro-aux/CMakeLists.txt b/aux/bro-aux/CMakeLists.txt
+index cc26826..b206bd9 100644
+--- a/aux/bro-aux/CMakeLists.txt
++++ b/aux/bro-aux/CMakeLists.txt
+@@ -96,4 +96,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/broccoli/CMakeLists.txt b/aux/broccoli/CMakeLists.txt
+index 72151d4..9942be1 100644
+--- a/aux/broccoli/CMakeLists.txt
++++ b/aux/broccoli/CMakeLists.txt
+@@ -169,4 +169,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/broccoli/bindings/broccoli-python/CMakeLists.txt b/aux/broccoli/bindings/broccoli-python/CMakeLists.txt
+index f4be86b..215ebd9 100644
+--- a/aux/broccoli/bindings/broccoli-python/CMakeLists.txt
++++ b/aux/broccoli/bindings/broccoli-python/CMakeLists.txt
+@@ -73,4 +73,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt b/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt
+index 2b8cbe7..5ba4726 100644
+--- a/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt
++++ b/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt
+@@ -113,4 +113,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
+index a7b98fa..3f56db0 100644
+--- a/aux/broctl/CMakeLists.txt
++++ b/aux/broctl/CMakeLists.txt
+@@ -260,4 +260,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/broctl/aux/capstats/CMakeLists.txt b/aux/broctl/aux/capstats/CMakeLists.txt
+index 2c6b5b3..5af2b32 100644
+--- a/aux/broctl/aux/capstats/CMakeLists.txt
++++ b/aux/broctl/aux/capstats/CMakeLists.txt
+@@ -65,4 +65,3 @@ target_link_libraries(capstats ${PCAP_LIBRARY})
+
+ install(TARGETS capstats DESTINATION bin)
+
+-include(UserChangedWarning)
+diff --git a/aux/broctl/aux/pysubnettree/CMakeLists.txt b/aux/broctl/aux/pysubnettree/CMakeLists.txt
+index dcd200a..91beaaa 100644
+--- a/aux/broctl/aux/pysubnettree/CMakeLists.txt
++++ b/aux/broctl/aux/pysubnettree/CMakeLists.txt
+@@ -76,4 +76,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
+diff --git a/aux/broctl/aux/trace-summary/CMakeLists.txt b/aux/broctl/aux/trace-summary/CMakeLists.txt
+index 8d5a260..ad6aeb7 100644
+--- a/aux/broctl/aux/trace-summary/CMakeLists.txt
++++ b/aux/broctl/aux/trace-summary/CMakeLists.txt
+@@ -50,4 +50,3 @@ message(
+ "\n================================================================\n"
+ )
+
+-include(UserChangedWarning)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/
@ 2015-08-23 1:52 Mike Auty
0 siblings, 0 replies; 4+ messages in thread
From: Mike Auty @ 2015-08-23 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 67f12402b4893e8c28a16a650a8e199bdd1bf1a8
Author: layman <layman <AT> localhost>
AuthorDate: Sun Aug 23 01:52:04 2015 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 01:52:04 2015 +0000
URL: https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=67f12402
Removed old bro ebuild, check the pentoo repository for a more recent version.
net-analyzer/bro/Manifest | 5 --
net-analyzer/bro/bro-2.0.ebuild | 67 ---------------
net-analyzer/bro/files/bro-config-root.patch | 26 ------
.../bro/files/bro-installpackageconfig.patch | 94 ----------------------
net-analyzer/bro/files/bro-userchanged.patch | 91 ---------------------
5 files changed, 283 deletions(-)
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
deleted file mode 100644
index 466ba08..0000000
--- a/net-analyzer/bro/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bro-config-root.patch 1259 SHA256 9835baf4979e871adfed779d49e8158a20a6e8ecf20c0c2434658190fc5159e9 SHA512 a8b173e4d65ef9610e65256ed79fc1ac4593a9994ea43e7ea8c24403354f6dd65c1137a890c2f925daf0d4865951250f3b7cfbec971dfd1867521ce0f703d49b WHIRLPOOL a5255dbe48910f65eba27490d9ce803daa1923abe584906c2b4a8b12bbe102f651156e4d74239ab7ebfa93075c409c66ab3472ebd7087016d51ceba13d9fdca3
-AUX bro-installpackageconfig.patch 3516 SHA256 e9a94b06200ea29a8d8aded24ed79003eab79f443d696e32dda5ffcd433f2db4 SHA512 5f08a9a7b56c37e67c404a63cb03edf2acfae3cc1b4f5eb855b931cf2bb195f834b87863886919623b3ce324fb8e63261c917c450a30d25d155efa6a54a7d73b WHIRLPOOL ec8d59e1cae1d47ae7a2223582a845b8f40797e7e1f8101d3651e35280c4d0d532c89018fc68874c821eb9db8e8911436e1de1d6d3bed02576abe8c59c1abc19
-AUX bro-userchanged.patch 3371 SHA256 d6c88b218cb77dc89410ff08648d18ee157d28be4b75b65176f7cb06bd4b389a SHA512 f0139af55ee1d05a36aa3827ecfb3f04be4041b0c0d5be6a5f0cf706a6f6542f9c994c49fc758a7d544276e67243606ed7dc4a8632194e93d8d4735ccbd44fd5 WHIRLPOOL 4bbb938bdf066ffc58684550a69306e0b6d986b30c6d59bcfafbcc35fca85443686aa8a323748bb4acc031c97f4a6a1855cc5cb04285c1417228a1dcf1a6c1e0
-DIST bro-2.0.tar.gz 3652838 SHA256 52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947 SHA512 d01c39dc716190dc67f57b2ca5833c4fe7f53ec9b912061c8d3ab7d334f10a2172524a1670086b8b6e514e7a0e43a96541a304c0117569b93ac9f72b06ea6e60 WHIRLPOOL 7f45446fe0151d6572f99115f43675ffde74e635e14513684c3b46eeb364d84a5a9ee91f9406df14cc79001a07efdadd19c200ca70bef043e9f301ef7ecbe333
-EBUILD bro-2.0.ebuild 1815 SHA256 2fb3ecdd4277543076d80627d68a0b50a9413887f3c7dd903704bdcc8a4fa25c SHA512 92c92a46afa7034e579fed9d2d8128fec84c87c5a1e5d1bae0076bdac576f42d67a02e7928119e4361cff8614ef1afaeb517147757056d7a00f0876469d2d446 WHIRLPOOL f3fd1b034b6f193732c270001b6089bf40a22755e69c49f67b9371ba309a81829f74a4f7fe901f93e5d18fcef82fe22d6d026b0d52771e5b673a59eb6537ecee
diff --git a/net-analyzer/bro/bro-2.0.ebuild b/net-analyzer/bro/bro-2.0.ebuild
deleted file mode 100644
index afa8f11..0000000
--- a/net-analyzer/bro/bro-2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils
-
-DESCRIPTION="An advanced intrusion detection system"
-HOMEPAGE="http://bro-ids.org/"
-SRC_URI="http://www.bro-ids.org/downloads/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug perftools +geoip +broctl +broaux +broccoli"
-
-DEPEND="dev-libs/geoip
- dev-libs/openssl
- sys-apps/file
- sys-libs/zlib
- net-libs/libpcap
- dev-lang/swig
- app-shells/bash
- geoip? ( dev-libs/geoip )
- perftools? ( dev-util/google-perftools )"
-RDEPEND="$DEPEND"
-
-src_prepare() {
- epatch "${FILESDIR}/bro-config-root.patch"
- epatch "${FILESDIR}/bro-userchanged.patch"
- epatch "${FILESDIR}/bro-installpackageconfig.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use geoip USE_GEOIP)
- $(cmake-utils_use perftools USE_PERFTOOLS)
- $(cmake-utils_use broctl INSTALL_BROCTL)
- $(cmake-utils_use broaux INSTALL_AUX_TOOLS)
- $(cmake-utils_use broccoli INSTALL_BROCCOLI)
- )
-
- mylibchanges="aux/broccoli/src
- aux/binpac/lib
- aux/broctl
- aux/broccoli/bindings/broccoli-ruby
- aux/broccoli/bindings/broccoli-python
- aux/broctl/aux/pysubnettree"
-
- for i in ${mylibchanges};
- do
- einfo "Apply sed changes to ${i}"
- sed -e "s#{CMAKE_INSTALL_PREFIX}/lib/#{CMAKE_INSTALL_PREFIX}/$(get_libdir)/#" \
- -e "s#PY_MOD_INSTALL_DIR lib/#PY_MOD_INSTALL_DIR $(get_libdir)/#" \
- -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
- -i "${i}/CMakeLists.txt"
- done
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dosym "/var/spool/bro/broctl-config.sh" "/usr/share/broctl/scripts/broctl-config.sh"
- setcap cap_net_raw,cap_net_admin=eip "${D}/usr/bin/bro"
-}
diff --git a/net-analyzer/bro/files/bro-config-root.patch b/net-analyzer/bro/files/bro-config-root.patch
deleted file mode 100644
index 7fabdab..0000000
--- a/net-analyzer/bro/files/bro-config-root.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/aux/broctl/BroControl/options.py b/aux/broctl/BroControl/options.py
-index d3b6de5..3919410 100644
---- a/aux/broctl/BroControl/options.py
-+++ b/aux/broctl/BroControl/options.py
-@@ -127,7 +127,7 @@ options = [
- "Directory for log postprocessors."),
- Option("HelperDir", "${BroBase}/share/broctl/scripts/helpers", "string", Option.AUTOMATIC, False,
- "Directory for broctl helper scripts."),
-- Option("CfgDir", "${BroBase}/etc", "string", Option.AUTOMATIC, False,
-+ Option("CfgDir", "/etc", "string", Option.AUTOMATIC, False,
- "Directory for configuration files."),
- Option("SpoolDir", "${BroBase}/spool", "string", Option.AUTOMATIC, False,
- "Directory for run-time data."),
-diff --git a/aux/broctl/bin/broctl.in b/aux/broctl/bin/broctl.in
-index 910cbbd..0b9b2b7 100755
---- a/aux/broctl/bin/broctl.in
-+++ b/aux/broctl/bin/broctl.in
-@@ -863,7 +863,7 @@ def saveState(loop):
- print >>sys.stderr, "abnormal termination, saving state ..."
- Config.writeState()
-
--Config = config.Configuration("etc/broctl.cfg", BroBase, Version)
-+Config = config.Configuration("../etc/broctl.cfg", "/usr", Version)
-
- for dir in Config.sitepluginpath.split(":") + [Config.plugindir]:
- if dir:
diff --git a/net-analyzer/bro/files/bro-installpackageconfig.patch b/net-analyzer/bro/files/bro-installpackageconfig.patch
deleted file mode 100644
index 047832b..0000000
--- a/net-analyzer/bro/files/bro-installpackageconfig.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/aux/broccoli/CMakeLists.txt b/aux/broccoli/CMakeLists.txt
-index 72151d4..ffb0dec 100644
---- a/aux/broccoli/CMakeLists.txt
-+++ b/aux/broccoli/CMakeLists.txt
-@@ -105,10 +105,7 @@ add_definitions(-DHAVE_CONFIG_H)
-
- include(InstallPackageConfigFile)
-
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf
-- ${BRO_SYSCONF_DIR}
-- broccoli.conf)
-+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/broccoli.conf DESTINATION ${BRO_SYSCONF_DIR})
-
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/broccoli-config DESTINATION bin)
-
-diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
-index a7b98fa..3e25025 100644
---- a/aux/broctl/CMakeLists.txt
-+++ b/aux/broctl/CMakeLists.txt
-@@ -191,33 +191,24 @@ if (NOT APPLE AND (${CMAKE_INSTALL_PREFIX} STREQUAL /usr OR
- set(EMPTY_WORLD_DIRS
- "${EMPTY_WORLD_DIRS} ${SPOOL} ${SPOOL}/tmp ${SPOOL}/scripts ${LOGS}"
- CACHE STRING "" FORCE)
-- InstallSymlink(${SPOOL}/broctl-config.sh
-- ${PREFIX}/share/broctl/scripts/broctl-config.sh)
-+ # InstallSymlink(${SPOOL}/broctl-config.sh
-+ # ${PREFIX}/share/broctl/scripts/broctl-config.sh)
- else ()
- install(DIRECTORY DESTINATION spool)
- install(DIRECTORY DESTINATION spool/tmp)
- install(DIRECTORY DESTINATION spool/scripts)
- install(DIRECTORY DESTINATION logs)
-- InstallSymlink(${PREFIX}/spool/broctl-config.sh
-- ${PREFIX}/share/broctl/scripts/broctl-config.sh)
-+ # InstallSymlink(${PREFIX}/spool/broctl-config.sh
-+ # ${PREFIX}/share/broctl/scripts/broctl-config.sh)
- endif ()
-
- # A couple of configuration options that are needed are placed in here.
- configure_file(etc/broctl.cfg.in
- ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg)
-
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg
-- ${ETC}
-- broctl.cfg)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/etc/networks.cfg
-- ${ETC}
-- networks.cfg)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/etc/node.cfg
-- ${ETC}
-- node.cfg)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/etc/broctl.cfg DESTINATION ${ETC})
-+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/networks.cfg DESTINATION ${ETC})
-+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/node.cfg DESTINATION ${ETC})
-
- ########################################################################
- ## Packaging Setup
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 6d6faf7..ad14918 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -1,28 +1,8 @@
- include(InstallPackageConfigFile)
-
- install(DIRECTORY ./ DESTINATION ${BRO_SCRIPT_INSTALL_PATH} FILES_MATCHING
-- PATTERN "site/local*" EXCLUDE
- PATTERN "test-all-policy.bro" EXCLUDE
- PATTERN "*.bro"
- PATTERN "*.sig"
- PATTERN "*.fp"
- )
--
--# Install all local* scripts as config files since they are meant to be
--# user modify-able.
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local.bro)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-manager.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local-manager.bro)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-proxy.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local-proxy.bro)
--InstallPackageConfigFile(
-- ${CMAKE_CURRENT_SOURCE_DIR}/site/local-worker.bro
-- ${BRO_SCRIPT_INSTALL_PATH}/site
-- local-worker.bro)
diff --git a/net-analyzer/bro/files/bro-userchanged.patch b/net-analyzer/bro/files/bro-userchanged.patch
deleted file mode 100644
index 12a18d1..0000000
--- a/net-analyzer/bro/files/bro-userchanged.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 241a5b2..42a41c4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -186,5 +186,3 @@ message(
- "\n"
- "\n================================================================\n"
- )
--
--include(UserChangedWarning)
-diff --git a/aux/binpac/CMakeLists.txt b/aux/binpac/CMakeLists.txt
-index de5768d..a25803d 100644
---- a/aux/binpac/CMakeLists.txt
-+++ b/aux/binpac/CMakeLists.txt
-@@ -61,4 +61,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/bro-aux/CMakeLists.txt b/aux/bro-aux/CMakeLists.txt
-index cc26826..b206bd9 100644
---- a/aux/bro-aux/CMakeLists.txt
-+++ b/aux/bro-aux/CMakeLists.txt
-@@ -96,4 +96,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/broccoli/CMakeLists.txt b/aux/broccoli/CMakeLists.txt
-index 72151d4..9942be1 100644
---- a/aux/broccoli/CMakeLists.txt
-+++ b/aux/broccoli/CMakeLists.txt
-@@ -169,4 +169,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/broccoli/bindings/broccoli-python/CMakeLists.txt b/aux/broccoli/bindings/broccoli-python/CMakeLists.txt
-index f4be86b..215ebd9 100644
---- a/aux/broccoli/bindings/broccoli-python/CMakeLists.txt
-+++ b/aux/broccoli/bindings/broccoli-python/CMakeLists.txt
-@@ -73,4 +73,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt b/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt
-index 2b8cbe7..5ba4726 100644
---- a/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt
-+++ b/aux/broccoli/bindings/broccoli-ruby/CMakeLists.txt
-@@ -113,4 +113,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/broctl/CMakeLists.txt b/aux/broctl/CMakeLists.txt
-index a7b98fa..3f56db0 100644
---- a/aux/broctl/CMakeLists.txt
-+++ b/aux/broctl/CMakeLists.txt
-@@ -260,4 +260,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/broctl/aux/capstats/CMakeLists.txt b/aux/broctl/aux/capstats/CMakeLists.txt
-index 2c6b5b3..5af2b32 100644
---- a/aux/broctl/aux/capstats/CMakeLists.txt
-+++ b/aux/broctl/aux/capstats/CMakeLists.txt
-@@ -65,4 +65,3 @@ target_link_libraries(capstats ${PCAP_LIBRARY})
-
- install(TARGETS capstats DESTINATION bin)
-
--include(UserChangedWarning)
-diff --git a/aux/broctl/aux/pysubnettree/CMakeLists.txt b/aux/broctl/aux/pysubnettree/CMakeLists.txt
-index dcd200a..91beaaa 100644
---- a/aux/broctl/aux/pysubnettree/CMakeLists.txt
-+++ b/aux/broctl/aux/pysubnettree/CMakeLists.txt
-@@ -76,4 +76,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
-diff --git a/aux/broctl/aux/trace-summary/CMakeLists.txt b/aux/broctl/aux/trace-summary/CMakeLists.txt
-index 8d5a260..ad6aeb7 100644
---- a/aux/broctl/aux/trace-summary/CMakeLists.txt
-+++ b/aux/broctl/aux/trace-summary/CMakeLists.txt
-@@ -50,4 +50,3 @@ message(
- "\n================================================================\n"
- )
-
--include(UserChangedWarning)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-23 1:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-18 0:16 [gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/ Mike Auty
-- strict thread matches above, loose matches on Subject: below --
2013-02-18 0:16 Mike Auty
2013-02-18 0:16 Mike Auty
2015-08-23 1:52 Mike Auty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox