diff --git a/srcpkgs/suricata/patches/configure.patch b/srcpkgs/suricata/patches/configure.patch deleted file mode 100644 index 8bfea4da553..00000000000 --- a/srcpkgs/suricata/patches/configure.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- configure.orig 2019-02-22 22:09:50.521219706 +0100 -+++ configure 2019-02-22 22:23:32.663207196 +0100 -@@ -26682,24 +26681,0 @@ $as_echo "#define HAVE_RUST 1" >>confdef -- as_ac_File=`$as_echo "ac_cv_file_$srcdir/rust/vendor" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $srcdir/rust/vendor" >&5 --$as_echo_n "checking for $srcdir/rust/vendor... " >&6; } --if eval \${$as_ac_File+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- test "$cross_compiling" = yes && -- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 --if test -r "$srcdir/rust/vendor"; then -- eval "$as_ac_File=yes" --else -- eval "$as_ac_File=no" --fi --fi --eval ac_res=\$$as_ac_File -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --if eval test \"x\$"$as_ac_File"\" = x"yes"; then : -- --cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$srcdir/rust/vendor" | $as_tr_cpp` 1 --_ACEOF --have_rust_vendor="yes" --fi diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template index ca2bc766139..f715e3fde91 100644 --- a/srcpkgs/suricata/template +++ b/srcpkgs/suricata/template @@ -1,6 +1,6 @@ # Template file for 'suricata' pkgname=suricata -version=4.1.5 +version=4.1.8 revision=1 build_style=gnu-configure build_helper="$(vopt_if rust rust)" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://suricata-ids.org/" distfiles="https://www.openinfosecfoundation.org/download/${pkgname}-${version}.tar.gz" -checksum=cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b +checksum=c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb build_options="lua rust hiredis" build_options_default="hiredis" @@ -34,6 +34,13 @@ 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