diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
| commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
| tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/tools/misc/arp-scan | |
| parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
| parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
| download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/arp-scan')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/arp-scan/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch | 24 |
2 files changed, 31 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix index 50915ebf7201..35d528598381 100644 --- a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix +++ b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix @@ -2,19 +2,24 @@ stdenv.mkDerivation rec { pname = "arp-scan"; - version = "1.9.8"; + version = "1.10.0"; src = fetchFromGitHub { owner = "royhills"; repo = "arp-scan"; rev = version; - sha256 = "sha256-zSihemqGaQ5z6XjA/dALoSJOuAkxF5/nnV6xE+GY7KI="; + sha256 = "sha256-BS+ItZd6cSMX92M6XGYrIeAiCB2iBdvbMvKdLfwawLQ="; }; + patches = [ + ./remove-install-exec-hook.patch + ]; + perlModules = with perlPackages; [ HTTPDate HTTPMessage LWP + TextCSV URI ]; diff --git a/nixpkgs/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch b/nixpkgs/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch new file mode 100644 index 000000000000..38421400384c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile.am b/Makefile.am +index c02e1cc..0dd6321 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,19 +29,3 @@ arp-scan.1: arp-scan.1.dist Makefile + $(do_subst) < $(srcdir)/arp-scan.1.dist > arp-scan.1 + get-oui.1: get-oui.1.dist Makefile + $(do_subst) < $(srcdir)/get-oui.1.dist > get-oui.1 +-# Install arp-scan with cap_net_raw if possible, otherwise SUID root +-install-exec-hook: +- @if command -v setcap > /dev/null; then \ +- if setcap cap_net_raw+p $(DESTDIR)$(bindir)/arp-scan$(EXEEXT); then \ +- echo "setcap cap_net_raw+p $(DESTDIR)$(bindir)/arp-scan$(EXEEXT)"; \ +- chmod u-s $(DESTDIR)$(bindir)/arp-scan$(EXEEXT); \ +- else \ +- echo "Setcap failed on $(DESTDIR)$(bindir)/arp-scan$(EXEEXT), falling back to setuid" >&2; \ +- echo "chmod u+s $(DESTDIR)$(bindir)/arp-scan$(EXEEXT)"; \ +- chmod u+s $(DESTDIR)$(bindir)/arp-scan$(EXEEXT); \ +- fi \ +- else \ +- echo "Setcap is not installed, falling back to setuid" >&2 ; \ +- echo "chmod u+s $(DESTDIR)$(bindir)/arp-scan$(EXEEXT)" ;\ +- chmod u+s $(DESTDIR)$(bindir)/arp-scan$(EXEEXT) ;\ +- fi |