From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 19 Dec 2022 17:51:45 +0000 (+0000)
Subject: bridge-utils: Drop package
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bbcd7589d9f344922ffeb264b03c43b29faf074;p=ipfire-3.x.git

bridge-utils: Drop package

bridge-utils is deprecated.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/bridge-utils/bridge-utils.nm b/bridge-utils/bridge-utils.nm
deleted file mode 100644
index 09bfc7bd8..000000000
--- a/bridge-utils/bridge-utils.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = bridge-utils
-version    = 1.5
-release    = 1
-
-groups     = Networking/Tools
-url        = http://bridge.sourceforge.net/
-license    = GPLv2+
-summary    = Utilities for configuring the linux ethernet bridge.
-
-description
-	This package contains utilities for configuring the linux ethernet \
-	bridge. The linux ethernet bridge can be used for connecting multiple \
-	ethernet devices together. The connecting is fully transparent: hosts \
-	connected to one ethernet device see hosts connected to the other \
-	ethernet devices directly.
-end
-
-source_dl  = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
-
-build
-	requires
-		autoconf
-		automake
-	end
-
-	prepare_cmds
-		autoconf
-	end
-
-	install_cmds
-		rm -rvf %{BUILDROOT}/usr/include
-	end
-end
-
-packages
-	package %{name}
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch b/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
deleted file mode 100644
index 292cc83c2..000000000
--- a/bridge-utils/patches/bridge-utils-1.5-linux_3.8_fix-1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
-Date:                    2013-03-10
-Initial Package Version: 1.5
-Upstream Status:         Unknown
-Origin:                  LFS
-Description:             This patch contains fixes a problem with 
-the omission of a needed include file in the kernel's linux/if_bridge.h.
-It also fixes some autoconf warnings.
-
-
-diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in
---- bridge-utils-1.5.orig/Makefile.in	2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/Makefile.in	2013-03-10 13:44:41.000000000 -0500
-@@ -9,6 +9,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- mandir=@mandir@
-+datarootdir=@datarootdir@
- distdir = $(PACKAGE)-$(VERSION)
- 
- SUBDIRS=libbridge brctl doc
-diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in
---- bridge-utils-1.5.orig/brctl/Makefile.in	2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/brctl/Makefile.in	2013-03-10 13:44:15.000000000 -0500
-@@ -12,6 +12,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- mandir=@mandir@
-+datarootdir=@datarootdir@
- 
- INSTALL=@INSTALL@
- 
-diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in
---- bridge-utils-1.5.orig/doc/Makefile.in	2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/doc/Makefile.in	2013-03-10 13:43:39.000000000 -0500
-@@ -9,6 +9,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- mandir=@mandir@
-+datarootdir=@datarootdir@
- 
- SUBDIRS=libbridge brctl
- 
-diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h bridge-utils-1.5/libbridge/libbridge.h
---- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-28 19:52:54.000000000 -0500
-+++ bridge-utils-1.5/libbridge/libbridge.h	2013-03-10 13:46:23.000000000 -0500
-@@ -21,6 +21,7 @@
- 
- #include <sys/socket.h>
- #include <linux/if.h>
-+#include <netinet/ip6.h>
- #include <linux/if_bridge.h>
- 
- /* defined in net/if.h but that conflicts with linux/if.h... */
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 59ea280fd..abd0323c8 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -5,7 +5,7 @@
 
 name       = dracut
 version    = 048
-release    = 2
+release    = 3
 
 groups     = System/Boot
 url        = http://sourceforge.net/apps/trac/dracut/wiki
@@ -103,7 +103,6 @@ packages
 		end
 
 		requires
-			bridge-utils
 			dhclient
 			iproute2
 			nfs-utils