From 26711fb8bc91082a7e5a11161292df2f4057a677 Mon Sep 17 00:00:00 2001 From: Ark74 <ark@switnet.org> Date: Tue, 28 Nov 2023 23:24:29 -0600 Subject: [PATCH] ifupdown: clear helper as upstream synched fixes. --- ...alid_lines_from_resolved_integration.patch | 42 ------------------- helpers/make-ifupdown | 6 +-- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch diff --git a/helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch b/helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch deleted file mode 100644 index cf767616..00000000 --- a/helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch +++ /dev/null @@ -1,42 +0,0 @@ - * Remove invalid lines from resolved integration scripts (LP: #1907878) - -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Sun, 15 May 2022 15:35:51 +0200 --- -diff -Nru ifupdown-0.8.36+nmu1ubuntu3/debian/if-down.d/resolved ifupdown-0.8.36+nmu1ubuntu4/debian/if-down.d/resolved ---- ifupdown-0.8.36+nmu1ubuntu3/debian/if-down.d/resolved 2020-07-28 11:55:18.000000000 +0200 -+++ ifupdown-0.8.36+nmu1ubuntu4/debian/if-down.d/resolved 2022-05-15 15:28:28.000000000 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh - # --# Script fragment to make ifupdown supply DNS infromation to resolved -+# Script fragment to make ifupdown supply DNS information to resolved - # - - case "$ADDRFAM" in -@@ -9,7 +9,6 @@ - esac - - if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then -- mystatedir statedir ifindex interface - interface=$IFACE - if [ ! "$interface" ]; then - return -diff -Nru ifupdown-0.8.36+nmu1ubuntu3/debian/if-up.d/resolved ifupdown-0.8.36+nmu1ubuntu4/debian/if-up.d/resolved ---- ifupdown-0.8.36+nmu1ubuntu3/debian/if-up.d/resolved 2022-04-17 23:21:44.000000000 +0200 -+++ ifupdown-0.8.36+nmu1ubuntu4/debian/if-up.d/resolved 2022-05-15 15:29:07.000000000 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh - # --# Script fragment to make ifupdown supply DNS infromation to resolved -+# Script fragment to make ifupdown supply DNS information to resolved - # - - case "$ADDRFAM" in -@@ -9,8 +9,6 @@ - esac - - if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then -- mystatedir statedir ifindex interface -- - interface=$IFACE - if [ ! "$interface" ]; then - return diff --git a/helpers/make-ifupdown b/helpers/make-ifupdown index 7ba97a33..bd5ea511 100644 --- a/helpers/make-ifupdown +++ b/helpers/make-ifupdown @@ -17,10 +17,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=0 +VERSION=1 . ./config -patch --no-backup-if-mismatch -p1 < $DATA/fix_invalid_lines_from_resolved_integration.patch +# Previously fixed LP: #1907878 -changelog "Manually apply LP: #1907878 on aramo" +changelog "Clean helper from manually patching previous bugs." package -- GitLab