From e8cedce6b69118bbbb4a950b21be7bdd50c70dde Mon Sep 17 00:00:00 2001 From: Andrii Riabchenko Date: Mon, 30 Oct 2023 10:00:24 +0200 Subject: [PATCH 1/2] new file: projects/wireshark.org/package.yml new file: projects/wireshark.org/test.cpp --- projects/wireshark.org/package.yml | 55 ++++++++++++++++++++++++++++++ projects/wireshark.org/test.cpp | 8 +++++ 2 files changed, 63 insertions(+) create mode 100644 projects/wireshark.org/package.yml create mode 100644 projects/wireshark.org/test.cpp diff --git a/projects/wireshark.org/package.yml b/projects/wireshark.org/package.yml new file mode 100644 index 0000000000..cb642eeba0 --- /dev/null +++ b/projects/wireshark.org/package.yml @@ -0,0 +1,55 @@ +distributable: + url: https://www.wireshark.org/download/src/all-versions/wireshark-{{version}}.tar.xz + strip-components: 1 +versions: + url: https://www.wireshark.org/download/src/all-versions/ + match: /wireshark-\d+\.\d+\.\d+\.tar\.xz/ + strip: + - /^wireshark-/ + - /\.tar\.xz/ +dependencies: + c-ares.org: '*' + gnome.org/glib: '*' + gnutls.org: '*' + gnupg.org/libgcrypt: '*' + github.com/maxmind/libmaxminddb: '*' + nghttp2.org: '*' + ibr.cs.tu-bs.de/libsmi: '*' + libssh.org: '*' + lua.org: '*' + github.com/xiph/speexdsp: '*' + tcpdump.org: '*' + gnome.org/libxml2: '*' +build: + dependencies: + cmake.org: '*' + gnu.org/bison: '*' + github.com/westes/flex: '*' + python.org: ^3.11 + freedesktop.org/pkg-config: '*' + linux: + gnu.org/gcc: '*' + gnu.org/make: '*' + script: + - cmake -S . -B build $CMAKE_ARGS + - cmake --build build + - cmake --install build + - cmake --install build --component Development + env: + CMAKE_ARGS: + - -DCMAKE_INSTALL_PREFIX="{{prefix}} + - -DCMAKE_INSTALL_LIBDIR=lib + - -DCMAKE_BUILD_TYPE=Release + - -DCMAKE_FIND_FRAMEWORK=LAST + - -DCMAKE_VERBOSE_MAKEFILE=ON + - -Wno-dev + - -DBUILD_wireshark=OFF +provides: + - bin/randpkt +test: + dependencies: + linux: + gnu.org/gcc: '*' + script: + - c++ -std=c++11 -o test test.cpp + - ./test diff --git a/projects/wireshark.org/test.cpp b/projects/wireshark.org/test.cpp new file mode 100644 index 0000000000..a037cfa0b3 --- /dev/null +++ b/projects/wireshark.org/test.cpp @@ -0,0 +1,8 @@ +#include +#include + +int main() { + printf("%d.%d.%d", WIRESHARK_VERSION_MAJOR, WIRESHARK_VERSION_MINOR, + WIRESHARK_VERSION_MICRO); + return 0; +} \ No newline at end of file From 14b974d315df569d846084af9c93e423531244c8 Mon Sep 17 00:00:00 2001 From: Andrii Riabchenko Date: Tue, 12 Dec 2023 19:49:22 +0200 Subject: [PATCH 2/2] modified: projects/wireshark.org/package.yml modified: projects/wireshark.org/test.cpp --- projects/wireshark.org/package.yml | 71 +++++++++++++++++++++--------- projects/wireshark.org/test.cpp | 2 +- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/projects/wireshark.org/package.yml b/projects/wireshark.org/package.yml index cb642eeba0..255cb44d6b 100644 --- a/projects/wireshark.org/package.yml +++ b/projects/wireshark.org/package.yml @@ -8,28 +8,25 @@ versions: - /^wireshark-/ - /\.tar\.xz/ dependencies: - c-ares.org: '*' - gnome.org/glib: '*' - gnutls.org: '*' - gnupg.org/libgcrypt: '*' - github.com/maxmind/libmaxminddb: '*' - nghttp2.org: '*' - ibr.cs.tu-bs.de/libsmi: '*' - libssh.org: '*' - lua.org: '*' - github.com/xiph/speexdsp: '*' - tcpdump.org: '*' - gnome.org/libxml2: '*' + c-ares.org: ^1.23 + gnome.org/glib: ^2.78.3 + gnutls.org: ^3.8.2 + gnupg.org/libgcrypt: ^1.10.3 + gnupg.org/libgpg-error: ^1.47 + github.com/maxmind/libmaxminddb: ^1.8 + nghttp2.org: ^1.58 + ibr.cs.tu-bs.de/libsmi: ^0.4.8 + libssh.org: ^0.10.5 + lua.org: ^5.4.6 + github.com/xiph/speexdsp: ^1.2.1 + tcpdump.org: ^1.10.4 + gnome.org/libxml2: ^2.12.3 build: dependencies: cmake.org: '*' gnu.org/bison: '*' github.com/westes/flex: '*' python.org: ^3.11 - freedesktop.org/pkg-config: '*' - linux: - gnu.org/gcc: '*' - gnu.org/make: '*' script: - cmake -S . -B build $CMAKE_ARGS - cmake --build build @@ -44,12 +41,42 @@ build: - -DCMAKE_VERBOSE_MAKEFILE=ON - -Wno-dev - -DBUILD_wireshark=OFF + - -DENABLE_GNUTLS=ON + - -DBUILD_wireshark_gtk=OFF + - -DENABLE_LUA=ON + - -DENABLE_SMI=ON + - -DBUILD_sshdump=ON + - -DBUILD_ciscodump=ON + - -DENABLE_NGHTTP2=ON + - -DENABLE_APPLICATION_BUNDLE=OFF + - -DCMAKE_INSTALL_NAME_DIR:STRING={{prefix}}/lib + - -DLUA_INCLUDE_DIR={{deps.lua.org.prefix}}/include/lua + - -DCARES_INCLUDE_DIR={{deps.c-ares.org.prefix}}/include + - -DGCRYPT_INCLUDE_DIR={{deps.gnupg.org/libgcrypt.prefix}}/include + - -DGNUTLS_INCLUDE_DIR={{deps.gnutls.org.prefix}}/include + - -DMAXMINDDB_INCLUDE_DIR={{deps.github.com/maxmind/libmaxminddb.prefix}}/include + darwin: + CMAKE_ARGS: + - -DLUA_LIBRARY={{deps.lua.org.prefix}}/lib/liblua.a + linux: + CMAKE_ARGS: + - -DLUA_LIBRARY={{deps.lua.org.prefix}}/lib/liblua.so provides: + - bin/capinfos + - bin/captype + - bin/dumpcap + - bin/editcap + - bin/idl2wrs + - bin/mergecap + - bin/mmdbresolve - bin/randpkt + - bin/rawshark + - bin/reordercap + - bin/sharkd + - bin/text2pcap + - bin/tshark test: - dependencies: - linux: - gnu.org/gcc: '*' - script: - - c++ -std=c++11 -o test test.cpp - - ./test + - c++ -std=c++11 -o test test.cpp + - ./test | grep {{version}} + - randpkt -b 100 -c 2 capture.pcap + - capinfos -Tmc capture.pcap | grep 'capture.pcap,2' \ No newline at end of file diff --git a/projects/wireshark.org/test.cpp b/projects/wireshark.org/test.cpp index a037cfa0b3..ee3a11f3bc 100644 --- a/projects/wireshark.org/test.cpp +++ b/projects/wireshark.org/test.cpp @@ -1,5 +1,5 @@ #include -#include +#include int main() { printf("%d.%d.%d", WIRESHARK_VERSION_MAJOR, WIRESHARK_VERSION_MINOR,