cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to snort-2.9.12, from maintainer Markus Lude plus one tweak to

Browse Source 
fix #!/bin/bash on a script which is very much a bash-only script.
This commit is contained in:
sthen 2019-02-12 22:19:52 +00:00
parent 2ee031586c
commit 9890e792f2
7 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/snort/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.100 2018/09/04 12:46:18 espie Exp $
# $OpenBSD: Makefile,v 1.101 2019/02/12 22:19:52 sthen Exp $
COMMENT = highly flexible sniffer/NIDS
VERSION = 2.9.11.1
DISTNAME = snort-${VERSION}
DISTNAME = snort-2.9.12
RULESV = 29120
SUBST_VARS = RULESV
CATEGORIES = net security
@ -14,7 +15,7 @@ MAINTAINER = Markus Lude <markus.lude@gmx.de>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c crypto daq dnet lzma m nghttp2 pcap pcre pthread z
WANTLIB = c crypto daq dnet luajit-5.1 lzma m nghttp2 pcap pcre pthread z
MASTER_SITES = https://www.snort.org/downloads/snort/
@ -25,6 +26,7 @@ CONFIGURE_ARGS += --disable-static-daq \
LIB_DEPENDS = archivers/xz \
devel/pcre \
lang/luajit \
net/daq \
net/libdnet \
www/nghttp2
@ -37,12 +39,8 @@ PREPROC = decoder.rules preprocessor.rules
DOCS = AUTHORS CREDITS README README.* *.pdf TODO USAGE \
WISHLIST
V = ${VERSION:S/.//g}
SUBST_VARS += V
REVISION = 0
pre-configure:
@${SUBST_CMD} ${WRKSRC}/etc/snort.conf
@cd ${WRKSRC}; ${SUBST_CMD} etc/snort.conf tools/appid_detector_builder.sh
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snort

4
net/snort/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (snort-2.9.11.1.tar.gz) = n2s66sWhCfVVBL03BWSsQxyxdzUHkp3EYWJomPM/Rs0=
SIZE (snort-2.9.11.1.tar.gz) = 6442755
SHA256 (snort-2.9.12.tar.gz) = ewLhGYfGy09tedcnmcqa0rS9Wcwdlrt9bJFUn5kNmdA=
SIZE (snort-2.9.12.tar.gz) = 6456877

14
net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_dynamic-preprocessors_appid_Makefile_in,v 1.1 2019/02/12 22:19:52 sthen Exp $
Index: src/dynamic-preprocessors/appid/Makefile.in
--- src/dynamic-preprocessors/appid/Makefile.in.orig
+++ src/dynamic-preprocessors/appid/Makefile.in
@@ -583,7 +583,7 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
$(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
-libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
@SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
@SO_WITH_STATIC_LIB_TRUE@libsf_appid_preproc_la_LIBADD = ../libsf_dynamic_preproc.la ../libsf_dynamic_utils.la $(LUA_LIBS)
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_appid_preproc_la_SOURCES = \

4
net/snort/patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_preprocessors_Stream6_snort_stream_tcp_c,v 1.5 2018/01/28 03:09:12 lteo Exp $
$OpenBSD: patch-src_preprocessors_Stream6_snort_stream_tcp_c,v 1.6 2019/02/12 22:19:52 sthen Exp $
Index: src/preprocessors/Stream6/snort_stream_tcp.c
--- src/preprocessors/Stream6/snort_stream_tcp.c.orig
+++ src/preprocessors/Stream6/snort_stream_tcp.c
@@ -8504,7 +8504,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
@@ -8530,7 +8530,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
char src_addr[17];
char dst_addr[17];
memset((char *)timestamp, 0, TIMEBUF_SIZE);

11
net/snort/patches/patch-tools_appid_detector_builder_sh Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-tools_appid_detector_builder_sh,v 1.1 2019/02/12 22:19:52 sthen Exp $
Index: tools/appid_detector_builder.sh
--- tools/appid_detector_builder.sh.orig
+++ tools/appid_detector_builder.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
##
## Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved.
##

8
net/snort/pkg/PLIST
View File

@ -1,16 +1,22 @@
@comment $OpenBSD: PLIST,v 1.31 2018/09/04 12:46:18 espie Exp $
@comment $OpenBSD: PLIST,v 1.32 2019/02/12 22:19:52 sthen Exp $
@pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
bin/appid_detector_builder.sh
@bin bin/snort
@bin bin/u2boat
@bin bin/u2openappid
@bin bin/u2spewfoo
@bin bin/u2streamer
lib/pkgconfig/snort.pc
lib/snort_dynamicengine/
lib/snort_dynamicengine/libsf_engine.a
@comment lib/snort_dynamicengine/libsf_engine.la
lib/snort_dynamicengine/libsf_engine.so
lib/snort_dynamicpreprocessor/
lib/snort_dynamicpreprocessor/libsf_appid_preproc.a
lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
lib/snort_dynamicpreprocessor/libsf_appid_preproc.so
lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
@comment lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so

8
net/snort/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.6 2018/09/04 12:46:18 espie Exp $
$OpenBSD: README,v 1.7 2019/02/12 22:19:52 sthen Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
@ -28,9 +28,9 @@ to the correct directory:
* Official Snort rules (replace <oinkcode> with yours):
ftp -o snortrules-snapshot-${V}.tar.gz \
https://www.snort.org/rules/snortrules-snapshot-${V}.tar.gz?oinkcode=<oinkcode>
tar -C /etc/snort -xzf snortrules-snapshot-${V}.tar.gz rules preproc_rules
ftp -o snortrules-snapshot-${RULESV}.tar.gz \
https://www.snort.org/rules/snortrules-snapshot-${RULESV}.tar.gz?oinkcode=<oinkcode>
tar -C /etc/snort -xzf snortrules-snapshot-${RULESV}.tar.gz rules preproc_rules
* Emerging Threats rules: