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: Import upstream patch for provider DDNSS.
Date: Wed, 02 Dec 2020 10:13:52 +0100
Message-ID: <20201202091352.2623-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3825378222862655143=="
List-Id: <development.lists.ipfire.org>

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

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-upda=
te-patch
 create mode 100644 src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-upda=
te-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))
=20
 	# Apply upstream patches.
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-htt=
ps.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-un=
handled-exeption-on-update-patch
=20
 	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-patc=
h 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
+   =20
+    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.
+   =20
+    Fixes #12328
+   =20
+    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 =3D self.send_request(self.url, data=3Ddata)
+=20
+ 		# This provider sends the response code as part of the header.
+-		header =3D response.info()
+-
+ 		# Get status information from the header.
+-		output =3D header.getheader('ddnss-response')
++		output =3D response.getheader('ddnss-response')
+=20
+ 		# Handle success messages.
+ 		if output =3D=3D "good" or output =3D=3D "nochg":
diff --git a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patc=
h 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
+   =20
+    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.
+   =20
+    Fixes #12328
+   =20
+    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 =3D self.send_request(self.url, data=3Ddata)
+=20
+ 		# This provider sends the response code as part of the header.
+-		header =3D response.info()
+-
+ 		# Get status information from the header.
+-		output =3D header.getheader('ddnss-response')
++		output =3D response.getheader('ddnss-response')
+=20
+ 		# Handle success messages.
+ 		if output =3D=3D "good" or output =3D=3D "nochg":
--=20
2.20.1


--===============3825378222862655143==--