From bad0dfc07619e46ac5aa775db41ffd25b6fa5665 Mon Sep 17 00:00:00 2001 From: asklymenko Date: Mon, 8 Jun 2026 17:19:46 +0300 Subject: [PATCH 1/3] T8969: vyos-build failing to build, missing dependencies. Add build scripts --- .../live-build-config/archives/bookworm-backports.pref.chroot | 2 +- scripts/package-build/libhtp/.gitignore | 1 + scripts/package-build/libhtp/build.py | 1 + scripts/package-build/libhtp/package.toml | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 scripts/package-build/libhtp/.gitignore create mode 120000 scripts/package-build/libhtp/build.py create mode 100644 scripts/package-build/libhtp/package.toml diff --git a/data/live-build-config/archives/bookworm-backports.pref.chroot b/data/live-build-config/archives/bookworm-backports.pref.chroot index f2c79d62bd..e0eba2c01d 100644 --- a/data/live-build-config/archives/bookworm-backports.pref.chroot +++ b/data/live-build-config/archives/bookworm-backports.pref.chroot @@ -2,7 +2,7 @@ Package: iproute2 Pin: release n=bookworm-backports Pin-Priority: 600 -Package: suricata libhtp2 +Package: suricata Pin: release n=bookworm-backports Pin-Priority: 600 diff --git a/scripts/package-build/libhtp/.gitignore b/scripts/package-build/libhtp/.gitignore new file mode 100644 index 0000000000..17d0b75356 --- /dev/null +++ b/scripts/package-build/libhtp/.gitignore @@ -0,0 +1 @@ +/ddclient/ diff --git a/scripts/package-build/libhtp/build.py b/scripts/package-build/libhtp/build.py new file mode 120000 index 0000000000..3c76af73e2 --- /dev/null +++ b/scripts/package-build/libhtp/build.py @@ -0,0 +1 @@ +../build.py \ No newline at end of file diff --git a/scripts/package-build/libhtp/package.toml b/scripts/package-build/libhtp/package.toml new file mode 100644 index 0000000000..fc1d445e6a --- /dev/null +++ b/scripts/package-build/libhtp/package.toml @@ -0,0 +1,4 @@ +[[packages]] +name = "libhtp2" +commit_id = "e851d98f" +scm_url = "https://salsa.debian.org/pkg-suricata-team/pkg-libhtp.git" From 91a74fd0a2896d7561e403f52c1022f595329820 Mon Sep 17 00:00:00 2001 From: asklymenko Date: Mon, 8 Jun 2026 17:23:27 +0300 Subject: [PATCH 2/3] T8969: vyos-build failing to build, missing dependencies. Modify gitignore file --- scripts/package-build/libhtp/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package-build/libhtp/.gitignore b/scripts/package-build/libhtp/.gitignore index 17d0b75356..65d738a3a6 100644 --- a/scripts/package-build/libhtp/.gitignore +++ b/scripts/package-build/libhtp/.gitignore @@ -1 +1 @@ -/ddclient/ +/libhtp/ From 4811386cfb84f26428bac85a166edee105556d66 Mon Sep 17 00:00:00 2001 From: asklymenko Date: Mon, 8 Jun 2026 17:59:07 +0300 Subject: [PATCH 3/3] T8969: vyos-build failing to build, missing dependencies --- .github/workflows/trigger_rebuild_packages.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml index 1a31b6b9a7..fa647c9a62 100644 --- a/.github/workflows/trigger_rebuild_packages.yml +++ b/.github/workflows/trigger_rebuild_packages.yml @@ -53,6 +53,8 @@ jobs: - 'scripts/package-build/isc-kea/**' keepalived: - 'scripts/package-build/keepalived/**' + libhtp: + - 'scripts/package-build/libhtp/**' libnss-mapuser: - 'scripts/package-build/libnss-mapuser/**' libpam-radius-auth: @@ -179,6 +181,10 @@ jobs: trigger_build "keepalived" fi + if [ "${{ steps.changes.outputs.libhtp }}" == "true" ]; then + trigger_build "libhtp" + fi + if [ "${{ steps.changes.outputs.libnss-mapuser }}" == "true" ]; then trigger_build "libnss-mapuser" fi