diff mbox series

package/openresolv: bump to version 3.9.2

Message ID 1571124033-15304-1-git-send-email-tolvupostur@gmail.com
State Accepted
Headers show
Series package/openresolv: bump to version 3.9.2 | expand

Commit Message

Einar Jón Oct. 15, 2019, 7:20 a.m. UTC
From: Einar Jon Gunnarsson <tolvupostur@gmail.com>

Version 3.9.2 strips the trailing comments generated by udhcpc
LICENSE copyright updated to 2019

Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
---
 package/openresolv/openresolv.hash | 4 ++--
 package/openresolv/openresolv.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Thomas Petazzoni Oct. 15, 2019, 7:25 a.m. UTC | #1
On Tue, 15 Oct 2019 09:20:33 +0200
Einar Jon Gunnarssson <tolvupostur@gmail.com> wrote:

> From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
> 
> Version 3.9.2 strips the trailing comments generated by udhcpc
> LICENSE copyright updated to 2019
> 
> Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
> ---
>  package/openresolv/openresolv.hash | 4 ++--
>  package/openresolv/openresolv.mk   | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas
Peter Korsgaard Oct. 29, 2019, 10:58 a.m. UTC | #2
>>>>> "Einar" == Einar Jon Gunnarssson <tolvupostur@gmail.com> writes:

 > From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
 > Version 3.9.2 strips the trailing comments generated by udhcpc

What does this mean exactly? I take it you refer to the '# ethX' we add
to /etc/resolv.conf so we can remove the lines once the interface is
again down.

Did older openresolv versions not work correctly with this? E.G. is this
something that should be backported to 2019.02.x / 2019.08.x or is it
just the new version of openresolv that removes the commit? If so, how
are those lines cleaned up again?
Einar Jón Oct. 31, 2019, 7:48 p.m. UTC | #3
Hello Peter


On Tue, 29 Oct 2019 at 11:58, Peter Korsgaard <peter@korsgaard.com> wrote:
>
> >>>>> "Einar" == Einar Jon Gunnarssson <tolvupostur@gmail.com> writes:
>
>  > From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>  > Version 3.9.2 strips the trailing comments generated by udhcpc
>
> What does this mean exactly? I take it you refer to the '# ethX' we add
> to /etc/resolv.conf so we can remove the lines once the interface is
> again down.


Exactly those, and similar lines (if any) in head/tail files.

> Did older openresolv versions not work correctly with this?

Openresolv 3.9.0 and older turned "nameserver 1.2.3.4 # ethX" to
nameserver 1.2.3.4
nameserver  #
nameserver ethX
See this email (and the rest of that thread):
https://roy.marples.name/archives/openresolv-discuss/0000041.html

>
> E.G. is this
> something that should be backported to 2019.02.x / 2019.08.x

If this was broken until July this year I don't think many people are using
a
combo of udhcpc+openresolv, so I doubt that backporting is very urgent.
We need it because we have to use NetworkManager for the modem, but
we don't want NetworkManager for ethX and the rest of the system.
That's probably a pretty unique use-case.

> or is it
> just the new version of openresolv that removes the commit?

See above. The linked mail explains in detail. The new version removes
trailing commits, and plays more nice with udhcpc.
It's just that the older versions would have extra garbage like
"nameserver #" and "nameserver ethX". Not harmful, but not useful,

>   If so, how are those lines cleaned up again?

All versions of openresolv are pretty good at cleaning up what is added.
There is a folder in /var/run that stores all the entries by
$interface.$type,
and those are deleted when the interface goes down. So that is fine in
all versions.
Run "resolvconf -l" to see a breakdown of all entries by origin.

Best regards,
Einar Jón

>
> --
> Bye, Peter Korsgaard
Peter Korsgaard Oct. 31, 2019, 10:01 p.m. UTC | #4
>>>>> "Einar" == Einar Jón <tolvupostur@gmail.com> writes:

