From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] ddns: Update to 015
Date: Wed, 15 Mar 2023 13:48:54 +0100
Message-ID: <20230315124854.734068-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3851318842284223656=="
List-Id: <development.lists.ipfire.org>

--===============3851318842284223656==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This version contains the recent patched changes and brings
support for a new ddns provider (godaddy).

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/ddns                                      |  8 ++---
 .../ddns-014-freednsafraid-fix-typo.patch     | 21 -----------
 ...eption-when-host-is-not-dual-stacked.patch | 35 -------------------
 3 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 src/patches/ddns-014-freednsafraid-fix-typo.patch
 delete mode 100644 src/patches/ddns-system-Catch-exception-when-host-is-not-=
dual-stacked.patch

diff --git a/lfs/ddns b/lfs/ddns
index 274c12cb9..eb67b107d 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 014
+VER        =3D 015
=20
 THISAPP    =3D ddns-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 007bf9f062bc0dc5c8c7ea946dcfabd03faff5f5c1791e9141f01a=
7d80bbc899b3565bf5e69f44f66ebe39b3ab02b95e3f6e25daa145272cef6ce4bd7f2bd82c
+$(DL_FILE)_BLAKE2 =3D 94f4b7a2ebe85fb1eab98e814cdcf13e9accdab02527eb54460eb7=
d31533d4752649734d426ef630ba0470181b21ce9ae4ffdbc869a1af9e2dddc336e6bfb0c2
=20
 install : $(TARGET)
=20
@@ -71,10 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
=20
-	# Apply upstream patches.
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-014-freednsafrai=
d-fix-typo.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-system-Catch-exc=
eption-when-host-is-not-dual-stacked.patch
-
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
diff --git a/src/patches/ddns-014-freednsafraid-fix-typo.patch b/src/patches/=
ddns-014-freednsafraid-fix-typo.patch
deleted file mode 100644
index 4982d52f4..000000000
--- a/src/patches/ddns-014-freednsafraid-fix-typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 3a162595b9b44a4cbf08a3db14a4d2ebfeeb5583
-Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
-Date:   Sat Oct 23 21:11:27 2021 +0200
-
-    FreeDNSAfraid.org: Fix typo in checking if the IP has been changed.
-   =20
-    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index 4f27af9..5b2a82d 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1204,7 +1204,7 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
- 		output =3D response.read().decode()
-=20
- 		# Handle success messages.
--		if output.startswith("Updated") or output.startswith("No IP changed detec=
ted"):
-+		if output.startswith("Updated") or output.startswith("No IP change detect=
ed"):
- 			return
-=20
- 		# Handle error codes.
diff --git a/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-st=
acked.patch b/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-s=
tacked.patch
deleted file mode 100644
index f75471d97..000000000
--- a/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.p=
atch
+++ /dev/null
@@ -1,35 +0,0 @@
-From de57b2caf44bf10de72e42a20abf690eca50d512 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer(a)ipfire.org>
-Date: Mon, 4 Apr 2022 10:33:46 +0100
-Subject: [PATCH] system: Catch exception when host is not dual-stacked
-
-This problem seems to have been introduced with an upgrade to Python
-3.10.
-
-Reported-by: Adrian Zaugg <ipfire.org(a)mailgurgler.com>
-Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
----
- src/ddns/system.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/ddns/system.py b/src/ddns/system.py
-index 73a27a5..48c9a8f 100644
---- a/src/ddns/system.py
-+++ b/src/ddns/system.py
-@@ -226,8 +226,12 @@ class DDNSSystem(object):
- 				if e.reason.errno =3D=3D -2:
- 					raise DDNSResolveError
-=20
-+				# Cannot assign requested address
-+				elif e.reason.errno =3D=3D 99:
-+					raise DDNSNetworkUnreachableError
-+
- 				# Network Unreachable (e.g. no IPv6 access)
--				if e.reason.errno =3D=3D 101:
-+				elif e.reason.errno =3D=3D 101:
- 					raise DDNSNetworkUnreachableError
-=20
- 				# Connection Refused
---=20
-2.30.2
-
--=20
2.30.2


--===============3851318842284223656==--