Bug#1031236: ifupdown: diff for NMU version 0.8.41+nmu1

[Uwe Kleine-König]

Hello Santiago,

On 6/21/23 19:58, Santiago Ruano Rincón wrote:

El 21/06/23 a las 19:10, Uwe Kleine-König escribió:

Control: tags 1031236 + pending

Dear maintainer,

I've prepared an NMU for ifupdown (versioned as 0.8.41+nmu1) and intend
to upload it to DELAYED/10 once I properly tested the patch.
(Unfortunately I locked myself out of the affected machine while
reconfiguring the network devices. So testing will have to wait until I
find someone with physical access to that machine.)

The change is effectively what Ken Milmore proposed.


Thanks for this. Would you like to prepare a MR instead. I would like to
handle the switch to dependency on dhcpcd-base along.


Sure:
https://salsa.debian.org/debian/ifupdown/-/merge_requests/20

Best regards
Uwe

Bug#1031236: ifupdown: diff for NMU version 0.8.41+nmu1

[Santiago Ruano Rincón]

El 21/06/23 a las 19:10, Uwe Kleine-König escribió:
> Control: tags 1031236 + pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for ifupdown (versioned as 0.8.41+nmu1) and intend
> to upload it to DELAYED/10 once I properly tested the patch.
> (Unfortunately I locked myself out of the affected machine while
> reconfiguring the network devices. So testing will have to wait until I
> find someone with physical access to that machine.)
> 
> The change is effectively what Ken Milmore proposed.

Thanks for this. Would you like to prepare a MR instead. I would like to
handle the switch to dependency on dhcpcd-base along.

Cheers,

 -- Santiago


signature.asc
Description: PGP signature

Bug#1031236: ifupdown: diff for NMU version 0.8.41+nmu1

[Uwe Kleine-König]

Control: tags 1031236 + pending

Dear maintainer,

I've prepared an NMU for ifupdown (versioned as 0.8.41+nmu1) and intend
to upload it to DELAYED/10 once I properly tested the patch.
(Unfortunately I locked myself out of the affected machine while
reconfiguring the network devices. So testing will have to wait until I
find someone with physical access to that machine.)

The change is effectively what Ken Milmore proposed.

Best regards
Uwe
diff -Nru ifupdown-0.8.41/debian/changelog ifupdown-0.8.41+nmu1/debian/changelog
--- ifupdown-0.8.41/debian/changelog	2023-01-24 14:07:32.0 +0100
+++ ifupdown-0.8.41+nmu1/debian/changelog	2023-06-21 18:18:20.0 +0200
@@ -1,3 +1,12 @@
+ifupdown (0.8.41+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix if-up.d/resolved hook to properly work with nameservers and search
+domains. Thanks to Dmytro Kolesnykov and Ken Milmore for the bug report
+and a proposed patch. (Closes: #1031236)
+
+ -- Uwe Kleine-König   Wed, 21 Jun 2023 18:18:20 +0200
+
 ifupdown (0.8.41) unstable; urgency=high
 
   * networking.service: Improve how to handle hotplug devices. Thanks to kibi,
diff -Nru ifupdown-0.8.41/debian/if-up.d/resolved ifupdown-0.8.41+nmu1/debian/if-up.d/resolved
--- ifupdown-0.8.41/debian/if-up.d/resolved	2022-12-09 21:37:03.0 +0100
+++ ifupdown-0.8.41+nmu1/debian/if-up.d/resolved	2023-06-21 18:17:47.0 +0200
@@ -43,11 +43,11 @@
 fi
 if  [ -n "$NEW_DNS" ]; then
 cat <"$mystatedir/ifupdown-${ADDRFAM}-$interface"
-"$DNS"="$NEW_DNS"
+$DNS="$NEW_DNS"
 EOF
 if  [ -n "$NEW_DOMAINS" ]; then
 cat <>"$mystatedir/ifupdown-${ADDRFAM}-$interface"
-"$DOMAINS"="$NEW_DOMAINS"
+$DOMAINS="$NEW_DOMAINS"
 EOF
 fi
 fi
@@ -66,7 +66,7 @@
 # ignore errors due to nonexistent file
 md5sum "$mystatedir/isc-dhcp-v4-$interface" "$mystatedir/isc-dhcp-v6-$interface" "$mystatedir/ifupdown-inet-$interface" "$mystatedir/ifupdown-inet6-$interface" > "$newstate" 2> /dev/null || true
 if ! cmp --silent "$oldstate" "$newstate" 2>/dev/null; then
-DNS DNS6 DOMAINS DOMAINS6 DEFAULT_ROUTE
+unset DNS DNS6 DOMAINS DOMAINS6 DEFAULT_ROUTE
 # v4 first
 if [ -e "$mystatedir/isc-dhcp-v4-$interface" ]; then
 . "$mystatedir/isc-dhcp-v4-$interface"


signature.asc
Description: PGP signature