From 1b3f740675b0e9c0f5fd499653f2f26405064fa0 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 12 Dec 2019 19:01:43 +0100
Subject: [PATCH] intrusion-detection-content-et-pro: support for suricata 5
 (devel only)

---
 security/intrusion-detection-content-et-pro/Makefile |  2 +-
 .../scripts/suricata/metadata/rules/et-pro.xml       | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/security/intrusion-detection-content-et-pro/Makefile b/security/intrusion-detection-content-et-pro/Makefile
index ab3e3a68b..fafdd5cfd 100644
--- a/security/intrusion-detection-content-et-pro/Makefile
+++ b/security/intrusion-detection-content-et-pro/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		intrusion-detection-content-et-pro
-PLUGIN_VERSION=		1.0.1
+PLUGIN_VERSION=		1.0.2
 PLUGIN_COMMENT=		IDS Proofpoint ET Pro ruleset (needs a valid subscription)
 PLUGIN_MAINTAINER=	ad@opnsense.org
 PLUGIN_WWW=		https://www.proofpoint.com/us/threat-insight/et-pro-ruleset
diff --git a/security/intrusion-detection-content-et-pro/src/opnsense/scripts/suricata/metadata/rules/et-pro.xml b/security/intrusion-detection-content-et-pro/src/opnsense/scripts/suricata/metadata/rules/et-pro.xml
index 19ad02bb8..4accb4f37 100644
--- a/security/intrusion-detection-content-et-pro/src/opnsense/scripts/suricata/metadata/rules/et-pro.xml
+++ b/security/intrusion-detection-content-et-pro/src/opnsense/scripts/suricata/metadata/rules/et-pro.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
 <ruleset documentation_url="http://doc.emergingthreats.net/bin/view/Main/EmergingFAQ">
-	<location url="https://rules.emergingthreatspro.com/%%etpro.oinkcode%%/suricata-4.0/etpro.rules.tar.gz" prefix="ET Pro"/>
+	<location url="https://rules.emergingthreatspro.com/%%etpro.oinkcode%%/suricata-5.0/etpro.rules.tar.gz" prefix="ET Pro"/>
+	<version url="https://rules.emergingthreatspro.com/%%etpro.oinkcode%%/suricata-5.0/version.txt"/>
 	<files>
 		<file description="activex" url="inline::rules/activex.rules">et_pro.activex.rules</file>
+		<file description="adware_pup" url="inline::rules/adware_pup.rules">et_pro.adware_pup.rules</file>
 		<file description="attack_response" url="inline::rules/attack_response.rules">et_pro.attack_response.rules</file>
 		<file description="botcc" url="inline::rules/botcc.portgrouped.rules">et_pro.botcc.portgrouped.rules</file>
 		<file description="botcc" url="inline::rules/botcc.rules">et_pro.botcc.rules</file>
 		<file description="chat" url="inline::rules/chat.rules">et_pro.chat.rules</file>
+		<file description="coinminer" url="inline::rules/coinminer.rules">et_pro.coinminer.rules</file>
 		<file description="ciarmy" url="inline::rules/ciarmy.rules">et_pro.ciarmy.rules</file>
 		<file description="compromised" url="inline::rules/compromised.rules">et_pro.compromised.rules</file>
 		<file description="current_events" url="inline::rules/current_events.rules">et_pro.current_events.rules</file>
@@ -16,18 +19,22 @@
 		<file description="drop" url="inline::rules/drop.rules">et_pro.drop.rules</file>
 		<file description="dshield" url="inline::rules/dshield.rules">et_pro.dshield.rules</file>
 		<file description="exploit" url="inline::rules/exploit.rules">et_pro.exploit.rules</file>
+		<file description="exploit_kit" url="inline::rules/exploit_kit.rules">et_pro.exploit_kit.rules</file>
 		<file description="ftp" url="inline::rules/ftp.rules">et_pro.ftp.rules</file>
 		<file description="games" url="inline::rules/games.rules">et_pro.games.rules</file>
+		<file description="hunting" url="inline::rules/hunting.rules">et_pro.hunting.rules</file>
 		<file description="icmp" url="inline::rules/icmp.rules">et_pro.icmp.rules</file>
 		<file description="icmp_info" url="inline::rules/icmp_info.rules">et_pro.icmp_info.rules</file>
 		<file description="imap" url="inline::rules/imap.rules">et_pro.imap.rules</file>
 		<file description="inappropriate" url="inline::rules/inappropriate.rules">et_pro.inappropriate.rules</file>
 		<file description="info" url="inline::rules/info.rules">et_pro.info.rules</file>
+		<file description="ja3" url="inline::rules/ja3.rules">et_pro.ja3.rules</file>
 		<file description="malware" url="inline::rules/malware.rules">et_pro.malware.rules</file>
 		<file description="misc" url="inline::rules/misc.rules">et_pro.misc.rules</file>
 		<file description="mobile_malware" url="inline::rules/mobile_malware.rules">et_pro.mobile_malware.rules</file>
 		<file description="netbios" url="inline::rules/netbios.rules">et_pro.netbios.rules</file>
 		<file description="p2p" url="inline::rules/p2p.rules">et_pro.p2p.rules</file>
+		<file description="phishing" url="inline::rules/phishing.rules">et_pro.phishing.rules</file>
 		<file description="policy" url="inline::rules/policy.rules">et_pro.policy.rules</file>
 		<file description="pop3" url="inline::rules/pop3.rules">et_pro.pop3.rules</file>
 		<file description="rbn-malvertisers" url="inline::rules/rbn-malvertisers.rules">et_pro.rbn-malvertisers.rules</file>
@@ -43,13 +50,14 @@
 		<file description="telnet" url="inline::rules/telnet.rules">et_pro.telnet.rules</file>
 		<file description="tftp" url="inline::rules/tftp.rules">et_pro.tftp.rules</file>
 		<file description="tor" url="inline::rules/tor.rules">et_pro.tor.rules</file>
-		<file description="trojan" url="inline::rules/trojan.rules">et_pro.trojan.rules</file>
 		<file description="user_agents" url="inline::rules/user_agents.rules">et_pro.user_agents.rules</file>
 		<file description="voip" url="inline::rules/voip.rules">et_pro.voip.rules</file>
 		<file description="web_client" url="inline::rules/web_client.rules">et_pro.web_client.rules</file>
 		<file description="web_server" url="inline::rules/web_server.rules">et_pro.web_server.rules</file>
 		<file description="web_specific_apps" url="inline::rules/web_specific_apps.rules">et_pro.web_specific_apps.rules</file>
 		<file description="worm" url="inline::rules/worm.rules">et_pro.worm.rules</file>
+		<!-- archived sets -->
+		<file description="trojan" url="inline::rules/trojan.rules" deprecated="true">et_pro.trojan.rules</file>
 	</files>
 	<properties>
 		<property name="etpro.oinkcode" default=""/>