bridge-utils: 1.5 -> 1.7.1
While at it: - updated package description (and mention DEPRECATED upstream status) - switched to .xz tarball - dropped upstreamed patch - dropped explicit checks for build result as upstream fixed it.
This commit is contained in:
parent
5373418b44
commit
19071065eb
@ -1,11 +0,0 @@
|
|||||||
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>
|
|
@ -1,7 +1,5 @@
|
|||||||
diff --git a/configure.in b/configure.in
|
--- a/configure.ac
|
||||||
index 5e3f89b..19be6d9 100644
|
+++ b/configure.ac
|
||||||
--- a/configure.in
|
|
||||||
+++ b/configure.in
|
|
||||||
@@ -9,6 +9,7 @@ dnl Checks for programs.
|
@@ -9,6 +9,7 @@ dnl Checks for programs.
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
@ -10,8 +8,6 @@ index 5e3f89b..19be6d9 100644
|
|||||||
|
|
||||||
dnl Checks for header files.
|
dnl Checks for header files.
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
|
|
||||||
index 20512c4..83c802b 100644
|
|
||||||
--- a/libbridge/Makefile.in
|
--- a/libbridge/Makefile.in
|
||||||
+++ b/libbridge/Makefile.in
|
+++ b/libbridge/Makefile.in
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
|
@ -2,29 +2,19 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bridge-utils";
|
pname = "bridge-utils";
|
||||||
version = "1.5";
|
version = "1.7.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz";
|
url = "https://kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-${version}.tar.xz";
|
||||||
sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
|
sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [ ./autoconf-ar.patch ];
|
||||||
./autoconf-ar.patch
|
|
||||||
./add-ip6-header.patch # Remove patch once the kernel headers are updated
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
# The bridge utils build does not fail even if the brctl binary
|
|
||||||
# is not build. This test ensures that we fail if we don't produce a brctl
|
|
||||||
# binary.
|
|
||||||
test -f $out/sbin/brctl
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "https://sourceforge.net/projects/bridge/";
|
description = "An userspace tool to configure linux bridges (deprecated in favour or iproute2).";
|
||||||
homepage = "https://wiki.linuxfoundation.org/networking/bridge";
|
homepage = "https://wiki.linuxfoundation.org/networking/bridge";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
|
Loading…
Reference in New Issue
Block a user