CVS commit: pkgsrc/net/snort

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 10 19:49:13 UTC 2024

Modified Files:
        pkgsrc/net/snort: Makefile PLIST distinfo
        pkgsrc/net/snort/patches:
            patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c
Added Files:
        pkgsrc/net/snort/patches: patch-src_sfutil_sf__ip.h

Log Message:
snort: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/net/snort/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/snort/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/snort/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/snort/patches/patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/snort/patches/patch-src_sfutil_sf__ip.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/snort/Makefile
diff -u pkgsrc/net/snort/Makefile:1.73 pkgsrc/net/snort/Makefile:1.74
--- pkgsrc/net/snort/Makefile:1.73      Wed Nov  8 13:20:35 2023
+++ pkgsrc/net/snort/Makefile   Fri May 10 19:49:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2023/11/08 13:20:35 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2024/05/10 19:49:13 jperkin Exp $
 #
 
 DISTNAME=              snort-2.9.16.1
@@ -96,6 +96,10 @@ CONFIGURE_ARGS+=     --disable-so_with_stati
 
 TOOL_DEPENDS+= bison-[0-9]*:../../devel/bison
 
+CPPFLAGS.SunOS+=       -Du_int8_t=uint8_t
+CPPFLAGS.SunOS+=       -Du_int16_t=uint16_t
+CPPFLAGS.SunOS+=       -Du_int32_t=uint32_t
+
 pre-build:
        ${CP} ${WRKSRC}/etc/snort.conf ${WRKSRC}/etc/snort.conf.default
 
@@ -121,9 +125,16 @@ post-install:
                        ${FILESDIR}/white_list.rules ${DESTDIR}${EGDIR}/rules/
        ${INSTALL_MAN} ${WRKSRC}/snort.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
+PLIST_VARS+=           appid
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --disable-open-appid
+.else
+PLIST.appid=           yes
+.include "../../lang/LuaJIT2/buildlink3.mk"
+.endif
+
 .include "../../www/nghttp2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/daq/buildlink3.mk"

Index: pkgsrc/net/snort/PLIST
diff -u pkgsrc/net/snort/PLIST:1.34 pkgsrc/net/snort/PLIST:1.35
--- pkgsrc/net/snort/PLIST:1.34 Tue Feb 18 23:00:26 2020
+++ pkgsrc/net/snort/PLIST      Fri May 10 19:49:13 2024
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.34 2020/02/18 23:00:26 sevan Exp $
-bin/appid_detector_builder.sh
+@comment $NetBSD: PLIST,v 1.35 2024/05/10 19:49:13 jperkin Exp $
+${PLIST.appid}bin/appid_detector_builder.sh
 bin/snort
 bin/u2boat
-bin/u2openappid
+${PLIST.appid}bin/u2openappid
 bin/u2spewfoo
-bin/u2streamer
+${PLIST.appid}bin/u2streamer
 lib/libsf_sorules.la
 lib/pkgconfig/snort.pc
 lib/snort_dynamicengine/libsf_engine.la
-lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
+${PLIST.appid}lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
 lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
 lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
@@ -100,18 +100,18 @@ share/examples/snort/snort.conf.default
 share/examples/snort/threshold.conf
 share/examples/snort/unicode.map
 share/snort/src/snort_dynamicsrc/Unified2_common.h
-share/snort/src/snort_dynamicsrc/appId.h
-share/snort/src/snort_dynamicsrc/appIdApi.h
+${PLIST.appid}share/snort/src/snort_dynamicsrc/appId.h
+${PLIST.appid}share/snort/src/snort_dynamicsrc/appIdApi.h
 share/snort/src/snort_dynamicsrc/appdata_adjuster.c
 share/snort/src/snort_dynamicsrc/appdata_adjuster.h
 share/snort/src/snort_dynamicsrc/bitop.h
 share/snort/src/snort_dynamicsrc/cip_common.h
-share/snort/src/snort_dynamicsrc/dns_defs.h
+${PLIST.appid}share/snort/src/snort_dynamicsrc/dns_defs.h
 share/snort/src/snort_dynamicsrc/event.h
 share/snort/src/snort_dynamicsrc/file_api.h
 share/snort/src/snort_dynamicsrc/file_mail_common.h
 share/snort/src/snort_dynamicsrc/idle_processing.h
-share/snort/src/snort_dynamicsrc/md5.h
+${PLIST.appid}share/snort/src/snort_dynamicsrc/md5.h
 share/snort/src/snort_dynamicsrc/mpse_methods.h
 share/snort/src/snort_dynamicsrc/obfuscation.h
 share/snort/src/snort_dynamicsrc/pcap_pkthdr32.h
