Unverified Commit 20d1b4ab authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

nqptp: 1.2.4 -> 1.2.6 (#507505)

parents b4eefa72 0a0f378f
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -8,22 +8,16 @@
}:

stdenv.mkDerivation (finalAttrs: {
  version = "1.2.4";
  version = "1.2.6";
  pname = "nqptp";

  src = fetchFromGitHub {
    owner = "mikebrady";
    repo = "nqptp";
    tag = finalAttrs.version;
    hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo=";
    hash = "sha256-bU7eTNnPhBA+XTW0SCps/iUCGuxObnv72/Lm+yKEgao=";
  };

  patches = [
    # these patches should be removed when > 1.2.4
    ./remove-setcap.patch
    ./systemd-service-capability.patch
  ];

  nativeBuildInputs = [
    autoreconfHook
    pkg-config
+0 −13
Original line number Diff line number Diff line
diff --git a/Makefile.am b/Makefile.am
index 78f36d7..8dc4e4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,6 @@ endif
 
 install-exec-hook:
 if BUILD_FOR_LINUX
-# NQPTP runs as user/group nqptp/nqptp on Linux and uses setcap to access ports 319 and 320
-	setcap 'cap_net_bind_service=+ep' $(bindir)/nqptp
 # no installer for System V
 if INSTALL_SYSTEMD_STARTUP
 	getent group nqptp &>/dev/null || groupadd -r nqptp &>/dev/null
+0 −12
Original line number Diff line number Diff line
diff --git a/nqptp.service.in b/nqptp.service.in
index 6f1eb0c..53e6a2e 100644
--- a/nqptp.service.in
+++ b/nqptp.service.in
@@ -8,6 +8,7 @@ Before=shairport-sync.service
 ExecStart=@prefix@/bin/nqptp
 User=nqptp
 Group=nqptp
+AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]
 WantedBy=multi-user.target