From 12ec796369291cac64c7fb8dc8ad9d5a6a352984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 17 Oct 2025 11:36:40 +0200 Subject: [PATCH 1/9] fill in d/watch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/watch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 9e7c0dae..4f136047 100644 --- a/debian/watch +++ b/debian/watch @@ -1 +1,7 @@ -version=3 +version=4 + opts=\ + filenamemangle=s%.*/@ANY_VERSION@%@PACKAGE@-$1.tar.gz%,\ + downloadurlmangle=s%(api.github.com/repos/[^/]+/[^/]+)/git/refs/%$1/tarball/refs/%g,\ + searchmode=plain \ + https://api.github.com/repos/CumulusNetworks/ifupdown2/git/matching-refs/tags/ \ + https://api.github.com/repos/[^/]+/[^/]+/git/refs/tags/@ANY_VERSION@ From 9d0c3a479092863fae84e2ed1a1912a12e7ed598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 17 Oct 2025 11:40:51 +0200 Subject: [PATCH 2/9] bump Standards-Version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 58cfff2e..f3d303a3 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10), python3-all, python3-setuptools, python3-docutils -Standards-Version: 4.5.0.2 +Standards-Version: 4.7.2 Homepage: https://github.com/cumulusnetworks/ifupdown2 X-Python-Version: >= 3.7 From a56ecb27a35b189130385ef37a562bc2a95eb6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 17 Oct 2025 13:27:31 +0200 Subject: [PATCH 3/9] update to DH 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/control | 2 +- debian/rules | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index f3d303a3..6d14dfbb 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ifupdown2 Section: admin Priority: optional Maintainer: Julien Fortin -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper-compat (= 13), dh-python, python3, python3-all, diff --git a/debian/rules b/debian/rules index 836214c7..60b3131d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export PYBUILD_NAME=ifupdown2 export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/ --install-scripts=/usr/share/ %: - dh $@ --with=python3 --with systemd --buildsystem=pybuild + dh $@ --with=python3 --buildsystem=pybuild override_dh_installman: ./ifupdown2/man/genmanpages.sh ./ifupdown2/man ./man @@ -19,11 +19,9 @@ override_dh_install: override_dh_auto_test: @echo "Skipping tests during the build process." -override_dh_systemd_start: - dh_systemd_start --name=networking --no-start - -override_dh_systemd_enable: - dh_systemd_enable --name=networking +override_dh_installsystemd: + # should only ever be reloaded, not restarted + dh_installsystemd --no-stop-on-upgrade --no-restart-after-upgrade --no-start --name networking override_dh_compress: dh_compress -X.py From eb66637c2eff65461ff56b98783f9cabdd13eb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 17 Oct 2025 13:27:41 +0200 Subject: [PATCH 4/9] d/rules: don't install tests dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 60b3131d..c9f84d63 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,9 @@ override_dh_install: override_dh_auto_test: @echo "Skipping tests during the build process." +execute_after_dh_auto_install: + rm -rf debian/ifupdown2/usr/share/tests + override_dh_installsystemd: # should only ever be reloaded, not restarted dh_installsystemd --no-stop-on-upgrade --no-restart-after-upgrade --no-start --name networking From c84c0a6bb5abd42d69889738f87da1576cc12285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 22 Oct 2025 12:52:50 +0200 Subject: [PATCH 5/9] d/copyright: add license and copyright of graphviz helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/copyright | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/debian/copyright b/debian/copyright index 5bf25afc..6761e298 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,11 @@ Files: * Copyright: 2014,2015,2016,2017,2018,2019,2020,2021,2022 Cumulus Networks, Inc. License: GPL-2 +Files: ifupdown2/lib/gvgen.py +Copyright: 2007-2020 Sebastien Tricaud +License: Expat +Comment: this is a vendored copy of what used to be python-gvgen + Files: debian/* Copyright: 2014,2015,2016,2017,2018,2019,2020,2021,2022 Cumulus Networks, Inc. License: GPL-2 @@ -26,3 +31,20 @@ License: GPL-2 . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. From aa35d1e9539bc84ea0aca2ac0ba84492fe5623a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 23 Oct 2025 09:28:12 +0200 Subject: [PATCH 6/9] d/rules: install init script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #1105958 Signed-off-by: Fabian Grünbichler --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index c9f84d63..c90087df 100755 --- a/debian/rules +++ b/debian/rules @@ -26,5 +26,10 @@ override_dh_installsystemd: # should only ever be reloaded, not restarted dh_installsystemd --no-stop-on-upgrade --no-restart-after-upgrade --no-start --name networking +override_dh_installinit: + cp etc/init.d/networking debian/ifupdown2.networking.init + # should only ever be reloaded, not restarted + dh_installinit --no-stop-on-upgrade --no-restart-after-upgrade --no-start --name networking + override_dh_compress: dh_compress -X.py From 145d82fed8946295064158753abb2cef2d935191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 23 Oct 2025 09:51:46 +0200 Subject: [PATCH 7/9] d/control: wrap-and-sort MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/control | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 6d14dfbb..424f6ae4 100644 --- a/debian/control +++ b/debian/control @@ -6,19 +6,28 @@ Build-Depends: debhelper-compat (= 13), dh-python, python3, python3-all, + python3-docutils, python3-setuptools, - python3-docutils Standards-Version: 4.7.2 Homepage: https://github.com/cumulusnetworks/ifupdown2 X-Python-Version: >= 3.7 Package: ifupdown2 Architecture: all -Provides: ifupdown -Conflicts: ifupdown -Replaces: ifupdown -Depends: ${python3:Depends}, ${misc:Depends}, iproute2, python3-six, python3-setuptools, python3-systemd -Suggests: isc-dhcp-client, bridge-utils, ethtool, python3-gvgen, python3-mako +Provides: ifupdown, +Conflicts: ifupdown, +Replaces: ifupdown, +Depends: iproute2, + python3-setuptools, + python3-six, + python3-systemd, + ${misc:Depends}, + ${python3:Depends}, +Suggests: bridge-utils, + ethtool, + isc-dhcp-client, + python3-gvgen, + python3-mako, Description: Network Interface Management tool similar to ifupdown ifupdown2 is ifupdown re-written in Python. It replaces ifupdown and provides the same user interface as ifupdown for network interface configuration. From efdeee38922d8750e90002ebe0602cfbc41d3aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 22 Oct 2025 13:53:18 +0200 Subject: [PATCH 8/9] d/control: move Suggests to Recommends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit these are most likely installed anyway, except for isc-dhcp-client (which is required for DHCP support at the moment, which is a big feature) and python3-mako, which is needed for templating support. Signed-off-by: Fabian Grünbichler --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 424f6ae4..5103a611 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: iproute2, python3-systemd, ${misc:Depends}, ${python3:Depends}, -Suggests: bridge-utils, +Recommends: bridge-utils, ethtool, isc-dhcp-client, python3-gvgen, From e343c5cae967c86a9b4a56dcff46ea3b686f7ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 23 Oct 2025 10:04:19 +0200 Subject: [PATCH 9/9] systemd unit: properly pull in network.target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it's a passive target provided by ifupdown2's networking.service, so this is the proper way to actually encode this. Signed-off-by: Fabian Grünbichler --- debian/ifupdown2.networking.service | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/ifupdown2.networking.service b/debian/ifupdown2.networking.service index cdb30657..36206049 100644 --- a/debian/ifupdown2.networking.service +++ b/debian/ifupdown2.networking.service @@ -4,6 +4,7 @@ Documentation=man:interfaces(5) man:ifup(8) man:ifdown(8) DefaultDependencies=no After=local-fs.target network-pre.target Before=shutdown.target network.target network-online.target +Wants=network.target Conflicts=shutdown.target Wants=systemd-udev-settle.service After=systemd-udev-settle.service