Merge ~mirespace/ubuntu/+source/bridge-utils:merge-oracular-lp2064391 into ubuntu/+source/bridge-utils:debian/sid

[Miriam España Acebal]

Hello team,

PPA for this merge is (all builds OK):
  ppa:mirespace/merge-bridge-utils-oracular-lp2064391
  https://launchpad.net/~mirespace/+archive/ubuntu/merge-bridge-utils-oracular-lp2064391

Usual tags are there:

  ❯ git tag | grep mirespace
mirespace/logical/1.7.1-1ubuntu2
mirespace/new/debian
mirespace/old/debian
mirespace/old/ubuntu
mirespace/reconstruct/1.7.1-1ubuntu2
mirespace/split/1.7.1-1ubuntu2

The package hasn't got DEP-8 tests (bug #1677763), but it has a test folder that was also not used at build time sadly. . These tests can be run manually.

It installs and uninstalls properly.

I was trying to check whether the delta we continue with is applicable, as the upstream project is kind of abandoned. This is also because in the README, you can see " This utility is DEPRECATED [...] use iproute2," and we now use netplan. So, I was unsuccessful in replicating scenarios that I found in some bugs with a netplan config (yes, I know mixing network tools is not the best approach).

Regarding that bugs, they are these: bug #1294172 (that states that was produced by the fix in bug #1003656 -one of the changes that remain in the delta we carry-), bug #1313796 .

I checked the reverse dependencies of bridge-utils, and lxc and cloud-init use it directly or indirectly:

❯ apt-cache rdepends --implicit --recurse bridge-utils | grep -E ^cloud-init
cloud-init
cloud-initramfs-growroot
cloud-initramfs-updateroot
cloud-initramfs-rescuevol
cloud-initramfs-rooturl
cloud-initramfs-dyn-netconf
cloud-initramfs-copymods
❯ apt-cache rdepends --implicit --recurse bridge-utils | grep -E ^lxc
lxc-utils
lxctl
lxc-templates
lxc
lxc1
lxc-dev
lxcfs

I wonder if we should continue to use bridge-utils... maybe the effort to move to iproute2 is huge.

[Andreas Hasenack (ahasenack)]

Thanks for handling this merge!

The delta is very old, wow, one is even 12 years old dealing with ifup/down which we don't do anymore. But messing with that sounds like trouble :/ And the delta seems easy enough to carry, which is good.

The delta has good enough bug references, so we can keep track of it.

Other checks:
- tags verified
- range-diff is clean, no changes
- debian changes ok

+1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, mirespace
Uploaders: ahasenack
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

I forgot to sponsor this back then, sorry. Uploaded now:

Uploading bridge-utils_1.7.1-2ubuntu1.dsc
Uploading bridge-utils_1.7.1-2ubuntu1.debian.tar.xz
Uploading bridge-utils_1.7.1-2ubuntu1_source.buildinfo
Uploading bridge-utils_1.7.1-2ubuntu1_source.changes

diff --git a/debian/bridge-network-interface.sh b/debian/bridge-network-interface.sh
index b62f333..ce13f37 100644
--- a/debian/bridge-network-interface.sh
+++ b/debian/bridge-network-interface.sh
@@ -29,7 +29,10 @@ if [ -d /run/network ]; then
 			$INTERFACE|$INTERFACE.*)
 				create_vlan_port
 				if [ -d /sys/class/net/$port ]; then
-					ifup --allow auto $i
+					if [ ! -d /sys/class/net/$i ]; then
+						brctl addbr $i
+					fi
+					brctl addif $i $port && ip link set dev $port up &&
 					if [ -e /proc/sys/net/ipv6/conf/$port ]; then ip link set $port addrgenmode none;fi
 					if [ "$(ifquery "$i"|sed -n -e's/^bridge[_-]hw: //p')" = "$port" ]; then
 						ip link set dev "$i" address "$(ip link show dev "$port" 2>/dev/null|sed -n "s|.*link/ether \([^ ]*\) brd.*|\1|p")"
