public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH] ddns: Update to 012
@ 2019-11-05  9:37 Stefan Schantl
  2019-11-05 10:18 ` Michael Tremer
  0 siblings, 1 reply; 7+ messages in thread
From: Stefan Schantl @ 2019-11-05  9:37 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/ddns | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lfs/ddns b/lfs/ddns
index cd56ee72b..a6ca2e35d 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 011
+VER        = 012
 
 THISAPP    = ddns-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f0399ba5bad3272f32e539c45cd1abe9
+$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
 
 install : $(TARGET)
 
-- 
2.20.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ddns: Update to 012
  2019-11-05  9:37 [PATCH] ddns: Update to 012 Stefan Schantl
@ 2019-11-05 10:18 ` Michael Tremer
  2019-11-05 12:16   ` Stefan Schantl
  0 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2019-11-05 10:18 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1203 bytes --]

Hi Stefan,

Yes, finally.

However, I cannot find all of those commits for this release in the master branch.

Could you check and potentially push again? I just think you didn’t push master.

  https://git.ipfire.org/?p=ddns.git;a=summary

This one just shows a slightly typo-ed tag:

  https://git.ipfire.org/?p=ddns.git;a=shortlog;h=ca9c381a5388ff10243048903f11192b95518c72

Are none of the urgent bug fixes in this release?

-Michael

> On 5 Nov 2019, at 09:37, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> lfs/ddns | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lfs/ddns b/lfs/ddns
> index cd56ee72b..a6ca2e35d 100644
> --- a/lfs/ddns
> +++ b/lfs/ddns
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 011
> +VER        = 012
> 
> THISAPP    = ddns-$(VER)
> DL_FILE    = $(THISAPP).tar.xz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = f0399ba5bad3272f32e539c45cd1abe9
> +$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
> 
> install : $(TARGET)
> 
> -- 
> 2.20.1
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ddns: Update to 012
  2019-11-05 10:18 ` Michael Tremer
@ 2019-11-05 12:16   ` Stefan Schantl
  2019-11-05 15:51     ` Michael Tremer
  0 siblings, 1 reply; 7+ messages in thread
From: Stefan Schantl @ 2019-11-05 12:16 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1549 bytes --]

Hello Michael,

the DDNS git is correct like it actually is. Every single patch which
was located on the ddns Mailing list has been merged.

What are that "urgent bug fixes" which you asked about?

Best regards,

-Stefan
> Hi Stefan,
> 
> Yes, finally.
> 
> However, I cannot find all of those commits for this release in the
> master branch.
> 
> Could you check and potentially push again? I just think you didn’t
> push master.
> 
>   https://git.ipfire.org/?p=ddns.git;a=summary
> 
> This one just shows a slightly typo-ed tag:
> 
>   
> https://git.ipfire.org/?p=ddns.git;a=shortlog;h=ca9c381a5388ff10243048903f11192b95518c72
> 
> Are none of the urgent bug fixes in this release?
> 
> -Michael
> 
> > On 5 Nov 2019, at 09:37, Stefan Schantl <stefan.schantl(a)ipfire.org>
> > wrote:
> > 
> > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> > ---
> > lfs/ddns | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/lfs/ddns b/lfs/ddns
> > index cd56ee72b..a6ca2e35d 100644
> > --- a/lfs/ddns
> > +++ b/lfs/ddns
> > @@ -24,7 +24,7 @@
> > 
> > include Config
> > 
> > -VER        = 011
> > +VER        = 012
> > 
> > THISAPP    = ddns-$(VER)
> > DL_FILE    = $(THISAPP).tar.xz
> > @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> > 
> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > 
> > -$(DL_FILE)_MD5 = f0399ba5bad3272f32e539c45cd1abe9
> > +$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
> > 
> > install : $(TARGET)
> > 
> > -- 
> > 2.20.1
> > 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ddns: Update to 012
  2019-11-05 12:16   ` Stefan Schantl
@ 2019-11-05 15:51     ` Michael Tremer
  2019-11-05 18:23       ` [PATCH] ddns: Import upstream patch for NoIP.com Stefan Schantl
  0 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2019-11-05 15:51 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1916 bytes --]


> On 5 Nov 2019, at 12:16, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
> 
> Hello Michael,
> 
> the DDNS git is correct like it actually is. Every single patch which
> was located on the ddns Mailing list has been merged.

Indeed.

> 
> What are that "urgent bug fixes" which you asked about?

https://bugzilla.ipfire.org/show_bug.cgi?id=12195
https://bugzilla.ipfire.org/show_bug.cgi?id=11561

These are easy. Please tell reporters that they should send potential fixes to the mailing lists.

Best,
-Michael

> 
> Best regards,
> 
> -Stefan
>> Hi Stefan,
>> 
>> Yes, finally.
>> 
>> However, I cannot find all of those commits for this release in the
>> master branch.
>> 
>> Could you check and potentially push again? I just think you didn’t
>> push master.
>> 
>>  https://git.ipfire.org/?p=ddns.git;a=summary
>> 
>> This one just shows a slightly typo-ed tag:
>> 
>> 
>> https://git.ipfire.org/?p=ddns.git;a=shortlog;h=ca9c381a5388ff10243048903f11192b95518c72
>> 
>> Are none of the urgent bug fixes in this release?
>> 
>> -Michael
>> 
>>> On 5 Nov 2019, at 09:37, Stefan Schantl <stefan.schantl(a)ipfire.org>
>>> wrote:
>>> 
>>> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>>> ---
>>> lfs/ddns | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/lfs/ddns b/lfs/ddns
>>> index cd56ee72b..a6ca2e35d 100644
>>> --- a/lfs/ddns
>>> +++ b/lfs/ddns
>>> @@ -24,7 +24,7 @@
>>> 
>>> include Config
>>> 
>>> -VER        = 011
>>> +VER        = 012
>>> 
>>> THISAPP    = ddns-$(VER)
>>> DL_FILE    = $(THISAPP).tar.xz
>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>> 
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> 
>>> -$(DL_FILE)_MD5 = f0399ba5bad3272f32e539c45cd1abe9
>>> +$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
>>> 
>>> install : $(TARGET)
>>> 
>>> -- 
>>> 2.20.1
>>> 
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] ddns: Import upstream patch for NoIP.com
  2019-11-05 15:51     ` Michael Tremer
