diff -pruN 1.7.1-4/debian/bridge-network-interface.sh 1.7.1-4ubuntu2/debian/bridge-network-interface.sh --- 1.7.1-4/debian/bridge-network-interface.sh 2025-01-09 12:08:34.000000000 +0000 +++ 1.7.1-4ubuntu2/debian/bridge-network-interface.sh 2025-03-08 15:49:46.000000000 +0000 @@ -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 -pruN 1.7.1-4/debian/bridge-utils-interfaces.5 1.7.1-4ubuntu2/debian/bridge-utils-interfaces.5 --- 1.7.1-4/debian/bridge-utils-interfaces.5 2025-03-07 14:36:34.000000000 +0000 +++ 1.7.1-4ubuntu2/debian/bridge-utils-interfaces.5 2025-03-08 15:49:46.000000000 +0000 @@ -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 -pruN 1.7.1-4/debian/changelog 1.7.1-4ubuntu2/debian/changelog --- 1.7.1-4/debian/changelog 2025-03-07 14:36:34.000000000 +0000 +++ 1.7.1-4ubuntu2/debian/changelog 2025-09-03 15:03:58.000000000 +0000 @@ -1,3 +1,22 @@ +bridge-utils (1.7.1-4ubuntu2) questing; urgency=medium + + * Rebuild to include updated RISC-V base ISA RVA23 + + -- Heinrich Schuchardt Wed, 03 Sep 2025 15:03:58 +0000 + +bridge-utils (1.7.1-4ubuntu1) plucky; urgency=medium + + * Merge from Debian Unstable. 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). + + -- Simon Quigley Fri, 14 Mar 2025 20:49:52 -0500 + bridge-utils (1.7.1-4) unstable; urgency=low * Add bridge_token option to set tokenized interface id for the @@ -5,6 +24,19 @@ bridge-utils (1.7.1-4) unstable; urgency -- Santiago García Mantiñán Fri, 07 Mar 2025 15:36:34 +0100 +bridge-utils (1.7.1-3ubuntu1) plucky; urgency=medium + + * Merge from Debian Unstable. 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). + + -- Simon Quigley Tue, 11 Feb 2025 15:56:44 -0600 + bridge-utils (1.7.1-3) unstable; urgency=medium * Merge and fix Gioele's patches, thanks. Closes: #1050200. @@ -14,6 +46,19 @@ bridge-utils (1.7.1-3) unstable; urgency -- Santiago García Mantiñán Thu, 09 Jan 2025 09:42:26 +0100 +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 Mon, 27 May 2024 17:13:05 +0200 + bridge-utils (1.7.1-2) unstable; urgency=low [ Debian Janitor ] @@ -25,6 +70,26 @@ bridge-utils (1.7.1-2) unstable; urgency -- Santiago García Mantiñán 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 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 Thu, 23 Feb 2023 15:07:42 +0000 + bridge-utils (1.7.1-1) unstable; urgency=low * New upstream version. @@ -48,6 +113,30 @@ bridge-utils (1.7-2) unstable; urgency=m -- Santiago García Mantiñán 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 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 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 Wed, 17 Mar 2021 12:32:22 -0700 + bridge-utils (1.7-1) unstable; urgency=medium * New upstream version. @@ -75,6 +164,18 @@ bridge-utils (1.6-6) unstable; urgency=m -- Santiago Garcia Mantinan 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 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 @@ -91,6 +192,18 @@ bridge-utils (1.6-4) unstable; urgency=l -- Santiago Garcia Mantinan 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 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. @@ -100,6 +213,18 @@ bridge-utils (1.6-3) unstable; urgency=m -- Santiago Garcia Mantinan 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 Fri, 01 Feb 2019 13:07:54 -0800 + bridge-utils (1.6-2) unstable; urgency=medium * Bump Standards-Version. @@ -117,12 +242,39 @@ bridge-utils (1.6-1) unstable; urgency=l -- Santiago Garcia Mantinan 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 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 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 Fri, 16 Mar 2018 16:10:39 -0700 + bridge-utils (1.5-15) unstable; urgency=medium * Fix substrings on interfaces. Closes: #873087. @@ -168,6 +320,26 @@ bridge-utils (1.5-10) unstable; urgency= -- Santiago Garcia Mantinan 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 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 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. @@ -186,6 +358,18 @@ bridge-utils (1.5-8) unstable; urgency=l -- Santiago Garcia Mantinan 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 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. @@ -194,6 +378,22 @@ bridge-utils (1.5-7) unstable; urgency=l -- Santiago Garcia Mantinan 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 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 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. @@ -208,6 +408,24 @@ bridge-utils (1.5-5) unstable; urgency=l -- Santiago Garcia Mantinan 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 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 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 @@ -461,3 +679,4 @@ bridge-utils (0.9.2-1) unstable; urgency Local variables: mode: debian-changelog End: + diff -pruN 1.7.1-4/debian/control 1.7.1-4ubuntu2/debian/control --- 1.7.1-4/debian/control 2025-01-09 12:11:48.000000000 +0000 +++ 1.7.1-4ubuntu2/debian/control 2025-03-08 15:49:46.000000000 +0000 @@ -1,7 +1,8 @@ Source: bridge-utils Section: net Priority: optional -Maintainer: Santiago García Mantiñán +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Santiago García Mantiñán Rules-Requires-Root: no Standards-Version: 4.7.0 Vcs-Git: https://salsa.debian.org/manty/bridge-utils.git diff -pruN 1.7.1-4/debian/ifupdown.sh 1.7.1-4ubuntu2/debian/ifupdown.sh --- 1.7.1-4/debian/ifupdown.sh 2025-03-07 14:30:17.000000000 +0000 +++ 1.7.1-4ubuntu2/debian/ifupdown.sh 2025-03-08 15:49:46.000000000 +0000 @@ -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" ]