From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1501413988E for ; Sun, 23 Aug 2015 01:52:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AECD8E08E1; Sun, 23 Aug 2015 01:52:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41CD3E08E1 for ; Sun, 23 Aug 2015 01:52:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53A9F34095A for ; Sun, 23 Aug 2015 01:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 984E214B for ; Sun, 23 Aug 2015 01:52:08 +0000 (UTC) From: "Mike Auty" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Auty" Message-ID: <1440294724.67f12402b4893e8c28a16a650a8e199bdd1bf1a8.ikelos@gentoo> Subject: [gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/ X-VCS-Repository: dev/ikelos X-VCS-Files: net-analyzer/bro/Manifest net-analyzer/bro/bro-2.0.ebuild net-analyzer/bro/files/bro-config-root.patch net-analyzer/bro/files/bro-installpackageconfig.patch net-analyzer/bro/files/bro-userchanged.patch X-VCS-Directories: net-analyzer/bro/ net-analyzer/bro/files/ X-VCS-Committer: ikelos X-VCS-Committer-Name: Mike Auty X-VCS-Revision: 67f12402b4893e8c28a16a650a8e199bdd1bf1a8 X-VCS-Branch: master Date: Sun, 23 Aug 2015 01:52:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 415cb283-caad-43b8-8018-d63e53735f61 X-Archives-Hash: 22f634bbdbdf118a9995ad135f2a69fa commit: 67f12402b4893e8c28a16a650a8e199bdd1bf1a8 Author: layman localhost> AuthorDate: Sun Aug 23 01:52:04 2015 +0000 Commit: Mike Auty gentoo 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)