Adding upstream version 20220105.upstream/20220105

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

13 files changed, 17 insertions, 56 deletions

diff --git a/dehydrated/Makefile b/dehydrated/Makefile
index eda0513..2b6da9f 100644
--- a/dehydrated/Makefile
+++ b/dehydrated/Makefile
@@ -1,6 +1,6 @@
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/bin/dehydrated-cron b/dehydrated/bin/dehydrated-cron
index 62bbfd7..2f283e4 100755
--- a/dehydrated/bin/dehydrated-cron
+++ b/dehydrated/bin/dehydrated-cron
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/bin/dehydrated-hook b/dehydrated/bin/dehydrated-hook
index 4e7b7ff..9103495 100755
--- a/dehydrated/bin/dehydrated-hook
+++ b/dehydrated/bin/dehydrated-hook
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/bin/dehydrated-nsupdate b/dehydrated/bin/dehydrated-nsupdate
index 0b93145..fa421ea 100755
--- a/dehydrated/bin/dehydrated-nsupdate
+++ b/dehydrated/bin/dehydrated-nsupdate
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -46,19 +46,6 @@ if command -v kdig > /dev/null 2>&1
 then
 	# knot-dnsutils
 	DIG="kdig +noidn"
-
-	# out-of-tree json output support
-	if kdig +json > /dev/null 2>&1
-	then
-		DIG="${DIG} +json"
-		KDIG_JSON="true"
-
-		if ! command -v jq > /dev/null 2>&1
-		then
-			echo "'${HOOK}': need jq for knot-dnsutils with json output" >&2
-			exit 1
-		fi
-	fi
 elif command -v dig > /dev/null 2>&1
 then
 	# bind-dnsutils
@@ -92,15 +79,7 @@ do
 done
 
 # find txt record to update
-case "${KDIG_JSON}" in
-	true)
-		CNAME="$(${DIG} "_acme-challenge.${DOMAIN}" | jq -r -M '.answer | .[] | .rdata' | tail -n1)"
-		;;
-
-	*)
-		CNAME="$(${DIG} +nocomments +noquestion "_acme-challenge.${DOMAIN}" 2>&1 | grep -v '^;' | awk '/CNAME/ { print $5 }' | tail -n1)"
-		;;
-esac
+CNAME="$(${DIG} +nocomments +noquestion "_acme-challenge.${DOMAIN}" 2>&1 | grep -v '^;' | awk '/CNAME/ { print $5 }' | tail -n1)"
 
 if [ -n "${CNAME}" ]
 then
@@ -114,28 +93,11 @@ ZONE="${TXT_RECORD}"
 
 while true
 do
-	case "${KDIG_JSON}" in
-		true)
-			NAMESERVERS="$(${DIG} NS "${ZONE}" | jq -r -M '.answer | .[] | .rdata')"
-			;;
-
-		*)
-			NAMESERVERS="$(${DIG} +nocomments +noquestion NS "${ZONE}" 2>&1 | grep -v '^;' | awk '/NS/ { print $5 }')"
-			;;
-	esac
+	NAMESERVERS="$(${DIG} +nocomments +noquestion NS "${ZONE}" 2>&1 | grep -v '^;' | awk '/NS/ { print $5 }')"
 
 	if [ -n "${NAMESERVERS}" ]
 	then
-		case "${KDIG_JSON}" in
-			true)
-				ZONE="$(${DIG} NS "${ZONE}" | jq -r -M '.answer | .[] | .rdata' | tail -n1)"
-				;;
-
-			*)
-				ZONE="$(${DIG} +nocomments +noquestion NS "${ZONE}" 2>&1 | grep -v '^;' | awk '/NS/ { print $1 }' | tail -n1)"
-				;;
-		esac
-
+		ZONE="$(${DIG} +nocomments +noquestion NS "${ZONE}" 2>&1 | grep -v '^;' | awk '/NS/ { print $1 }' | tail -n1)"
 		break
 	else
 		ZONE="$(echo "${ZONE}" | cut -d '.' -f 2-)"