Hi,

 >> What does this mean exactly? I take it you refer to the '# ethX' we add
 >> to /etc/resolv.conf so we can remove the lines once the interface is
 >> again down.

 > Exactly those, and similar lines (if any) in head/tail files.

Ok, does the logic in /usr/share/udhcpc/default.script to remove name
servers again when an interface is brought down then still work?


 >> Did older openresolv versions not work correctly with this?

 > Openresolv 3.9.0 and older turned "nameserver 1.2.3.4 # ethX" to
 > nameserver 1.2.3.4
 > nameserver  #
 > nameserver ethX
 > See this email (and the rest of that thread):
 > https://roy.marples.name/archives/openresolv-discuss/0000041.html

Thanks.

 >> E.G. is this
 >> something that should be backported to 2019.02.x / 2019.08.x

 > If this was broken until July this year I don't think many people are using
 > a
 > combo of udhcpc+openresolv, so I doubt that backporting is very urgent.
 > We need it because we have to use NetworkManager for the modem, but
 > we don't want NetworkManager for ethX and the rest of the system.
 > That's probably a pretty unique use-case.

I indeed guess not.

Thanks.
Einar Jón Nov. 1, 2019, 11:20 a.m. UTC | #5
Hi

On Fri, 1 Nov 2019 at 10:18, Peter Korsgaard <peter@korsgaard.com> wrote:

> >>>>> "Einar" == Einar Jón <tolvupostur@gmail.com> writes:
>
> Hi,
>
>  >> What does this mean exactly? I take it you refer to the '# ethX' we add
>  >> to /etc/resolv.conf so we can remove the lines once the interface is
>  >> again down.
>
>  > Exactly those, and similar lines (if any) in head/tail files.
>
> Ok, does the logic in /usr/share/udhcpc/default.script to remove name
> servers again when an interface is brought down then still work?
>

Openresolv removes the comments from /etc/resolv.conf which breaks the
logic in /usr/share/udhcpc/default.script. But openresolv takes care of
that
if you add this section to a /usr/share/udhcpc/default.script.d/whatever
  deconfig)
     [ "$METHOD" = dhcp ] && /sbin/resolvconf -f -d "$interface"
     /sbin/resolvconf -f -d "$interface.$ADDRFAM"

Best regards
Einar Jón
diff mbox series

Patch

diff --git a/package/openresolv/openresolv.hash b/package/openresolv/openresolv.hash
index e1a1fb5..b8eb434 100644
--- a/package/openresolv/openresolv.hash
+++ b/package/openresolv/openresolv.hash
@@ -1,3 +1,3 @@ 
 # Locally calculated
-sha256 96b3f84435a183426c622db7097a930fb0d48a99e82cd87ce83bd343b8c20574 openresolv-fe4e1ec4e2be2adfc1530ade94ebb30aa6f51540.tar.gz
-sha256 d1f9dcd2dac4e095b14caab517cfe791a6e0785346164b7d0cafc13c714f8aa5 LICENSE
+sha256 0024df7c4568a157db1c3511a55d37d442629d586c575d9e0f9c2004df8297bd openresolv-3.9.2.tar.gz
+sha256 f78b2c2bfb333e66e935c81510580d002b6e2009a5b8132b3b5be8ed8f8f3fa7 LICENSE
diff --git a/package/openresolv/openresolv.mk b/package/openresolv/openresolv.mk
index 3f9d603..3a64446 100644
--- a/package/openresolv/openresolv.mk
+++ b/package/openresolv/openresolv.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-OPENRESOLV_VERSION = fe4e1ec4e2be2adfc1530ade94ebb30aa6f51540
-OPENRESOLV_SITE = $(call github,rsmarples,openresolv,$(OPENRESOLV_VERSION))
+OPENRESOLV_VERSION = 3.9.2
+OPENRESOLV_SITE = $(call github,rsmarples,openresolv,openresolv-$(OPENRESOLV_VERSION))
 OPENRESOLV_LICENSE = BSD-2-Clause
 OPENRESOLV_LICENSE_FILES = LICENSE