Cleaner output

.gitignore

@@ -1,3 +1,4 @@
 tests/__pycache__/
 pkg/**
 *.pkg.tar.zst
+*.pkg.tar.zst.sig

PKGBUILD

@@ -1,5 +1,5 @@
 depends=('bash>=4.4' 'gnupg>=2.2' 'curl>=7.72' 'Uniglot')
-makedepends=('make>=4.2')
+makedepends=('make>=4.2', 'python-pytest')
 checkdepends=()
 optdepends=()
 pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')"

canary

@@ -1,21 +1,21 @@
-As of 2021-01-10, aninix.net has not received any National Security Letters or FISA court orders, and we have not been subject to any gag order(s) by a FISA court, or any other similar court(s) of any government. AniNIX has never placed any backdoors in our hardware or software and has not received any requests to do so. AniNIX has never disclosed any user communications to any third party. No searches or seizures of any kind have ever been performed on AniNIX assets.
+As of 2025-12-17, the AniNIX has not received any National Security Letters or FISA court orders, and we have not been subject to any gag order(s) by a FISA court, or any other similar court(s) of any government. AniNIX has never placed any backdoors in our hardware or software and has not received any requests to do so. AniNIX has never disclosed any user communications to any third party. No searches or seizures of any kind have ever been performed on AniNIX assets.
 
 The next two updates should be on or before:
-* 2021-04-10
-* 2021-07-09
+* 2026-03-17
+* 2026-06-15
 
 Recent news:
-* https://www.aljazeera.com/news/2021/1/10/kazakh-ruling-party-set-to-retain-hold-on-power-in-sundays-vote</link
-* https://www.npr.org/2021/01/10/955399729/black-boxes-wreckage-located-in-indonesia-air-crash-no-signs-of-survivors</link
+* https://www.aljazeera.com/news/2025/12/17/putin-slams-wests-war-hysteria-as-eu-mulls-russian-assets-for-ukraine?traffic_source=rss</link
+* https://www.npr.org/2025/12/17/nx-s1-5637406/new-kremlin-dictionary-redefines-common-words-and-excludes-others-altogether</link
 
 To verify this message, on the terminal import our public key from pool.sks-keyservers.net and verify the canary:
-$ gpg --keyserver pool.sks-keyservers.net --recv-key 1CC1E3F4ED06F296
+$ gpg --fetch-keys https://aninix.net/AniNIX/ShadowArch/raw/branch/main/EtcFiles/aninix.gpg
 $ gpg2 --fingerprint 1CC1E3F4ED06F296
 pub   ed25519 2019-05-19 [SC]
       904D E627 5579 CB58 9D85  720C 1CC1 E3F4 ED06 F296
 uid           [ultimate] DarkFeather <ircs://aninix.net:6697/DarkFeather>
 sub   cv25519 2019-05-19 [E]
-$ gpg --verify <(curl -s https://foundation.aninix.net/AniNIX/WarrantCanary/raw/branch/main/canary.asc) 2>&1 | grep 'Good signature'
+$ gpg --verify <(curl -s https://aninix.net/AniNIX/WarrantCanary/raw/branch/main/canary.asc) 2>&1 | grep 'Good signature'
 gpg: Good signature from "DarkFeather <ircs://aninix.net:6697/DarkFeather>" [ultimate]
 
 There will most likely be other lines in the output from that last command, but as long as it says "Good signature", the verification worked correctly.

canary.asc

@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-As of 2021-01-10, aninix.net has not received any National Security Letters or FISA court orders, and we have not been subject to any gag order(s) by a FISA court, or any other similar court(s) of any government. AniNIX has never placed any backdoors in our hardware or software and has not received any requests to do so. AniNIX has never disclosed any user communications to any third party. No searches or seizures of any kind have ever been performed on AniNIX assets.
+As of 2025-12-17, the AniNIX has not received any National Security Letters or FISA court orders, and we have not been subject to any gag order(s) by a FISA court, or any other similar court(s) of any government. AniNIX has never placed any backdoors in our hardware or software and has not received any requests to do so. AniNIX has never disclosed any user communications to any third party. No searches or seizures of any kind have ever been performed on AniNIX assets.
 
 The next two updates should be on or before:
-* 2021-04-10
-* 2021-07-09
+* 2026-03-17
+* 2026-06-15
 
 Recent news:
-* https://www.aljazeera.com/news/2021/1/10/kazakh-ruling-party-set-to-retain-hold-on-power-in-sundays-vote</link
-* https://www.npr.org/2021/01/10/955399729/black-boxes-wreckage-located-in-indonesia-air-crash-no-signs-of-survivors</link
+* https://www.aljazeera.com/news/2025/12/17/putin-slams-wests-war-hysteria-as-eu-mulls-russian-assets-for-ukraine?traffic_source=rss</link
+* https://www.npr.org/2025/12/17/nx-s1-5637406/new-kremlin-dictionary-redefines-common-words-and-excludes-others-altogether</link
 
 To verify this message, on the terminal import our public key from pool.sks-keyservers.net and verify the canary:
-$ gpg --keyserver pool.sks-keyservers.net --recv-key 1CC1E3F4ED06F296
+$ gpg --fetch-keys https://aninix.net/AniNIX/ShadowArch/raw/branch/main/EtcFiles/aninix.gpg
 $ gpg2 --fingerprint 1CC1E3F4ED06F296
 pub   ed25519 2019-05-19 [SC]
       904D E627 5579 CB58 9D85  720C 1CC1 E3F4 ED06 F296
 uid           [ultimate] DarkFeather <ircs://aninix.net:6697/DarkFeather>
 sub   cv25519 2019-05-19 [E]
-$ gpg --verify <(curl -s https://foundation.aninix.net/AniNIX/WarrantCanary/raw/branch/main/canary.asc) 2>&1 | grep 'Good signature'
+$ gpg --verify <(curl -s https://aninix.net/AniNIX/WarrantCanary/raw/branch/main/canary.asc) 2>&1 | grep 'Good signature'
 gpg: Good signature from "DarkFeather <ircs://aninix.net:6697/DarkFeather>" [ultimate]
 
 There will most likely be other lines in the output from that last command, but as long as it says "Good signature", the verification worked correctly.
+
 -----BEGIN PGP SIGNATURE-----
 
-iHUEARYKAB0WIQSQTeYnVXnLWJ2FcgwcweP07QbylgUCX/vI1wAKCRAcweP07Qby
-lsP1AQCMVDKlFretUSwh52FCaiMnHRIXlleGV15YG4c+njnecwEA9PICOHad/6wX
-ira6GAgJFRV9klsmsvqrot24r2uNZQ4=
-=jtak
+iHUEARYKAB0WIQSQTeYnVXnLWJ2FcgwcweP07QbylgUCaUMbdQAKCRAcweP07Qby
+llJsAQDBbngI2DdQ1gFAd/EwrgyspAYveHn8QIlRZ7hb8jv9lAEAzXMn9TTira6G
+KpioAAMZiOM1UTVODmTC5EXmBZA51Ao=
+=0j/g
 -----END PGP SIGNATURE-----

warrant_canary

@@ -8,7 +8,7 @@ unset canaryText
 # cskey=E9C7C942
 keyserver=pool.sks-keyservers.net
 key=1CC1E3F4ED06F296
-canary=https://foundation.aninix.net/AniNIX/WarrantCanary/raw/branch/main/canary.asc
+canary=https://aninix.net/AniNIX/WarrantCanary/raw/branch/main/canary.asc
 unset gitCommit
 alJazeera='https://www.aljazeera.com/xml/rss/all.xml'
 alJazeeraDate="$(date +%Y/%m/%d | sed -s 's#/0#/#g')"
@@ -43,13 +43,13 @@ function RecentNews() {
     # param rssFeed: the url to pull
     rssFeed="$1"
     date="$2"
-    curl -s "$rssFeed" | grep "$date" | egrep -m 5 link | tail -n 1 | cut -f 2 -d '>' | cut -f 1 -d '?'
+    curl -s "$rssFeed" | grep "$date" |   tr '>' '\n' | grep /link | tail -n 1
 }
 
 function CreateCanary() {
     rm ./canary.asc
     cat > ./canary << EOM
-As of $(date +%F), aninix.net has not received any National Security Letters or FISA court orders, and we have not been subject to any gag order(s) by a FISA court, or any other similar court(s) of any government. AniNIX has never placed any backdoors in our hardware or software and has not received any requests to do so. AniNIX has never disclosed any user communications to any third party. No searches or seizures of any kind have ever been performed on AniNIX assets.
+As of $(date +%F), the AniNIX has not received any National Security Letters or FISA court orders, and we have not been subject to any gag order(s) by a FISA court, or any other similar court(s) of any government. AniNIX has never placed any backdoors in our hardware or software and has not received any requests to do so. AniNIX has never disclosed any user communications to any third party. No searches or seizures of any kind have ever been performed on AniNIX assets.
 
 The next two updates should be on or before:
 * `date -d @$(( $time + 7776000 )) +%F`
@@ -60,7 +60,7 @@ Recent news:
 * $(RecentNews "$npr" "$nprdate")
 
 To verify this message, on the terminal import our public key from $keyserver and verify the canary:
-$ gpg --keyserver $keyserver --recv-key $key
+$ gpg --fetch-keys https://aninix.net/AniNIX/ShadowArch/raw/branch/main/EtcFiles/aninix.gpg
 $ gpg2 --fingerprint $key
 $(gpg2 --fingerprint $key)
 $ gpg --verify <(curl -s $canary) 2>&1 | grep 'Good signature'
@@ -110,7 +110,7 @@ function CanaryVerify() {
     retcode=$?
     echo
     header Human-readable text:
-    echo "$canaryText" | grep -B 99 'To verify this' | grep -v 'To verify this'
+    echo "$canaryText" | grep -B 99 'To verify this' | grep -vE 'To verify this|BEGIN PGP SIGNED MESSAGE|^Hash: SHA512$'
     exit $retcode
 }