diff --git a/dehydrated/share/hooks/deploy_cert.fullchain-privkey b/dehydrated/share/hooks/deploy_cert.fullchain-privkey
index 95f0aa7..57d735b 100755
--- a/dehydrated/share/hooks/deploy_cert.fullchain-privkey
+++ b/dehydrated/share/hooks/deploy_cert.fullchain-privkey
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey b/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey
index 70af6dc..b408f03 100755
--- a/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey
+++ b/dehydrated/share/hooks/deploy_ocsp.fullchain-privkey
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/share/hooks/exit_hook.fix-permissions b/dehydrated/share/hooks/exit_hook.fix-permissions
index d19c8e6..1e089f7 100755
--- a/dehydrated/share/hooks/exit_hook.fix-permissions
+++ b/dehydrated/share/hooks/exit_hook.fix-permissions
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/share/hooks/exit_hook.service-reload b/dehydrated/share/hooks/exit_hook.service-reload
index f7bc8e4..daba7dd 100755
--- a/dehydrated/share/hooks/exit_hook.service-reload
+++ b/dehydrated/share/hooks/exit_hook.service-reload
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/share/man/Makefile b/dehydrated/share/man/Makefile
index 7f7b3b8..a6d6bf2 100644
--- a/dehydrated/share/man/Makefile
+++ b/dehydrated/share/man/Makefile
@@ -1,6 +1,6 @@
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/dehydrated/share/man/dehydrated-cron.1.rst b/dehydrated/share/man/dehydrated-cron.1.rst
index ad2f579..c060127 100644
--- a/dehydrated/share/man/dehydrated-cron.1.rst
+++ b/dehydrated/share/man/dehydrated-cron.1.rst
@@ -1,6 +1,6 @@
 .. Open Infrastructure: service-tools
 
-.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.. Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 ..
 .. SPDX-License-Identifier: GPL-3.0+
 ..
diff --git a/dehydrated/share/man/dehydrated-hook.1.rst b/dehydrated/share/man/dehydrated-hook.1.rst
index 7dc8f49..607be92 100644
--- a/dehydrated/share/man/dehydrated-hook.1.rst
+++ b/dehydrated/share/man/dehydrated-hook.1.rst
@@ -1,6 +1,6 @@
 .. Open Infrastructure: service-tools
 
-.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.. Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 ..
 .. SPDX-License-Identifier: GPL-3.0+
 ..
diff --git a/dehydrated/share/man/dehydrated-nsupdate.1.rst b/dehydrated/share/man/dehydrated-nsupdate.1.rst
index 17a6203..058785f 100644
--- a/dehydrated/share/man/dehydrated-nsupdate.1.rst
+++ b/dehydrated/share/man/dehydrated-nsupdate.1.rst
@@ -1,6 +1,6 @@
 .. Open Infrastructure: service-tools
 
-.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.. Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 ..
 .. SPDX-License-Identifier: GPL-3.0+
 ..
@@ -73,8 +73,7 @@ Features
 | **dehydrated-nsupdate** removes records after succesfull verification.
 
 | **bind9-dnsutils and knot-dnsutils support*
-| **dehydrated-nsupdate** works with both nsupdate (bind9) and knsupdate (knot),
-| including support for kdigs out-of-tree json output.
+| **dehydrated-nsupdate** works with both nsupdate (bind9) and knsupdate (knot).
 
 | **IDN handling**
 | **dehydrated-nsupdate** works with IDN domains by not expanding the punycode.
diff --git a/dehydrated/share/man/man.in b/dehydrated/share/man/man.in
index b7acdb7..f95ca67 100644
--- a/dehydrated/share/man/man.in
+++ b/dehydrated/share/man/man.in
@@ -1,6 +1,6 @@
 .\" Open Infrastructure: service-tools
 .\"
-.\" Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.\" Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 .\"
 .\" SPDX-License-Identifier: GPL-3.0+
 .\"