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.sign b/bridge-utils-1.7.tar.sign new file mode 100644 index 0000000..312f820 Binary files /dev/null and b/bridge-utils-1.7.tar.sign differ diff --git a/bridge-utils-1.7.tar.xz b/bridge-utils-1.7.tar.xz new file mode 100644 index 0000000..2bea673 --- /dev/null +++ b/bridge-utils-1.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:939987e659b1a4c36ae46f44b6687f373bc5c916a9eab91f775630f5e38b997e +size 29420 diff --git a/bridge-utils.changes b/bridge-utils.changes index ee3e8bf..f7b218d 100644 --- a/bridge-utils.changes +++ b/bridge-utils.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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 +- Update project URLs +- 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..5771da6 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,13 +17,14 @@ 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 -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 @@ -66,7 +67,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}/*