From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 31 Jan 2020 06:13:31 +0000 (+0100)
Subject: ddns: Update to 013
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f16ddb5fc74128e6387e736e4c7f66ace6d0b338

ddns: Update to 013

This is an update to the first python3-based release of ddns.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/ddns b/lfs/ddns
index 47817c0587..89ab02e961 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 012
+VER        = 013
 
 THISAPP    = ddns-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
+$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb
 
 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)
 
-	# Add upstream patch for fixing noip.com
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-rename-provider.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-fix-handle-name.patch
-
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
diff --git a/src/patches/ddns-012-noip-fix-handle-name.patch b/src/patches/ddns-012-noip-fix-handle-name.patch
deleted file mode 100644
index d1d281c342..0000000000
--- a/src/patches/ddns-012-noip-fix-handle-name.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit c0277eeea2b2c1ed8f40f1248b28438e44e51912
-Author: Stefan Schantl <stefan.schantl@ipfire.org>
-Date:   Tue Nov 12 08:43:31 2019 +0100
-
-    NoIP.com: Rename handle back to no-ip.com
-    
-    The old handle name is required for backward compatiblity.
-    
-    Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
-
-diff --git a/ddns.conf.sample b/ddns.conf.sample
-index 528684f..61a608a 100644
---- a/ddns.conf.sample
-+++ b/ddns.conf.sample
-@@ -120,7 +120,7 @@
- # password = pass
- 
- # [test.noip.org]
--# provider = noip.com
-+# provider = no-ip.com
- # username = user
- # password = pass
- 
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index 4789107..661fbcc 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1344,7 +1344,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
- 
- 
- class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
--	handle    = "noip.com"
-+	handle    = "no-ip.com"
- 	name      = "NoIP"
- 	website   = "http://www.noip.com/"
- 	protocols = ("ipv4",)
diff --git a/src/patches/ddns-012-noip-rename-provider.patch b/src/patches/ddns-012-noip-rename-provider.patch
deleted file mode 100644
index acc5e66a79..0000000000
--- a/src/patches/ddns-012-noip-rename-provider.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445
-Author: Stefan Schantl <stefan.schantl@ipfire.org>
-Date:   Tue Nov 5 19:09:53 2019 +0100
-
-    No-IP.com: Rename provider and handle to NoIP.com
-    
-    Fixes #11561.
-    
-    Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
-
-diff --git a/README b/README
-index 76f63bc..c75c448 100644
---- a/README
-+++ b/README
-@@ -75,7 +75,7 @@ SUPPORTED PROVIDERS:
- 	loopia.se
- 	myonlineportal.net
- 	namecheap.com
--	no-ip.com
-+	noip.com
- 	now-dns.com
- 	nsupdate.info
- 	opendns.com
-diff --git a/ddns.conf.sample b/ddns.conf.sample
-index 5b3b845..528684f 100644
---- a/ddns.conf.sample
-+++ b/ddns.conf.sample
-@@ -119,8 +119,8 @@
- # provider = namecheap.com
- # password = pass
- 
--# [test.no-ip.org]
--# provider = no-ip.com
-+# [test.noip.org]
-+# provider = noip.com
- # username = user
- # password = pass
- 
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index f3c62c1..4789107 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1344,16 +1344,16 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
- 
- 
- class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
--	handle    = "no-ip.com"
--	name      = "No-IP"
--	website   = "http://www.no-ip.com/"
-+	handle    = "noip.com"
-+	name      = "NoIP"
-+	website   = "http://www.noip.com/"
- 	protocols = ("ipv4",)
- 
- 	# Information about the format of the HTTP request is to be found
--	# here: http://www.no-ip.com/integrate/request and
--	# here: http://www.no-ip.com/integrate/response
-+	# here: http://www.noip.com/integrate/request and
-+	# here: http://www.noip.com/integrate/response
- 
--	url = "http://dynupdate.no-ip.com/nic/update"
-+	url = "http://dynupdate.noip.com/nic/update"
- 
- 	def prepare_request_data(self, proto):
- 		assert proto == "ipv4"