pyrox.dev
Merge pull request #155535 from risicle/ris-libreswan-4.6
libreswan: 4.5 -> 4.6
authored by Michele Guerini Rocco and committed by GitHub 2da332aa 5c89b037
+2
-2
nixos/tests/libreswan.nix
+2
-2
nixos/tests/libreswan.nix
···
89
89
"""
90
90
Sends a message as Alice to Bob
91
91
"""
92
-
bob.execute("nc -lu ::0 1234 >/tmp/msg >&2 &")
92
+
bob.execute("nc -lu ::0 1234 >/tmp/msg &")
93
93
alice.sleep(1)
94
94
alice.succeed(f"echo '{msg}' | nc -uw 0 bob 1234")
95
95
bob.succeed(f"grep '{msg}' /tmp/msg")
···
100
100
Starts eavesdropping on Alice and Bob
101
101
"""
102
102
match = "src host alice and dst host bob"
103
-
eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log >&2 &")
103
+
eve.execute(f"tcpdump -i br0 -c 1 -Avv {match} >/tmp/log &")
104
104
105
105
106
106
start_all()
+8
-5
pkgs/tools/networking/libreswan/default.nix
+8
-5
pkgs/tools/networking/libreswan/default.nix
···
42
42
43
43
stdenv.mkDerivation rec {
44
44
pname = "libreswan";
45
-
version = "4.5";
45
+
version = "4.6";
46
46
47
47
src = fetchurl {
48
48
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
49
-
sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7";
49
+
sha256 = "1zsnsfx18pf5dy1p4jva2sfl0bdfx5y9ls54f9bp70m64r46yf96";
50
50
};
51
51
52
52
strictDeps = true;
···
70
70
] ++ lib.optional stdenv.isLinux libselinux;
71
71
72
72
prePatch = ''
73
-
# Correct iproute2 path
74
-
sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \
75
-
-e 's|"/sbin/iptables"|"${iptables}/bin/iptables"|' \
73
+
# Correct iproute2 and iptables path
74
+
sed -e 's|/sbin/ip|${iproute2}/bin/ip|' \
75
+
-e 's|/sbin/\(ip6\?tables\)|${iptables}/bin/\1|' \
76
76
-i initsystems/systemd/ipsec.service.in \
77
+
programs/barf/barf.in \
77
78
programs/verify/verify.in
79
+
sed -e 's|\([[:blank:]]\)\(ip6\?tables\(-save\)\? -\)|\1${iptables}/bin/\2|' \
80
+
-i programs/verify/verify.in
78
81
79
82
# Prevent the makefile from trying to
80
83
# reload the systemd daemon or create tmpfiles