From 4cd2f0a44ca32cd9ced70ba3c8ce87c051af1f5b Mon Sep 17 00:00:00 2001
From: Blackyfff <blackyfff@noreply.git.freifunk-franken.de>
Date: Mon, 26 Jul 2021 19:23:34 +0200
Subject: [PATCH] Insert version information

Signed-off-by: Blackyfff <blackyfff@noreply.git.freifunk-franken.de>
---
 usr/lib/ffdns/update-dns.sh      | 11 +++++++++--
 usr/lib/ffdns/update-hoodzone.sh |  9 +++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh
index d56f4f9..81e9d18 100644
--- a/usr/lib/ffdns/update-dns.sh
+++ b/usr/lib/ffdns/update-dns.sh
@@ -8,6 +8,8 @@
 # exit script when command fails
 set -e
 
+export DNSSCRIPT_VERSION="0.8"
+
 . /etc/ffdns/community.conf
 . /etc/ffdns/local.conf
 
@@ -41,7 +43,12 @@ rm -f "$TempFolder""$ExternalView"".conf"
 
 CachedMasterFile="$TempFolder""cache/db.""$MasterDomain"
 PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")"
-curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile" || :
+curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && \
+	[ -f "$CachedMasterFile" ] && \
+	{
+		echo ""
+		echo "_dnsscript_version	IN TXT	""$DNSSCRIPT_VERSION" | NormalizeZoneFileFormatting
+	} >> "$CachedMasterFile" || :
 PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")"
 [ -n "$SubCommunityDomain" ] || ServeMasterZone="$( GetAllZoneNameservers "$MasterDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')"
 if [ -n "$MasterExternDomain" ]; then
@@ -77,7 +84,7 @@ UpdateExternal() {
 		[ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedZoneFile")" ] || \
 			sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedZoneFile"
 		
-		sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile"
+		sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\(@|\S\+\.\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile"
 		
 		UpdateExternDomain="$(UpdateDNSSECEntryCache "$ExternDomain" "$ZoneTempFolder" "$CachedZoneFile" "$DNSSECKeyFolder")"
 		if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then
diff --git a/usr/lib/ffdns/update-hoodzone.sh b/usr/lib/ffdns/update-hoodzone.sh
index cd42d44..48622d6 100644
--- a/usr/lib/ffdns/update-hoodzone.sh
+++ b/usr/lib/ffdns/update-hoodzone.sh
@@ -24,7 +24,7 @@ GetLeaseEntriesInSubnet() {
 	done
 }
 
-OldLeases="$(sed -e '/^;### Leases ###/,$!d' "$HoodZoneFile" | sed 1d)"
+OldLeases="$(sed -e '/^;### Leases ###/,$!d;/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$HoodZoneFile" | sed 1d)"
 
 if [ -f "/tmp/dhcp.leases" ]; then
 	DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3	IN A	\2/p' "/tmp/dhcp.leases")"
@@ -44,9 +44,10 @@ NewLeases="$(echo "$NewLeases" |
 			sed -ne 's/^\(\(\(\S\+\)'"$DomainReg"'\)\|\(\S\+\)\)\(.*\)$/\3\4\5/p' |
 			awk '!a[$0]++' |
 # uncomment and duplicate to secure static DNS-Entries
-			sed -e '/^dns\s\+.*/d' |
-			sed -e '/^gw01\s\+.*/d' |
-			NormalizeZoneFileFormatting)"
+#			sed -e '/^dns\s\+.*/d' |
+#			sed -e '/^gw01\s\+.*/d' |
+			NormalizeZoneFileFormatting; \
+			echo "_dnsscript_version	IN TXT	""$DNSSCRIPT_VERSION" | NormalizeZoneFileFormatting)"
 
 UpdateZone="$(UpdateDNSSECEntryCache "$Domain" "$ZoneTempFolder" "$HoodZoneFile")"