From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 May 2019 15:25:01 +0000 (+0100)
Subject: ddns: Update to 011
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29fc1c8c3a23834425ac646dca26c350ebb2c52c;p=people%2Fms%2Fipfire-2.x.git

ddns: Update to 011

Add support for two new providers and has some general bug fixes
included.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/ddns b/lfs/ddns
index 80dd9bbef3..cd56ee72ba 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 010
+VER        = 011
 
 THISAPP    = ddns-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 51e74b613732c0d7be3adb3348a5ed95
+$(DL_FILE)_MD5 = f0399ba5bad3272f32e539c45cd1abe9
 
 install : $(TARGET)
 
@@ -71,9 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-0001-New-provider-Schokokeks.org.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-0002-Schokokeks.org-Fix-malformed-update-URL.patch
-
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
diff --git a/src/patches/ddns-0001-New-provider-Schokokeks.org.patch b/src/patches/ddns-0001-New-provider-Schokokeks.org.patch
deleted file mode 100644
index be123a5232..0000000000
--- a/src/patches/ddns-0001-New-provider-Schokokeks.org.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 521c9d90f4e879ef3d9e1590f29e27990011ae46 Mon Sep 17 00:00:00 2001
-From: Steffen Peters <sauron99@gmx.de>
-Date: Mon, 4 Jul 2016 22:14:10 +0200
-Subject: [PATCH 185/185] New provider: Schokokeks.org
-
-Signed-off-by: Steffen Peters <sauron99@gmx.de>
-Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
----
- README                |  1 +
- src/ddns/providers.py | 12 ++++++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/README b/README
-index d8027a4..cedbf21 100644
---- a/README
-+++ b/README
-@@ -75,6 +75,7 @@ SUPPORTED PROVIDERS:
- 	opendns.com
- 	ovh.com
- 	regfish.com
-+	schokokeks.org
- 	selfhost.de
- 	spdns.org
- 	strato.com
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index 6b25cb6..c482dad 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1687,3 +1687,15 @@ class DDNSProviderZZZZ(DDNSProvider):
- 
- 		# If we got here, some other update error happened.
- 		raise DDNSUpdateError
-+
-+class DDNSProviderSchokokeksDNS(DDNSProtocolDynDNS2, DDNSProvider):
-+       handle    = "schokokeks.org"
-+       name      = "Schokokeks"
-+       website   = "http://www.schokokeks.org/"
-+       protocols = ("ipv4",)
-+
-+       # Information about the format of the request is to be found
-+       # https://wiki.schokokeks.org/DynDNS
-+
-+       url = "https://dyndns.schokokeks.org/nic/update?myip=<ipaddr>"
-+
--- 
-2.7.4
-
diff --git a/src/patches/ddns-0002-Schokokeks.org-Fix-malformed-update-URL.patch b/src/patches/ddns-0002-Schokokeks.org-Fix-malformed-update-URL.patch
deleted file mode 100644
index e00dcf6b8e..0000000000
--- a/src/patches/ddns-0002-Schokokeks.org-Fix-malformed-update-URL.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f77e6bc92825d65e881d5dc7fc443139278c0d5f Mon Sep 17 00:00:00 2001
-From: Stefan Schantl <stefan.schantl@ipfire.org>
-Date: Fri, 28 Oct 2016 12:35:20 +0200
-Subject: [PATCH 3/3] Schockokeks.org: Fix malformed update URL.
-
-* Move Provider Class into correct alphabetical order.
-
-Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
-Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
-Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
----
- src/ddns/providers.py | 23 +++++++++++------------
- 1 file changed, 11 insertions(+), 12 deletions(-)
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index c482dad..2c30d42 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1424,6 +1424,17 @@ class DDNSProviderRegfish(DDNSProvider):
- 		raise DDNSUpdateError
- 
- 
-+class DDNSProviderSchokokeksDNS(DDNSProtocolDynDNS2, DDNSProvider):
-+	handle    = "schokokeks.org"
-+	name      = "Schokokeks"
-+	website   = "http://www.schokokeks.org/"
-+	protocols = ("ipv4",)
-+
-+	# Information about the format of the request is to be found
-+	# https://wiki.schokokeks.org/DynDNS
-+	url = "https://dyndns.schokokeks.org/nic/update"
-+
-+
- class DDNSProviderSelfhost(DDNSProtocolDynDNS2, DDNSProvider):
- 	handle    = "selfhost.de"
- 	name      = "Selfhost.de"
-@@ -1687,15 +1698,3 @@ class DDNSProviderZZZZ(DDNSProvider):
- 
- 		# If we got here, some other update error happened.
- 		raise DDNSUpdateError
--
--class DDNSProviderSchokokeksDNS(DDNSProtocolDynDNS2, DDNSProvider):
--       handle    = "schokokeks.org"
--       name      = "Schokokeks"
--       website   = "http://www.schokokeks.org/"
--       protocols = ("ipv4",)
--
--       # Information about the format of the request is to be found
--       # https://wiki.schokokeks.org/DynDNS
--
--       url = "https://dyndns.schokokeks.org/nic/update?myip=<ipaddr>"
--
--- 
-2.7.4
-