From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 7 May 2022 09:44:48 +0000 (+0200)
Subject: Merge branch 'next' into ipblocklist-rbsed-c168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d4d67b07e99a5b5ee29c36c42c805886a758094;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'next' into ipblocklist-rbsed-c168

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

7d4d67b07e99a5b5ee29c36c42c805886a758094
diff --cc config/cron/crontab
index a83c9573af,d61d266190..1a2537e541
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@@ -62,9 -62,9 +62,12 @@@ HOME=
  # Update location database
  %hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1
  
 +# Update Lists for IP-based blocking.
 +%hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ipblocklists >/dev/null 2>&1
 +
+ # Update surciata rules.
+ %daily,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1
+ 
  # Retry sending spooled mails regularly
  %hourly * /usr/sbin/dma -q
  
diff --cc make.sh
index ba8d92564a,09b307e362..cca7b3af42
--- a/make.sh
+++ b/make.sh
@@@ -1450,9 -1443,7 +1443,8 @@@ buildipfire() 
    lfsmake2 ragel
    lfsmake2 hyperscan
    lfsmake2 suricata
-   lfsmake2 oinkmaster
    lfsmake2 ids-ruleset-sources
 +  lfsmake2 ipblocklist-sources
    lfsmake2 squid
    lfsmake2 squidguard
    lfsmake2 calamaris