From fc7ac0c1a5bc340edcfdd1d27f902c01aca1ee9f Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 20 Aug 2008 13:56:57 +0000
Subject: [PATCH] upgrade bridge-utils to v1.4

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12346 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/bridge-utils/Makefile                       | 13 ++++++++++---
 .../patches/001-patch-libbridge_makefile_in         |  6 ++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index e9f2de5aa..de9bc95d7 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/bridge
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
+PKG_MD5SUM:=0182fcac3a2b307113bbec34e5f1c673
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,6 +34,13 @@ endef
 CONFIGURE_ARGS += \
 	--with-linux-headers="$(LINUX_DIR)" \
 
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); \
+	autoconf; \
+	./configure $(CONFIGURE_ARGS) \
+	)
+endef
+
 define Package/bridge/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
diff --git a/package/bridge-utils/patches/001-patch-libbridge_makefile_in b/package/bridge-utils/patches/001-patch-libbridge_makefile_in
index 5d211284a..cfd5cf785 100644
--- a/package/bridge-utils/patches/001-patch-libbridge_makefile_in
+++ b/package/bridge-utils/patches/001-patch-libbridge_makefile_in
@@ -1,7 +1,5 @@
-Index: bridge-utils-1.0.6/libbridge/Makefile.in
-===================================================================
---- bridge-utils-1.0.6.orig/libbridge/Makefile.in	2007-06-04 13:21:26.951879360 +0200
-+++ bridge-utils-1.0.6/libbridge/Makefile.in	2007-06-04 13:21:27.019869024 +0200
+--- a/libbridge/Makefile.in
++++ b/libbridge/Makefile.in
 @@ -5,7 +5,7 @@
  RANLIB=@RANLIB@