diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-08-02 20:56:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 20:56:27 +0300 |
| commit | d4039aac6c068a1254b4335567c680bba7bb0149 (patch) | |
| tree | 362cca110a66c26467ea84032e1eed4494b7f2a1 /net | |
| parent | 430b7a4e90c98dc2653e0fdaa81acc7045f2c330 (diff) | |
| parent | aa69320bc84e33509db7b346544edb282b576d8a (diff) | |
Merge pull request #6590 from neheb/bridge
bridge-utils: Update to 1.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge-utils/Makefile | 17 | ||||
| -rw-r--r-- | net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch | 10 | ||||
| -rw-r--r-- | net/bridge-utils/patches/100-musl-compat.patch | 11 |
3 files changed, 7 insertions, 31 deletions
diff --git a/net/bridge-utils/Makefile b/net/bridge-utils/Makefile index 00c63ea44..81614d3e6 100644 --- a/net/bridge-utils/Makefile +++ b/net/bridge-utils/Makefile @@ -9,15 +9,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=bridge-utils -PKG_VERSION:=1.5 -PKG_RELEASE:=5 +PKG_VERSION:=1.6 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git -PKG_SOURCE_VERSION:=v${PKG_VERSION} -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MIRROR_HASH:=ce568c41f60987ed972c53fb8dab92bf45052849c4992e8ae931c1eb505630b7 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@KERNEL/linux/utils/net/$(PKG_NAME) +PKG_HASH:=cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 +PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com> PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING @@ -29,8 +27,7 @@ define Package/bridge SECTION:=net CATEGORY:=Base system TITLE:=Ethernet bridging configuration utility - URL:=http://bridge.sourceforge.net/ - PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com> + URL:=http://www.linuxfromscratch.org/blfs/view/svn/basicnet/bridge-utils.html endef define Package/bridge/description diff --git a/net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch b/net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch deleted file mode 100644 index c2087e590..000000000 --- a/net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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> - diff --git a/net/bridge-utils/patches/100-musl-compat.patch b/net/bridge-utils/patches/100-musl-compat.patch deleted file mode 100644 index 5655643d8..000000000 --- a/net/bridge-utils/patches/100-musl-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -19,6 +19,8 @@ - #ifndef _LIBBRIDGE_H - #define _LIBBRIDGE_H - -+#include <sys/types.h> -+#include <sys/select.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <linux/if.h> |