@ 2019-11-05 18:23       ` Stefan Schantl
  2019-11-06 15:36         ` Michael Tremer
  0 siblings, 1 reply; 7+ messages in thread
From: Stefan Schantl @ 2019-11-05 18:23 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3007 bytes --]

Reference: #11561.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/ddns                                      |  3 +
 .../ddns-012-noip-rename-provider.patch       | 65 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 src/patches/ddns-012-noip-rename-provider.patch

diff --git a/lfs/ddns b/lfs/ddns
index a6ca2e35d..8bfa92f77 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -71,6 +71,9 @@ $(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) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
diff --git a/src/patches/ddns-012-noip-rename-provider.patch b/src/patches/ddns-012-noip-rename-provider.patch
new file mode 100644
index 000000000..acc5e66a7
--- /dev/null
+++ b/src/patches/ddns-012-noip-rename-provider.patch
@@ -0,0 +1,65 @@
+commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445
+Author: Stefan Schantl <stefan.schantl(a)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(a)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"
-- 
2.20.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] ddns: Import upstream patch for NoIP.com
  2019-11-05 18:23       ` [PATCH] ddns: Import upstream patch for NoIP.com Stefan Schantl
@ 2019-11-06 15:36         ` Michael Tremer
  2019-11-12  8:09           ` [PATCH] ddns: Import rename NoIP.com handle back to no-ip.com patch Stefan Schantl
  0 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2019-11-06 15:36 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3565 bytes --]

Hi,

You have already merged this patch, so I commented in Bugzilla.

However, here is it again for the record:

You cannot change the handle because all existing configurations - which arguably don’t work anyways now - won’t pick this provider to run an update.

-Michael

> On 5 Nov 2019, at 18:23, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
> 
> Reference: #11561.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> lfs/ddns                                      |  3 +
> .../ddns-012-noip-rename-provider.patch       | 65 +++++++++++++++++++
> 2 files changed, 68 insertions(+)
> create mode 100644 src/patches/ddns-012-noip-rename-provider.patch
> 
> diff --git a/lfs/ddns b/lfs/ddns
> index a6ca2e35d..8bfa92f77 100644
> --- a/lfs/ddns
> +++ b/lfs/ddns
> @@ -71,6 +71,9 @@ $(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) && [ -x "configure" ] || sh ./autogen.sh
> 	cd $(DIR_APP) && ./configure \
> 		--prefix=/usr \
> diff --git a/src/patches/ddns-012-noip-rename-provider.patch b/src/patches/ddns-012-noip-rename-provider.patch
> new file mode 100644
> index 000000000..acc5e66a7
> --- /dev/null
> +++ b/src/patches/ddns-012-noip-rename-provider.patch
> @@ -0,0 +1,65 @@
> +commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445
> +Author: Stefan Schantl <stefan.schantl(a)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(a)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"
> -- 
> 2.20.1
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] ddns: Import rename NoIP.com handle back to no-ip.com patch
  2019-11-06 15:36         ` Michael Tremer
@ 2019-11-12  8:09           ` Stefan Schantl
  0 siblings, 0 replies; 7+ messages in thread
From: Stefan Schantl @ 2019-11-12  8:09 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2245 bytes --]

This patch is required for compatiblity reasons for any existing
configurations.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/ddns                                      |  1 +
 .../ddns-012-noip-fix-handle-name.patch       | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 src/patches/ddns-012-noip-fix-handle-name.patch

diff --git a/lfs/ddns b/lfs/ddns
index 8bfa92f77..47817c058 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# 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 \
diff --git a/src/patches/ddns-012-noip-fix-handle-name.patch b/src/patches/ddns-012-noip-fix-handle-name.patch
new file mode 100644
index 000000000..d1d281c34
--- /dev/null
+++ b/src/patches/ddns-012-noip-fix-handle-name.patch
@@ -0,0 +1,36 @@
+commit c0277eeea2b2c1ed8f40f1248b28438e44e51912
+Author: Stefan Schantl <stefan.schantl(a)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(a)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",)
-- 
2.20.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-11-12  8:09 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05  9:37 [PATCH] ddns: Update to 012 Stefan Schantl
2019-11-05 10:18 ` Michael Tremer
2019-11-05 12:16   ` Stefan Schantl
2019-11-05 15:51     ` Michael Tremer
2019-11-05 18:23       ` [PATCH] ddns: Import upstream patch for NoIP.com Stefan Schantl
2019-11-06 15:36         ` Michael Tremer
2019-11-12  8:09           ` [PATCH] ddns: Import rename NoIP.com handle back to no-ip.com patch Stefan Schantl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox