summaryrefslogtreecommitdiff
path: root/package/bridge-utils
diff options
context:
space:
mode:
Diffstat (limited to 'package/bridge-utils')
-rw-r--r--package/bridge-utils/Makefile11
-rw-r--r--package/bridge-utils/patches/patch-brctl_brctl_c13
-rw-r--r--package/bridge-utils/patches/patch-configure_in10
-rw-r--r--package/bridge-utils/patches/patch-libbridge_libbridge_h11
4 files changed, 5 insertions, 40 deletions
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 9eb148633..50a76fc30 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -4,17 +4,16 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= bridge-utils
-PKG_VERSION:= 1.5
-PKG_RELEASE:= 2
-PKG_HASH:= 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688
+PKG_VERSION:= 1.6
+PKG_RELEASE:= 1
+PKG_HASH:= cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8
PKG_DESCR:= ethernet bridging tools
PKG_SECTION:= net/route
PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
+PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/bridge-utils/
PKG_BB:= 1
-PKG_CFLINE_BRIDGE_UTILS:=select ADK_KERNEL_BRIDGE
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+PKG_CFLINE_BRIDGE_UTILS:=select ADK_KERNEL_BRIDGE
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/bridge-utils/patches/patch-brctl_brctl_c b/package/bridge-utils/patches/patch-brctl_brctl_c
deleted file mode 100644
index 5305e47cc..000000000
--- a/package/bridge-utils/patches/patch-brctl_brctl_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- bridge-utils-1.5.orig/brctl/brctl.c 2011-03-29 02:52:54.000000000 +0200
-+++ bridge-utils-1.5/brctl/brctl.c 2013-12-27 20:58:33.000000000 +0100
-@@ -19,8 +19,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <getopt.h>
-+#include <sys/types.h>
-
- #include "libbridge.h"
- #include "config.h"
diff --git a/package/bridge-utils/patches/patch-configure_in b/package/bridge-utils/patches/patch-configure_in
deleted file mode 100644
index 0b61864cb..000000000
--- a/package/bridge-utils/patches/patch-configure_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- bridge-utils-1.5.orig/configure.in 2011-03-29 02:52:54.000000000 +0200
-+++ bridge-utils-1.5/configure.in 2013-11-03 15:09:52.000000000 +0100
-@@ -9,6 +9,7 @@ dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-+AC_CHECK_TOOL(AR, ar, ar)
-
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/package/bridge-utils/patches/patch-libbridge_libbridge_h b/package/bridge-utils/patches/patch-libbridge_libbridge_h
deleted file mode 100644
index bbfd4ccb3..000000000
--- a/package/bridge-utils/patches/patch-libbridge_libbridge_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-29 02:52:54.000000000 +0200
-+++ bridge-utils-1.5/libbridge/libbridge.h 2013-12-27 21:01:15.000000000 +0100
-@@ -20,6 +20,8 @@
- #define _LIBBRIDGE_H
-
- #include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
-