From patchwork Fri Jan 31 06:13:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2735 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4886Nj2SZNz3xYC for ; Fri, 31 Jan 2020 06:13:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4886Ng1rB3z3FZ; Fri, 31 Jan 2020 06:13:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1580451220; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=jsjcwXlQBFLxnjjr1j2pW4yXBWo41g7NEtu3+TEdgbI=; b=YydtEGozpdMk1BYoP1kaP85XejZsaOrBncBbnswvx69OIQ/2mnXuc2vWuuZ1x1rM2/RD5F MlXiTpERRGtrG+DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1580451220; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=jsjcwXlQBFLxnjjr1j2pW4yXBWo41g7NEtu3+TEdgbI=; b=n+6cikwtzwEiBqff6J+sPUiNiVraAqYbLkzE071OwN3jD3LIzjy66N0CcUil8JemaJAlpK pcJkla3wHvo+hYGW1ivg0wiT0xZMCjAiBRQufCDUuQ3fuFz0gYI0owcEYz0qMqb9Y39iXf qPkiXg1tK4Ki24Gv/HiXPMvsiaw07vXBwL7/QmrG+z+Spp9aC/awPYBomN4+uM8fn+4kbl u6aHFmZernR1UTfTBvZ+Np61kINyW4zTrcHaXyrqwAHZpVrkBBM7nm1cCsbC7AFyPmVUUO KAIbgOUcFW9no1DQMB4quk6GedqbXCFYp0M27Pqy8sTcRLtN6tEFczhkoxw7uA== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4886Nf07DSz2ycq; Fri, 31 Jan 2020 06:13:38 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4886Nc0cCGz2xxq for ; Fri, 31 Jan 2020 06:13:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4886NZ5BYzz2ds; Fri, 31 Jan 2020 06:13:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1580451215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jsjcwXlQBFLxnjjr1j2pW4yXBWo41g7NEtu3+TEdgbI=; b=BcAqchdISiKhEJhIXKBg2omUFCUzqPGgV+BXH/cIWGZRb5vNNSskJttdMZBkf+hIZIB8sr go1ictK06IsRZCBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1580451215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jsjcwXlQBFLxnjjr1j2pW4yXBWo41g7NEtu3+TEdgbI=; b=d19Qudq/GBQzJmbRUNO1aBt6ekFPC3nubqticmzMbKkfuI1w5F+LEsG5LPQGoy192in2Dj ilL19RBXRqQ7O9VFXjxEXBCkHy2rfJkTUCRkoNbPO3vQeVOCY7C38b8x1kxuU4CuEt3lVl NurqhBh8/d5NspMuSbY3kfzUlpuoQjrIl9mUvmvNYLdJ/J0jlNMkGWVlUky6zwHthXLSEz +9jm+AvxqKHqoYc8xfr5bfQgyzyMgAvrp810WXFqwTH50veGQ/BAphBoP0pFA6OLTCTgG8 cfqJT3jHGy5CpYD0Uv+ciL0zqZ+dcVOoBlQ0GVu3fE53FFw1MVT0zzG3By6hDA== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] ddns: Update to 013 Date: Fri, 31 Jan 2020 07:13:31 +0100 Message-Id: <20200131061331.17956-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is an update to the first python3-based release of ddns. Signed-off-by: Stefan Schantl Reviewed-by: Michael Tremer --- lfs/ddns | 8 +-- .../ddns-012-noip-fix-handle-name.patch | 36 ---------- .../ddns-012-noip-rename-provider.patch | 65 ------------------- 3 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 src/patches/ddns-012-noip-fix-handle-name.patch delete mode 100644 src/patches/ddns-012-noip-rename-provider.patch diff --git a/lfs/ddns b/lfs/ddns index 47817c058..89ab02e96 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 d1d281c34..000000000 --- a/src/patches/ddns-012-noip-fix-handle-name.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit c0277eeea2b2c1ed8f40f1248b28438e44e51912 -Author: Stefan Schantl -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 - -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 acc5e66a7..000000000 --- a/src/patches/ddns-012-noip-rename-provider.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445 -Author: Stefan Schantl -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 - -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"