[PATCH] bridge-utils: Update to version 1.7.1

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4553 bytes --]

- Update from version 1.5 (2011) to 1.7.1 (2021)
- bridge-utils has been marked as deprecated in June 2020 and that only critical bug
   fixes will be applied in future. Since that time there have been three commits in
   the git repository, none of which are critical at all but mostly cleaning up. The
   last commit was in January 2022.
- Even though no new changes are planned it makes sense to update this package from
   the 2011 version to the 2021 version.
- The patch that was previously used is no longer needed as it is now built into the
   source tarball.
- Rootfile update not required.
- Changelog was last updated in 2006. It looks like the only source for changes is
   the git commits. There are 28 commits between version 1.5 and 1.7.1
   https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/log/?h=main

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/bridge-utils                              | 11 +++----
 .../bridge-utils-1.5-compile-fix-1.patch      | 31 -------------------
 2 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 src/patches/bridge-utils-1.5-compile-fix-1.patch

diff --git a/lfs/bridge-utils b/lfs/bridge-utils
index f1170d7aa..b67b84850 100644
--- a/lfs/bridge-utils
+++ b/lfs/bridge-utils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.5
+VER        = 1.7.1
 
 THISAPP    = bridge-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd
+$(DL_FILE)_BLAKE2 = 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515
 
 install : $(TARGET)
 
@@ -69,8 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bridge-utils-1.5-compile-fix-1.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && find . -name Makefile.in | xargs sed -i -e "s/^KERNEL_HEADERS/#&/g"
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP) && ./configure --prefix=/usr
diff --git a/src/patches/bridge-utils-1.5-compile-fix-1.patch b/src/patches/bridge-utils-1.5-compile-fix-1.patch
deleted file mode 100644
index c2696086e..000000000
--- a/src/patches/bridge-utils-1.5-compile-fix-1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d Mon Sep 17 00:00:00 2001
-From: Russell Senior <russell(a)personaltelco.net>
-Date: Wed, 06 Mar 2013 20:49:42 +0000
-Subject: bridge-utils: Fix compile against linux-3.8.x
-
-Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
-struct in6_addr but doesn't define it.  The trivial seeming fix of
-including the header that does define it causes more problems.  The
-problem was discussed on mailing lists in January 2013.  The final
-suggestion I found was here:
-
-      http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
-
-This is intended to implement that suggestion.
-
-Signed-off-by: Russell Senior <russell(a)personaltelco.net>
----
-diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index 39964f2..dd14bae 100644
---- a/libbridge/libbridge.h
-+++ b/libbridge/libbridge.h
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- 
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
- 
---
-cgit v0.9.2
-- 
2.47.0