From 1a045053d761ef890eb435b7860c50265095d072 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Mon, 11 Sep 2023 15:46:02 +0300
Subject: [PATCH] Merge and version rules for waterfox (from report)

---
 800.renames-and-merges/w.yaml        |  1 -
 800.renames-and-merges/waterfox.yaml | 37 ++++++++++++++++++++++++++++
 900.version-fixes/w.yaml             |  2 ++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 800.renames-and-merges/waterfox.yaml

diff --git a/800.renames-and-merges/w.yaml b/800.renames-and-merges/w.yaml
index 756a544f3..1080e52e6 100644
--- a/800.renames-and-merges/w.yaml
+++ b/800.renames-and-merges/w.yaml
@@ -6,7 +6,6 @@
 - { setname: warzone2100,              name: warzone-2100 }
 - { setname: warzone2100,              name: warzone2100-data, addflavor: true }
 - { setname: watchexec,                name: "rust:watchexec-cli" }
-- { setname: waterfox,                 name: waterfox-kde, addflavor: kde }
 - { setname: watson,                   name: td-watson }
 - { setname: wavpack,                  name: libwavpack }
 - { setname: waylandpp,                name: libwaylandpp }
diff --git a/800.renames-and-merges/waterfox.yaml b/800.renames-and-merges/waterfox.yaml
new file mode 100644
index 000000000..36bdc4e6c
--- /dev/null
+++ b/800.renames-and-merges/waterfox.yaml
@@ -0,0 +1,37 @@
+# vim: tabstop=39 expandtab softtabstop=39 nomodeline
+
+- setname: waterfox
+  name:
+    - waterfox.classic
+    - waterfox-classic
+    - waterfox-g
+    - waterfox-g3
+    - waterfox-g4
+    - waterfox-g5
+
+- setname: waterfox
+  name:
+    - waterfox-current
+  weak_devel: true
+  nolegacy: true
+
+- setname: waterfox
+  name:
+    - waterfox-current-kpe
+  addflavor: kpe
+  weak_devel: true
+  nolegacy: true
+
+- setname: waterfox
+  name:
+    - waterfox-kde
+  addflavor: kde
+
+- setname: waterfox
+  name:
+    - waterfox-g-kpe
+    - waterfox-g3-kpe
+    - waterfox-g4-kpe
+    - waterfox-g5-kpe
+    - waterfox-classic-kpe
+  addflavor: kpe
diff --git a/900.version-fixes/w.yaml b/900.version-fixes/w.yaml
index ddd737c1d..c7a514a93 100644
--- a/900.version-fixes/w.yaml
+++ b/900.version-fixes/w.yaml
@@ -14,6 +14,8 @@
 - { name: waterfox,                    ver: "2019.10",               ruleset: antix,       incorrect: true }
 - { name: waterfox,                                                  ruleset: antix,       untrusted: true } # accused of fake 2019.10
 - { name: waterfox,                    verpat: "[^G].*",                                   incorrect: true } # official versioning scheme is Gx.y.z
+- { name: waterfox,                    verpat: "20[0-9]{2}\\..*",                          incorrect: false, sink: true } # classic version, abandoned and vulnerable
+- { name: waterfox,                    releq: "56",                                        incorrect: false, sink: true } # ancient classic version, abandoned and vulnerable
 - { name: wavpack,                                                   ruleset: opensuse,    untrusted: true } # accused of fake 4.60.99
 - { name: wayfire,                     releq: "0.8.0",               ruleset: bioarch,     incorrect: true }
 - { name: wayfire,                                                   ruleset: bioarch,     untrusted: true } # accused of fake 0.8.0.20230521.121235