Merge pull request #1220 from asklymenko/rolling

T8969: vyos-build failing to build, missing dependencies

Author: jestabro

.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

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
 

scripts/package-build/libhtp/.gitignore

@@ -0,0 +1 @@
+/libhtp/

scripts/package-build/libhtp/build.py

@@ -0,0 +1 @@
+../build.py

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"