From 11801ef1279735272dd128119b25d48ae03e7a3a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 24 Apr 2024 03:56:37 +0200 Subject: Merging debian version 1:7.0.5-1. Signed-off-by: Daniel Baumann --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/rules | 5 ----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf37120..cb53284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +suricata (1:7.0.5-1) unstable; urgency=medium + + * New upstream release. + * Bump versioned libhtp dependency to 0.5.48 or later. + * Remove (probably buggy) Rust constraint from d/rules. + + -- Sascha Steinbiss Tue, 23 Apr 2024 15:12:33 +0200 + suricata (1:7.0.4-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 2cab593..4dfcf3f 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends: debhelper-compat (= 13), libyaml-dev, python3:any, zlib1g-dev | libz-dev, - libhtp-dev (>= 1:0.5.47), + libhtp-dev (>= 1:0.5.48), procps, dpdk-dev [amd64 arm64 riscv64 ppc64el], libnuma-dev [amd64 arm64 riscv64 ppc64el] diff --git a/debian/rules b/debian/rules index 286dcf1..9abdb69 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ endif LUAJIT_ARCHS = i386 amd64 powerpc mips mipsel armel armhf HYPERSCAN_ARCHS = i386 amd64 hurd-i386 kfreebsd-amd64 x32 -RUST_ARCHS = i386 amd64 EBPF_ARCHS = amd64 arm64 armel armhf i386 ppc64el s390x ppc64 sparc64 x32 DPDK_ARCHS = amd64x arm64x riscv64x ppc64elx @@ -33,10 +32,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(HYPERSCAN_ARCHS))) ENABLE_HYPERSCAN="--enable-libhs" endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(RUST_ARCHS))) - ENABLE_HYPERSCAN="--enable-rust" -endif - ifneq (,$(findstring $(DEB_HOST_ARCH)x,$(DPDK_ARCHS))) ENABLE_DPDK="--enable-dpdk" endif -- cgit v1.2.3