control: tag -1 patch
On Sun, Jan 18, 2015 at 3:29 PM, Thomas Hood wrote:
> package resolvconf
> tags 775356 confirmed
> stop
>
> Hmm, yes, as you say this arises from the fact that isc-dhcp-client's
> /sbin/dhclient-script switched from #!/bin/bash to #!/bin/sh last
> September.
>
> If you have a patch to send, please send it quickly as this is an RC
> bug. A fixed release of resolvconf will have to be pushed into
> testing.
I prepared a patch fixing resolvconf's bashisms. Please test.
Best wishes,
Mike
diff -Nru resolvconf-1.76/debian/changelog resolvconf-1.76+nmu1/debian/changelog
--- resolvconf-1.76/debian/changelog 2014-10-10 12:22:18.000000000 +0000
+++ resolvconf-1.76+nmu1/debian/changelog 2015-01-18 22:30:58.000000000 +0000
@@ -1,3 +1,10 @@
+resolvconf (1.76+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix bashisms in the resolvconf exit hook for dhclient (closes: #775356).
+
+ -- Michael Gilbert <mgilb...@debian.org> Sun, 18 Jan 2015 22:11:53 +0000
+
resolvconf (1.76) unstable; urgency=low
* resolvconf.service: Install into sysinit.target, not into
diff -Nru resolvconf-1.76/etc/dhcp/dhclient-enter-hooks.d/resolvconf resolvconf-1.76+nmu1/etc/dhcp/dhclient-enter-hooks.d/resolvconf
--- resolvconf-1.76/etc/dhcp/dhclient-enter-hooks.d/resolvconf 2014-10-10 12:22:18.000000000 +0000
+++ resolvconf-1.76+nmu1/etc/dhcp/dhclient-enter-hooks.d/resolvconf 2015-01-18 22:29:29.000000000 +0000
@@ -52,12 +52,12 @@
R="${R}search $new_dhcp6_domain_search
"
fi
- shopt -s nocasematch
for nameserver in $new_dhcp6_name_servers ; do
# If the nameserver has a link-local address
# then add a zone ID (interface name) to it.
- if [[ "$nameserver" =~ ^fe80:: ]] ; then
+ lowercase=$(echo "$nameserver" | tr '[:upper:]' '[:lower:]')
+ if expr "$lowercase" : ^fe80:: >/dev/null; then
zone_id="%$interface"
else
zone_id=""
@@ -65,7 +65,6 @@
R="${R}nameserver $nameserver$zone_id
"
done
- shopt -u nocasematch
[ ! "$interface" ] || echo -n "$R" | /sbin/resolvconf -a "${interface}.ip6.dhclient"
}
;;
