From 8f300559e1547179061d7ccbf70bb034bc0b1cb0 Mon Sep 17 00:00:00 2001
From: Diederik de Groot <dkgroot@talon.nl>
Date: Sat, 10 Jul 2021 19:29:39 +0200
Subject: [PATCH] Update rewrite rules

---
 etc/tftpd-hpa/rewrite.rules | 64 +++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/etc/tftpd-hpa/rewrite.rules b/etc/tftpd-hpa/rewrite.rules
index be36ec4..f2c5a45 100644
--- a/etc/tftpd-hpa/rewrite.rules
+++ b/etc/tftpd-hpa/rewrite.rules
@@ -1,3 +1,11 @@
+#
+# TFTPd Rewrite for SCCP_Manager Custom remaping
+#	/firmware
+#	/settings
+#	/wallpapers
+#	/ringtones
+#	/locales
+#
 # 6901 firmware (java-based)
 ri ^(APP6901SCCP)(.+\.sgn)$ firmware/6901/\1\2
 ri ^(KNL6901SCCP)(.+\.sgn)$ firmware/6901/\1\2
@@ -50,13 +58,13 @@ ri ^(P00405000700.sbn)$ firmware/7910/\1
 ri ^(CP7912080004SCCP080108A.sbin)$ firmware/7912/\1
 
 # 7915 firmware (ancient)
-ri ^(B015-1-0-4.SBN)$ firmware/7915/\1
+ri ^(B015-1-0-)(.+\.SBN)$ firmware/7915/\1\2
 
 # 7916 firmware (ancient)
-ri ^(B016-1-0-4.SBN)$ firmware/7916/\1
+ri ^(B016-1-0-)(.+\.SBN)$ firmware/7916/\1\2
 
 # 7920 firmware (ancient)
-ri ^(cmterm_7920.4.0-03-02.bin)$ firmware/7920/\1
+ri ^(cmterm_7920)(.+\.bin)$ firmware/7920/\1\2
 
 # 7921_7925 firmware (ancient)
 ri ^(APPS-1.4.3.4.SBN)$ firmware/7921/\1
@@ -98,14 +106,10 @@ ri ^(cmterm_7936.3-3-21-0.bin)$ firmware/7936/\1
 ri ^(apps37sccp.1-4-5-7.bin)$ firmware/7937/\1
 
 # 7940_7960 firmware (ancient)
-ri ^(P0030801SR.bin)$ firmware/7940/\1
-ri ^(P0030801SR.loads)$ firmware/7940/\1
-ri ^(P0030801SR.sb2)$ firmware/7940/\1
-ri ^(P0030801SR.sbn)$ firmware/7940/\1
-ri ^(P0030801SR01.bin)$ firmware/7940/\1
-ri ^(P0030801SR01.loads)$ firmware/7940/\1
-ri ^(P0030801SR01.sb2)$ firmware/7940/\1
-ri ^(P0030801SR01.sbn)$ firmware/7940/\1
+ri ^(P0030801SR)(.+\.bin)$ firmware/7940/\1\2
+ri ^(P0030801SR)(.+\.loads)$ firmware/7940/\1\2
+ri ^(P0030801SR)(.+\.sb2)$ firmware/7940/\1\2
+ri ^(P0030801SR)(.+\.sbn)$ firmware/7940/\1\2
 
 # 7941_7961 firmware (java-based)
 ri ^(apps41)(.+\.sbn)$ firmware/7941/\1\2
@@ -167,41 +171,39 @@ ri ^(SCCP894x)(.+\.loads)$ firmware/894x/\1\2
 # ata186/ata188 firmware (ancient)
 ri ^(ATA030204SCCP090202A.zup)$ firmware/ata186/\1
 
-# SPA
-ri ^(spa50x)(.+\.bin)$ firmware/spa50x/\1\2
-ri ^(spa51x)(.+\.bin)$ firmware/spa51x/\1\2
-ri ^(spa525)(.+\.bin)$ firmware/spa525/\1\2
-ri ^(spa941)(.+\.bin)$ firmware/spa941/\1\2
-
 # Sub-Directory Handling
 
 # settings
-ri ^(.+\.tlv)?$ settings/\1
-ri ^\/(.+\.tlv)?$ settings/\1
-ri ^((.+\.cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
-ri ^\/((.+\-cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
-ri ^\/((SPA504G-cfg.xml)(\.enc)?(\.sgn)?)$ settings/\1
+#ri ^(.+\.tlv)?$ settings/\1
+#ri ^\/(.+\.tlv)?$ settings/\1
+#ri ^((.+\.cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
+#ri ^\/((.+\-cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
+#ri ^\/((SPA504G-cfg.xml)(\.enc)?(\.sgn)?)$ settings/\1
 
 # Keep firmware in a separate directory (optional)
 #ri ^(.+\.loads)$ firmware/\1
 #ri ^(.+\.sbn)$ firmware/\1
 
 # Keep locales in a separate directory (optional)
-ri ^(.+)\/(.+-sccp.jar(.+\.sgn)?)$ locales/languages/\1/\2
-ri ^(.+)\/(.+-dictionary.+.xml(.+\.sgn)?)$ locales/languages/\1/\2
-ri ^(.+)\/(.+-font.xml(.+\.sgn)?)$ locales/languages/\1/\2
-ri ^(.+)\/(.+-kate.+\.xml(.+\.sgn)?)$ locales/languages/\1/\2
-ri ^(.+)\/(CIPC_Locale\..+(.+\.sgn)?)$ locales/languages/\1/\2
-ri ^(.+)\/(.+-tones.xml(.+\.sgn)?)$ locales/countries/\1/\2
+ri ^(.+)\/(.+-sccp.jar)$ languages/\1/\2
+ri ^(.+)\/(.+-sip.jar)$ languages/\1/\2
+ri ^(.+)\/(.+-dictionary.xml)$ languages/\1/\2
+ri ^(.+)\/(.+-dictionary-ext.xml)$ languages/\1/\2
+ri ^(.+)\/(.+-tones.xml)$ languages/\1/\2
+ri ^(.+)\/(.+-font.xml)$ languages/\1/\2
+ri ^(.+)\/(.+-kate.xml)$ languages/\1/\2
+ri ^(.+)\/(gk.+)(\.cfg)$ languages/\1/\2\3
+
+#ri ^(.+)\/(.+-tones.xml)$ locales/countries/\1/\2
 
 # Keep ring-tones in a separate directory (optional)
 ri ^([R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml
 ri ^(Distinctive[R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml
-ri ^(.+)(\.raw|\.rwb)(\.sgn)?$ ringtones/\1\2\3
+ri ^(.+)(\.raw|\.rwb|\.pcm)(\.sgn)?$ ringtones/\1\2\3
 
 # Rename Desktops to wallpapers (optional)
-ri ^Desktops/(.+)/(List\.xml)(\.sgn)?$ wallpapers/\1/\2\3
-ri ^Desktops/(.+)/(.+\.png)(\.sgn)?$ wallpapers/\1/\2\3
+#ri ^Desktops/(.+)/(List\.xml)(\.sgn)?$ wallpapers/\1/\2\3
+#ri ^Desktops/(.+)/(.+\.png)(\.sgn)?$ wallpapers/\1/\2\3
 
 ri ^authorized_keys$ settings/authorized_keys