This version contains the recent patched changes and brings support for a new ddns provider (godaddy).
Signed-off-by: Stefan Schantl stefan.schantl@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 @@
include Config
-VER = 014 +VER = 015
THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 007bf9f062bc0dc5c8c7ea946dcfabd03faff5f5c1791e9141f01a7d80bbc899b3565bf5e69f44f66ebe39b3ab02b95e3f6e25daa145272cef6ce4bd7f2bd82c +$(DL_FILE)_BLAKE2 = 94f4b7a2ebe85fb1eab98e814cdcf13e9accdab02527eb54460eb7d31533d4752649734d426ef630ba0470181b21ce9ae4ffdbc869a1af9e2dddc336e6bfb0c2
install : $(TARGET)
@@ -71,10 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- # Apply upstream patches. - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-014-freednsafraid-fix-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch - cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/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@ipfire.org -Date: Sat Oct 23 21:11:27 2021 +0200 - - FreeDNSAfraid.org: Fix typo in checking if the IP has been changed. - - Signed-off-by: Stefan Schantl stefan.schantl@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 = response.read().decode() - - # Handle success messages. -- if output.startswith("Updated") or output.startswith("No IP changed detected"): -+ if output.startswith("Updated") or output.startswith("No IP change detected"): - return - - # Handle error codes. diff --git a/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch b/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch deleted file mode 100644 index f75471d97..000000000 --- a/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch +++ /dev/null @@ -1,35 +0,0 @@ -From de57b2caf44bf10de72e42a20abf690eca50d512 Mon Sep 17 00:00:00 2001 -From: Michael Tremer michael.tremer@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@mailgurgler.com -Signed-off-by: Michael Tremer michael.tremer@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 == -2: - raise DDNSResolveError - -+ # Cannot assign requested address -+ elif e.reason.errno == 99: -+ raise DDNSNetworkUnreachableError -+ - # Network Unreachable (e.g. no IPv6 access) -- if e.reason.errno == 101: -+ elif e.reason.errno == 101: - raise DDNSNetworkUnreachableError - - # Connection Refused --- -2.30.2 -