From c00418e20178c597419a1359f121475324fc3ecb Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 5 Jan 2023 01:19:36 -0600
Subject: [PATCH] ifupdown: backport fix LP:1907878 on aramo

---
 ...alid_lines_from_resolved_integration.patch | 42 +++++++++++++++++++
 helpers/make-ifupdown                         | 26 ++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch
 create mode 100644 helpers/make-ifupdown

diff --git a/helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch b/helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch
new file mode 100644
index 00000000..cf767616
--- /dev/null
+++ b/helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch
@@ -0,0 +1,42 @@
+ * 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
new file mode 100644
index 00000000..614f084e
--- /dev/null
+++ b/helpers/make-ifupdown
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+#    Copyright (C) 2022  Luis Guzmán <ark@switnet.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=0
+. ./config
+
+patch -p1 < $DATA/fix_invalid_lines_from_resolved_integration.patch
+
+changelog "Manually apply LP: #1907878 on aramo"
+compile
-- 
GitLab