Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zeek: rename from bro, update to 3.1.4 #20798

Merged
merged 1 commit into from
Aug 1, 2020
Merged

Conversation

abenson
Copy link
Contributor

@abenson abenson commented Apr 9, 2020

No description provided.

@abenson
Copy link
Contributor Author

abenson commented Apr 9, 2020

I asked in #xbps whether to use replaces= or what, and was told transitional package instead

@sgn
Copy link
Member

sgn commented Apr 10, 2020

replaces='bro>=0"?

xbps-remove -o will remove zeek if using replaces,
because it's not explicitly installed and no packages depends on it.

If xbps-pkgdb can mark zeek as manual when bro is manual, I think it's fine.

@abenson
Copy link
Contributor Author

abenson commented Apr 10, 2020

Yeah, replaces really should should make the package inherit installation state.

srcpkgs/zeek/template Outdated Show resolved Hide resolved
@abenson abenson changed the title zeek: rename from bro, update to 3.1.1 [WIP] zeek: rename from bro, update to 3.1.1 Apr 13, 2020
srcpkgs/bro/template Outdated Show resolved Hide resolved
@abenson
Copy link
Contributor Author

abenson commented Apr 21, 2020

Travis fails due to license. Otherwise seems g2g.

@Chocimier
Copy link
Member

Please make bro subpackage of zeek.

@abenson abenson force-pushed the bro2zeek branch 3 times, most recently from 773c57f to aa9b3e7 Compare April 22, 2020 04:28
@abenson abenson changed the title [WIP] zeek: rename from bro, update to 3.1.1 zeek: rename from bro, update to 3.1.1 Apr 23, 2020
@abenson
Copy link
Contributor Author

abenson commented May 19, 2020

Hm, this doesn't seem right.

SONAME libbroker.so.2 from /usr/lib/libbroker.so.1.3

Though better than the same issue in the current bro build.

/usr/lib/libbroker.so.0 -> /usr/lib/libbroker.so..

@sgn sgn mentioned this pull request Jun 5, 2020
srcpkgs/zeek/template Outdated Show resolved Hide resolved
srcpkgs/zeek/template Outdated Show resolved Hide resolved
@sgn
Copy link
Member

sgn commented Jun 5, 2020

Here is for cross-compile, it doesn't require patching, unlike bro:

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 7bee0e5bf2..52156006b0 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -4,21 +4,38 @@ version=3.1.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel jemalloc-devel"
+hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+ bind-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel libressl-devel
+ jemalloc-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.zeek.org"
 distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
 checksum=d7bf24615c4c0af2435c99c9fb8c9c0f0ecdce375e184ba7f63b715ae5900a61
-nocross="Needs to build part of itself to run, can't be built separately yet."
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"
 	configure_args+=" -DIS_VOID_MUSL=1"
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		mkdir -p native
+		cd native
+		CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \
+		CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
+		LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \
+		cmake ..
+		make ${makejobs} binpac bifcl
+		configure_args+="
+		 -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/aux/bifcl/bifcl
+		 -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/aux/binpac/src/binpac"
+		cd ..
+	fi
+}
+
 post_install() {
 	vsv zeek
 	vlicense COPYING

Thanks to @sgn for the cross compile fixes!
@abenson abenson merged commit 4675d9c into void-linux:master Aug 1, 2020
@abenson abenson deleted the bro2zeek branch March 20, 2021 20:18
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 21, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants