* [PR PATCH] Suricata 7.0.1
@ 2024-01-29 17:37 abenson
2024-01-29 17:42 ` [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1 abenson
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: abenson @ 2024-01-29 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
There is a new pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages suricata_7.0.1
https://github.com/void-linux/void-packages/pull/48425
Suricata 7.0.1
#### Testing the changes
- I tested the changes in this PR: **NO**t yet
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-suricata_7.0.1-48425.patch --]
[-- Type: text/x-diff, Size: 5217 bytes --]
From 814765814e71196702260db865dd51c7d48d2600 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:25:08 -0500
Subject: [PATCH 1/2] libhtp: update to 0.5.45.
---
srcpkgs/libhtp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 515fd4dac2a51..433ded15ec877 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
-version=0.5.36
-revision=2
+version=0.5.45
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/OISF/libhtp"
distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
-checksum=ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b
+checksum=d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606
pre_configure() {
autoreconf -fi
From 638e7915b9399bf342b7db2e998bc5bfdda2c531 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:30:17 -0500
Subject: [PATCH 2/2] [WIP] suricata: update to 7.0.1.
---
.../patches/fix-missing-syscalls.patch | 21 ++++++++++
srcpkgs/suricata/template | 42 ++++++++-----------
2 files changed, 39 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/suricata/patches/fix-missing-syscalls.patch
diff --git a/srcpkgs/suricata/patches/fix-missing-syscalls.patch b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
new file mode 100644
index 0000000000000..e1c28982e614f
--- /dev/null
+++ b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
@@ -0,0 +1,21 @@
+--- a/src/util-landlock.c
++++ b/src/util-landlock.c
+@@ -40,6 +40,18 @@
+
+ #include <linux/landlock.h>
+
++#ifndef __NR_landlock_create_ruleset
++#define __NR_landlock_create_ruleset 444
++#endif
++
++#ifndef __NR_landlock_add_rule
++#define __NR_landlock_add_rule 445
++#endif
++
++#ifndef __NR_landlock_restrict_self
++#define __NR_landlock_restrict_self 446
++#endif
++
+ #ifndef landlock_create_ruleset
+ static inline int landlock_create_ruleset(
+ const struct landlock_ruleset_attr *const attr, const size_t size, const __u32 flags)
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index 3e4f58bae137d..cf64eda3a3ae5 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,31 +1,28 @@
# Template file for 'suricata'
pkgname=suricata
-version=4.1.8
-revision=2
+version=7.0.2
+revision=1
build_style=gnu-configure
-build_helper="$(vopt_if rust rust)"
-configure_args="--disable-gccmarch-native $(vopt_enable rust)
- $(vopt_enable lua) $(vopt_enable hiredis) --disable-suricata-update
- --disable-static --enable-non-bundled-htp"
-hostmakedepends="pkg-config $(vopt_if rust cargo)"
-makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel
+build_helper=rust
+configure_args="--disable-gccmarch-native $(vopt_enable lua) $(vopt_enable hiredis)
+ --disable-suricata-update --disable-static --enable-non-bundled-htp"
+hostmakedepends="pkg-config cargo"
+makedepends="libnet-devel libpcap-devel pcre2-devel libyaml-devel libcap-ng-devel
liblz4-devel liblzma-devel file-devel jansson-devel nss-devel libhtp-devel
- $(vopt_if rust rust-std) $(vopt_if lua lua53-devel)
- $(vopt_if hiredis hiredis-devel)"
+ libunwind-devel rust-std $(vopt_if lua lua53-devel) $(vopt_if hiredis hiredis-devel)"
short_desc="Suricata is a network IDS, IPS and NSM engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://suricata-ids.org/"
distfiles="https://www.openinfosecfoundation.org/download/${pkgname}-${version}.tar.gz"
-checksum=c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb
+checksum=b4eb604838ef99a8396bc8b7bb54cad11f2442cbd7cbb300e7f5aab19097bc4d
-build_options="lua rust hiredis"
+build_options="lua hiredis"
build_options_default="hiredis"
desc_option_hiredis="Enable hiredis support"
-desc_option_rust="Enable rust protocol parsers"
if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" rust lua"
+ build_options_default+=" lua"
fi
system_accounts="suricata"
@@ -34,10 +31,7 @@ conf_files="/etc/${pkgname}/*.* /etc/${pkgname}/rules/*"
CFLAGS="-fcommon"
post_configure() {
- if [ "$build_option_rust" ]; then
- vsed -i rust/Makefile \
- -e 's/#RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
- fi
+ vsed -i rust/Makefile -e 's/#RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
}
post_build() {
@@ -49,10 +43,10 @@ post_build() {
post_install() {
vsv $pkgname
- vinstall $pkgname.yaml 644 etc/$pkgname
- vinstall classification.config 644 etc/$pkgname
- vinstall reference.config 644 etc/$pkgname
- vinstall threshold.config 644 etc/$pkgname
- vmkdir etc/$pkgname/rules
- vcopy rules/*.rules etc/$pkgname/rules
+ vinstall suricata.yaml 644 etc/suricata
+ vinstall etc/classification.config 644 etc/suricata
+ vinstall etc/reference.config 644 etc/suricata
+ vinstall threshold.config 644 etc/suricata
+ vmkdir etc/suricata/rules
+ vcopy rules/*.rules etc/suricata/rules
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
@ 2024-01-29 17:42 ` abenson
2024-01-29 17:57 ` abenson
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2024-01-29 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages suricata_7.0.1
https://github.com/void-linux/void-packages/pull/48425
[WIP] suricata: update to 7.0.1
#### Testing the changes
- I tested the changes in this PR: **NO**t yet
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-suricata_7.0.1-48425.patch --]
[-- Type: text/x-diff, Size: 5249 bytes --]
From 814765814e71196702260db865dd51c7d48d2600 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:25:08 -0500
Subject: [PATCH 1/2] libhtp: update to 0.5.45.
---
srcpkgs/libhtp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 515fd4dac2a51..433ded15ec877 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
-version=0.5.36
-revision=2
+version=0.5.45
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/OISF/libhtp"
distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
-checksum=ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b
+checksum=d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606
pre_configure() {
autoreconf -fi
From 7f8d63340534480406b33be02ca709034a8857b2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:30:17 -0500
Subject: [PATCH 2/2] [WIP] suricata: update to 7.0.2.
---
.../patches/fix-missing-syscalls.patch | 21 +++++++++
srcpkgs/suricata/template | 44 +++++++------------
2 files changed, 38 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/suricata/patches/fix-missing-syscalls.patch
diff --git a/srcpkgs/suricata/patches/fix-missing-syscalls.patch b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
new file mode 100644
index 0000000000000..e1c28982e614f
--- /dev/null
+++ b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
@@ -0,0 +1,21 @@
+--- a/src/util-landlock.c
++++ b/src/util-landlock.c
+@@ -40,6 +40,18 @@
+
+ #include <linux/landlock.h>
+
++#ifndef __NR_landlock_create_ruleset
++#define __NR_landlock_create_ruleset 444
++#endif
++
++#ifndef __NR_landlock_add_rule
++#define __NR_landlock_add_rule 445
++#endif
++
++#ifndef __NR_landlock_restrict_self
++#define __NR_landlock_restrict_self 446
++#endif
++
+ #ifndef landlock_create_ruleset
+ static inline int landlock_create_ruleset(
+ const struct landlock_ruleset_attr *const attr, const size_t size, const __u32 flags)
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index 3e4f58bae137d..6b5efb9b89b20 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,31 +1,28 @@
# Template file for 'suricata'
pkgname=suricata
-version=4.1.8
-revision=2
+version=7.0.2
+revision=1
build_style=gnu-configure
-build_helper="$(vopt_if rust rust)"
-configure_args="--disable-gccmarch-native $(vopt_enable rust)
- $(vopt_enable lua) $(vopt_enable hiredis) --disable-suricata-update
- --disable-static --enable-non-bundled-htp"
-hostmakedepends="pkg-config $(vopt_if rust cargo)"
-makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel
+build_helper=rust
+configure_args="--disable-gccmarch-native $(vopt_enable lua) $(vopt_enable hiredis)
+ --disable-suricata-update --disable-static --enable-non-bundled-htp"
+hostmakedepends="pkg-config cargo"
+makedepends="libnet-devel libpcap-devel pcre2-devel libyaml-devel libcap-ng-devel
liblz4-devel liblzma-devel file-devel jansson-devel nss-devel libhtp-devel
- $(vopt_if rust rust-std) $(vopt_if lua lua53-devel)
- $(vopt_if hiredis hiredis-devel)"
+ libunwind-devel rust-std $(vopt_if lua lua53-devel) $(vopt_if hiredis hiredis-devel)"
short_desc="Suricata is a network IDS, IPS and NSM engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://suricata-ids.org/"
distfiles="https://www.openinfosecfoundation.org/download/${pkgname}-${version}.tar.gz"
-checksum=c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb
+checksum=b4eb604838ef99a8396bc8b7bb54cad11f2442cbd7cbb300e7f5aab19097bc4d
-build_options="lua rust hiredis"
+build_options="lua hiredis"
build_options_default="hiredis"
desc_option_hiredis="Enable hiredis support"
-desc_option_rust="Enable rust protocol parsers"
if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" rust lua"
+ build_options_default+=" lua"
fi
system_accounts="suricata"
@@ -33,13 +30,6 @@ conf_files="/etc/${pkgname}/*.* /etc/${pkgname}/rules/*"
CFLAGS="-fcommon"
-post_configure() {
- if [ "$build_option_rust" ]; then
- vsed -i rust/Makefile \
- -e 's/#RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
- fi
-}
-
post_build() {
sed -i 's|#run-as:|run-as:|g' $pkgname.yaml
sed -i "s|# user: suri| user: $pkgname|g" $pkgname.yaml
@@ -49,10 +39,10 @@ post_build() {
post_install() {
vsv $pkgname
- vinstall $pkgname.yaml 644 etc/$pkgname
- vinstall classification.config 644 etc/$pkgname
- vinstall reference.config 644 etc/$pkgname
- vinstall threshold.config 644 etc/$pkgname
- vmkdir etc/$pkgname/rules
- vcopy rules/*.rules etc/$pkgname/rules
+ vinstall suricata.yaml 644 etc/suricata
+ vinstall etc/classification.config 644 etc/suricata
+ vinstall etc/reference.config 644 etc/suricata
+ vinstall threshold.config 644 etc/suricata
+ vmkdir etc/suricata/rules
+ vcopy rules/*.rules etc/suricata/rules
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
2024-01-29 17:42 ` [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1 abenson
@ 2024-01-29 17:57 ` abenson
2024-03-14 17:17 ` zlice
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2024-01-29 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages suricata_7.0.1
https://github.com/void-linux/void-packages/pull/48425
[WIP] suricata: update to 7.0.1
#### Testing the changes
- I tested the changes in this PR: **NO**t yet
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-suricata_7.0.1-48425.patch --]
[-- Type: text/x-diff, Size: 5218 bytes --]
From 814765814e71196702260db865dd51c7d48d2600 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:25:08 -0500
Subject: [PATCH 1/2] libhtp: update to 0.5.45.
---
srcpkgs/libhtp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 515fd4dac2a51..433ded15ec877 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
-version=0.5.36
-revision=2
+version=0.5.45
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/OISF/libhtp"
distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
-checksum=ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b
+checksum=d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606
pre_configure() {
autoreconf -fi
From 88e2828940d4b5cbcc1f040e5b04911c8ae961f9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:30:17 -0500
Subject: [PATCH 2/2] [WIP] suricata: update to 7.0.2.
---
.../patches/fix-missing-syscalls.patch | 21 ++++++++++
srcpkgs/suricata/template | 42 ++++++++-----------
2 files changed, 39 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/suricata/patches/fix-missing-syscalls.patch
diff --git a/srcpkgs/suricata/patches/fix-missing-syscalls.patch b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
new file mode 100644
index 0000000000000..e1c28982e614f
--- /dev/null
+++ b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
@@ -0,0 +1,21 @@
+--- a/src/util-landlock.c
++++ b/src/util-landlock.c
+@@ -40,6 +40,18 @@
+
+ #include <linux/landlock.h>
+
++#ifndef __NR_landlock_create_ruleset
++#define __NR_landlock_create_ruleset 444
++#endif
++
++#ifndef __NR_landlock_add_rule
++#define __NR_landlock_add_rule 445
++#endif
++
++#ifndef __NR_landlock_restrict_self
++#define __NR_landlock_restrict_self 446
++#endif
++
+ #ifndef landlock_create_ruleset
+ static inline int landlock_create_ruleset(
+ const struct landlock_ruleset_attr *const attr, const size_t size, const __u32 flags)
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index 3e4f58bae137d..277dc0df67647 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,31 +1,28 @@
# Template file for 'suricata'
pkgname=suricata
-version=4.1.8
-revision=2
+version=7.0.2
+revision=1
build_style=gnu-configure
-build_helper="$(vopt_if rust rust)"
-configure_args="--disable-gccmarch-native $(vopt_enable rust)
- $(vopt_enable lua) $(vopt_enable hiredis) --disable-suricata-update
- --disable-static --enable-non-bundled-htp"
-hostmakedepends="pkg-config $(vopt_if rust cargo)"
-makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel
+build_helper=rust
+configure_args="--disable-gccmarch-native $(vopt_enable lua) $(vopt_enable hiredis)
+ --disable-suricata-update --disable-static --enable-non-bundled-htp"
+hostmakedepends="pkg-config cargo"
+makedepends="libnet-devel libpcap-devel pcre2-devel libyaml-devel libcap-ng-devel
liblz4-devel liblzma-devel file-devel jansson-devel nss-devel libhtp-devel
- $(vopt_if rust rust-std) $(vopt_if lua lua53-devel)
- $(vopt_if hiredis hiredis-devel)"
+ libunwind-devel rust-std $(vopt_if lua lua53-devel) $(vopt_if hiredis hiredis-devel)"
short_desc="Suricata is a network IDS, IPS and NSM engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://suricata-ids.org/"
distfiles="https://www.openinfosecfoundation.org/download/${pkgname}-${version}.tar.gz"
-checksum=c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb
+checksum=b4eb604838ef99a8396bc8b7bb54cad11f2442cbd7cbb300e7f5aab19097bc4d
-build_options="lua rust hiredis"
+build_options="lua hiredis"
build_options_default="hiredis"
desc_option_hiredis="Enable hiredis support"
-desc_option_rust="Enable rust protocol parsers"
if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" rust lua"
+ build_options_default+=" lua"
fi
system_accounts="suricata"
@@ -34,10 +31,7 @@ conf_files="/etc/${pkgname}/*.* /etc/${pkgname}/rules/*"
CFLAGS="-fcommon"
post_configure() {
- if [ "$build_option_rust" ]; then
- vsed -i rust/Makefile \
- -e 's/#RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
- fi
+ vsed -i rust/Makefile -e 's/.*RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
}
post_build() {
@@ -49,10 +43,10 @@ post_build() {
post_install() {
vsv $pkgname
- vinstall $pkgname.yaml 644 etc/$pkgname
- vinstall classification.config 644 etc/$pkgname
- vinstall reference.config 644 etc/$pkgname
- vinstall threshold.config 644 etc/$pkgname
- vmkdir etc/$pkgname/rules
- vcopy rules/*.rules etc/$pkgname/rules
+ vinstall suricata.yaml 644 etc/suricata
+ vinstall etc/classification.config 644 etc/suricata
+ vinstall etc/reference.config 644 etc/suricata
+ vinstall threshold.config 644 etc/suricata
+ vmkdir etc/suricata/rules
+ vcopy rules/*.rules etc/suricata/rules
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP] suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
2024-01-29 17:42 ` [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1 abenson
2024-01-29 17:57 ` abenson
@ 2024-03-14 17:17 ` zlice
2024-03-15 12:02 ` [PR PATCH] [Updated] " abenson
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: zlice @ 2024-03-14 17:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48425#issuecomment-1997954588
Comment:
7.0.3 [suricata-template.txt](https://github.com/void-linux/void-packages/files/14605760/suricata-template.txt)
Think this hack fixes the rust cross build stuff. Not sure if that's just this package or if it's something with void's cross build that could be fixed.
Also `libhtp` `version=0.5.46` `checksum=31a184c9aa1d015f5add33c5480f95738189449954c383e217b27cda97e98789` from tocsh1's PR
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
` (2 preceding siblings ...)
2024-03-14 17:17 ` zlice
@ 2024-03-15 12:02 ` abenson
2024-03-15 12:24 ` abenson
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2024-03-15 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages suricata_7.0.1
https://github.com/void-linux/void-packages/pull/48425
[WIP] suricata: update to 7.0.1
#### Testing the changes
- I tested the changes in this PR: **NO**t yet
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-suricata_7.0.1-48425.patch --]
[-- Type: text/x-diff, Size: 5615 bytes --]
From 7280991e9e02bb6254ae321dfe1b5ad457dab805 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:25:08 -0500
Subject: [PATCH 1/2] libhtp: update to 0.5.46.
---
srcpkgs/libhtp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 515fd4dac2a514..4bd880c72f38e9 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
-version=0.5.36
-revision=2
+version=0.5.46
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/OISF/libhtp"
distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
-checksum=ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b
+checksum=31a184c9aa1d015f5add33c5480f95738189449954c383e217b27cda97e98789
pre_configure() {
autoreconf -fi
From 645b3890fd5c5e12528f7afa34115e3d7e883025 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 12:30:17 -0500
Subject: [PATCH 2/2] suricata: update to 7.0.3.
---
.../patches/fix-missing-syscalls.patch | 21 ++++++++
srcpkgs/suricata/template | 50 ++++++++++---------
2 files changed, 47 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/suricata/patches/fix-missing-syscalls.patch
diff --git a/srcpkgs/suricata/patches/fix-missing-syscalls.patch b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
new file mode 100644
index 00000000000000..e1c28982e614fe
--- /dev/null
+++ b/srcpkgs/suricata/patches/fix-missing-syscalls.patch
@@ -0,0 +1,21 @@
+--- a/src/util-landlock.c
++++ b/src/util-landlock.c
+@@ -40,6 +40,18 @@
+
+ #include <linux/landlock.h>
+
++#ifndef __NR_landlock_create_ruleset
++#define __NR_landlock_create_ruleset 444
++#endif
++
++#ifndef __NR_landlock_add_rule
++#define __NR_landlock_add_rule 445
++#endif
++
++#ifndef __NR_landlock_restrict_self
++#define __NR_landlock_restrict_self 446
++#endif
++
+ #ifndef landlock_create_ruleset
+ static inline int landlock_create_ruleset(
+ const struct landlock_ruleset_attr *const attr, const size_t size, const __u32 flags)
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index 3e4f58bae137db..8ef16674451965 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,31 +1,28 @@
# Template file for 'suricata'
pkgname=suricata
-version=4.1.8
-revision=2
+version=7.0.3
+revision=1
build_style=gnu-configure
-build_helper="$(vopt_if rust rust)"
-configure_args="--disable-gccmarch-native $(vopt_enable rust)
- $(vopt_enable lua) $(vopt_enable hiredis) --disable-suricata-update
- --disable-static --enable-non-bundled-htp"
-hostmakedepends="pkg-config $(vopt_if rust cargo)"
-makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel
+build_helper=rust
+configure_args="--disable-gccmarch-native $(vopt_enable lua) $(vopt_enable hiredis)
+ --disable-suricata-update --disable-static --enable-non-bundled-htp"
+hostmakedepends="pkg-config cargo"
+makedepends="libnet-devel libpcap-devel pcre2-devel libyaml-devel libcap-ng-devel
liblz4-devel liblzma-devel file-devel jansson-devel nss-devel libhtp-devel
- $(vopt_if rust rust-std) $(vopt_if lua lua53-devel)
- $(vopt_if hiredis hiredis-devel)"
+ libunwind-devel rust-std $(vopt_if lua lua53-devel) $(vopt_if hiredis hiredis-devel)"
short_desc="Suricata is a network IDS, IPS and NSM engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://suricata-ids.org/"
distfiles="https://www.openinfosecfoundation.org/download/${pkgname}-${version}.tar.gz"
-checksum=c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb
+checksum=ea0742d7a98783f1af4a57661af6068bc2d850ac3eca04b3204d28ce165e35ff
-build_options="lua rust hiredis"
+build_options="lua hiredis"
build_options_default="hiredis"
desc_option_hiredis="Enable hiredis support"
-desc_option_rust="Enable rust protocol parsers"
if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" rust lua"
+ build_options_default+=" lua"
fi
system_accounts="suricata"
@@ -33,13 +30,18 @@ conf_files="/etc/${pkgname}/*.* /etc/${pkgname}/rules/*"
CFLAGS="-fcommon"
-post_configure() {
- if [ "$build_option_rust" ]; then
- vsed -i rust/Makefile \
- -e 's/#RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
+pre_configure() {
+ if [ ! -z "$CROSS_BUILD" ]; then
+ mkdir -p rust/target/${XBPS_CROSS_RUST_TARGET}
+ ln -fs ${XBPS_CROSS_RUST_TARGET} rust/target/${XBPS_CROSS_RUST_TARGET/-unknown}
+ ln -fs ${XBPS_CROSS_RUST_TARGET} rust/target/${XBPS_CROSS_TRIPLET/-unknown}
fi
}
+post_configure() {
+ vsed -i rust/Makefile -e 's/.*RUST_TARGET[[:space:]]*=.*/RUST_TARGET =/'
+}
+
post_build() {
sed -i 's|#run-as:|run-as:|g' $pkgname.yaml
sed -i "s|# user: suri| user: $pkgname|g" $pkgname.yaml
@@ -49,10 +51,10 @@ post_build() {
post_install() {
vsv $pkgname
- vinstall $pkgname.yaml 644 etc/$pkgname
- vinstall classification.config 644 etc/$pkgname
- vinstall reference.config 644 etc/$pkgname
- vinstall threshold.config 644 etc/$pkgname
- vmkdir etc/$pkgname/rules
- vcopy rules/*.rules etc/$pkgname/rules
+ vinstall suricata.yaml 644 etc/suricata
+ vinstall etc/classification.config 644 etc/suricata
+ vinstall etc/reference.config 644 etc/suricata
+ vinstall threshold.config 644 etc/suricata
+ vmkdir etc/suricata/rules
+ vcopy rules/*.rules etc/suricata/rules
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP] suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
` (3 preceding siblings ...)
2024-03-15 12:02 ` [PR PATCH] [Updated] " abenson
@ 2024-03-15 12:24 ` abenson
2024-03-15 13:59 ` zlice
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2024-03-15 12:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/48425#issuecomment-1999556815
Comment:
That works! I think its just this package, though, not an issue with Void's cross setup.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
` (4 preceding siblings ...)
2024-03-15 12:24 ` abenson
@ 2024-03-15 13:59 ` zlice
2024-03-15 14:13 ` abenson
2024-03-15 14:13 ` [PR PATCH] [Merged]: " abenson
7 siblings, 0 replies; 9+ messages in thread
From: zlice @ 2024-03-15 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/48425#issuecomment-1999728051
Comment:
sweet. ok sounds good. btw still 701 title =p
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
` (5 preceding siblings ...)
2024-03-15 13:59 ` zlice
@ 2024-03-15 14:13 ` abenson
2024-03-15 14:13 ` [PR PATCH] [Merged]: " abenson
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2024-03-15 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/48425#issuecomment-1999758370
Comment:
meh its just a title =D
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: suricata: update to 7.0.1
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
` (6 preceding siblings ...)
2024-03-15 14:13 ` abenson
@ 2024-03-15 14:13 ` abenson
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2024-03-15 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
There's a merged pull request on the void-packages repository
suricata: update to 7.0.1
https://github.com/void-linux/void-packages/pull/48425
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-03-15 14:13 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-29 17:37 [PR PATCH] Suricata 7.0.1 abenson
2024-01-29 17:42 ` [PR PATCH] [Updated] [WIP] suricata: update to 7.0.1 abenson
2024-01-29 17:57 ` abenson
2024-03-14 17:17 ` zlice
2024-03-15 12:02 ` [PR PATCH] [Updated] " abenson
2024-03-15 12:24 ` abenson
2024-03-15 13:59 ` zlice
2024-03-15 14:13 ` abenson
2024-03-15 14:13 ` [PR PATCH] [Merged]: " abenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).