@@ -175,8 +175,8 @@ share/snort/src/snort_dynamicsrc/ssl_ins
 share/snort/src/snort_dynamicsrc/ssl_session.h
 share/snort/src/snort_dynamicsrc/str_search.h
 share/snort/src/snort_dynamicsrc/stream_api.h
-share/snort/src/snort_dynamicsrc/thirdparty_appid_api.h
-share/snort/src/snort_dynamicsrc/thirdparty_appid_types.h
+${PLIST.appid}share/snort/src/snort_dynamicsrc/thirdparty_appid_api.h
+${PLIST.appid}share/snort/src/snort_dynamicsrc/thirdparty_appid_types.h
 share/snort/src/snort_dynamicsrc/treenodes.h
 share/snort/src/snort_dynamicsrc/util_unfold.c
 share/snort/src/snort_dynamicsrc/util_unfold.h

Index: pkgsrc/net/snort/distinfo
diff -u pkgsrc/net/snort/distinfo:1.54 pkgsrc/net/snort/distinfo:1.55
--- pkgsrc/net/snort/distinfo:1.54      Tue Oct 26 11:06:57 2021
+++ pkgsrc/net/snort/distinfo   Fri May 10 19:49:13 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.54 2021/10/26 11:06:57 nia Exp $
+$NetBSD: distinfo,v 1.55 2024/05/10 19:49:13 jperkin Exp $
 
 BLAKE2s (snort-2.9.16.1.tar.gz) = b16ef3efa589cb5a934af44d85965dcfb57bb93132263b16e21f47d6529e9c72
 SHA512 (snort-2.9.16.1.tar.gz) = 9462bd38a032c96298a6b6abea8502dadbab53f6f5163b90abb9ae247262c0e76afdeef31748a6bbd216a7c9d65d14e18b7096865135d88087ea27cc32596155
 Size (snort-2.9.16.1.tar.gz) = 6947960 bytes
-SHA1 (patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c) = 73ba0e37d37cc919957d4bb5b660a581bc6af9a2
+SHA1 (patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c) = 6491f65335666666c71fb3b4cf1d8c8264d6f99b
+SHA1 (patch-src_sfutil_sf__ip.h) = 72136becfb48ba2f2bbbede8b42e31821a78aee9
 SHA1 (patch-src_target-based_sftarget__reader.c) = 60f053d990af6329e48a1a26c89d9c4a59a0ffce

Index: pkgsrc/net/snort/patches/patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c
diff -u pkgsrc/net/snort/patches/patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c:1.1 
pkgsrc/net/snort/patches/patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c:1.2
--- pkgsrc/net/snort/patches/patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c:1.1  Thu Oct  1 19:45:02 2020
+++ pkgsrc/net/snort/patches/patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c      Fri May 10 19:49:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c,v 1.1 2020/10/01 19:45:02 nils Exp $
+$NetBSD: patch-src_dynamic-preprocessors_appid_service__plugins_service__rpc.c,v 1.2 2024/05/10 19:49:13 jperkin Exp $
 
 endrpcent() is defined in /usr/include/rpc/rpcent.h in NetBSD.
 
@@ -8,7 +8,7 @@ endrpcent() is defined in /usr/include/r
  #include "rpc/rpc.h"
  #endif
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__sun)
 +#include "rpc/rpcent.h"
 +#endif
 +

Added files:

Index: pkgsrc/net/snort/patches/patch-src_sfutil_sf__ip.h
diff -u /dev/null pkgsrc/net/snort/patches/patch-src_sfutil_sf__ip.h:1.1
--- /dev/null   Fri May 10 19:49:13 2024
+++ pkgsrc/net/snort/patches/patch-src_sfutil_sf__ip.h  Fri May 10 19:49:13 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_sfutil_sf__ip.h,v 1.1 2024/05/10 19:49:13 jperkin Exp $
+
+Support SunOS.
+
+--- src/sfutil/sf_ip.h.orig    2020-07-10 11:28:24.000000000 +0000
++++ src/sfutil/sf_ip.h
+@@ -72,6 +72,12 @@
+ 
+ #endif
+ 
++#ifdef __sun
++#define s6_addr8        _S6_un._S6_u8
++#define s6_addr16       _S6_un._S6_u16
++#define s6_addr32       _S6_un._S6_u32
++#endif
++
+ #ifndef WIN32
+ #if !defined(s6_addr8)
+ #define s6_addr8  __u6_addr.__u6_addr8