- Upgrade snort to 2.1.3

- Grab maintainership of the package (with ok of previous owner)
- Use SUBST_* code

Ok'ed wiz@, snj@, salo@

From the changelog:

2004-05-06 Daniel Roelker <droelker@sourcefire.com>

    * src/detection-plugins/sp_pattern_match.c:
      Fixed rule read up error when parsing hexmode content options.
      Thanks for pointing it out Toni Maatta.  (Roelker)

    * src/preprocessors/spp_stream4.c:
       Fixed null pointer dereference when detect_scans were enabled and
       creating a new session that had funky flags.  Thanks to Chad
       Kreimendahl for reporting the bug and testing the fix.  (Roelker)

2004-04-20 Daniel Roelker <droelker@sourcefire.com>

    * src/event_queue.c:
    * src/event_queue.h:
    * src/sfutil/sfeventq.c:
    * src/sfutil/sfeventq.h:
      Added multi-event queueing in Snort.  Snort now supports logging
      multiple events per packet, and prioritizing those events using
      different methods.  Thanks to H.D. Moore for illustrating event
      obfuscations when snort only logged one event per packet. (Roelker)

    * src/snort.c:
    * src/decode.c:
    * src/detect.c:
    * src/fpcreate.c:
    * src/fpdetect.c:
    * src/preprocessors/spp_arpspoof.c:
    * src/preprocessors/spp_bo.c:
    * src/preprocessors/spp_frag2.c:
    * src/preprocessors/snort_httpinspect.c:
    * src/preprocessors/spp_rpc_decode.c:
    * src/preprocessors/spp_stream4.c:
      Updated event generators to use new event queueing sytem.  (Roelker)

    * src/output-plugins/spo_alert_fast.c:
      Added newline to 'cmg' alert output, so IP decode is easier to
      read.  (Roelker)

    * src/output-plugins/spo_database.c:
      Updated how current/utc times are calculated, as well as how they are
      formatted, thanks Marcus Janoski.  (Reid)

    * src/parser.c:
      Error on unterminated IP lists.  Added 'config event_queue' parameter.
      Configuration changes to 'config checksum_mode' for specifying
      which checksums to do.  (Norton)

    * src/plugbase.h:
      Fixes from Chris Reid for timestamp routines.  (Reid)

    * src/tag.c:
      Revert to old tag functionality.  Will add proposed tagging
      configurations in the future.  (Roelker)

4 files changed, 250 insertions, 13 deletions

diff --git a/net/snort-pgsql/Makefile b/net/snort-pgsql/Makefile
index c13644c17da..3becf56497b 100644
--- a/net/snort-pgsql/Makefile
+++ b/net/snort-pgsql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/04/10 03:11:17 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/01 17:10:22 adrianp Exp $
 
 .include "../../net/snort/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-pgsql-/}
-PKGREVISION=	1
 
 COMMENT=	Network Intrusion Detection System (with PostgreSQL support)
 
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index f10fa774f38..f02ab28b8ce 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.14 2004/04/10 03:09:45 snj Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/07/01 17:10:22 adrianp Exp $
 #
 
-DISTNAME=		snort-2.1.2
+DISTNAME=		snort-2.1.3
 CATEGORIES=		net security
 MASTER_SITES=		http://www.snort.org/dl/				\
 			ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
 			ftp://gd.tuwien.ac.at/infosys/security/snort/dl/
 
-MAINTAINER=		salo@NetBSD.org
+MAINTAINER=		adrianp@NetBSD.org
 HOMEPAGE=		http://www.snort.org/
 
 USE_BUILDLINK3=		YES
@@ -50,18 +50,21 @@ SUPPORT_FILES+=		${EGDIR}/unicode.map \
 
 EGDIR=			${PREFIX}/share/examples/snort
 
-post-configure:
-	@${SED} ${FILES_SUBST_SED} ${WRKSRC}/etc/snort.conf > \
-		${WRKDIR}/snort.conf.default
+SUBST_CLASSES=		paths
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	etc/snort.conf
+SUBST_SED.paths=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_MESSAGE.cgi=	"Fixing paths."
 
 post-install:
+	@${CP} ${WRKSRC}/etc/snort.conf ${WRKSRC}/etc/snort.conf.default
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/*.config \
 			${WRKSRC}/etc/*.map \
 			${WRKSRC}/etc/generators \
 			${WRKSRC}/etc/sid \
 			${WRKSRC}/etc/threshold.conf \
-			${WRKDIR}/snort.conf.default ${EGDIR}/
+			${WRKSRC}/etc/snort.conf.default ${EGDIR}/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
 	cd ${WRKSRC}/doc ; \
 	for i in `${LS} | ${EGREP} -v "(Makefile|signatures)"` ; do \
diff --git a/net/snort/PLIST b/net/snort/PLIST
index 81d3940305c..1be494562f0 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/04/23 22:07:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/07/01 17:10:22 adrianp Exp $
 bin/snort
 man/man8/snort.8
 share/doc/snort/AUTHORS
@@ -16,6 +16,7 @@ share/doc/snort/README.WIN32
 share/doc/snort/README.alert_order
 share/doc/snort/README.csv
 share/doc/snort/README.database
+share/doc/snort/README.event_queue
 share/doc/snort/README.flow
 share/doc/snort/README.flow-portscan
 share/doc/snort/README.flowbits
@@ -1378,32 +1379,266 @@ share/doc/snort/signatures/2318.txt
 share/doc/snort/signatures/2319.txt
 share/doc/snort/signatures/232.txt
 share/doc/snort/signatures/2320.txt
+share/doc/snort/signatures/2321.txt
+share/doc/snort/signatures/2322.txt
+share/doc/snort/signatures/2323.txt
+share/doc/snort/signatures/2324.txt
+share/doc/snort/signatures/2325.txt
+share/doc/snort/signatures/2326.txt
+share/doc/snort/signatures/2327.txt
+share/doc/snort/signatures/2328.txt
 share/doc/snort/signatures/2329.txt
 share/doc/snort/signatures/233.txt
+share/doc/snort/signatures/2330.txt
+share/doc/snort/signatures/2331.txt
+share/doc/snort/signatures/2332.txt
+share/doc/snort/signatures/2333.txt
+share/doc/snort/signatures/2334.txt
+share/doc/snort/signatures/2335.txt
+share/doc/snort/signatures/2336.txt
+share/doc/snort/signatures/2337.txt
+share/doc/snort/signatures/2338.txt
+share/doc/snort/signatures/2339.txt
 share/doc/snort/signatures/234.txt
+share/doc/snort/signatures/2340.txt
+share/doc/snort/signatures/2341.txt
+share/doc/snort/signatures/2342.txt
+share/doc/snort/signatures/2343.txt
+share/doc/snort/signatures/2344.txt
+share/doc/snort/signatures/2345.txt
+share/doc/snort/signatures/2346.txt
+share/doc/snort/signatures/2347.txt
+share/doc/snort/signatures/2348.txt
+share/doc/snort/signatures/2349.txt
 share/doc/snort/signatures/235.txt
 share/doc/snort/signatures/2350.txt
 share/doc/snort/signatures/2351.txt
+share/doc/snort/signatures/2352.txt
+share/doc/snort/signatures/2353.txt
+share/doc/snort/signatures/2354.txt
+share/doc/snort/signatures/2355.txt
+share/doc/snort/signatures/2356.txt
+share/doc/snort/signatures/2357.txt
+share/doc/snort/signatures/2358.txt
+share/doc/snort/signatures/2359.txt
 share/doc/snort/signatures/236.txt
+share/doc/snort/signatures/2360.txt
+share/doc/snort/signatures/2361.txt
+share/doc/snort/signatures/2362.txt
+share/doc/snort/signatures/2363.txt
+share/doc/snort/signatures/2364.txt
+share/doc/snort/signatures/2365.txt
+share/doc/snort/signatures/2366.txt
+share/doc/snort/signatures/2367.txt
+share/doc/snort/signatures/2368.txt
+share/doc/snort/signatures/2369.txt
 share/doc/snort/signatures/237.txt
+share/doc/snort/signatures/2370.txt
+share/doc/snort/signatures/2371.txt
+share/doc/snort/signatures/2372.txt
+share/doc/snort/signatures/2373.txt
+share/doc/snort/signatures/2374.txt
+share/doc/snort/signatures/2375.txt
+share/doc/snort/signatures/2376.txt
+share/doc/snort/signatures/2377.txt
+share/doc/snort/signatures/2378.txt
+share/doc/snort/signatures/2379.txt
 share/doc/snort/signatures/238.txt
+share/doc/snort/signatures/2380.txt
+share/doc/snort/signatures/2381.txt
+share/doc/snort/signatures/2382.txt
+share/doc/snort/signatures/2383.txt
+share/doc/snort/signatures/2384.txt
+share/doc/snort/signatures/2385.txt
+share/doc/snort/signatures/2386.txt
+share/doc/snort/signatures/2387.txt
+share/doc/snort/signatures/2389.txt
 share/doc/snort/signatures/239.txt
+share/doc/snort/signatures/2390.txt
+share/doc/snort/signatures/2391.txt
+share/doc/snort/signatures/2392.txt
+share/doc/snort/signatures/2393.txt
+share/doc/snort/signatures/2394.txt
+share/doc/snort/signatures/2395.txt
+share/doc/snort/signatures/2396.txt
+share/doc/snort/signatures/2397.txt
+share/doc/snort/signatures/2398.txt
+share/doc/snort/signatures/2399.txt
 share/doc/snort/signatures/240.txt
+share/doc/snort/signatures/2400.txt
+share/doc/snort/signatures/2401.txt
+share/doc/snort/signatures/2402.txt
+share/doc/snort/signatures/2403.txt
+share/doc/snort/signatures/2404.txt
+share/doc/snort/signatures/2409.txt
 share/doc/snort/signatures/241.txt
+share/doc/snort/signatures/2411.txt
+share/doc/snort/signatures/2412.txt
+share/doc/snort/signatures/2413.txt
+share/doc/snort/signatures/2414.txt
+share/doc/snort/signatures/2415.txt
+share/doc/snort/signatures/2416.txt
+share/doc/snort/signatures/2417.txt
+share/doc/snort/signatures/2418.txt
+share/doc/snort/signatures/2419.txt
+share/doc/snort/signatures/2420.txt
+share/doc/snort/signatures/2421.txt
+share/doc/snort/signatures/2422.txt
+share/doc/snort/signatures/2423.txt
+share/doc/snort/signatures/2424.txt
+share/doc/snort/signatures/2425.txt
+share/doc/snort/signatures/2426.txt
+share/doc/snort/signatures/2427.txt
+share/doc/snort/signatures/2428.txt
+share/doc/snort/signatures/2429.txt
 share/doc/snort/signatures/243.txt
+share/doc/snort/signatures/2430.txt
+share/doc/snort/signatures/2431.txt
+share/doc/snort/signatures/2432.txt
+share/doc/snort/signatures/2433.txt
+share/doc/snort/signatures/2434.txt
+share/doc/snort/signatures/2435.txt
+share/doc/snort/signatures/2436.txt
+share/doc/snort/signatures/2438.txt
+share/doc/snort/signatures/2439.txt
 share/doc/snort/signatures/244.txt
+share/doc/snort/signatures/2440.txt
+share/doc/snort/signatures/2441.txt
+share/doc/snort/signatures/2442.txt
+share/doc/snort/signatures/2443.txt
+share/doc/snort/signatures/2444.txt
+share/doc/snort/signatures/2445.txt
+share/doc/snort/signatures/2446.txt
+share/doc/snort/signatures/2447.txt
+share/doc/snort/signatures/2448.txt
+share/doc/snort/signatures/2449.txt
 share/doc/snort/signatures/245.txt
+share/doc/snort/signatures/2450.txt
+share/doc/snort/signatures/2451.txt
+share/doc/snort/signatures/2452.txt
+share/doc/snort/signatures/2453.txt
+share/doc/snort/signatures/2454.txt
+share/doc/snort/signatures/2455.txt
+share/doc/snort/signatures/2456.txt
+share/doc/snort/signatures/2457.txt
+share/doc/snort/signatures/2458.txt
+share/doc/snort/signatures/2459.txt
 share/doc/snort/signatures/246.txt
+share/doc/snort/signatures/2460.txt
+share/doc/snort/signatures/2461.txt
+share/doc/snort/signatures/2462.txt
+share/doc/snort/signatures/2463.txt
+share/doc/snort/signatures/2464.txt
+share/doc/snort/signatures/2465.txt
+share/doc/snort/signatures/2466.txt
+share/doc/snort/signatures/2467.txt
+share/doc/snort/signatures/2468.txt
+share/doc/snort/signatures/2469.txt
 share/doc/snort/signatures/247.txt
+share/doc/snort/signatures/2470.txt
+share/doc/snort/signatures/2471.txt
+share/doc/snort/signatures/2472.txt
+share/doc/snort/signatures/2473.txt
+share/doc/snort/signatures/2474.txt
+share/doc/snort/signatures/2475.txt
+share/doc/snort/signatures/2476.txt
+share/doc/snort/signatures/2477.txt
+share/doc/snort/signatures/2478.txt
+share/doc/snort/signatures/2479.txt
 share/doc/snort/signatures/248.txt
+share/doc/snort/signatures/2480.txt
+share/doc/snort/signatures/2481.txt
+share/doc/snort/signatures/2482.txt
+share/doc/snort/signatures/2483.txt
+share/doc/snort/signatures/2484.txt
+share/doc/snort/signatures/2485.txt
+share/doc/snort/signatures/2486.txt
+share/doc/snort/signatures/2487.txt
+share/doc/snort/signatures/2488.txt
+share/doc/snort/signatures/2489.txt
 share/doc/snort/signatures/249.txt
+share/doc/snort/signatures/2490.txt
+share/doc/snort/signatures/2491.txt
+share/doc/snort/signatures/2492.txt
+share/doc/snort/signatures/2493.txt
+share/doc/snort/signatures/2494.txt
+share/doc/snort/signatures/2495.txt
+share/doc/snort/signatures/2496.txt
+share/doc/snort/signatures/2497.txt
+share/doc/snort/signatures/2498.txt
+share/doc/snort/signatures/2499.txt
 share/doc/snort/signatures/250.txt
+share/doc/snort/signatures/2500.txt
+share/doc/snort/signatures/2501.txt
+share/doc/snort/signatures/2502.txt
+share/doc/snort/signatures/2503.txt
+share/doc/snort/signatures/2504.txt
+share/doc/snort/signatures/2505.txt
+share/doc/snort/signatures/2506.txt
+share/doc/snort/signatures/2507.txt
+share/doc/snort/signatures/2508.txt
+share/doc/snort/signatures/2509.txt
 share/doc/snort/signatures/251.txt
+share/doc/snort/signatures/2510.txt
+share/doc/snort/signatures/2511.txt
+share/doc/snort/signatures/2512.txt
+share/doc/snort/signatures/2513.txt
+share/doc/snort/signatures/2514.txt
+share/doc/snort/signatures/2515.txt
+share/doc/snort/signatures/2516.txt
+share/doc/snort/signatures/2517.txt
+share/doc/snort/signatures/2518.txt
+share/doc/snort/signatures/2519.txt
 share/doc/snort/signatures/252.txt
+share/doc/snort/signatures/2520.txt
+share/doc/snort/signatures/2521.txt
+share/doc/snort/signatures/2522.txt
+share/doc/snort/signatures/2523.txt
+share/doc/snort/signatures/2524.txt
+share/doc/snort/signatures/2525.txt
+share/doc/snort/signatures/2526.txt
+share/doc/snort/signatures/2527.txt
+share/doc/snort/signatures/2528.txt
+share/doc/snort/signatures/2529.txt
 share/doc/snort/signatures/253.txt
+share/doc/snort/signatures/2530.txt
+share/doc/snort/signatures/2531.txt
+share/doc/snort/signatures/2532.txt
+share/doc/snort/signatures/2533.txt
+share/doc/snort/signatures/2534.txt
+share/doc/snort/signatures/2535.txt
+share/doc/snort/signatures/2536.txt
+share/doc/snort/signatures/2537.txt
+share/doc/snort/signatures/2538.txt
+share/doc/snort/signatures/2539.txt
 share/doc/snort/signatures/254.txt
+share/doc/snort/signatures/2540.txt
+share/doc/snort/signatures/2541.txt
+share/doc/snort/signatures/2542.txt
+share/doc/snort/signatures/2543.txt
+share/doc/snort/signatures/2544.txt
+share/doc/snort/signatures/2545.txt
+share/doc/snort/signatures/2546.txt
+share/doc/snort/signatures/2547.txt
+share/doc/snort/signatures/2548.txt
+share/doc/snort/signatures/2549.txt
 share/doc/snort/signatures/255.txt
+share/doc/snort/signatures/2550.txt
+share/doc/snort/signatures/2551.txt
+share/doc/snort/signatures/2552.txt
+share/doc/snort/signatures/2553.txt
+share/doc/snort/signatures/2554.txt
+share/doc/snort/signatures/2555.txt
+share/doc/snort/signatures/2556.txt
+share/doc/snort/signatures/2557.txt
+share/doc/snort/signatures/2558.txt
+share/doc/snort/signatures/2559.txt
 share/doc/snort/signatures/256.txt
+share/doc/snort/signatures/2560.txt
+share/doc/snort/signatures/2561.txt
+share/doc/snort/signatures/2562.txt
+share/doc/snort/signatures/2563.txt
+share/doc/snort/signatures/2564.txt
 share/doc/snort/signatures/257.txt
 share/doc/snort/signatures/258.txt
 share/doc/snort/signatures/259.txt
diff --git a/net/snort/distinfo b/net/snort/distinfo
index d678d37e8f8..dde9ba94fbb 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2004/04/10 03:09:45 snj Exp $
+$NetBSD: distinfo,v 1.22 2004/07/01 17:10:22 adrianp Exp $
 
-SHA1 (snort-2.1.2.tar.gz) = 6a3c81b9d13fd8e847cf3e1f44d49f3406ace2b3
-Size (snort-2.1.2.tar.gz) = 2315827 bytes
+SHA1 (snort-2.1.3.tar.gz) = 34859591085607d964f063a404ea06e597ba6df6
+Size (snort-2.1.3.tar.gz) = 2379344 bytes
 SHA1 (patch-aa) = 08bbfc795c7db4d06f1a1a887369df2c6b1a0a79
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
 SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38