pyrox.dev
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.
-11
pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch
-11
pkgs/os-specific/linux/bridge-utils/add-ip6-header.patch
···
1
-
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
2
-
index 39964f2..dd14bae 100644
3
-
--- a/libbridge/libbridge.h
4
-
+++ b/libbridge/libbridge.h
5
-
@@ -20,6 +20,7 @@
6
-
#define _LIBBRIDGE_H
7
-
8
-
#include <sys/socket.h>
9
-
+#include <netinet/in.h>
10
-
#include <linux/if.h>
11
-
#include <linux/if_bridge.h>
+2
-6
pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
+2
-6
pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
···
1
-
diff --git a/configure.in b/configure.in
2
-
index 5e3f89b..19be6d9 100644
3
-
--- a/configure.in
4
-
+++ b/configure.in
1
+
--- a/configure.ac
2
+
+++ b/configure.ac
5
3
@@ -9,6 +9,7 @@ dnl Checks for programs.
6
4
AC_PROG_CC
7
5
AC_PROG_INSTALL
···
10
8
11
9
dnl Checks for header files.
12
10
AC_HEADER_STDC
13
-
diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
14
-
index 20512c4..83c802b 100644
15
11
--- a/libbridge/Makefile.in
16
12
+++ b/libbridge/Makefile.in
17
13
@@ -1,7 +1,7 @@
+5
-15
pkgs/os-specific/linux/bridge-utils/default.nix
+5
-15
pkgs/os-specific/linux/bridge-utils/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "bridge-utils";
5
-
version = "1.5";
5
+
version = "1.7.1";
6
6
7
7
src = fetchurl {
8
-
url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz";
9
-
sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688";
8
+
url = "https://kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-${version}.tar.xz";
9
+
sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4=";
10
10
};
11
11
12
-
patches = [
13
-
./autoconf-ar.patch
14
-
./add-ip6-header.patch # Remove patch once the kernel headers are updated
15
-
];
12
+
patches = [ ./autoconf-ar.patch ];
16
13
17
14
nativeBuildInputs = [ autoreconfHook ];
18
15
19
-
postInstall = ''
20
-
# The bridge utils build does not fail even if the brctl binary
21
-
# is not build. This test ensures that we fail if we don't produce a brctl
22
-
# binary.
23
-
test -f $out/sbin/brctl
24
-
'';
25
-
26
16
meta = {
27
-
description = "https://sourceforge.net/projects/bridge/";
17
+
description = "An userspace tool to configure linux bridges (deprecated in favour or iproute2).";
28
18
homepage = "https://wiki.linuxfoundation.org/networking/bridge";
29
19
license = lib.licenses.gpl2Plus;
30
20
platforms = lib.platforms.linux;