From 53f128de07ac49998dd3f0f1fc08226d36c8bc07 Mon Sep 17 00:00:00 2001
From: root <root@router.collabnet.local>
Date: Mon, 18 Dec 2023 11:43:30 -0500
Subject: [PATCH] Update

---
 .gitignore                |  3 +--
 bannedsitelist            | 14 +++++++-------
 bannedurllist             | 12 ++++++------
 categories/malicious/urls |  2 ++
 getoisd.sh                |  2 ++
 getut1.sh                 | 12 ++++++++++--
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 039833e..cdd727a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /oisd/big
 /oisd/nsfw
-/ut1/ut1.tar.gz
-/ut1/blacklists/
+/ut1/*/
diff --git a/bannedsitelist b/bannedsitelist
index 12cb823..c9c5ba3 100644
--- a/bannedsitelist
+++ b/bannedsitelist
@@ -4,12 +4,12 @@
 .Include</etc/e2guardian/lists/group1/categories/other/domains>
 .Include</etc/e2guardian/lists/group1/categories/request/domains>
 .Include</etc/e2guardian/lists/group1/categories/proxy/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/adult/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/dating/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/lingerie/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/redirector/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/remote-control/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/sexual_education/domains>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/vpn/domains>
+.Include</etc/e2guardian/lists/group1/ut1/adult/domains>
+.Include</etc/e2guardian/lists/group1/ut1/dating/domains>
+.Include</etc/e2guardian/lists/group1/ut1/lingerie/domains>
+.Include</etc/e2guardian/lists/group1/ut1/redirector/domains>
+.Include</etc/e2guardian/lists/group1/ut1/remote-control/domains>
+.Include</etc/e2guardian/lists/group1/ut1/sexual_education/domains>
+.Include</etc/e2guardian/lists/group1/ut1/vpn/domains>
 .Include</etc/e2guardian/lists/group1/oisd/big>
 .Include</etc/e2guardian/lists/group1/oisd/nsfw>
diff --git a/bannedurllist b/bannedurllist
index 555b3d3..7156d27 100644
--- a/bannedurllist
+++ b/bannedurllist
@@ -3,9 +3,9 @@
 .Include</etc/e2guardian/lists/group1/categories/remote/urls>
 .Include</etc/e2guardian/lists/group1/categories/other/urls>
 .Include</etc/e2guardian/lists/group1/categories/proxy/urls>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/adult/urls>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/dating/urls>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/lingerie/urls>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/redirector/urls>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/remote-control/urls>
-.Include</etc/e2guardian/lists/group1/ut1/blacklists/sexual_education/urls>
+.Include</etc/e2guardian/lists/group1/ut1/adult/urls>
+.Include</etc/e2guardian/lists/group1/ut1/dating/urls>
+.Include</etc/e2guardian/lists/group1/ut1/lingerie/urls>
+.Include</etc/e2guardian/lists/group1/ut1/redirector/urls>
+.Include</etc/e2guardian/lists/group1/ut1/remote-control/urls>
+.Include</etc/e2guardian/lists/group1/ut1/sexual_education/urls>
diff --git a/categories/malicious/urls b/categories/malicious/urls
index 818d581..2b150f4 100644
--- a/categories/malicious/urls
+++ b/categories/malicious/urls
@@ -949,3 +949,5 @@ github.com/Nazar17P3948
 codeload.github.com/Nazar17P3948
 raw.githubusercontent.com/Nazar17P3948
 cdn.discordapp.com/attachments/949286428435693649/996345275855687790/
+download.sysinternals.com/files/SysinternalsSuite.zip
+download.sysinternals.com/files/SysinternalsSuite-Nano.zip
diff --git a/getoisd.sh b/getoisd.sh
index 1454dd9..75cf072 100755
--- a/getoisd.sh
+++ b/getoisd.sh
@@ -6,3 +6,5 @@ if ! command -v curl >/dev/null; then
 fi
 curl https://big.oisd.nl/domainswild2 -o oisd/big
 curl https://nsfw.oisd.nl/domainswild2 -o oisd/nsfw
+sed -i '1s|^|#listcategory: "oisd nsfw (Report False Block: https://oisd.nl/report)"\n|' oisd/nsfw
+sed -i '1s|^|#listcategory: "oisd big (Report False Block: https://oisd.nl/report)"\n|' oisd/big
diff --git a/getut1.sh b/getut1.sh
index fb2010d..57bb006 100755
--- a/getut1.sh
+++ b/getut1.sh
@@ -7,5 +7,13 @@ if ! command -v tar >/dev/null; then
 	echo 'tar is required for this script to work.'
 	exit 1
 fi
-ftp ftp://ftp.ut-capitole.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz -o ut1/ut1.tar.gz
-tar xzf ut1/ut1.tar.gz -C ut1/
+
+categories=("adult" "dating" "lingerie" "remote-control" "sexual_education" "vpn" "redirector")
+for category in "${categories[@]}"; do
+  mkdir -p "ut1/$category"
+  ftp "ftp://ftp.ut-capitole.fr/pub/reseau/cache/squidguard_contrib/${category}.tar.gz" -o "ut1/${category}.tar.gz"
+  tar xzf "ut1/${category}.tar.gz" -C ut1/
+  sed -i "1s|^|#listcategory: \"UT1 $category (Report False Block: https://dsi.ut-capitole.fr/cgi-bin/squidguard_modify.cgi)\"\n|" "ut1/$category/domains"
+  sed -i "1s|^|#listcategory: \"UT1 $category (Report False Block: https://dsi.ut-capitole.fr/cgi-bin/squidguard_modify.cgi)\"\n|" "ut1/$category/urls"
+  rm "ut1/${category}.tar.gz"
+done