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
This commit is contained in:
Pedro Monreal Gonzalez 2020-11-03 07:35:09 +00:00 committed by Git OBS Bridge
parent ae7c4a1450
commit fba1f17298
6 changed files with 30 additions and 13 deletions

View File

@ -2,9 +2,9 @@ Index: libbridge/libbridge.h
=================================================================== ===================================================================
--- libbridge/libbridge.h.orig --- libbridge/libbridge.h.orig
+++ libbridge/libbridge.h +++ libbridge/libbridge.h
@@ -23,6 +23,7 @@ @@ -25,6 +25,7 @@
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <linux/if.h> #include <linux/if.h>
+#include <linux/in6.h> +#include <linux/in6.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>

View File

@ -1,13 +1,13 @@
Index: libbridge/Makefile.in Index: libbridge/Makefile.in
=================================================================== ===================================================================
--- libbridge/Makefile.in.orig 2008-01-08 17:20:35.000000000 +0100 --- libbridge/Makefile.in.orig
+++ libbridge/Makefile.in 2008-05-06 08:44:34.000000000 +0200 +++ libbridge/Makefile.in
@@ -5,7 +5,7 @@ AR=ar @@ -5,7 +5,7 @@ AR=ar
RANLIB=@RANLIB@ RANLIB=@RANLIB@
CC=@CC@ CC=@CC@
-CFLAGS = -Wall -g $(KERNEL_HEADERS) -CFLAGS = -Wall @CFLAGS@ $(KERNEL_HEADERS)
+CFLAGS += -Wall -g $(KERNEL_HEADERS) +CFLAGS += -Wall @CFLAGS@ $(KERNEL_HEADERS)
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e86e7d9aca850869b5505d6377e79005cb7630022f8c624e6db52d877f5bf4cf
size 33368

3
bridge-utils-1.7.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b9b12f31d147320dea931f1041b8a69d84741ddb92cf35ea1f896b67da98b7c
size 33069

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Oct 27 16:44:27 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
- 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 <christophe@krop.fr> Tue Sep 10 20:26:53 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -1,7 +1,7 @@
# #
# spec file for package bridge-utils # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,12 +17,12 @@
Name: bridge-utils Name: bridge-utils
Version: 1.6 Version: 1.7
Release: 0 Release: 0
Summary: Utilities for Configuring the Linux Ethernet Bridge Summary: Utilities for Configuring the Linux Ethernet Bridge
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Networking/Routing 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 Source: http://www.kernel.org/pub/linux/utils/net/bridge-utils/%{name}-%{version}.tar.gz
Patch0: %{name}-1.5-hz.diff Patch0: %{name}-1.5-hz.diff
Patch1: %{name}-1.5-optflags.patch Patch1: %{name}-1.5-optflags.patch
@ -66,7 +66,8 @@ install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README THANKS TODO doc/[FHPRSW]* %license COPYING
%doc AUTHORS ChangeLog README THANKS doc/[FHPRSW]*
%{_mandir}/man?/* %{_mandir}/man?/*
%{_sbindir}/* %{_sbindir}/*