Update to version 2.1.0.

Changes:

2.1.0:
======
- A new connection tracking module, Flow (replaces conversation)
- A new portscan detector based off of Flow, Flow-Portscan (replaces
  portscan2)
- A new http preprocessor, HttpInspect (replaces http_decode)
- Alert Thresholding and Suppression
- PCRE rule keyword (Perl Compat Regular Expressions)
- isdataat rule keyword (buffer length detection)
- A ton of new and updated rules.

2.0.6:
======
- 64-bit update for detection engine. (Thanks, Silio d'Angelo)
- Added better PPP decoding. (Thanks Jesper Peterson)
- Updated ip_proto optimization for high-speed detection engine.
- Fixed infinite loop problem that was introduced by the recursive pattern
  matching patch. Reported by Lawrence Reed, thanks for testing out the
  changes for us!
- Various changes to help respond (version 1) work a little better.
- spp_http_decode 64-bit patch from Dirk Mueller.
- Out-of-order ACK problem from Andrew Rucker. Also, updated stream4 to the
  most recent version from HEAD.
- Minor fixes to tagging related to 'src' and 'dst' directives
- When counting one byte patterns in 'ningroup' added a check for
  psLen==1 (wu-manber pattern matcher). Thanks Josh Sakofsky and Dennis
  McGuire for helping us test this.

2.0.5:
======
- Stream4 fixes from Andrew Rucker Jones.
- Allow memcap to be configured for threshold features.

2.0.4:
======
- Fixed a core dump introduced with 2.0.3 when dealing with negated patterns

2.0.3:
======
- doe_ptr handling in byte_test/byte_jump slightly modified to work
  better with the pcre patch
- content processing is now recursive to make distance/within processing
  better ( thanks to Shai Rubin for patch! )
- fixed a bug in the mwm.c pattern matcher that resulted in some alerts
  not firing in a particular configuration of rules

2.0.2:
======
- Added Thresholding and Suppression features (Marc Norton/Sourcefire)
- Fixed TCP RST processing bug found (Shai Rubin)
- Cleanup of spp_arpspoof (Jeff Nathan)
- Cleanup of win32 version including proper Event Log support (Chris Reid)
- Munged data fixes for stream4 (Chris Green)

5 files changed, 906 insertions, 28 deletions

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 07d828eb33d..7fcd47de61a 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/07/26 11:13:16 salo Exp $
+# $NetBSD: Makefile,v 1.24 2003/12/31 14:11:42 salo Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT=	The Open Source Network Intrusion Detection System
 
-USE_BUILDLINK2=	YES
-
-.include "../../net/libpcap/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 0e5d0b44c54..5408c5e55fa 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.12 2003/09/23 15:43:50 salo Exp $
+# $NetBSD: Makefile.common,v 1.13 2003/12/31 14:11:42 salo Exp $
 #
 
-DISTNAME=		snort-2.0.2
+DISTNAME=		snort-2.1.0
 CATEGORIES=		net security
 MASTER_SITES=		http://www.snort.org/dl/				\
 			ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
@@ -10,6 +10,7 @@ MASTER_SITES=		http://www.snort.org/dl/				\
 MAINTAINER=		salo@NetBSD.org
 HOMEPAGE=		http://www.snort.org/
 
+USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
@@ -30,10 +31,22 @@ FILES_SUBST+=		SNORT_USER="${SNORT_USER}" SNORT_GROUP="${SNORT_GROUP}"
 OWN_DIRS_PERMS=		/var/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
 CONF_FILES=		${EGDIR}/snort.conf.default \
 			${PKG_SYSCONFDIR}/snort.conf
+CONF_FILES+=		${EGDIR}/threshold.conf \
+			${PKG_SYSCONFDIR}/threshold.conf
 CONF_FILES+=		${EGDIR}/classification.config \
 			${PKG_SYSCONFDIR}/classification.config
 CONF_FILES+=		${EGDIR}/reference.config \
 			${PKG_SYSCONFDIR}/reference.config
+SUPPORT_FILES+=		${EGDIR}/gen-msg.map \
+			${PKG_SYSCONFDIR}/gen-msg.map
+SUPPORT_FILES+=		${EGDIR}/generators \
+			${PKG_SYSCONFDIR}/generators
+SUPPORT_FILES+=		${EGDIR}/sid \
+			${PKG_SYSCONFDIR}/sid
+SUPPORT_FILES+=		${EGDIR}/sid-msg.map \
+			${PKG_SYSCONFDIR}/sid-msg.map
+SUPPORT_FILES+=		${EGDIR}/unicode.map \
+			${PKG_SYSCONFDIR}/unicode.map
 
 EGDIR=			${PREFIX}/share/examples/snort
 
@@ -43,8 +56,11 @@ post-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/classification.config \
-			${WRKSRC}/etc/reference.config \
+	${INSTALL_DATA} ${WRKSRC}/etc/*.config \
+			${WRKSRC}/etc/*.map \
+			${WRKSRC}/etc/generators \
+			${WRKSRC}/etc/sid \
+			${WRKSRC}/etc/threshold.conf \
 			${WRKDIR}/snort.conf.default ${EGDIR}/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
 	cd ${WRKSRC}/doc ; \
@@ -55,12 +71,11 @@ post-install:
 	${RM} -rf signatures/CVS; \
 	${PAX} -rw -pm signatures ${PREFIX}/share/doc/snort
 	${INSTALL_DATA_DIR} ${PREFIX}/share/snort/rules
-	cd ${WRKSRC}/etc ; \
-	for i in *.map sid ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/snort/rules ; \
-	done
 	cd ${WRKSRC}/rules ; \
 	for i in `${LS} | ${GREP} -v Makefile` ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/snort/rules ; \
 	done
 	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
+
+.include "../../devel/pcre/buildlink2.mk"
+.include "../../net/libpcap/buildlink2.mk"
diff --git a/net/snort/PLIST b/net/snort/PLIST
index a55e3ac3857..4609654db0f 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/09/23 15:43:51 salo Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/12/31 14:11:42 salo Exp $
 bin/snort
 etc/rc.d/snort
 man/man8/snort.8
@@ -11,21 +11,31 @@ share/doc/snort/NEWS
 share/doc/snort/README
 share/doc/snort/README.FLEXRESP
 share/doc/snort/README.PLUGINS
+share/doc/snort/README.UNSOCK
+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.flow
+share/doc/snort/README.flow-portscan
+share/doc/snort/README.http_inspect
 share/doc/snort/README.thresholding
-share/doc/snort/RULES.todo
-share/doc/snort/SnortUsersManual.pdf
+share/doc/snort/README.wireless
 share/doc/snort/TODO
 share/doc/snort/USAGE
 share/doc/snort/signatures/1000.txt
 share/doc/snort/signatures/1001.txt
 share/doc/snort/signatures/1002.txt
 share/doc/snort/signatures/1003.txt
+share/doc/snort/signatures/1004.txt
+share/doc/snort/signatures/1005.txt
 share/doc/snort/signatures/1007.txt
 share/doc/snort/signatures/1008.txt
 share/doc/snort/signatures/1009.txt
+share/doc/snort/signatures/1010.txt
 share/doc/snort/signatures/1011.txt
+share/doc/snort/signatures/1012.txt
+share/doc/snort/signatures/1013.txt
 share/doc/snort/signatures/1015.txt
 share/doc/snort/signatures/1016.txt
 share/doc/snort/signatures/1017.txt
@@ -39,9 +49,16 @@ share/doc/snort/signatures/1024.txt
 share/doc/snort/signatures/1025.txt
 share/doc/snort/signatures/1026.txt
 share/doc/snort/signatures/1027.txt
+share/doc/snort/signatures/1028.txt
 share/doc/snort/signatures/1029.txt
 share/doc/snort/signatures/103.txt
 share/doc/snort/signatures/1030.txt
+share/doc/snort/signatures/1031.txt
+share/doc/snort/signatures/1032.txt
+share/doc/snort/signatures/1033.txt
+share/doc/snort/signatures/1034.txt
+share/doc/snort/signatures/1035.txt
+share/doc/snort/signatures/1036.txt
 share/doc/snort/signatures/1037.txt
 share/doc/snort/signatures/1038.txt
 share/doc/snort/signatures/1039.txt
@@ -53,73 +70,218 @@ share/doc/snort/signatures/1043.txt
 share/doc/snort/signatures/1044.txt
 share/doc/snort/signatures/1045.txt
 share/doc/snort/signatures/1046.txt
+share/doc/snort/signatures/1047.txt
+share/doc/snort/signatures/1048.txt
 share/doc/snort/signatures/105.txt
 share/doc/snort/signatures/1050.txt
+share/doc/snort/signatures/1051.txt
+share/doc/snort/signatures/1052.txt
+share/doc/snort/signatures/1053.txt
 share/doc/snort/signatures/1054.txt
 share/doc/snort/signatures/1055.txt
+share/doc/snort/signatures/1056.txt
+share/doc/snort/signatures/1057.txt
+share/doc/snort/signatures/1058.txt
+share/doc/snort/signatures/1059.txt
 share/doc/snort/signatures/106.txt
+share/doc/snort/signatures/1060.txt
+share/doc/snort/signatures/1061.txt
 share/doc/snort/signatures/1062.txt
+share/doc/snort/signatures/1064.txt
+share/doc/snort/signatures/1065.txt
 share/doc/snort/signatures/1066.txt
 share/doc/snort/signatures/1067.txt
+share/doc/snort/signatures/1068.txt
+share/doc/snort/signatures/1069.txt
 share/doc/snort/signatures/107.txt
 share/doc/snort/signatures/1070.txt
 share/doc/snort/signatures/1071.txt
+share/doc/snort/signatures/1072.txt
 share/doc/snort/signatures/1073.txt
 share/doc/snort/signatures/1075.txt
 share/doc/snort/signatures/1076.txt
+share/doc/snort/signatures/1077.txt
+share/doc/snort/signatures/1078.txt
 share/doc/snort/signatures/1079.txt
 share/doc/snort/signatures/108.txt
 share/doc/snort/signatures/1080.txt
+share/doc/snort/signatures/1081.txt
+share/doc/snort/signatures/1082.txt
+share/doc/snort/signatures/1083.txt
+share/doc/snort/signatures/1084.txt
+share/doc/snort/signatures/1085.txt
+share/doc/snort/signatures/1086.txt
 share/doc/snort/signatures/1087.txt
+share/doc/snort/signatures/1088.txt
+share/doc/snort/signatures/1089.txt
 share/doc/snort/signatures/109.txt
+share/doc/snort/signatures/1090.txt
+share/doc/snort/signatures/1091.txt
+share/doc/snort/signatures/1092.txt
+share/doc/snort/signatures/1093.txt
 share/doc/snort/signatures/1094.txt
+share/doc/snort/signatures/1095.txt
+share/doc/snort/signatures/1096.txt
+share/doc/snort/signatures/1097.txt
+share/doc/snort/signatures/1098.txt
+share/doc/snort/signatures/1099.txt
 share/doc/snort/signatures/110.txt
+share/doc/snort/signatures/1100.txt
+share/doc/snort/signatures/1101.txt
+share/doc/snort/signatures/1102.txt
 share/doc/snort/signatures/1103.txt
 share/doc/snort/signatures/1104.txt
+share/doc/snort/signatures/1105.txt
+share/doc/snort/signatures/1106.txt
+share/doc/snort/signatures/1107.txt
+share/doc/snort/signatures/1108.txt
+share/doc/snort/signatures/1109.txt
 share/doc/snort/signatures/111.txt
+share/doc/snort/signatures/1110.txt
+share/doc/snort/signatures/1111.txt
+share/doc/snort/signatures/1112.txt
+share/doc/snort/signatures/1113.txt
+share/doc/snort/signatures/1115.txt
+share/doc/snort/signatures/1116.txt
+share/doc/snort/signatures/1117.txt
+share/doc/snort/signatures/1118.txt
+share/doc/snort/signatures/1119.txt
 share/doc/snort/signatures/112.txt
+share/doc/snort/signatures/1120.txt
 share/doc/snort/signatures/1122.txt
+share/doc/snort/signatures/1123.txt
+share/doc/snort/signatures/1124.txt
+share/doc/snort/signatures/1125.txt
+share/doc/snort/signatures/1126.txt
+share/doc/snort/signatures/1127.txt
+share/doc/snort/signatures/1128.txt
 share/doc/snort/signatures/1129.txt
+share/doc/snort/signatures/1130.txt
+share/doc/snort/signatures/1131.txt
+share/doc/snort/signatures/1132.txt
 share/doc/snort/signatures/1133.txt
+share/doc/snort/signatures/1134.txt
+share/doc/snort/signatures/1136.txt
 share/doc/snort/signatures/1137.txt
 share/doc/snort/signatures/1139.txt
 share/doc/snort/signatures/114.txt
+share/doc/snort/signatures/1140.txt
+share/doc/snort/signatures/1141.txt
+share/doc/snort/signatures/1142.txt
+share/doc/snort/signatures/1143.txt
+share/doc/snort/signatures/1144.txt
+share/doc/snort/signatures/1145.txt
+share/doc/snort/signatures/1146.txt
+share/doc/snort/signatures/1147.txt
+share/doc/snort/signatures/1148.txt
 share/doc/snort/signatures/1149.txt
 share/doc/snort/signatures/115.txt
+share/doc/snort/signatures/1150.txt
+share/doc/snort/signatures/1151.txt
+share/doc/snort/signatures/1152.txt
+share/doc/snort/signatures/1153.txt
+share/doc/snort/signatures/1154.txt
+share/doc/snort/signatures/1155.txt
+share/doc/snort/signatures/1156.txt
+share/doc/snort/signatures/1157.txt
 share/doc/snort/signatures/1158.txt
 share/doc/snort/signatures/1159.txt
 share/doc/snort/signatures/116.txt
+share/doc/snort/signatures/1160.txt
+share/doc/snort/signatures/1161.txt
+share/doc/snort/signatures/1162.txt
 share/doc/snort/signatures/1163.txt
+share/doc/snort/signatures/1164.txt
+share/doc/snort/signatures/1165.txt
 share/doc/snort/signatures/1166.txt
 share/doc/snort/signatures/1167.txt
+share/doc/snort/signatures/1168.txt
 share/doc/snort/signatures/117.txt
 share/doc/snort/signatures/1171.txt
+share/doc/snort/signatures/1172.txt
+share/doc/snort/signatures/1173.txt
+share/doc/snort/signatures/1174.txt
 share/doc/snort/signatures/1175.txt
+share/doc/snort/signatures/1176.txt
+share/doc/snort/signatures/1177.txt
+share/doc/snort/signatures/1178.txt
+share/doc/snort/signatures/1179.txt
 share/doc/snort/signatures/118.txt
+share/doc/snort/signatures/1180.txt
+share/doc/snort/signatures/1181.txt
+share/doc/snort/signatures/1182.txt
+share/doc/snort/signatures/1183.txt
+share/doc/snort/signatures/1184.txt
+share/doc/snort/signatures/1185.txt
 share/doc/snort/signatures/1186.txt
+share/doc/snort/signatures/1187.txt
 share/doc/snort/signatures/1188.txt
 share/doc/snort/signatures/1189.txt
 share/doc/snort/signatures/119.txt
 share/doc/snort/signatures/1190.txt
 share/doc/snort/signatures/1191.txt
+share/doc/snort/signatures/1192.txt
+share/doc/snort/signatures/1193.txt
+share/doc/snort/signatures/1194.txt
+share/doc/snort/signatures/1195.txt
 share/doc/snort/signatures/1196.txt
+share/doc/snort/signatures/1197.txt
 share/doc/snort/signatures/1198.txt
+share/doc/snort/signatures/1199.txt
 share/doc/snort/signatures/120.txt
+share/doc/snort/signatures/1200.txt
+share/doc/snort/signatures/1201.txt
+share/doc/snort/signatures/1202.txt
+share/doc/snort/signatures/1204.txt
+share/doc/snort/signatures/1205.txt
+share/doc/snort/signatures/1206.txt
+share/doc/snort/signatures/1207.txt
+share/doc/snort/signatures/1208.txt
+share/doc/snort/signatures/1209.txt
 share/doc/snort/signatures/121.txt
+share/doc/snort/signatures/1211.txt
+share/doc/snort/signatures/1212.txt
+share/doc/snort/signatures/1213.txt
+share/doc/snort/signatures/1214.txt
+share/doc/snort/signatures/1215.txt
+share/doc/snort/signatures/1216.txt
+share/doc/snort/signatures/1217.txt
+share/doc/snort/signatures/1218.txt
+share/doc/snort/signatures/1219.txt
+share/doc/snort/signatures/1220.txt
+share/doc/snort/signatures/1221.txt
+share/doc/snort/signatures/1222.txt
+share/doc/snort/signatures/1224.txt
 share/doc/snort/signatures/1225.txt
 share/doc/snort/signatures/1226.txt
 share/doc/snort/signatures/1227.txt
 share/doc/snort/signatures/1228.txt
 share/doc/snort/signatures/1229.txt
+share/doc/snort/signatures/1230.txt
+share/doc/snort/signatures/1231.txt
+share/doc/snort/signatures/1232.txt
+share/doc/snort/signatures/1233.txt
+share/doc/snort/signatures/1234.txt
+share/doc/snort/signatures/1235.txt
+share/doc/snort/signatures/1236.txt
+share/doc/snort/signatures/1237.txt
+share/doc/snort/signatures/1238.txt
 share/doc/snort/signatures/1240.txt
+share/doc/snort/signatures/1241.txt
 share/doc/snort/signatures/1242.txt
 share/doc/snort/signatures/1243.txt
 share/doc/snort/signatures/1244.txt
 share/doc/snort/signatures/1245.txt
+share/doc/snort/signatures/1248.txt
+share/doc/snort/signatures/1249.txt
 share/doc/snort/signatures/1250.txt
 share/doc/snort/signatures/1251.txt
+share/doc/snort/signatures/1254.txt
+share/doc/snort/signatures/1255.txt
 share/doc/snort/signatures/1256.txt
 share/doc/snort/signatures/1257.txt
+share/doc/snort/signatures/1258.txt
+share/doc/snort/signatures/1259.txt
 share/doc/snort/signatures/1260.txt
 share/doc/snort/signatures/1261.txt
 share/doc/snort/signatures/1262.txt
@@ -134,7 +296,10 @@ share/doc/snort/signatures/1270.txt
 share/doc/snort/signatures/1271.txt
 share/doc/snort/signatures/1272.txt
 share/doc/snort/signatures/1273.txt
+share/doc/snort/signatures/1274.txt
 share/doc/snort/signatures/1275.txt
+share/doc/snort/signatures/1276.txt
+share/doc/snort/signatures/1277.txt
 share/doc/snort/signatures/1279.txt
 share/doc/snort/signatures/1280.txt
 share/doc/snort/signatures/1281.txt
@@ -143,10 +308,23 @@ share/doc/snort/signatures/1284.txt
 share/doc/snort/signatures/1285.txt
 share/doc/snort/signatures/1286.txt
 share/doc/snort/signatures/1287.txt
+share/doc/snort/signatures/1288.txt
+share/doc/snort/signatures/1289.txt
 share/doc/snort/signatures/1290.txt
+share/doc/snort/signatures/1291.txt
 share/doc/snort/signatures/1292.txt
 share/doc/snort/signatures/1298.txt
 share/doc/snort/signatures/1299.txt
+share/doc/snort/signatures/1300.txt
+share/doc/snort/signatures/1301.txt
+share/doc/snort/signatures/1302.txt
+share/doc/snort/signatures/1303.txt
+share/doc/snort/signatures/1304.txt
+share/doc/snort/signatures/1305.txt
+share/doc/snort/signatures/1306.txt
+share/doc/snort/signatures/1307.txt
+share/doc/snort/signatures/1308.txt
+share/doc/snort/signatures/1309.txt
 share/doc/snort/signatures/1310.txt
 share/doc/snort/signatures/1311.txt
 share/doc/snort/signatures/1312.txt
@@ -194,9 +372,12 @@ share/doc/snort/signatures/1353.txt
 share/doc/snort/signatures/1354.txt
 share/doc/snort/signatures/1355.txt
 share/doc/snort/signatures/1356.txt
+share/doc/snort/signatures/1357.txt
 share/doc/snort/signatures/1358.txt
 share/doc/snort/signatures/1359.txt
 share/doc/snort/signatures/1360.txt
+share/doc/snort/signatures/1361.txt
+share/doc/snort/signatures/1362.txt
 share/doc/snort/signatures/1363.txt
 share/doc/snort/signatures/1364.txt
 share/doc/snort/signatures/1365.txt
@@ -205,24 +386,46 @@ share/doc/snort/signatures/1367.txt
 share/doc/snort/signatures/1368.txt
 share/doc/snort/signatures/1369.txt
 share/doc/snort/signatures/1370.txt
+share/doc/snort/signatures/1371.txt
 share/doc/snort/signatures/1372.txt
 share/doc/snort/signatures/1373.txt
 share/doc/snort/signatures/1374.txt
+share/doc/snort/signatures/1375.txt
+share/doc/snort/signatures/1376.txt
+share/doc/snort/signatures/1377.txt
 share/doc/snort/signatures/1378.txt
+share/doc/snort/signatures/1379.txt
 share/doc/snort/signatures/1380.txt
+share/doc/snort/signatures/1381.txt
 share/doc/snort/signatures/1382.txt
 share/doc/snort/signatures/1383.txt
+share/doc/snort/signatures/1384.txt
+share/doc/snort/signatures/1385.txt
+share/doc/snort/signatures/1386.txt
 share/doc/snort/signatures/1387.txt
+share/doc/snort/signatures/1388.txt
 share/doc/snort/signatures/1389.txt
+share/doc/snort/signatures/1390.txt
+share/doc/snort/signatures/1391.txt
+share/doc/snort/signatures/1392.txt
+share/doc/snort/signatures/1393.txt
 share/doc/snort/signatures/1394.txt
+share/doc/snort/signatures/1395.txt
+share/doc/snort/signatures/1396.txt
 share/doc/snort/signatures/1397.txt
 share/doc/snort/signatures/1398.txt
 share/doc/snort/signatures/1399.txt
 share/doc/snort/signatures/1400.txt
 share/doc/snort/signatures/1401.txt
 share/doc/snort/signatures/1402.txt
+share/doc/snort/signatures/1403.txt
+share/doc/snort/signatures/1404.txt
+share/doc/snort/signatures/1405.txt
+share/doc/snort/signatures/1406.txt
+share/doc/snort/signatures/1407.txt
 share/doc/snort/signatures/1408.txt
 share/doc/snort/signatures/141.txt
+share/doc/snort/signatures/1410.txt
 share/doc/snort/signatures/1411.txt
 share/doc/snort/signatures/1412.txt
 share/doc/snort/signatures/1413.txt
@@ -234,10 +437,22 @@ share/doc/snort/signatures/1418.txt
 share/doc/snort/signatures/1419.txt
 share/doc/snort/signatures/1420.txt
 share/doc/snort/signatures/1422.txt
+share/doc/snort/signatures/1423.txt
+share/doc/snort/signatures/1424.txt
+share/doc/snort/signatures/1425.txt
+share/doc/snort/signatures/1428.txt
+share/doc/snort/signatures/1429.txt
 share/doc/snort/signatures/1431.txt
 share/doc/snort/signatures/1432.txt
+share/doc/snort/signatures/1433.txt
+share/doc/snort/signatures/1434.txt
 share/doc/snort/signatures/1435.txt
+share/doc/snort/signatures/1436.txt
+share/doc/snort/signatures/1437.txt
+share/doc/snort/signatures/1438.txt
+share/doc/snort/signatures/1439.txt
 share/doc/snort/signatures/144.txt
+share/doc/snort/signatures/1440.txt
 share/doc/snort/signatures/1441.txt
 share/doc/snort/signatures/1442.txt
 share/doc/snort/signatures/1443.txt
@@ -247,46 +462,181 @@ share/doc/snort/signatures/1446.txt
 share/doc/snort/signatures/1449.txt
 share/doc/snort/signatures/145.txt
 share/doc/snort/signatures/1450.txt
+share/doc/snort/signatures/1451.txt
+share/doc/snort/signatures/1452.txt
+share/doc/snort/signatures/1453.txt
+share/doc/snort/signatures/1454.txt
+share/doc/snort/signatures/1455.txt
+share/doc/snort/signatures/1456.txt
+share/doc/snort/signatures/1457.txt
+share/doc/snort/signatures/1458.txt
+share/doc/snort/signatures/1459.txt
 share/doc/snort/signatures/146.txt
+share/doc/snort/signatures/1460.txt
+share/doc/snort/signatures/1461.txt
+share/doc/snort/signatures/1462.txt
 share/doc/snort/signatures/1463.txt
+share/doc/snort/signatures/1464.txt
+share/doc/snort/signatures/1465.txt
+share/doc/snort/signatures/1466.txt
+share/doc/snort/signatures/1467.txt
+share/doc/snort/signatures/1468.txt
+share/doc/snort/signatures/1469.txt
 share/doc/snort/signatures/147.txt
+share/doc/snort/signatures/1470.txt
+share/doc/snort/signatures/1471.txt
+share/doc/snort/signatures/1472.txt
+share/doc/snort/signatures/1473.txt
+share/doc/snort/signatures/1474.txt
+share/doc/snort/signatures/1475.txt
+share/doc/snort/signatures/1476.txt
+share/doc/snort/signatures/1478.txt
+share/doc/snort/signatures/1479.txt
+share/doc/snort/signatures/1480.txt
+share/doc/snort/signatures/1481.txt
+share/doc/snort/signatures/1482.txt
+share/doc/snort/signatures/1483.txt
 share/doc/snort/signatures/1484.txt
 share/doc/snort/signatures/1485.txt
 share/doc/snort/signatures/1486.txt
 share/doc/snort/signatures/1487.txt
+share/doc/snort/signatures/1488.txt
+share/doc/snort/signatures/1489.txt
 share/doc/snort/signatures/1490.txt
 share/doc/snort/signatures/1491.txt
+share/doc/snort/signatures/1492.txt
+share/doc/snort/signatures/1493.txt
+share/doc/snort/signatures/1494.txt
+share/doc/snort/signatures/1495.txt
+share/doc/snort/signatures/1496.txt
 share/doc/snort/signatures/1497.txt
+share/doc/snort/signatures/1498.txt
+share/doc/snort/signatures/1499.txt
+share/doc/snort/signatures/1500.txt
+share/doc/snort/signatures/1501.txt
+share/doc/snort/signatures/1502.txt
+share/doc/snort/signatures/1503.txt
 share/doc/snort/signatures/1504.txt
+share/doc/snort/signatures/1505.txt
+share/doc/snort/signatures/1506.txt
+share/doc/snort/signatures/1507.txt
+share/doc/snort/signatures/1508.txt
+share/doc/snort/signatures/1509.txt
 share/doc/snort/signatures/151.txt
+share/doc/snort/signatures/1510.txt
+share/doc/snort/signatures/1511.txt
+share/doc/snort/signatures/1512.txt
+share/doc/snort/signatures/1513.txt
+share/doc/snort/signatures/1514.txt
+share/doc/snort/signatures/1515.txt
+share/doc/snort/signatures/1516.txt
+share/doc/snort/signatures/1517.txt
+share/doc/snort/signatures/1518.txt
 share/doc/snort/signatures/1519.txt
 share/doc/snort/signatures/152.txt
 share/doc/snort/signatures/1520.txt
+share/doc/snort/signatures/1521.txt
+share/doc/snort/signatures/1522.txt
+share/doc/snort/signatures/1523.txt
+share/doc/snort/signatures/1524.txt
+share/doc/snort/signatures/1525.txt
 share/doc/snort/signatures/1526.txt
 share/doc/snort/signatures/1527.txt
+share/doc/snort/signatures/1528.txt
+share/doc/snort/signatures/1529.txt
 share/doc/snort/signatures/153.txt
 share/doc/snort/signatures/1530.txt
+share/doc/snort/signatures/1531.txt
+share/doc/snort/signatures/1532.txt
+share/doc/snort/signatures/1533.txt
+share/doc/snort/signatures/1534.txt
+share/doc/snort/signatures/1535.txt
+share/doc/snort/signatures/1536.txt
+share/doc/snort/signatures/1537.txt
+share/doc/snort/signatures/1539.txt
+share/doc/snort/signatures/1540.txt
 share/doc/snort/signatures/1541.txt
+share/doc/snort/signatures/1542.txt
+share/doc/snort/signatures/1543.txt
 share/doc/snort/signatures/1544.txt
 share/doc/snort/signatures/1545.txt
 share/doc/snort/signatures/1546.txt
+share/doc/snort/signatures/1547.txt
+share/doc/snort/signatures/1548.txt
 share/doc/snort/signatures/1549.txt
 share/doc/snort/signatures/155.txt
 share/doc/snort/signatures/1550.txt
+share/doc/snort/signatures/1551.txt
+share/doc/snort/signatures/1552.txt
+share/doc/snort/signatures/1553.txt
+share/doc/snort/signatures/1554.txt
+share/doc/snort/signatures/1555.txt
+share/doc/snort/signatures/1556.txt
+share/doc/snort/signatures/1557.txt
+share/doc/snort/signatures/1558.txt
+share/doc/snort/signatures/1559.txt
+share/doc/snort/signatures/1560.txt
+share/doc/snort/signatures/1561.txt
+share/doc/snort/signatures/1562.txt
+share/doc/snort/signatures/1563.txt
+share/doc/snort/signatures/1564.txt
+share/doc/snort/signatures/1565.txt
+share/doc/snort/signatures/1566.txt
 share/doc/snort/signatures/1567.txt
 share/doc/snort/signatures/1568.txt
+share/doc/snort/signatures/1569.txt
 share/doc/snort/signatures/157.txt
+share/doc/snort/signatures/1570.txt
+share/doc/snort/signatures/1571.txt
+share/doc/snort/signatures/1572.txt
+share/doc/snort/signatures/1573.txt
+share/doc/snort/signatures/1574.txt
+share/doc/snort/signatures/1575.txt
+share/doc/snort/signatures/1576.txt
+share/doc/snort/signatures/1577.txt
+share/doc/snort/signatures/1578.txt
+share/doc/snort/signatures/1579.txt
 share/doc/snort/signatures/158.txt
+share/doc/snort/signatures/1580.txt
+share/doc/snort/signatures/1581.txt
+share/doc/snort/signatures/1582.txt
+share/doc/snort/signatures/1583.txt
+share/doc/snort/signatures/1584.txt
+share/doc/snort/signatures/1585.txt
+share/doc/snort/signatures/1586.txt
+share/doc/snort/signatures/1587.txt
+share/doc/snort/signatures/1588.txt
+share/doc/snort/signatures/1589.txt
 share/doc/snort/signatures/159.txt
+share/doc/snort/signatures/1590.txt
+share/doc/snort/signatures/1591.txt
+share/doc/snort/signatures/1592.txt
+share/doc/snort/signatures/1593.txt
+share/doc/snort/signatures/1594.txt
 share/doc/snort/signatures/1595.txt
+share/doc/snort/signatures/1597.txt
+share/doc/snort/signatures/1598.txt
+share/doc/snort/signatures/1599.txt
+share/doc/snort/signatures/160.txt
 share/doc/snort/signatures/1600.txt
 share/doc/snort/signatures/1601.txt
 share/doc/snort/signatures/1602.txt
+share/doc/snort/signatures/1603.txt
+share/doc/snort/signatures/1604.txt
 share/doc/snort/signatures/1605.txt
+share/doc/snort/signatures/1606.txt
 share/doc/snort/signatures/1607.txt
+share/doc/snort/signatures/1608.txt
+share/doc/snort/signatures/1609.txt
 share/doc/snort/signatures/161.txt
 share/doc/snort/signatures/1610.txt
+share/doc/snort/signatures/1611.txt
+share/doc/snort/signatures/1612.txt
+share/doc/snort/signatures/1613.txt
+share/doc/snort/signatures/1614.txt
+share/doc/snort/signatures/1615.txt
 share/doc/snort/signatures/1616.txt
+share/doc/snort/signatures/1617.txt
 share/doc/snort/signatures/1618.txt
 share/doc/snort/signatures/162.txt
 share/doc/snort/signatures/1621.txt
@@ -296,20 +646,48 @@ share/doc/snort/signatures/1624.txt
 share/doc/snort/signatures/1625.txt
 share/doc/snort/signatures/1626.txt
 share/doc/snort/signatures/1627.txt
+share/doc/snort/signatures/1628.txt
 share/doc/snort/signatures/163.txt
 share/doc/snort/signatures/1631.txt
 share/doc/snort/signatures/1632.txt
 share/doc/snort/signatures/1633.txt
 share/doc/snort/signatures/1636.txt
+share/doc/snort/signatures/1637.txt
 share/doc/snort/signatures/1638.txt
 share/doc/snort/signatures/1639.txt
 share/doc/snort/signatures/1640.txt
 share/doc/snort/signatures/1641.txt
+share/doc/snort/signatures/1642.txt
+share/doc/snort/signatures/1643.txt
+share/doc/snort/signatures/1644.txt
 share/doc/snort/signatures/1645.txt
+share/doc/snort/signatures/1646.txt
+share/doc/snort/signatures/1647.txt
+share/doc/snort/signatures/1648.txt
+share/doc/snort/signatures/1649.txt
+share/doc/snort/signatures/1650.txt
+share/doc/snort/signatures/1651.txt
+share/doc/snort/signatures/1652.txt
+share/doc/snort/signatures/1653.txt
+share/doc/snort/signatures/1654.txt
+share/doc/snort/signatures/1655.txt
+share/doc/snort/signatures/1656.txt
+share/doc/snort/signatures/1657.txt
+share/doc/snort/signatures/1658.txt
+share/doc/snort/signatures/1659.txt
 share/doc/snort/signatures/1660.txt
 share/doc/snort/signatures/1661.txt
 share/doc/snort/signatures/1662.txt
+share/doc/snort/signatures/1663.txt
+share/doc/snort/signatures/1664.txt
+share/doc/snort/signatures/1665.txt
+share/doc/snort/signatures/1666.txt
 share/doc/snort/signatures/1667.txt
+share/doc/snort/signatures/1668.txt
+share/doc/snort/signatures/1669.txt
+share/doc/snort/signatures/1670.txt
+share/doc/snort/signatures/1671.txt
+share/doc/snort/signatures/1672.txt
 share/doc/snort/signatures/1673.txt
 share/doc/snort/signatures/1674.txt
 share/doc/snort/signatures/1675.txt
@@ -336,34 +714,91 @@ share/doc/snort/signatures/1695.txt
 share/doc/snort/signatures/1696.txt
 share/doc/snort/signatures/1697.txt
 share/doc/snort/signatures/1699.txt
+share/doc/snort/signatures/1700.txt
+share/doc/snort/signatures/1701.txt
+share/doc/snort/signatures/1702.txt
+share/doc/snort/signatures/1703.txt
+share/doc/snort/signatures/1704.txt
+share/doc/snort/signatures/1705.txt
+share/doc/snort/signatures/1706.txt
+share/doc/snort/signatures/1707.txt
+share/doc/snort/signatures/1708.txt
+share/doc/snort/signatures/1709.txt
+share/doc/snort/signatures/1710.txt
+share/doc/snort/signatures/1711.txt
+share/doc/snort/signatures/1712.txt
+share/doc/snort/signatures/1713.txt
+share/doc/snort/signatures/1714.txt
+share/doc/snort/signatures/1715.txt
+share/doc/snort/signatures/1716.txt
+share/doc/snort/signatures/1717.txt
+share/doc/snort/signatures/1718.txt
+share/doc/snort/signatures/1719.txt
+share/doc/snort/signatures/1720.txt
+share/doc/snort/signatures/1721.txt
+share/doc/snort/signatures/1722.txt
+share/doc/snort/signatures/1723.txt
+share/doc/snort/signatures/1724.txt
 share/doc/snort/signatures/1725.txt
 share/doc/snort/signatures/1726.txt
+share/doc/snort/signatures/1727.txt
 share/doc/snort/signatures/1728.txt
 share/doc/snort/signatures/1729.txt
+share/doc/snort/signatures/1730.txt
+share/doc/snort/signatures/1731.txt
 share/doc/snort/signatures/1732.txt
 share/doc/snort/signatures/1733.txt
+share/doc/snort/signatures/1734.txt
+share/doc/snort/signatures/1736.txt
+share/doc/snort/signatures/1737.txt
+share/doc/snort/signatures/1738.txt
+share/doc/snort/signatures/1739.txt
+share/doc/snort/signatures/1740.txt
+share/doc/snort/signatures/1741.txt
+share/doc/snort/signatures/1742.txt
+share/doc/snort/signatures/1743.txt
+share/doc/snort/signatures/1744.txt
+share/doc/snort/signatures/1745.txt
 share/doc/snort/signatures/1746.txt
 share/doc/snort/signatures/1747.txt
+share/doc/snort/signatures/1748.txt
 share/doc/snort/signatures/1750.txt
 share/doc/snort/signatures/1751.txt
+share/doc/snort/signatures/1752.txt
 share/doc/snort/signatures/1753.txt
 share/doc/snort/signatures/1754.txt
+share/doc/snort/signatures/1755.txt
 share/doc/snort/signatures/1756.txt
+share/doc/snort/signatures/1757.txt
+share/doc/snort/signatures/1758.txt
 share/doc/snort/signatures/1759.txt
 share/doc/snort/signatures/176.txt
+share/doc/snort/signatures/1762.txt
+share/doc/snort/signatures/1763.txt
+share/doc/snort/signatures/1764.txt
+share/doc/snort/signatures/1765.txt
+share/doc/snort/signatures/1766.txt
+share/doc/snort/signatures/1767.txt
 share/doc/snort/signatures/1768.txt
+share/doc/snort/signatures/1769.txt
+share/doc/snort/signatures/1770.txt
+share/doc/snort/signatures/1771.txt
 share/doc/snort/signatures/1772.txt
 share/doc/snort/signatures/1773.txt
+share/doc/snort/signatures/1774.txt
 share/doc/snort/signatures/1775.txt
 share/doc/snort/signatures/1776.txt
 share/doc/snort/signatures/1777.txt
 share/doc/snort/signatures/1778.txt
+share/doc/snort/signatures/1779.txt
 share/doc/snort/signatures/1781.txt
 share/doc/snort/signatures/1782.txt
 share/doc/snort/signatures/1783.txt
 share/doc/snort/signatures/1784.txt
 share/doc/snort/signatures/1785.txt
 share/doc/snort/signatures/1786.txt
+share/doc/snort/signatures/1787.txt
+share/doc/snort/signatures/1788.txt
 share/doc/snort/signatures/1789.txt
 share/doc/snort/signatures/1790.txt
 share/doc/snort/signatures/1791.txt
@@ -375,8 +810,13 @@ share/doc/snort/signatures/1797.txt
 share/doc/snort/signatures/1798.txt
 share/doc/snort/signatures/1799.txt
 share/doc/snort/signatures/1800.txt
+share/doc/snort/signatures/1801.txt
+share/doc/snort/signatures/1802.txt
+share/doc/snort/signatures/1803.txt
+share/doc/snort/signatures/1804.txt
 share/doc/snort/signatures/1805.txt
 share/doc/snort/signatures/1806.txt
+share/doc/snort/signatures/1807.txt
 share/doc/snort/signatures/1808.txt
 share/doc/snort/signatures/1809.txt
 share/doc/snort/signatures/1810.txt
@@ -384,21 +824,44 @@ share/doc/snort/signatures/1811.txt
 share/doc/snort/signatures/1812.txt
 share/doc/snort/signatures/1813.txt
 share/doc/snort/signatures/1814.txt
+share/doc/snort/signatures/1815.txt
+share/doc/snort/signatures/1816.txt
 share/doc/snort/signatures/1817.txt
 share/doc/snort/signatures/1818.txt
+share/doc/snort/signatures/1820.txt
 share/doc/snort/signatures/1821.txt
+share/doc/snort/signatures/1822.txt
+share/doc/snort/signatures/1823.txt
+share/doc/snort/signatures/1824.txt
+share/doc/snort/signatures/1825.txt
+share/doc/snort/signatures/1826.txt
+share/doc/snort/signatures/1827.txt
 share/doc/snort/signatures/1828.txt
+share/doc/snort/signatures/1829.txt
 share/doc/snort/signatures/183.txt
+share/doc/snort/signatures/1830.txt
 share/doc/snort/signatures/1831.txt
 share/doc/snort/signatures/1832.txt
 share/doc/snort/signatures/1833.txt
+share/doc/snort/signatures/1834.txt
+share/doc/snort/signatures/1835.txt
 share/doc/snort/signatures/1836.txt
 share/doc/snort/signatures/1837.txt
 share/doc/snort/signatures/1838.txt
+share/doc/snort/signatures/1839.txt
 share/doc/snort/signatures/184.txt
 share/doc/snort/signatures/1841.txt
+share/doc/snort/signatures/1842.txt
 share/doc/snort/signatures/1843.txt
+share/doc/snort/signatures/1844.txt
+share/doc/snort/signatures/1845.txt
+share/doc/snort/signatures/1846.txt
+share/doc/snort/signatures/1847.txt
+share/doc/snort/signatures/1848.txt
+share/doc/snort/signatures/1849.txt
 share/doc/snort/signatures/185.txt
+share/doc/snort/signatures/1850.txt
+share/doc/snort/signatures/1851.txt
 share/doc/snort/signatures/1852.txt
 share/doc/snort/signatures/1853.txt
 share/doc/snort/signatures/1854.txt
@@ -406,10 +869,28 @@ share/doc/snort/signatures/1855.txt
 share/doc/snort/signatures/1856.txt
 share/doc/snort/signatures/1857.txt
 share/doc/snort/signatures/1858.txt
+share/doc/snort/signatures/1859.txt
+share/doc/snort/signatures/1860.txt
+share/doc/snort/signatures/1861.txt
 share/doc/snort/signatures/1862.txt
 share/doc/snort/signatures/1864.txt
+share/doc/snort/signatures/1865.txt
 share/doc/snort/signatures/1866.txt
+share/doc/snort/signatures/1867.txt
+share/doc/snort/signatures/1868.txt
+share/doc/snort/signatures/1869.txt
+share/doc/snort/signatures/1870.txt
 share/doc/snort/signatures/1871.txt
+share/doc/snort/signatures/1872.txt
+share/doc/snort/signatures/1873.txt
+share/doc/snort/signatures/1874.txt
+share/doc/snort/signatures/1875.txt
+share/doc/snort/signatures/1876.txt
+share/doc/snort/signatures/1877.txt
+share/doc/snort/signatures/1878.txt
+share/doc/snort/signatures/1879.txt
+share/doc/snort/signatures/1880.txt
+share/doc/snort/signatures/1881.txt
 share/doc/snort/signatures/1882.txt
 share/doc/snort/signatures/1883.txt
 share/doc/snort/signatures/1884.txt
@@ -425,6 +906,11 @@ share/doc/snort/signatures/1896.txt
 share/doc/snort/signatures/1897.txt
 share/doc/snort/signatures/1898.txt
 share/doc/snort/signatures/1899.txt
+share/doc/snort/signatures/1900.txt
+share/doc/snort/signatures/1901.txt
+share/doc/snort/signatures/1902.txt
+share/doc/snort/signatures/1903.txt
+share/doc/snort/signatures/1904.txt
 share/doc/snort/signatures/1905.txt
 share/doc/snort/signatures/1906.txt
 share/doc/snort/signatures/1907.txt
@@ -439,6 +925,9 @@ share/doc/snort/signatures/1915.txt
 share/doc/snort/signatures/1916.txt
 share/doc/snort/signatures/1917.txt
 share/doc/snort/signatures/1918.txt
+share/doc/snort/signatures/1919.txt
+share/doc/snort/signatures/1920.txt
+share/doc/snort/signatures/1921.txt
 share/doc/snort/signatures/1922.txt
 share/doc/snort/signatures/1923.txt
 share/doc/snort/signatures/1924.txt
@@ -447,9 +936,18 @@ share/doc/snort/signatures/1926.txt
 share/doc/snort/signatures/1927.txt
 share/doc/snort/signatures/1928.txt
 share/doc/snort/signatures/1929.txt
+share/doc/snort/signatures/1930.txt
+share/doc/snort/signatures/1931.txt
+share/doc/snort/signatures/1932.txt
+share/doc/snort/signatures/1933.txt
+share/doc/snort/signatures/1937.txt
 share/doc/snort/signatures/1941.txt
 share/doc/snort/signatures/1942.txt
+share/doc/snort/signatures/1943.txt
+share/doc/snort/signatures/1944.txt
 share/doc/snort/signatures/1945.txt
+share/doc/snort/signatures/1946.txt
+share/doc/snort/signatures/1947.txt
 share/doc/snort/signatures/1948.txt
 share/doc/snort/signatures/1949.txt
 share/doc/snort/signatures/195.txt
@@ -460,12 +958,28 @@ share/doc/snort/signatures/1953.txt
 share/doc/snort/signatures/1954.txt
 share/doc/snort/signatures/1955.txt
 share/doc/snort/signatures/1956.txt
+share/doc/snort/signatures/1957.txt
+share/doc/snort/signatures/1958.txt
+share/doc/snort/signatures/1959.txt
+share/doc/snort/signatures/1960.txt
+share/doc/snort/signatures/1961.txt
+share/doc/snort/signatures/1962.txt
 share/doc/snort/signatures/1963.txt
 share/doc/snort/signatures/1964.txt
 share/doc/snort/signatures/1965.txt
+share/doc/snort/signatures/1967.txt
+share/doc/snort/signatures/1968.txt
+share/doc/snort/signatures/1969.txt
 share/doc/snort/signatures/1970.txt
 share/doc/snort/signatures/1971.txt
+share/doc/snort/signatures/1972.txt
+share/doc/snort/signatures/1973.txt
+share/doc/snort/signatures/1974.txt
 share/doc/snort/signatures/1975.txt
+share/doc/snort/signatures/1976.txt
+share/doc/snort/signatures/1977.txt
+share/doc/snort/signatures/1978.txt
+share/doc/snort/signatures/1979.txt
 share/doc/snort/signatures/1980.txt
 share/doc/snort/signatures/1981.txt
 share/doc/snort/signatures/1982.txt
@@ -479,6 +993,13 @@ share/doc/snort/signatures/1989.txt
 share/doc/snort/signatures/1990.txt
 share/doc/snort/signatures/1991.txt
 share/doc/snort/signatures/1992.txt
+share/doc/snort/signatures/1993.txt
+share/doc/snort/signatures/1994.txt
+share/doc/snort/signatures/1995.txt
+share/doc/snort/signatures/1996.txt
+share/doc/snort/signatures/1997.txt
+share/doc/snort/signatures/1998.txt
+share/doc/snort/signatures/1999.txt
 share/doc/snort/signatures/2000.txt
 share/doc/snort/signatures/2001.txt
 share/doc/snort/signatures/2002.txt
@@ -663,30 +1184,157 @@ share/doc/snort/signatures/2174.txt
 share/doc/snort/signatures/2175.txt
 share/doc/snort/signatures/2176.txt
 share/doc/snort/signatures/2177.txt
+share/doc/snort/signatures/2178.txt
+share/doc/snort/signatures/2179.txt
 share/doc/snort/signatures/218.txt
 share/doc/snort/signatures/2180.txt
 share/doc/snort/signatures/2181.txt
 share/doc/snort/signatures/2182.txt
 share/doc/snort/signatures/2183.txt
+share/doc/snort/signatures/2184.txt
+share/doc/snort/signatures/2185.txt
 share/doc/snort/signatures/2186.txt
 share/doc/snort/signatures/2187.txt
 share/doc/snort/signatures/2188.txt
 share/doc/snort/signatures/2189.txt
 share/doc/snort/signatures/219.txt
+share/doc/snort/signatures/2190.txt
+share/doc/snort/signatures/2191.txt
 share/doc/snort/signatures/2192.txt
 share/doc/snort/signatures/2193.txt
+share/doc/snort/signatures/2194.txt
+share/doc/snort/signatures/2195.txt
+share/doc/snort/signatures/2196.txt
+share/doc/snort/signatures/2197.txt
+share/doc/snort/signatures/2198.txt
+share/doc/snort/signatures/2199.txt
 share/doc/snort/signatures/220.txt
+share/doc/snort/signatures/2200.txt
+share/doc/snort/signatures/2201.txt
+share/doc/snort/signatures/2202.txt
+share/doc/snort/signatures/2203.txt
+share/doc/snort/signatures/2204.txt
+share/doc/snort/signatures/2205.txt
+share/doc/snort/signatures/2206.txt
+share/doc/snort/signatures/2207.txt
+share/doc/snort/signatures/2208.txt
+share/doc/snort/signatures/2209.txt
 share/doc/snort/signatures/221.txt
+share/doc/snort/signatures/2210.txt
+share/doc/snort/signatures/2211.txt
+share/doc/snort/signatures/2212.txt
+share/doc/snort/signatures/2213.txt
+share/doc/snort/signatures/2214.txt
+share/doc/snort/signatures/2215.txt
+share/doc/snort/signatures/2216.txt
+share/doc/snort/signatures/2217.txt
+share/doc/snort/signatures/2218.txt
+share/doc/snort/signatures/2219.txt
 share/doc/snort/signatures/222.txt
+share/doc/snort/signatures/2220.txt
+share/doc/snort/signatures/2221.txt
+share/doc/snort/signatures/2222.txt
+share/doc/snort/signatures/2223.txt
+share/doc/snort/signatures/2224.txt
+share/doc/snort/signatures/2225.txt
+share/doc/snort/signatures/2226.txt
+share/doc/snort/signatures/2227.txt
+share/doc/snort/signatures/2228.txt
+share/doc/snort/signatures/2229.txt
 share/doc/snort/signatures/223.txt
+share/doc/snort/signatures/2230.txt
+share/doc/snort/signatures/2231.txt
+share/doc/snort/signatures/2232.txt
+share/doc/snort/signatures/2233.txt
+share/doc/snort/signatures/2234.txt
+share/doc/snort/signatures/2235.txt
+share/doc/snort/signatures/2236.txt
+share/doc/snort/signatures/2237.txt
+share/doc/snort/signatures/2238.txt
+share/doc/snort/signatures/2239.txt
 share/doc/snort/signatures/224.txt
+share/doc/snort/signatures/2240.txt
+share/doc/snort/signatures/2241.txt
+share/doc/snort/signatures/2242.txt
+share/doc/snort/signatures/2243.txt
+share/doc/snort/signatures/2244.txt
+share/doc/snort/signatures/2245.txt
+share/doc/snort/signatures/2246.txt
+share/doc/snort/signatures/2247.txt
+share/doc/snort/signatures/2248.txt
+share/doc/snort/signatures/2249.txt
 share/doc/snort/signatures/225.txt
+share/doc/snort/signatures/2250.txt
+share/doc/snort/signatures/2251.txt
+share/doc/snort/signatures/2252.txt
+share/doc/snort/signatures/2253.txt
+share/doc/snort/signatures/2254.txt
+share/doc/snort/signatures/2256.txt
+share/doc/snort/signatures/2257.txt
+share/doc/snort/signatures/2258.txt
+share/doc/snort/signatures/2259.txt
 share/doc/snort/signatures/226.txt
+share/doc/snort/signatures/2260.txt
+share/doc/snort/signatures/2261.txt
+share/doc/snort/signatures/2262.txt
+share/doc/snort/signatures/2263.txt
+share/doc/snort/signatures/2264.txt
+share/doc/snort/signatures/2265.txt
+share/doc/snort/signatures/2266.txt
+share/doc/snort/signatures/2267.txt
+share/doc/snort/signatures/2268.txt
+share/doc/snort/signatures/2269.txt
 share/doc/snort/signatures/227.txt
+share/doc/snort/signatures/2270.txt
+share/doc/snort/signatures/2271.txt
+share/doc/snort/signatures/2272.txt
+share/doc/snort/signatures/2273.txt
+share/doc/snort/signatures/2274.txt
+share/doc/snort/signatures/2275.txt
+share/doc/snort/signatures/2277.txt
+share/doc/snort/signatures/2278.txt
+share/doc/snort/signatures/2279.txt
 share/doc/snort/signatures/228.txt
+share/doc/snort/signatures/2280.txt
+share/doc/snort/signatures/2281.txt
+share/doc/snort/signatures/2282.txt
+share/doc/snort/signatures/2283.txt
+share/doc/snort/signatures/2284.txt
+share/doc/snort/signatures/2285.txt
+share/doc/snort/signatures/2286.txt
+share/doc/snort/signatures/2287.txt
+share/doc/snort/signatures/2288.txt
+share/doc/snort/signatures/2289.txt
 share/doc/snort/signatures/229.txt
+share/doc/snort/signatures/2290.txt
+share/doc/snort/signatures/2291.txt
+share/doc/snort/signatures/2292.txt
+share/doc/snort/signatures/2293.txt
+share/doc/snort/signatures/2294.txt
+share/doc/snort/signatures/2295.txt
+share/doc/snort/signatures/2296.txt
+share/doc/snort/signatures/2297.txt
+share/doc/snort/signatures/2298.txt
+share/doc/snort/signatures/2299.txt
 share/doc/snort/signatures/230.txt
+share/doc/snort/signatures/2300.txt
+share/doc/snort/signatures/2301.txt
+share/doc/snort/signatures/2302.txt
+share/doc/snort/signatures/2303.txt
+share/doc/snort/signatures/2304.txt
+share/doc/snort/signatures/2305.txt
+share/doc/snort/signatures/2306.txt
+share/doc/snort/signatures/2307.txt
+share/doc/snort/signatures/2308.txt
+share/doc/snort/signatures/2309.txt
 share/doc/snort/signatures/231.txt
+share/doc/snort/signatures/2310.txt
+share/doc/snort/signatures/2311.txt
+share/doc/snort/signatures/2312.txt
+share/doc/snort/signatures/2313.txt
+share/doc/snort/signatures/2314.txt
+share/doc/snort/signatures/2315.txt
+share/doc/snort/signatures/2316.txt
 share/doc/snort/signatures/232.txt
 share/doc/snort/signatures/233.txt
 share/doc/snort/signatures/234.txt
@@ -745,6 +1393,11 @@ share/doc/snort/signatures/289.txt
 share/doc/snort/signatures/290.txt
 share/doc/snort/signatures/291.txt
 share/doc/snort/signatures/292.txt
+share/doc/snort/signatures/295.txt
+share/doc/snort/signatures/296.txt
+share/doc/snort/signatures/297.txt
+share/doc/snort/signatures/298.txt
+share/doc/snort/signatures/299.txt
 share/doc/snort/signatures/300.txt
 share/doc/snort/signatures/301.txt
 share/doc/snort/signatures/302.txt
@@ -763,6 +1416,8 @@ share/doc/snort/signatures/314.txt
 share/doc/snort/signatures/315.txt
 share/doc/snort/signatures/316.txt
 share/doc/snort/signatures/317.txt
+share/doc/snort/signatures/318.txt
+share/doc/snort/signatures/319.txt
 share/doc/snort/signatures/320.txt
 share/doc/snort/signatures/321.txt
 share/doc/snort/signatures/322.txt
@@ -781,8 +1436,17 @@ share/doc/snort/signatures/334.txt
 share/doc/snort/signatures/335.txt
 share/doc/snort/signatures/336.txt
 share/doc/snort/signatures/337.txt
+share/doc/snort/signatures/338.txt
 share/doc/snort/signatures/339.txt
+share/doc/snort/signatures/342.txt
+share/doc/snort/signatures/343.txt
 share/doc/snort/signatures/344.txt
+share/doc/snort/signatures/345.txt
+share/doc/snort/signatures/348.txt
+share/doc/snort/signatures/349.txt
+share/doc/snort/signatures/350.txt
+share/doc/snort/signatures/351.txt
+share/doc/snort/signatures/352.txt
 share/doc/snort/signatures/353.txt
 share/doc/snort/signatures/354.txt
 share/doc/snort/signatures/355.txt
@@ -869,6 +1533,11 @@ share/doc/snort/signatures/439.txt
 share/doc/snort/signatures/440.txt
 share/doc/snort/signatures/441.txt
 share/doc/snort/signatures/443.txt
+share/doc/snort/signatures/445.txt
+share/doc/snort/signatures/446.txt
+share/doc/snort/signatures/448.txt
+share/doc/snort/signatures/449.txt
+share/doc/snort/signatures/450.txt
 share/doc/snort/signatures/451.txt
 share/doc/snort/signatures/452.txt
 share/doc/snort/signatures/453.txt
@@ -912,20 +1581,26 @@ share/doc/snort/signatures/497.txt
 share/doc/snort/signatures/498.txt
 share/doc/snort/signatures/499.txt
 share/doc/snort/signatures/500.txt
+share/doc/snort/signatures/501.txt
 share/doc/snort/signatures/502.txt
 share/doc/snort/signatures/503.txt
 share/doc/snort/signatures/504.txt
 share/doc/snort/signatures/505.txt
 share/doc/snort/signatures/506.txt
 share/doc/snort/signatures/507.txt
+share/doc/snort/signatures/508.txt
+share/doc/snort/signatures/509.txt
 share/doc/snort/signatures/510.txt
 share/doc/snort/signatures/511.txt
 share/doc/snort/signatures/512.txt
+share/doc/snort/signatures/513.txt
 share/doc/snort/signatures/514.txt
+share/doc/snort/signatures/516.txt
 share/doc/snort/signatures/517.txt
 share/doc/snort/signatures/518.txt
 share/doc/snort/signatures/519.txt
 share/doc/snort/signatures/520.txt
+share/doc/snort/signatures/521.txt
 share/doc/snort/signatures/522.txt
 share/doc/snort/signatures/523.txt
 share/doc/snort/signatures/524.txt
@@ -952,8 +1627,23 @@ share/doc/snort/signatures/552.txt
 share/doc/snort/signatures/553.txt
 share/doc/snort/signatures/554.txt
 share/doc/snort/signatures/555.txt
+share/doc/snort/signatures/556.txt
+share/doc/snort/signatures/557.txt
+share/doc/snort/signatures/558.txt
+share/doc/snort/signatures/559.txt
+share/doc/snort/signatures/560.txt
+share/doc/snort/signatures/561.txt
+share/doc/snort/signatures/562.txt
+share/doc/snort/signatures/563.txt
+share/doc/snort/signatures/564.txt
+share/doc/snort/signatures/565.txt
+share/doc/snort/signatures/566.txt
 share/doc/snort/signatures/567.txt
 share/doc/snort/signatures/568.txt
+share/doc/snort/signatures/569.txt
+share/doc/snort/signatures/570.txt
+share/doc/snort/signatures/571.txt
+share/doc/snort/signatures/572.txt
 share/doc/snort/signatures/574.txt
 share/doc/snort/signatures/575.txt
 share/doc/snort/signatures/576.txt
@@ -968,6 +1658,7 @@ share/doc/snort/signatures/584.txt
 share/doc/snort/signatures/585.txt
 share/doc/snort/signatures/586.txt
 share/doc/snort/signatures/587.txt
+share/doc/snort/signatures/588.txt
 share/doc/snort/signatures/589.txt
 share/doc/snort/signatures/590.txt
 share/doc/snort/signatures/591.txt
@@ -985,20 +1676,30 @@ share/doc/snort/signatures/608.txt
 share/doc/snort/signatures/609.txt
 share/doc/snort/signatures/610.txt
 share/doc/snort/signatures/611.txt
+share/doc/snort/signatures/612.txt
+share/doc/snort/signatures/613.txt
 share/doc/snort/signatures/614.txt
+share/doc/snort/signatures/615.txt
+share/doc/snort/signatures/616.txt
 share/doc/snort/signatures/618.txt
+share/doc/snort/signatures/619.txt
 share/doc/snort/signatures/620.txt
 share/doc/snort/signatures/621.txt
+share/doc/snort/signatures/622.txt
 share/doc/snort/signatures/623.txt
 share/doc/snort/signatures/624.txt
 share/doc/snort/signatures/625.txt
 share/doc/snort/signatures/626.txt
 share/doc/snort/signatures/627.txt
+share/doc/snort/signatures/628.txt
 share/doc/snort/signatures/629.txt
 share/doc/snort/signatures/630.txt
 share/doc/snort/signatures/631.txt
 share/doc/snort/signatures/632.txt
 share/doc/snort/signatures/634.txt
+share/doc/snort/signatures/635.txt
+share/doc/snort/signatures/636.txt
+share/doc/snort/signatures/637.txt
 share/doc/snort/signatures/638.txt
 share/doc/snort/signatures/639.txt
 share/doc/snort/signatures/640.txt
@@ -1008,10 +1709,13 @@ share/doc/snort/signatures/643.txt
 share/doc/snort/signatures/644.txt
 share/doc/snort/signatures/645.txt
 share/doc/snort/signatures/646.txt
+share/doc/snort/signatures/647.txt
 share/doc/snort/signatures/648.txt
 share/doc/snort/signatures/649.txt
 share/doc/snort/signatures/650.txt
 share/doc/snort/signatures/651.txt
+share/doc/snort/signatures/652.txt
+share/doc/snort/signatures/653.txt
 share/doc/snort/signatures/654.txt
 share/doc/snort/signatures/655.txt
 share/doc/snort/signatures/657.txt
@@ -1030,6 +1734,8 @@ share/doc/snort/signatures/670.txt
 share/doc/snort/signatures/671.txt
 share/doc/snort/signatures/672.txt
 share/doc/snort/signatures/673.txt
+share/doc/snort/signatures/674.txt
+share/doc/snort/signatures/675.txt
 share/doc/snort/signatures/676.txt
 share/doc/snort/signatures/677.txt
 share/doc/snort/signatures/678.txt
@@ -1044,25 +1750,43 @@ share/doc/snort/signatures/686.txt
 share/doc/snort/signatures/687.txt
 share/doc/snort/signatures/688.txt
 share/doc/snort/signatures/689.txt
+share/doc/snort/signatures/690.txt
 share/doc/snort/signatures/691.txt
 share/doc/snort/signatures/692.txt
 share/doc/snort/signatures/693.txt
 share/doc/snort/signatures/694.txt
+share/doc/snort/signatures/695.txt
+share/doc/snort/signatures/696.txt
+share/doc/snort/signatures/697.txt
+share/doc/snort/signatures/698.txt
+share/doc/snort/signatures/699.txt
+share/doc/snort/signatures/700.txt
+share/doc/snort/signatures/701.txt
+share/doc/snort/signatures/702.txt
+share/doc/snort/signatures/703.txt
+share/doc/snort/signatures/704.txt
+share/doc/snort/signatures/705.txt
 share/doc/snort/signatures/706.txt
+share/doc/snort/signatures/707.txt
 share/doc/snort/signatures/708.txt
 share/doc/snort/signatures/711.txt
+share/doc/snort/signatures/714.txt
 share/doc/snort/signatures/715.txt
 share/doc/snort/signatures/716.txt
 share/doc/snort/signatures/717.txt
 share/doc/snort/signatures/718.txt
 share/doc/snort/signatures/719.txt
 share/doc/snort/signatures/720.txt
+share/doc/snort/signatures/721.txt
 share/doc/snort/signatures/724.txt
 share/doc/snort/signatures/725.txt
 share/doc/snort/signatures/726.txt
 share/doc/snort/signatures/727.txt
 share/doc/snort/signatures/728.txt
+share/doc/snort/signatures/729.txt
+share/doc/snort/signatures/730.txt
 share/doc/snort/signatures/731.txt
+share/doc/snort/signatures/732.txt
 share/doc/snort/signatures/733.txt
 share/doc/snort/signatures/734.txt
 share/doc/snort/signatures/735.txt
@@ -1079,22 +1803,158 @@ share/doc/snort/signatures/804.txt
 share/doc/snort/signatures/805.txt
 share/doc/snort/signatures/806.txt
 share/doc/snort/signatures/807.txt
+share/doc/snort/signatures/808.txt
+share/doc/snort/signatures/809.txt
+share/doc/snort/signatures/810.txt
+share/doc/snort/signatures/811.txt
+share/doc/snort/signatures/812.txt
+share/doc/snort/signatures/813.txt
+share/doc/snort/signatures/815.txt
+share/doc/snort/signatures/817.txt
+share/doc/snort/signatures/818.txt
+share/doc/snort/signatures/819.txt
+share/doc/snort/signatures/820.txt
+share/doc/snort/signatures/821.txt
+share/doc/snort/signatures/823.txt
 share/doc/snort/signatures/824.txt
+share/doc/snort/signatures/825.txt
+share/doc/snort/signatures/826.txt
+share/doc/snort/signatures/827.txt
+share/doc/snort/signatures/828.txt
+share/doc/snort/signatures/829.txt
+share/doc/snort/signatures/830.txt
+share/doc/snort/signatures/832.txt
+share/doc/snort/signatures/833.txt
+share/doc/snort/signatures/834.txt
 share/doc/snort/signatures/835.txt
+share/doc/snort/signatures/836.txt
+share/doc/snort/signatures/837.txt
+share/doc/snort/signatures/838.txt
+share/doc/snort/signatures/839.txt
+share/doc/snort/signatures/840.txt
+share/doc/snort/signatures/841.txt
+share/doc/snort/signatures/842.txt
+share/doc/snort/signatures/843.txt
+share/doc/snort/signatures/844.txt
+share/doc/snort/signatures/845.txt
+share/doc/snort/signatures/846.txt
+share/doc/snort/signatures/847.txt
+share/doc/snort/signatures/848.txt
+share/doc/snort/signatures/849.txt
+share/doc/snort/signatures/850.txt
+share/doc/snort/signatures/851.txt
+share/doc/snort/signatures/852.txt
+share/doc/snort/signatures/853.txt
+share/doc/snort/signatures/854.txt
+share/doc/snort/signatures/856.txt
+share/doc/snort/signatures/857.txt
+share/doc/snort/signatures/858.txt
+share/doc/snort/signatures/859.txt
+share/doc/snort/signatures/860.txt
+share/doc/snort/signatures/861.txt
+share/doc/snort/signatures/862.txt
+share/doc/snort/signatures/863.txt
+share/doc/snort/signatures/864.txt
+share/doc/snort/signatures/865.txt
+share/doc/snort/signatures/866.txt
+share/doc/snort/signatures/867.txt
+share/doc/snort/signatures/868.txt
+share/doc/snort/signatures/869.txt
+share/doc/snort/signatures/870.txt
+share/doc/snort/signatures/871.txt
+share/doc/snort/signatures/872.txt
+share/doc/snort/signatures/873.txt
+share/doc/snort/signatures/875.txt
+share/doc/snort/signatures/877.txt
+share/doc/snort/signatures/878.txt
+share/doc/snort/signatures/879.txt
+share/doc/snort/signatures/880.txt
+share/doc/snort/signatures/881.txt
 share/doc/snort/signatures/882.txt
+share/doc/snort/signatures/883.txt
+share/doc/snort/signatures/884.txt
+share/doc/snort/signatures/885.txt
+share/doc/snort/signatures/886.txt
+share/doc/snort/signatures/887.txt
+share/doc/snort/signatures/888.txt
+share/doc/snort/signatures/889.txt
+share/doc/snort/signatures/890.txt
+share/doc/snort/signatures/891.txt
+share/doc/snort/signatures/892.txt
+share/doc/snort/signatures/893.txt
 share/doc/snort/signatures/894.txt
+share/doc/snort/signatures/895.txt
+share/doc/snort/signatures/896.txt
+share/doc/snort/signatures/897.txt
+share/doc/snort/signatures/898.txt
+share/doc/snort/signatures/899.txt
+share/doc/snort/signatures/900.txt
+share/doc/snort/signatures/901.txt
+share/doc/snort/signatures/902.txt
+share/doc/snort/signatures/903.txt
 share/doc/snort/signatures/904.txt
 share/doc/snort/signatures/905.txt
 share/doc/snort/signatures/906.txt
 share/doc/snort/signatures/907.txt
 share/doc/snort/signatures/908.txt
+share/doc/snort/signatures/909.txt
+share/doc/snort/signatures/910.txt
+share/doc/snort/signatures/911.txt
+share/doc/snort/signatures/912.txt
+share/doc/snort/signatures/913.txt
+share/doc/snort/signatures/914.txt
+share/doc/snort/signatures/915.txt
+share/doc/snort/signatures/916.txt
+share/doc/snort/signatures/917.txt
+share/doc/snort/signatures/918.txt
+share/doc/snort/signatures/919.txt
+share/doc/snort/signatures/920.txt
+share/doc/snort/signatures/921.txt
+share/doc/snort/signatures/922.txt
+share/doc/snort/signatures/923.txt
+share/doc/snort/signatures/924.txt
+share/doc/snort/signatures/925.txt
+share/doc/snort/signatures/926.txt
+share/doc/snort/signatures/927.txt
+share/doc/snort/signatures/928.txt
+share/doc/snort/signatures/929.txt
+share/doc/snort/signatures/930.txt
+share/doc/snort/signatures/931.txt
+share/doc/snort/signatures/932.txt
+share/doc/snort/signatures/933.txt
+share/doc/snort/signatures/935.txt
+share/doc/snort/signatures/936.txt
+share/doc/snort/signatures/937.txt
 share/doc/snort/signatures/939.txt
+share/doc/snort/signatures/940.txt
+share/doc/snort/signatures/941.txt
+share/doc/snort/signatures/942.txt
+share/doc/snort/signatures/943.txt
+share/doc/snort/signatures/944.txt
+share/doc/snort/signatures/945.txt
+share/doc/snort/signatures/946.txt
+share/doc/snort/signatures/947.txt
 share/doc/snort/signatures/948.txt
+share/doc/snort/signatures/949.txt
+share/doc/snort/signatures/950.txt
 share/doc/snort/signatures/951.txt
 share/doc/snort/signatures/952.txt
 share/doc/snort/signatures/953.txt
+share/doc/snort/signatures/954.txt
+share/doc/snort/signatures/955.txt
+share/doc/snort/signatures/956.txt
+share/doc/snort/signatures/957.txt
 share/doc/snort/signatures/958.txt
+share/doc/snort/signatures/959.txt
+share/doc/snort/signatures/960.txt
+share/doc/snort/signatures/961.txt
+share/doc/snort/signatures/962.txt
+share/doc/snort/signatures/963.txt
+share/doc/snort/signatures/964.txt
+share/doc/snort/signatures/965.txt
+share/doc/snort/signatures/966.txt
 share/doc/snort/signatures/967.txt
+share/doc/snort/signatures/968.txt
 share/doc/snort/signatures/969.txt
 share/doc/snort/signatures/970.txt
 share/doc/snort/signatures/971.txt
@@ -1110,6 +1970,8 @@ share/doc/snort/signatures/980.txt
 share/doc/snort/signatures/981.txt
 share/doc/snort/signatures/982.txt
 share/doc/snort/signatures/983.txt
+share/doc/snort/signatures/984.txt
+share/doc/snort/signatures/985.txt
 share/doc/snort/signatures/986.txt
 share/doc/snort/signatures/987.txt
 share/doc/snort/signatures/988.txt
@@ -1125,10 +1987,17 @@ share/doc/snort/signatures/997.txt
 share/doc/snort/signatures/998.txt
 share/doc/snort/signatures/999.txt
 share/doc/snort/signatures/snort-sid-template.txt
-share/doc/snort/snortman.tex
+share/doc/snort/snort_manual.pdf
+share/doc/snort/snort_manual.tex
 share/examples/snort/classification.config
+share/examples/snort/gen-msg.map
+share/examples/snort/generators
 share/examples/snort/reference.config
+share/examples/snort/sid
+share/examples/snort/sid-msg.map
 share/examples/snort/snort.conf.default
+share/examples/snort/threshold.conf
+share/examples/snort/unicode.map
 share/snort/rules/attack-responses.rules
 share/snort/rules/backdoor.rules
 share/snort/rules/bad-traffic.rules
@@ -1141,7 +2010,6 @@ share/snort/rules/experimental.rules
 share/snort/rules/exploit.rules
 share/snort/rules/finger.rules
 share/snort/rules/ftp.rules
-share/snort/rules/gen-msg.map
 share/snort/rules/icmp-info.rules
 share/snort/rules/icmp.rules
 share/snort/rules/imap.rules
@@ -1163,8 +2031,6 @@ share/snort/rules/rpc.rules
 share/snort/rules/rservices.rules
 share/snort/rules/scan.rules
 share/snort/rules/shellcode.rules
-share/snort/rules/sid
-share/snort/rules/sid-msg.map
 share/snort/rules/smtp.rules
 share/snort/rules/snmp.rules
 share/snort/rules/sql.rules
diff --git a/net/snort/distinfo b/net/snort/distinfo
index d9d982b3b13..9c5c0aca7e1 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2003/09/23 15:43:51 salo Exp $
+$NetBSD: distinfo,v 1.19 2003/12/31 14:11:42 salo Exp $
 
-SHA1 (snort-2.0.2.tar.gz) = e79733bc1a17b2cb9cb0d64cc94c7cc9d16fba18
-Size (snort-2.0.2.tar.gz) = 1885220 bytes
+SHA1 (snort-2.1.0.tar.gz) = fa54d1ccdddde5ba1a793c6ab88006534933c66e
+Size (snort-2.1.0.tar.gz) = 2244701 bytes
 SHA1 (patch-aa) = 33a0a8014ce8458f99da8eefb68127ef02d8628c
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
 SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38
 SHA1 (patch-ad) = 983317cb82d13de66ac88127d3eea7d3b3186da4
-SHA1 (patch-ae) = 5a5123c5352e87650a4ce91123a196c576f37ea8
+SHA1 (patch-ae) = 2e2f6373b9859959e161a106ab4b1122fbc5a06c
diff --git a/net/snort/patches/patch-ae b/net/snort/patches/patch-ae
index 49b0ca26d84..9d57194f5f0 100644
--- a/net/snort/patches/patch-ae
+++ b/net/snort/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2003/04/16 06:37:20 salo Exp $
+$NetBSD: patch-ae,v 1.3 2003/12/31 14:11:42 salo Exp $
 
---- etc/snort.conf.orig	2003-04-03 23:10:50.000000000 +0200
-+++ etc/snort.conf	2003-04-16 08:09:48.000000000 +0200
-@@ -99,7 +99,7 @@
+--- etc/snort.conf.orig	2003-12-18 18:14:35.000000000 +0100
++++ etc/snort.conf	2003-12-30 02:25:47.000000000 +0100
+@@ -104,7 +104,7 @@
  var AIM_SERVERS [64.12.24.0/24,64.12.25.0/24,64.12.26.14/24,64.12.28.0/24,64.12.29.0/24,64.12.161.0/24,64.12.163.0/24,205.188.5.0/24,205.188.9.0/24]
  
  # Path to your rules files (this can be a relative path)
 -var RULE_PATH ../rules
 +var RULE_PATH @PREFIX@/share/snort/rules
  
- # Configure the snort decoder:
+ # Configure the snort decoder
  # ============================