diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2021-09-13 18:09:43 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-03 07:45:29 +0000 |
commit | 19071065ebe4ad100e1017edc49d2b5f9bd6052a (patch) | |
tree | 45b8bcd809acac47824ae1a32135c3570c896b0a | |
parent | 5373418b446b0d71946ec086daa6baf68409a0cd (diff) | |
download | nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.tar nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.tar.gz nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.tar.bz2 nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.tar.lz nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.tar.xz nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.tar.zst nixpkgs-19071065ebe4ad100e1017edc49d2b5f9bd6052a.zip |
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.
-rw-r--r-- | pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/bridge-utils/default.nix | 20 |
3 files changed, 7 insertions, 32 deletions
diff --git a/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch b/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch deleted file mode 100644 index c9149bfec38..00000000000 --- a/pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch +++ /dev/null @@ -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> diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch index efa41075644..21b089179ce 100644 --- a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch +++ b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch @@ -1,7 +1,5 @@ -diff --git a/configure.in b/configure.in -index 5e3f89b..19be6d9 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -9,6 +9,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL @@ -10,8 +8,6 @@ index 5e3f89b..19be6d9 100644 dnl Checks for header files. AC_HEADER_STDC -diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in -index 20512c4..83c802b 100644 --- a/libbridge/Makefile.in +++ b/libbridge/Makefile.in @@ -1,7 +1,7 @@ diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 92e7606c9bd..cbbf77c67c8 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -2,29 +2,19 @@ stdenv.mkDerivation rec { pname = "bridge-utils"; - version = "1.5"; + version = "1.7.1"; src = fetchurl { - url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz"; - sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; + url = "https://kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-${version}.tar.xz"; + sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4="; }; - patches = [ - ./autoconf-ar.patch - ./add-ip6-header.patch # Remove patch once the kernel headers are updated - ]; + patches = [ ./autoconf-ar.patch ]; 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 = { - 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"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; |