diff --git a/debian/bridge-utils-interfaces.5 b/debian/bridge-utils-interfaces.5
index f44aeb5..c16ebd1 100644
--- a/debian/bridge-utils-interfaces.5
+++ b/debian/bridge-utils-interfaces.5
@@ -173,7 +173,7 @@ have a fractional part.
 .TP                                
 .BI bridge_gcint " time"
 set garbage collection interval to \fItime\fP seconds, default is 4,
-can have a fractional part.
+can have a fractional part.  Available on Linux kernel versions < 2.6.0.
 .TP                    
 .BI bridge_hello " time"
 set hello time to \fItime\fP seconds, default is 2, can have a
diff --git a/debian/changelog b/debian/changelog
index f68a589..4eb47dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bridge-utils (1.7.1-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2064391). Remaining changes:
+    - debian/bridge-network-interface.sh: Don't call ifup from
+      bridge-network-interface, instead just call brctl and let
+      udev/upstart bring the interface up (LP: 1003656).
+    - debian/ifupdown.sh: Handle bridge params which use port and
+      value (LP: 1576876).
+    - debian/bridge-utils-interface.5: Update unsettable gcint value
+      for newer kernels (LP: 1576858).
+
+ -- Miriam España Acebal <[e-mail]>  Mon, 27 May 2024 17:13:05 +0200
+
 bridge-utils (1.7.1-2) unstable; urgency=low
 
   [ Debian Janitor ]
@@ -9,6 +22,26 @@ bridge-utils (1.7.1-2) unstable; urgency=low
 
  -- Santiago García Mantiñán <[e-mail]>  Fri, 01 Mar 2024 23:09:33 +0100
 
