From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] ddns: Import upstream patch for provider DDNSS.
Date: Wed, 02 Dec 2020 10:13:52 +0100 [thread overview]
Message-ID: <20201202091352.2623-1-stefan.schantl@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3829 bytes --]
Fixes #12328.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
lfs/ddns | 1 +
...nss-fix-unhandled-exeption-on-update-patch | 30 +++++++++++++++++++
...nss-fix-unhandled-exeption-on-update-patch | 30 +++++++++++++++++++
3 files changed, 61 insertions(+)
create mode 100644 src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch
create mode 100644 src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
diff --git a/lfs/ddns b/lfs/ddns
index 0e045ddc4..0a71b52ea 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Apply upstream patches.
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure \
diff --git a/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch
new file mode 100644
index 000000000..95f6391be
--- /dev/null
+++ b/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch
@@ -0,0 +1,30 @@
+commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
+Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
+Date: Mon May 25 18:00:51 2020 +0200
+
+ ProviderDDNSS: Fix unhandled exception on update
+
+ In python > 3.3 the getheader() attribute is not longer part of the
+ urllib.response response.info() object. It is part of response object
+ and so directly can be accessed.
+
+ Fixes #12328
+
+ Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
+
+diff --git a/src/ddns/providers.py b/src/ddns/providers.py
+index f1fed22..46d8a67 100644
+--- a/src/ddns/providers.py
++++ b/src/ddns/providers.py
+@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
+ response = self.send_request(self.url, data=data)
+
+ # This provider sends the response code as part of the header.
+- header = response.info()
+-
+ # Get status information from the header.
+- output = header.getheader('ddnss-response')
++ output = response.getheader('ddnss-response')
+
+ # Handle success messages.
+ if output == "good" or output == "nochg":
diff --git a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
new file mode 100644
index 000000000..95f6391be
--- /dev/null
+++ b/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
@@ -0,0 +1,30 @@
+commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9
+Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
+Date: Mon May 25 18:00:51 2020 +0200
+
+ ProviderDDNSS: Fix unhandled exception on update
+
+ In python > 3.3 the getheader() attribute is not longer part of the
+ urllib.response response.info() object. It is part of response object
+ and so directly can be accessed.
+
+ Fixes #12328
+
+ Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
+
+diff --git a/src/ddns/providers.py b/src/ddns/providers.py
+index f1fed22..46d8a67 100644
+--- a/src/ddns/providers.py
++++ b/src/ddns/providers.py
+@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider):
+ response = self.send_request(self.url, data=data)
+
+ # This provider sends the response code as part of the header.
+- header = response.info()
+-
+ # Get status information from the header.
+- output = header.getheader('ddnss-response')
++ output = response.getheader('ddnss-response')
+
+ # Handle success messages.
+ if output == "good" or output == "nochg":
--
2.20.1
reply other threads:[~2020-12-02 9:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201202091352.2623-1-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox