[packages/snort] - up to 2.9.18.1

[baggins]

commit 4cb4516c27ef3497c6e00be5b2b9ae031b9d8969
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 12 22:18:06 2021 +0200

    - up to 2.9.18.1

 snort-link.patch | 27 +++++++++++++++++++++++----
 snort.spec       | 12 ++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/snort.spec b/snort.spec
index 4f14b87..ddbdfaf 100644
--- a/snort.spec
+++ b/snort.spec
@@ -12,12 +12,12 @@ Summary(pt_BR.UTF-8):	Ferramenta de detecção de intrusos
 Summary(ru.UTF-8):	Snort - система обнаружения попыток вторжения в сеть
 Summary(uk.UTF-8):	Snort - система виявлення спроб вторгнення в мережу
 Name:		snort
-Version:	2.9.8.2
-Release:	2
+Version:	2.9.18.1
+Release:	1
 License:	GPL v2 (vrt rules on VRT-License)
 Group:		Networking
 Source0:	http://www.snort.org/downloads/snort/%{name}-%{version}.tar.gz
-# Source0-md5:	b5005f88a01b42ff7ee0defb94161ffc
+# Source0-md5:	2b4e30300ef6feca1f60c267e727c6c0
 Source1:	http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/%{name}rules-pr-2.4.tar.gz
 # Source1-md5:	35d9a2486f8c0280bb493aa03c011927
 %if %{with registered}
@@ -36,9 +36,11 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	daq-static
 BuildRequires:	libdnet-devel
+BuildRequires:	libnetfilter_queue-devel
 BuildRequires:	libnet-devel
 BuildRequires:	libnet1-devel = 1.0.2a
 BuildRequires:	libpcap-devel
+BuildRequires:	libtirpc-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
@@ -141,6 +143,7 @@ done
 cd $_DIR
 
 %build
+export CFLAGS="%{rpmcflags} -I/usr/include/tirpc"
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -154,7 +157,8 @@ cd $_DIR
 	--enable-side-channel \
 	--enable-build-dynamic-examples
 
-%{__make} -j1
+%{__make}
+%{__make} -C src/dynamic-plugins/sf_engine/examples
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/snort-link.patch b/snort-link.patch
index fca7e18..fbc88ee 100644
--- a/snort-link.patch
+++ b/snort-link.patch
@@ -1,11 +1,30 @@
 --- snort-2.9.8.2/src/dynamic-examples/dynamic-rule/Makefile.am~	2011-06-08 09:33:10.000000000 +0900
 +++ snort-2.9.8.2/src/dynamic-examples/dynamic-rule/Makefile.am	2016-04-10 10:02:21.076065236 +0900
-@@ -7,7 +7,7 @@
- 
+@@ -7,6 +7,7 @@
  noinst_lib_LTLIBRARIES = lib_sfdynamic_example_rule.la
  
--lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic @XCCFLAGS@
-+lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic @XCCFLAGS@ -L../../dynamic-plugins/sf_engine/.libs -lsf_engine
+ lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic @XCCFLAGS@
++lib_sfdynamic_example_rule_la_LIBADD = $(top_srcdir)/src/dynamic-plugins/sf_engine/libsf_engine.la
  
  BUILT_SOURCES = \
  sfsnort_dynamic_detection_lib.c \
+--- snort-2.9.18.1/src/dynamic-plugins/sf_engine/examples/Makefile.am.orig	2021-08-18 18:28:53.000000000 +0200
++++ snort-2.9.18.1/src/dynamic-plugins/sf_engine/examples/Makefile.am	2021-10-12 21:40:48.123063346 +0200
+@@ -5,6 +5,7 @@
+ lib_LTLIBRARIES = libsf_sorules.la
+ 
+ libsf_sorules_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
++libsf_sorules_la_LIBADD = $(top_srcdir)/src/dynamic-plugins/sf_engine/libsf_engine.la
+ 
+ libsf_sorules_la_SOURCES = \
+ sfsnort_dynamic_detection_lib.c \
+--- snort-2.9.18.1/src/dynamic-plugins/sf_engine/Makefile.am.orig	2021-08-18 18:28:53.000000000 +0200
++++ snort-2.9.18.1/src/dynamic-plugins/sf_engine/Makefile.am	2021-10-12 21:40:48.123063346 +0200
+@@ -213,7 +213,5 @@
+ sha2.c: ../../sfutil/sha2.c
+ 	@src_file=$?; dst_file=$@; $(copy_files)
+ 
+-SUBDIRS = examples
+-
+ clean-local:
+ 	rm -rf sfhashfcn.c sfhashfcn.c.new sfghash.c sfprimetable.c sf_ip.c sf_ip.h sf_iph.h ipv6_port.h snort_debug.h snort_debug.h.new sfprimetable.h sfghash.h ipv6_port.h.new sfhashfcn.h sf_types.h sf_protocols.h preprocids.h sf_sechash.h sf_sechash.c md5.h md5.c sha2.h sha2.c
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/snort.git/commitdiff/4cb4516c27ef3497c6e00be5b2b9ae031b9d8969