From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: ddns@lists.ipfire.org
Subject: Re: [PATCH] add new provider it's DNS (https://www.itsdns.de)
Date: Mon, 27 May 2019 16:29:15 +0100
Message-ID: <94B41211-2B18-4581-84D0-A1275F8E08B4@ipfire.org>
In-Reply-To: <796272ba-63d2-d31e-5bcc-340b0b9e3ccc@stalhut.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4200083550984684017=="
List-Id: <ddns.lists.ipfire.org>

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

Hello Jan,

This one time I will accept the file :)

The downside of files is that you cannot have inline comments in them which m=
akes the conversation around the patch a bit more difficult.

However, this is merged now. I have tagged a new release of ddns and integrat=
ed that into the next tree of IPFire:

  https://git.ipfire.org/?p=3Dddns.git;a=3Dcommitdiff;h=3D327095f0ea7f80b7826=
64dbc9cb0fce68c7e19cd

This will eventually become Core Update 133 and I would suppose that this wil=
l be available in around 6 weeks. We don=E2=80=99t even have 132 out, yet.

Hope this is okay.

Best,
-Michael

> On 26 May 2019, at 22:01, Jan Stalhut <jan(a)stalhut.de> wrote:
>=20
> Hi Michael,
>=20
> thank you for the fast feedback. Now, you find the patch-file as attachment=
 of this email. I hope this works now.
>=20
> Can you say something on how long it will take to make these changes into a=
n ipfire release?
>=20
> Best regards,
> Jan
>=20
>=20
> Am 26.05.19 um 11:30 schrieb Michael Tremer:
>> Hello Jan,
>> Thank you for submitting your patch. It looks good to me.
>> But unfortunately I wasn=E2=80=99t able to merge it.
>> I suppose that your email client replaced all tabs with spaces or somethin=
g:
>> [root(a)ipfire ddns]# pwclient git-am -p ddns -s 2265
>> Applying patch #2265 using "git am -s"
>> Description: add new provider it's DNS (https://www.itsdns.de)
>> Applying: add new provider it's DNS (https://www.itsdns.de)
>> error: patch failed: README:67
>> error: README: patch does not apply
>> error: patch failed: src/ddns/providers.py:1108
>> error: src/ddns/providers.py: patch does not apply
>> Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de)
>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>> When you have resolved this problem, run "git am --continue".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am --abort".
>> 'git am' failed with exit status 128
>> [root(a)ipfire ddns]# git apply -3 .git/rebase-apply/patch
>> error: patch failed: README:67
>> Falling back to three-way merge...
>> error: patch failed: README:67
>> error: README: patch does not apply
>> error: patch failed: src/ddns/providers.py:1108
>> Falling back to three-way merge...
>> error: patch failed: src/ddns/providers.py:1108
>> error: src/ddns/providers.py: patch does not apply
>> Could you check that and send again?
>> Best,
>> -Michael
>>> On 25 May 2019, at 22:48, Jan Stalhut <jan(a)stalhut.de> wrote:
>>>=20
>>> ---
>>> README                |  1 +
>>> src/ddns/providers.py | 10 ++++++++++
>>> 2 files changed, 11 insertions(+)
>>>=20
>>> diff --git a/README b/README
>>> index d170858..1c5ffd6 100644
>>> --- a/README
>>> +++ b/README
>>> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS:
>>>        enom.com
>>>        entrydns.net
>>>        freedns.afraid.org
>>> +       itsdns.de
>>>        joker.com
>>>        loopia.se
>>>        myonlineportal.net
>>> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
>>> index ea723e5..a9a0b03 100644
>>> --- a/src/ddns/providers.py
>>> +++ b/src/ddns/providers.py
>>> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
>>>                # If we got here, some other update error happened.
>>>                raise DDNSUpdateError
>>>=20
>>> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
>>> +        handle    =3D "itsdns.de"
>>> +        name      =3D "it's DNS"
>>> +        website   =3D "http://www.itsdns.de/"
>>> +        protocols =3D ("ipv6", "ipv4")
>>> +
>>> +        # Information about the format of the HTTP request is to be
>>> +        # found here: https://www.itsdns.de/dynupdatehelp.htm
>>> +
>>> +        url =3D "https://www.itsdns.de/update.php=E2=80=9D
>>>=20
>> And you could add another empty line here, because we usually have two emp=
ty lines after a class.
>>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>>>                handle  =3D "joker.com"
>>> --=20
>>> 2.17.1
>>> _______________________________________________
>>> ddns mailing list
>>> ddns(a)lists.ipfire.org
>>> https://lists.ipfire.org/mailman/listinfo/ddns
>=20
>=20
> Mit freundlichen Gr=C3=BC=C3=9Fen
> Jan Stalhut
>=20
> --=20
> Jan Stalhut
> Rostocker Str. 21
> 27211 Bassum
>=20
> Tel. 04241 8208797
> Mobil 0171 5380915
>=20
> Facebook -> http://facebook.com/jan.stalhut
> <0001-add-new-provider-it-s-DNS-https-www.itsdns.de.patch>


--===============4200083550984684017==--