cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libreswan: 4.7 -> 4.8

Browse source 
Note: this also fixes DNSSEC support, which was enabled but not working
due to the (most likely) missing DNS root file.
This commit is contained in:
rnhmjoj 2022-10-05 23:31:45 +02:00
parent eb3d3b2e90
commit f288df00cb
No known key found for this signature in database
GPG key ID: BFBAF4C975F76450
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/libreswan/default.nix
View file

@ -30,6 +30,7 @@
, docbook_xml_dtd_412 , docbook_xml_dtd_412
, docbook_xsl , docbook_xsl
, findXMLCatalogs , findXMLCatalogs
, dns-root-data
}: }:
let let
@ -43,11 +44,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libreswan"; pname = "libreswan";
version = "4.7"; version = "4.8";
src = fetchurl { src = fetchurl {
url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
sha256 = "0i7wyfgkaq6kcfhh1yshb1v7q42n3zvdkhq10f3ks1h075xk7mnx"; sha256 = "sha256-gEy5EX1/tBGYE7FVrJF+NFZY41ehOBim9t/Oikch4gs=";
}; };
strictDeps = true; strictDeps = true;
@ -77,9 +78,9 @@ stdenv.mkDerivation rec {
-e 's|/bin/bash|${runtimeShell}|g' \ -e 's|/bin/bash|${runtimeShell}|g' \
-i initsystems/systemd/ipsec.service.in \ -i initsystems/systemd/ipsec.service.in \
programs/barf/barf.in \ programs/barf/barf.in \
programs/verify/verify.in programs/verify.linux/verify.in
sed -e 's|\([[:blank:]]\)\(ip6\?tables\(-save\)\? -\)|\1${iptables}/bin/\2|' \ sed -e 's|\([[:blank:]]\)\(ip6\?tables\(-save\)\? -\)|\1${iptables}/bin/\2|' \
-i programs/verify/verify.in -i programs/verify.linux/verify.in
# Prevent the makefile from trying to # Prevent the makefile from trying to
# reload the systemd daemon or create tmpfiles # reload the systemd daemon or create tmpfiles
@ -92,7 +93,7 @@ stdenv.mkDerivation rec {
# Fix python script to use the correct python # Fix python script to use the correct python
sed -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' \ sed -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' \
-i programs/verify/verify.in -i programs/verify.linux/verify.in
# Replace wget with curl to save a dependency # Replace wget with curl to save a dependency
curlArgs='-s --remote-name-all --output-dir' curlArgs='-s --remote-name-all --output-dir'
@ -113,6 +114,7 @@ stdenv.mkDerivation rec {
"UNITDIR=$(out)/etc/systemd/system/" "UNITDIR=$(out)/etc/systemd/system/"
"TMPFILESDIR=$(out)/lib/tmpfiles.d/" "TMPFILESDIR=$(out)/lib/tmpfiles.d/"
"LINUX_VARIANT=nixos" "LINUX_VARIANT=nixos"
"DEFAULT_DNSSEC_ROOTKEY_FILE=${dns-root-data}/root.key"
]; ];
# Hack to make install work # Hack to make install work