dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lldpd: 0.9.7 -> 0.9.8

Browse Source 
Now uses the upstream systemd unit which adds lots of hardening flags.
This commit is contained in:
Franz Pletz 2017-08-24 19:53:25 +02:00
parent 7c696a08ce
commit 951106c650
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/lldpd.nix
View File

@ -28,16 +28,11 @@ in
users.extraGroups._lldpd = {}; users.extraGroups._lldpd = {};
environment.systemPackages = [ pkgs.lldpd ]; environment.systemPackages = [ pkgs.lldpd ];
systemd.packages = [ pkgs.lldpd ];
systemd.services.lldpd = { systemd.services.lldpd = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; environment.LLDPD_OPTIONS = concatStringsSep " " cfg.extraArgs;
requires = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.lldpd}/bin/lldpd -d ${concatStringsSep " " cfg.extraArgs}";
PrivateTmp = true;
PrivateDevices = true;
};
}; };
}; };
} }

5
pkgs/tools/networking/lldpd/default.nix
View File

@ -3,17 +3,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lldpd-${version}"; name = "lldpd-${version}";
version = "0.9.7"; version = "0.9.8";
src = fetchurl { src = fetchurl {
url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
sha256 = "1f0d5s4643pjmgycc5ssgl1pggyq5a7navhabkyhcg0aqdah6dmr"; sha256 = "0kwck17cr2f1a395a8bfmj7fz1n4i1hv429cbdbkhff33glr9r4y";
}; };
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--enable-pie" "--enable-pie"
"--with-snmp" "--with-snmp"
"--with-systemdsystemunitdir=\${out}/lib/systemd/system"
]; ];
nativeBuildInputs = [ pkgconfig removeReferencesTo ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ];