Merge ~vorlon/ubuntu/+source/resolvconf:ubuntu/devel into ubuntu/+source/resolvconf:ubuntu/devel

[Steve Langasek]

1bfeda0... by Steve Langasek on 2020-04-23

Suppress warning message that /etc/resolv.conf is not a symlink to the resolvconf-managed file, since it now never will be.

[Dimitri John Ledkov (xnox)]

Code review good.

Proceeding to test build and interractively test.

Unmerged commits

1bfeda0... by Steve Langasek on 2020-04-23

Suppress warning message that /etc/resolv.conf is not a symlink to the resolvconf-managed file, since it now never will be.

318150c... by Steve Langasek on 2020-04-23

Restart systemd-resolved after writing the config file, as systemd-resolved does not appear to watch the config directories for updates as one would expect.

32457f0... by Steve Langasek on 2020-04-23

Drop the systemd units that only exist for pulling resolved state into resolvconf.

9dfc86c... by Steve Langasek on 2020-04-22

Make resolvconf feed changes into /run/systemd/resolved.conf.d instead of updating a resolv.conf file.

f79f3b2... by Steve Langasek on 2020-04-22

Fix wrong spelling of rm_conffile

08cc6d7... by Steve Langasek on 2020-04-22

add bug link

c84ad81... by Steve Langasek on 2020-04-22

Revert any symlinking of /etc/resolv.conf to resolvconf's file, pointing it instead to the resolved file.

133ae11... by Steve Langasek on 2020-04-22

Drop the dhclient hook: on Ubuntu, DNS configuration will instead be fed directly to resolved via a hook provided by ifupdown.

eabed2a... by Andrej Shadura on 2020-01-03

Import patches-unapplied version 1.82 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3f2ee40ab584dcaa10b43622fe754a05981204a9

New changelog entries:
  [ Andrej Shadura ]
  * Update the debconf translation templates (Closes: #947164).
  * Update translations.
  [ Helge Kreutzmann ]
  * Update German debconf translation (Closes: #947171).
  [ Frans Spiesschaert ]
  * Update Dutch debconf translation (Closes: #948037).

3f2ee40... by Andrej Shadura on 2019-12-19

Import patches-unapplied version 1.81 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3dbe8b345728756b17c277563c09420cb51732d2

New changelog entries:
  [ Russell Coker ]
  * Set correct SE Linux context on created directories and files
    (Closes: #850783).
  [ Jakub Wilk ]
  * Drop symlink resolving logic from the init script (Closes: #946609).

diff --git a/debian/changelog b/debian/changelog
index 9048ad8..d56c5ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+resolvconf (1.82ubuntu1) UNRELEASED; urgency=medium
+
+  * Drop the dhclient hook: on Ubuntu, DNS configuration will instead be
+    fed directly to resolved via a hook provided by ifupdown.  LP: #1874337.
+  * Revert any symlinking of /etc/resolv.conf to resolvconf's file, pointing
+    it instead to the resolved file.
+  * Make resolvconf feed changes into /run/systemd/resolved.conf.d 
+    instead of updating a resolv.conf file.
+  * Drop the systemd units that only exist for pulling resolved state into
+    resolvconf.
+  * Restart systemd-resolved after writing the config file, as
+    systemd-resolved does not appear to watch the config directories for
+    updates as one would expect.
+  * Suppress warning message that /etc/resolv.conf is not a symlink to the
+    resolvconf-managed file, since it now never will be.
+
+ -- Steve Langasek <[e-mail]>  Tue, 21 Apr 2020 23:51:11 -0700
+
 resolvconf (1.82) unstable; urgency=medium
 
   [ Andrej Shadura ]
diff --git a/debian/postinst b/debian/postinst
index 40cd101..22b64c0 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -52,9 +52,28 @@ esac
 #
 case "$1" in
   configure)
-	# Do linkify once again on dpkg-reconfigure
-	if [ "$DEBCONF_RECONFIGURE" = 1 ] || [ "$1" = reconfigure ] ; then
-		rm -f /var/lib/resolvconf/linkified
+	# Unconditionally re-link this to resolved on upgrade.  resolvconf
+	# management of /etc/resolv.conf is unsupported on Ubuntu.
+	if dpkg --compare-versions "$2" lt-nl 1.82ubuntu1~ \
+	   && [ "$(readlink -m /etc/resolv.conf)" = "/run/resolvconf/resolv.conf" ]
+	then
+		if is_immutable_file /etc/resolv.conf ; then
+			if dnssec_trigger_is_installed ; then
+				# dnssec-trigger sets the immutability attribute. Override it.
+				# See #776778 for background.
+				chattr -i /etc/resolv.conf
+			else
+				# Respect the admin
+				report_err "Cannot replace the current /etc/resolv.conf with a symbolic link because it is immutable; to correct this problem, gain root privileges in a terminal and run 'chattr -i /etc/resolv.conf' and then 'dpkg --configure resolvconf'; aborting"
+				exit 1
+			fi
+		fi
+		rm -f /etc/resolv.conf
+		ln -s ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+
+		# we are "done" and nothing that looks at this file should ever
+		# think otherwise
+		:> /var/lib/resolvconf/linkified
 	fi
 
 	# Link tail to original if appropriate
@@ -67,55 +86,6 @@ case "$1" in
 		fi
 	fi
 
-	# Linkify /etc/resolv.conf if appropriate
-	if [ ! -e /var/lib/resolvconf/linkified ] ; then
-		db_get resolvconf/linkify-resolvconf
-		if [ "$RET" = "true" ] ; then
-			if is_immutable_file /etc/resolv.conf ; then
-				if dnssec_trigger_is_installed ; then
-					# dnssec-trigger sets the immutability attribute. Override it.
-					# See #776778 for background.
-					chattr -i /etc/resolv.conf
-				else
-					# Respect the admin
-					report_err "Cannot replace the current /etc/resolv.conf with a symbolic link because it is immutable; to correct this problem, gain root privileges in a terminal and run 'chattr -i /etc/resolv.conf' and then 'dpkg --configure resolvconf'; aborting"
-					exit 1
-				fi
-			else
-				if
-					[ -f /etc/resolv.conf ] \
-					&& {
-						[ ! -L /etc/resolv.conf ] \
-						|| [ ! "$(readlink -m /etc/resolv.conf)" = "/run/resolvconf/resolv.conf" ]
-					}
-				then
-					# Back up original file
-					if [ ! -e /etc/resolvconf/resolv.conf.d/original ] ; then
-						cp -a /etc/resolv.conf /etc/resolvconf/resolv.conf.d/original
-					else
-						cp -a /etc/resolv.conf /etc/resolv.conf.dpkg-old
-					fi
-					# Before creating the link, make sure that the original file is
-					# at the target of the link.  /sbin/resolvconf will overwrite
-					# this when it does an update, of course.
-					if [ ! -e /run/resolvconf/resolv.conf ] ; then
-						cp -aH /etc/resolv.conf /run/resolvconf/resolv.conf
-					fi
-					# Add the original file to the database so that its contents
-					# are included when resolvconf updates.
-					# Yes, this is an ugly workaround for the problem that some
-					# interface configurers haven't added a dpkg-event.d script.
-					cp -aH /etc/resolv.conf /run/resolvconf/interface/original.resolvconf
-				fi
-				# Create the link
-				# The link is relative to allow for cp from outside a chroot into a chroot
-				# to work without overwriting the file outside the chroot (or failing)
-				ln -nsf ../run/resolvconf/resolv.conf /etc/resolv.conf
-				# Make a record that we have created it
-				:> /var/lib/resolvconf/linkified
-			fi
-		fi
-	fi
 	;;
   # triggered)
 	# Don't do anything here
diff --git a/debian/resolvconf.maintscript b/debian/resolvconf.maintscript
index 2e88567..e27c872 100644
--- a/debian/resolvconf.maintscript
+++ b/debian/resolvconf.maintscript
@@ -1 +1,2 @@
 rm_conffile /etc/init/resolvconf.conf 1.80~~
+rm_conffile /etc/dhcp/dhclient-enter-hooks.d/resolvconf 1.82ubuntu1~
diff --git a/debian/resolvconf.resolvconf-pull-resolved.path b/debian/resolvconf.resolvconf-pull-resolved.path
deleted file mode 100644
index 9ccd05e..0000000
--- a/debian/resolvconf.resolvconf-pull-resolved.path
+++ /dev/null
@@ -1,7 +0,0 @@
-[Path]
-PathChanged=/run/systemd/resolve/stub-resolv.conf
-PathExists=/run/systemd/resolve/stub-resolv.conf
-
-[Install]
-WantedBy=systemd-resolved.service
-
diff --git a/debian/resolvconf.resolvconf-pull-resolved.service b/debian/resolvconf.resolvconf-pull-resolved.service
deleted file mode 100644
index 109c462..0000000
--- a/debian/resolvconf.resolvconf-pull-resolved.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-ConditionPathExists=/run/resolvconf/enable-updates
-ConditionFileIsExecutable=/sbin/resolvconf
-
-[Service]
-Type=oneshot
-ExecStart=+-/bin/sh -c 'cat /run/systemd/resolve/stub-resolv.conf | grep -v edns0 | /sbin/resolvconf -a systemd-resolved'
diff --git a/debian/rules b/debian/rules
index dbfd316..888537b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,5 @@ override_dh_install:
 
 override_dh_installsystemd:
 	dh_installsystemd
-	dh_installsystemd --name=resolvconf-pull-resolved
 
 .PHONY: override_dh_auto_test override_dh_installinit override_dh_install override_dh_installsystemd
diff --git a/etc/dhcp/dhclient-enter-hooks.d/resolvconf b/etc/dhcp/dhclient-enter-hooks.d/resolvconf
deleted file mode 100644
index 72b2be7..0000000
--- a/etc/dhcp/dhclient-enter-hooks.d/resolvconf
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Script fragment to make dhclient supply nameserver information to resolvconf
-#
-
-# Tips:
-# * Be careful about changing the environment since this is sourced
-# * This script fragment uses bash features
-# * As of isc-dhcp-client 4.2 the "reason" (for running the script) can be one of the following.
-#   (Listed on man page:) MEDIUM(0) PREINIT(0)  BOUND(M)  RENEW(M)  REBIND(M)  REBOOT(M)         EXPIRE(D)  FAIL(D) RELEASE(D)  STOP(D) NBI(-) TIMEOUT(M)
-#   (Also used in master script:)                                                                                                                         ARPCHECK(0), ARPSEND(0)
-#   (Also used in master script:)   PREINIT6(0) BOUND6(M) RENEW6(M) REBIND6(M)        DEPREF6(0) EXPIRE6(D)         RELEASE6(D) STOP6(D)
-#   (0) = master script does not run make_resolv_conf
-#   (M) = master script runs make_resolv_conf
-#   (D) = master script downs interface
-#   (-) = master script does nothing with this
-
-if [ -x /sbin/resolvconf ] ; then
-	# For safety, first undefine the nasty default make_resolv_conf()
-	make_resolv_conf() { : ; }
-	case "$reason" in
-	  BOUND|RENEW|REBIND|REBOOT|TIMEOUT)
-		# Define a resolvconf-compatible m_r_c() function
-		# It gets run later (or, in the TIMEOUT case, MAY get run later)
-		make_resolv_conf() {
-			local R
-			local N
-			R=""
-			if [ "$new_domain_name_servers" ] && [ "$new_domain_name" ] ; then
-				R="${R}domain $new_domain_name
-"
-			fi
-			if [ "$new_domain_name_servers" ] && [ "$new_domain_search" ] ; then
-				R="${R}search $new_domain_search
-"
-			fi
-			for N in $new_domain_name_servers ; do
-				R="${R}nameserver $N
-"
-			done
-			[ ! "$interface" ] || echo -n "$R" | /sbin/resolvconf -a "${interface}.dhclient"
-		}
-		;;
-	  BOUND6|RENEW6|REBIND6)
-		# Define a resolvconf-compatible m_r_c() function
-		# It gets run later (or, in the TIMEOUT case, MAY get run later)
-		make_resolv_conf() {
-			local R
-			local N
-			local N_LOW
-			local ZONE_ID
-			R=""
-			if [ "$new_dhcp6_name_servers" ] && [ "$new_dhcp6_domain_search" ] ; then
-				R="${R}search $new_dhcp6_domain_search
-"
-			fi
-			for N in $new_dhcp6_name_servers ; do
-
-				# If the nameserver has a link-local address
-				# then add a zone ID (interface name) to it.
-				N_LOW="$(echo "$N" | tr '[:upper:]' '[:lower:]')"
-				if expr "$N_LOW" : ^fe80:: >/dev/null ; then
-					ZONE_ID="%$interface"
-				else
-					ZONE_ID=""
-				fi
-				R="${R}nameserver $N$ZONE_ID
-"
-			done
-			[ ! "$interface" ] || echo -n "$R" | /sbin/resolvconf -a "${interface}.ip6.dhclient"
-		}
-		;;
-	  EXPIRE|FAIL|RELEASE|STOP)
-		# Delete resolv.conf info 
-		[ ! "$interface" ] || /sbin/resolvconf -d "${interface}.dhclient"
-		;;
-	  EXPIRE6|RELEASE6|STOP6)
-		# Delete resolv.conf info 
-		[ ! "$interface" ] || /sbin/resolvconf -d "${interface}.ip6.dhclient"
-		;;
-	esac
-fi
diff --git a/etc/resolvconf/update.d/libc b/etc/resolvconf/update.d/libc
index 12298c7..c848adc 100755
--- a/etc/resolvconf/update.d/libc
+++ b/etc/resolvconf/update.d/libc
@@ -7,9 +7,6 @@
 #
 # This script is part of the resolvconf package.
 #
-# Set REPORT_ABSENT_SYMLINK=no to inhibit warning message that
-# /etc/resolv.conf is not a symbolic link
-#
 # Set TRUNCATE_NAMESERVER_LIST_AFTER_LOOPBACK_ADDRESS=no
 # to allow additional nameserver addresses to be listed in
 # resolv.conf after an initial loopback address 127.* or ::1.
@@ -32,17 +29,6 @@ TAILFILE="${RESOLVCONFDIR}/tail"
 DYNAMICRSLVCNFFILE="/run/resolvconf/resolv.conf"
 TMPFILE="${DYNAMICRSLVCNFFILE}_new.$$"
 
-# Set unset variables to their defaults
-if [ -z "$REPORT_ABSENT_SYMLINK" ] ; then
-	# '..._ALTERED_...' is the old deprecated name for this variable
-	if [ "$REPORT_ALTERED_SYMLINK" ] ; then
-		REPORT_ABSENT_SYMLINK="$REPORT_ALTERED_SYMLINK"
-	else
-		# Set to default value
-		REPORT_ABSENT_SYMLINK=y
-	fi
-fi
-
 if [ -z "$TRUNCATE_NAMESERVER_LIST_AFTER_LOOPBACK_ADDRESS" ] ; then
 	# '..._127' is the old deprecated name for this variable
 	if [ "$TRUNCATE_NAMESERVER_LIST_AFTER_127" ] ; then
@@ -56,18 +42,6 @@ fi
 
 report_warning() { echo "$0: Warning: $*" >&2 ; }
 
-resolv_conf_is_symlinked_to_dynamic_file() {
-	[ -L ${ETC}/resolv.conf ] && [ "$(readlink -m ${ETC}/resolv.conf)" = "$DYNAMICRSLVCNFFILE" ]
-}
-
-if ! resolv_conf_is_symlinked_to_dynamic_file ; then
-	case "$REPORT_ABSENT_SYMLINK" in
-	  y|Y|yes|YES|Yes)
-		report_warning "${ETC}/resolv.conf is not a symbolic link to $DYNAMICRSLVCNFFILE"
-		;;
-	esac
-fi
-
 # Args are candidate items not containing spaces
 # Returns RSLT -- space-separated list of items without duplicates
 #
@@ -131,31 +105,19 @@ clean_up
 
 ### Make the file ###
 : > "$TMPFILE"
-[ -f "$HEADFILE" ] && cat "$HEADFILE" >> "$TMPFILE"
-for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMPFILE" ; done
-[ "$SRCHS" ] && echo "search $SRCHS" >> "$TMPFILE"
-[ "$RSLVCNFFILES" ] && sed -e '/^[[:space:]]*$/d' -e '/^[[:space:]]*#/d' -e '/^[[:space:]]*\(\(nameserver\)\|\(search\)\|\(domain\)\)[[:space:]]/d' $RSLVCNFFILES >> "$TMPFILE" 2>/dev/null
-[ -f "$TAILFILE" ] && cat "$TAILFILE" >> "$TMPFILE"
-
-### Put the file in place ###
-
-if [ -f "$DYNAMICRSLVCNFFILE" ] && [ "$(cat $TMPFILE)" = "$(cat $DYNAMICRSLVCNFFILE)" ] ; then
-	# The file has not changed
-	rm -f "$TMPFILE"
-	exit 0
-fi
-
-# The file has changed
-mv -f "$TMPFILE" "$DYNAMICRSLVCNFFILE"
+cat <<EOF >"$TMPFILE"
+[Resolve]
+DNS=$NMSRVRS
+EOF
 
-# Only notify users of /etc/resolv.conf if /etc/resolv.conf is actually
-# symlinked to the file we have just updated.
-resolv_conf_is_symlinked_to_dynamic_file || exit 0
+[ "$SRCHS" ] && echo "DNS=$SRCHS" >> "$TMPFILE"
 
-# Notify users of the resolver
-if [ -d "${ETCRESOLVCONF}/update-libc.d" ] ; then
-	exec run-parts "${ETCRESOLVCONF}/update-libc.d"
+### Put the file in place ###
+statedir=/run/systemd/resolved.conf.d
+mkdir -p "$statedir"
+mv -f "$TMPFILE" "$statedir/resolvconf.conf"
+if systemctl --quiet is-active systemd-resolved; then
+	systemctl restart systemd-resolved
 fi
 
 exit 0
-