From fba1f17298b12e0a7ec6c21a87f4822c3491465a6e7c255d9a297a6bb69dad2d Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 3 Nov 2020 07:35:09 +0000 Subject: [PATCH 1/2] Accepting request 844385 from home:pmonrealgonzalez:branches:network:utilities - This utility is DEPRECATED. No new features will ever be added. Instead use the bridge command from the iproute2 package which supports more features. - Update to version 1.7 * Replace references to enslave * Remove out of date TODO * brctl: fix signed/unsigned comparison warnings * libbridge: add missing sys/time.h include in header * libbridge: Include the configured CFLAGS when compiling - Rebase patches: * bridge-utils-1.5-ip6.patch * bridge-utils-1.5-optflags.patch OBS-URL: https://build.opensuse.org/request/show/844385 OBS-URL: https://build.opensuse.org/package/show/network:utilities/bridge-utils?expand=0&rev=28 --- bridge-utils-1.5-ip6.patch | 4 ++-- bridge-utils-1.5-optflags.patch | 8 ++++---- bridge-utils-1.6.tar.gz | 3 --- bridge-utils-1.7.tar.gz | 3 +++ bridge-utils.changes | 16 ++++++++++++++++ bridge-utils.spec | 9 +++++---- 6 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 bridge-utils-1.6.tar.gz create mode 100644 bridge-utils-1.7.tar.gz diff --git a/bridge-utils-1.5-ip6.patch b/bridge-utils-1.5-ip6.patch index 01105a2..2f53239 100644 --- a/bridge-utils-1.5-ip6.patch +++ b/bridge-utils-1.5-ip6.patch @@ -2,9 +2,9 @@ Index: libbridge/libbridge.h =================================================================== --- libbridge/libbridge.h.orig +++ libbridge/libbridge.h -@@ -23,6 +23,7 @@ - #include +@@ -25,6 +25,7 @@ #include + #include +#include #include diff --git a/bridge-utils-1.5-optflags.patch b/bridge-utils-1.5-optflags.patch index 86007ee..fc83b6e 100644 --- a/bridge-utils-1.5-optflags.patch +++ b/bridge-utils-1.5-optflags.patch @@ -1,13 +1,13 @@ Index: libbridge/Makefile.in =================================================================== ---- libbridge/Makefile.in.orig 2008-01-08 17:20:35.000000000 +0100 -+++ libbridge/Makefile.in 2008-05-06 08:44:34.000000000 +0200 +--- libbridge/Makefile.in.orig ++++ libbridge/Makefile.in @@ -5,7 +5,7 @@ AR=ar RANLIB=@RANLIB@ CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS += -Wall -g $(KERNEL_HEADERS) +-CFLAGS = -Wall @CFLAGS@ $(KERNEL_HEADERS) ++CFLAGS += -Wall @CFLAGS@ $(KERNEL_HEADERS) prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/bridge-utils-1.6.tar.gz b/bridge-utils-1.6.tar.gz deleted file mode 100644 index c9f15e2..0000000 --- a/bridge-utils-1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e86e7d9aca850869b5505d6377e79005cb7630022f8c624e6db52d877f5bf4cf -size 33368 diff --git a/bridge-utils-1.7.tar.gz b/bridge-utils-1.7.tar.gz new file mode 100644 index 0000000..df56b7a --- /dev/null +++ b/bridge-utils-1.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b9b12f31d147320dea931f1041b8a69d84741ddb92cf35ea1f896b67da98b7c +size 33069 diff --git a/bridge-utils.changes b/bridge-utils.changes index ee3e8bf..254c47f 100644 --- a/bridge-utils.changes +++ b/bridge-utils.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Oct 27 16:44:27 UTC 2020 - Pedro Monreal + +- This utility is DEPRECATED. No new features will ever be added. + Instead use the bridge command from the iproute2 package which + supports more features. +- Update to version 1.7 + * Replace references to enslave + * Remove out of date TODO + * brctl: fix signed/unsigned comparison warnings + * libbridge: add missing sys/time.h include in header + * libbridge: Include the configured CFLAGS when compiling +- Rebase patches: + * bridge-utils-1.5-ip6.patch + * bridge-utils-1.5-optflags.patch + ------------------------------------------------------------------- Tue Sep 10 20:26:53 UTC 2019 - Christophe Giboudeaux diff --git a/bridge-utils.spec b/bridge-utils.spec index 3b722b2..d87562e 100644 --- a/bridge-utils.spec +++ b/bridge-utils.spec @@ -1,7 +1,7 @@ # # spec file for package bridge-utils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: bridge-utils -Version: 1.6 +Version: 1.7 Release: 0 Summary: Utilities for Configuring the Linux Ethernet Bridge License: GPL-2.0-or-later Group: Productivity/Networking/Routing -Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge +URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge Source: http://www.kernel.org/pub/linux/utils/net/bridge-utils/%{name}-%{version}.tar.gz Patch0: %{name}-1.5-hz.diff Patch1: %{name}-1.5-optflags.patch @@ -66,7 +66,8 @@ install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README THANKS TODO doc/[FHPRSW]* +%license COPYING +%doc AUTHORS ChangeLog README THANKS doc/[FHPRSW]* %{_mandir}/man?/* %{_sbindir}/* From ab09e83dbd67e07e14d225d10962b3ee109d8ad25a3a42c828ed5322e1126993 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 3 Nov 2020 23:05:47 +0000 Subject: [PATCH 2/2] Accepting request 845626 from home:pmonrealgonzalez:branches:network:utilities - Update project URLs * bridge-utils-1.5-optflags.patch OBS-URL: https://build.opensuse.org/request/show/845626 OBS-URL: https://build.opensuse.org/package/show/network:utilities/bridge-utils?expand=0&rev=29 --- bridge-utils-1.7.tar.gz | 3 --- bridge-utils-1.7.tar.sign | Bin 0 -> 566 bytes bridge-utils-1.7.tar.xz | 3 +++ bridge-utils.changes | 3 ++- bridge-utils.spec | 5 +++-- 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 bridge-utils-1.7.tar.gz create mode 100644 bridge-utils-1.7.tar.sign create mode 100644 bridge-utils-1.7.tar.xz diff --git a/bridge-utils-1.7.tar.gz b/bridge-utils-1.7.tar.gz deleted file mode 100644 index df56b7a..0000000 --- a/bridge-utils-1.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b9b12f31d147320dea931f1041b8a69d84741ddb92cf35ea1f896b67da98b7c -size 33069 diff --git a/bridge-utils-1.7.tar.sign b/bridge-utils-1.7.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..312f820137c416b7475a419ce556a069d0b9ef60177da554873d698cef7fed8c GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$%-0?*Ix35P+wD zV3p0}es^XM|68hThF4lwkURfeE3>}Bw>^6V)b#@zfFPn!JP7CEZuSd|pq9D&o8G=$ zhCc%tNyVcmsDK&N)m26?S(eW>_{MT?rGoFNA5yT@O{VTXFM-9A#7YHws4AbODGGMW zSOBlzZdJ!C{THm_11TbQkC$EQ=}^rM?H>U(x@=yP)j9x}1Y&?PI2sqHR6%UXRbUpx zlSnF8n>vc~!@H6S*F2;|QMuj}CxPD#Jyu%%e~SYzP-}{4<9<)Wg>$s|@-|`WyhBAZ z8Q9rzYC-2-VMtajfNa0TzeWLGp{why@ctoWpQ(F6+;d9|(!#!bkmD{Zg=vHb7Dh7n zele@+FV=*Q#*Qr!{jugEiinnsZPBV&e+6W+v;#sG$Vi&Q9~VZ8OKB!E$NfbdhhX5N zeqK-$TY6$K2akB*E?u|VXJkI#@ zT`mMP0)G0AwS4fd<>kfXOX;m)4OEMg2+c8iBj2hu#5L)rr9zrHUmE18XJV55!@hYU7=(DQrryLHDn2c{ zv>O&W7t> * brctl: fix signed/unsigned comparison warnings * libbridge: add missing sys/time.h include in header * libbridge: Include the configured CFLAGS when compiling +- Update project URLs - Rebase patches: * bridge-utils-1.5-ip6.patch - * bridge-utils-1.5-optflags.patch + * bridge-utils-1.5-optflags.patch ------------------------------------------------------------------- Tue Sep 10 20:26:53 UTC 2019 - Christophe Giboudeaux diff --git a/bridge-utils.spec b/bridge-utils.spec index d87562e..5771da6 100644 --- a/bridge-utils.spec +++ b/bridge-utils.spec @@ -22,8 +22,9 @@ Release: 0 Summary: Utilities for Configuring the Linux Ethernet Bridge License: GPL-2.0-or-later Group: Productivity/Networking/Routing -URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge -Source: http://www.kernel.org/pub/linux/utils/net/bridge-utils/%{name}-%{version}.tar.gz +URL: https://www.linuxfoundation.org/collaborate/workgroups/networking/bridge +Source0: https://kernel.org/pub/linux/kernel/people/shemminger/%{name}/%{name}-%{version}.tar.xz +Source1: https://kernel.org/pub/linux/kernel/people/shemminger/%{name}/%{name}-%{version}.tar.sign Patch0: %{name}-1.5-hz.diff Patch1: %{name}-1.5-optflags.patch Patch2: bridge-utils-1.5-ip6.patch