+bridge-utils (1.7.1-1ubuntu2) noble; urgency=high
+
+  * No change rebuild for 64-bit time_t and frame pointers.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 08 Apr 2024 17:54:51 +0200
+
+bridge-utils (1.7.1-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update unsettable gcint value for newer kernels
+  * Dropped changes, no longer applicable:
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+
+ -- Graham Inggs <[e-mail]>  Thu, 23 Feb 2023 15:07:42 +0000
+
 bridge-utils (1.7.1-1) unstable; urgency=low
 
   * New upstream version.
@@ -32,6 +65,30 @@ bridge-utils (1.7-2) unstable; urgency=medium
 
  -- Santiago García Mantiñán <[e-mail]>  Mon, 03 Oct 2022 23:11:46 +0200
 
+bridge-utils (1.7-1ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild for ppc64el baseline bump.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 23 Mar 2022 10:44:35 +0100
+
+bridge-utils (1.7-1ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:09:41 +0200
+
+bridge-utils (1.7-1ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+      + Update unsettable gcint value for newer kernels
+
+ -- Steve Langasek <[e-mail]>  Wed, 17 Mar 2021 12:32:22 -0700
+
 bridge-utils (1.7-1) unstable; urgency=medium
 
   * New upstream version.
@@ -59,6 +116,18 @@ bridge-utils (1.6-6) unstable; urgency=medium
 
  -- Santiago Garcia Mantinan <[e-mail]>  Tue, 16 Feb 2021 13:29:04 +0100
 
+bridge-utils (1.6-5ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+      + Update unsettable gcint value for newer kernels
+
+ -- Steve Langasek <[e-mail]>  Fri, 29 Jan 2021 12:30:23 -0800
+
 bridge-utils (1.6-5) unstable; urgency=low
 
   * Overload bridge_hw to allow do specify an interface as well as the
@@ -75,6 +144,18 @@ bridge-utils (1.6-4) unstable; urgency=low
 
  -- Santiago Garcia Mantinan <[e-mail]>  Thu, 21 Jan 2021 10:51:31 +0100
 
+bridge-utils (1.6-3ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+      + Update unsettable gcint value for newer kernels
+
+ -- Steve Langasek <[e-mail]>  Fri, 01 May 2020 15:37:05 -0700
+
 bridge-utils (1.6-3) unstable; urgency=medium
 
   * Support VLAN aware setups where we need vlan filtering.
@@ -84,6 +165,18 @@ bridge-utils (1.6-3) unstable; urgency=medium
 
  -- Santiago Garcia Mantinan <[e-mail]>  Thu, 30 Apr 2020 10:06:38 +0200
 
+bridge-utils (1.6-2ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+      + Update unsettable gcint value for newer kernels
+
+ -- Steve Langasek <[e-mail]>  Fri, 01 Feb 2019 13:07:54 -0800
+
 bridge-utils (1.6-2) unstable; urgency=medium
 
   * Bump Standards-Version.
@@ -101,12 +194,39 @@ bridge-utils (1.6-1) unstable; urgency=low
 
  -- Santiago Garcia Mantinan <[e-mail]>  Tue, 15 Jan 2019 13:18:33 +0100
 
+bridge-utils (1.5-16ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+      + Update unsettable gcint value for newer kernels
+
+ -- Steve Langasek <[e-mail]>  Tue, 15 May 2018 07:25:38 -0700
+
 bridge-utils (1.5-16) unstable; urgency=medium
 
   * Don't set dev globally at bridge-utils.sh. Closes: #873086.
 
  -- Santiago Garcia Mantinan <[e-mail]>  Sun, 08 Apr 2018 23:06:30 +0200
 
+bridge-utils (1.5-15ubuntu1) bionic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - debian/ifupdown.sh: Handle bridge params which use port and value
+    - debian/bridge-utils-interface.5:
+      + Update max, default value for path cost
+      + Update unsettable gcint value for newer kernels
+  * Dropped changes, included in Debian:
+    - Set BRIDGE_HOTPLUG=yes as that's the behaviour we had in the past and
+      need for the event based networking. Reverting change from 1.5-4.
+
+ -- Steve Langasek <[e-mail]>  Fri, 16 Mar 2018 16:10:39 -0700
+
 bridge-utils (1.5-15) unstable; urgency=medium
 
   * Fix substrings on interfaces. Closes: #873087.
@@ -152,6 +272,26 @@ bridge-utils (1.5-10) unstable; urgency=low
 
  -- Santiago Garcia Mantinan <[e-mail]>  Thu, 10 Nov 2016 22:23:49 +0100
 
+bridge-utils (1.5-9ubuntu2) yakkety; urgency=medium
+
+  * debian/ifupdown.sh:
+    - Handle bridge params which use port and value (LP: #1576876)
+  * debian/bridge-utils-interface.5:
+    - Update max, default value for path cost (LP: #1576870)
+    - Update unsettable gcint value for newer kernels (LP: #1576858)
+
+ -- Ryan Harper <[e-mail]>  Thu, 05 May 2016 10:38:12 -0500
+
+bridge-utils (1.5-9ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable (LP: #1487108).  Remaining changes:
+    - Set BRIDGE_HOTPLUG=yes as that's the behaviour we had in the past and
+      need for the event based networking. Reverting change from 1.5-4.
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+
+ -- Andy Whitcroft <[e-mail]>  Thu, 20 Aug 2015 17:02:39 +0100
+
 bridge-utils (1.5-9) unstable; urgency=low
 
   * Fix kernel version check and adjust it to match kernel behaviours.
@@ -170,6 +310,18 @@ bridge-utils (1.5-8) unstable; urgency=low
 
  -- Santiago Garcia Mantinan <[e-mail]>  Sat, 07 Dec 2013 18:55:13 +0100
 
+bridge-utils (1.5-7ubuntu1) utopic; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Set BRIDGE_HOTPLUG=yes as that's the behaviour we had in the past and
+      need for the event based networking. Reverting change from 1.5-4.
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+    - Use dh_strip rather than "install -s", since it supports
+      cross-building.
+
+ -- Colin Watson <[e-mail]>  Wed, 30 Apr 2014 12:16:28 +0100
+
 bridge-utils (1.5-7) unstable; urgency=low
 
   * The scripts now use iproute instead of ifconfig. Closes: #698630.
@@ -178,6 +330,22 @@ bridge-utils (1.5-7) unstable; urgency=low
 
  -- Santiago Garcia Mantinan <[e-mail]>  Fri, 8 Nov 2013 09:55:25 +0100
 
+bridge-utils (1.5-6ubuntu2) trusty; urgency=medium
+
+  * Use dh_strip rather than "install -s", since it supports cross-building.
+
+ -- Colin Watson <[e-mail]>  Fri, 10 Jan 2014 14:42:13 +0000
+
+bridge-utils (1.5-6ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Set BRIDGE_HOTPLUG=yes as that's the behaviour we had in the past and
+      need for the event based networking. Reverting change from 1.5-4.
+    - Don't call ifup from bridge-network-interface, instead just call brctl
+      and let udev/upstart bring the interface up.
+
+ -- Logan Rosen <[e-mail]>  Mon, 19 Nov 2012 21:28:42 -0500
+
 bridge-utils (1.5-6) unstable; urgency=low
 
   * Will rewrite post wheezy, changing to suggests. Closes: #693095.
@@ -192,6 +360,24 @@ bridge-utils (1.5-5) unstable; urgency=low
 
  -- Santiago Garcia Mantinan <[e-mail]>  Thu, 08 Nov 2012 19:56:15 +0100
 
+bridge-utils (1.5-4ubuntu2) quantal; urgency=low
+
+  * Revert last chance as udev doesn't accept that syntax.
+  * Set BRIDGE_HOTPLUG=yes as that's the behaviour we had in the past and
+    need for the event based networking. Reverting change from 1.5-4.
+  * Don't call ifup from bridge-network-interface, instead just call brctl
+    and let udev/upstart bring the interface up (LP: #1003656)
+
+ -- Stéphane Graber <[e-mail]>  Tue, 11 Sep 2012 10:45:45 -0400
+
+bridge-utils (1.5-4ubuntu1) quantal; urgency=low
+
+  * Start bridge-network-interface in the background to avoid blocking the
+    rest of the udev events (most importantly the upstart one).
+    (LP: #1003656)
+
+ -- Stéphane Graber <[e-mail]>  Fri, 07 Sep 2012 17:35:13 -0400
+
 bridge-utils (1.5-4) unstable; urgency=low
 
   * Remove mkdir and exit if /run/network doesn't exist. Thanks
@@ -445,3 +631,4 @@ bridge-utils (0.9.2-1) unstable; urgency=low
 Local variables:
 mode: debian-changelog
 End:
+
diff --git a/debian/control b/debian/control
index 208c32a..2c6b8a0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: bridge-utils
 Section: net
 Priority: optional
-Maintainer: Santiago García Mantiñán <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Santiago García Mantiñán <[e-mail]>
 Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/manty/bridge-utils.git
 Vcs-Browser: https://salsa.debian.org/manty/bridge-utils
diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh
index 31bd1b2..63277f8 100644
--- a/debian/ifupdown.sh
+++ b/debian/ifupdown.sh
@@ -146,12 +146,20 @@ if [ "$MODE" = "start" ] ; then
 
   if [ "$IF_BRIDGE_PATHCOST" ]
   then
-    brctl setpathcost $IFACE $IF_BRIDGE_PATHCOST
+    echo "$IF_BRIDGE_PATHCOST" | {
+      while read PORT COST; do
+        brctl setpathcost $IFACE $PORT $COST
+      done
+    }
   fi
 
   if [ "$IF_BRIDGE_PORTPRIO" ]
   then
-    brctl setportprio $IFACE $IF_BRIDGE_PORTPRIO
+    echo "$IF_BRIDGE_PORTPRIO" | {
+      while read PORT PRIO; do
+        brctl setportprio $IFACE $PORT $PRIO
+      done
+    }
   fi
 
   if [ "$IF_BRIDGE_STP" ]