summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrancesco Gazzetta <fgaz@fgaz.me>2022-09-08 14:20:54 +0200
committerFrancesco Gazzetta <fgaz@fgaz.me>2022-09-08 14:20:54 +0200
commitadcd8c81efc7669e7742666ffc51a32c68012778 (patch)
tree6e2b6c1d411cace961253ea98301bf58a3eb815d
parent58db1157a7f184bc0cd2a5a5bf8cd9bc3d524402 (diff)
downloadnixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.tar
nixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.tar.gz
nixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.tar.bz2
nixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.tar.lz
nixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.tar.xz
nixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.tar.zst
nixpkgs-adcd8c81efc7669e7742666ffc51a32c68012778.zip
xinetd: 2.3.15 -> 2.3.15.4, switch to openSUSE fork
The original project is no longer maintained. Most distributions
already switched to the openSUSE fork.
-rw-r--r--pkgs/servers/xinetd/default.nix30
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index e296112045d..e1323b084fc 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -1,31 +1,31 @@
-{ fetchurl, fetchpatch, lib, stdenv, libtirpc }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, libtirpc
+}:
 
 stdenv.mkDerivation rec {
   pname = "xinetd";
-  version = "2.3.15";
+  version = "2.3.15.4";
 
   src = fetchurl {
-    url = "http://www.xinetd.org/xinetd-${version}.tar.gz";
-    sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz";
+    url = "https://github.com/openSUSE/xinetd/releases/download/${version}/xinetd-${version}.tar.xz";
+    hash = "sha256-K6pYEBC8cDYavfo38SHpKuucXOZ/mnGRPOvWk1nMllQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02";
-      name = "CVE-2013-4342.patch";
-      sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v";
-    })
+  nativeBuildInputs = [
+    pkg-config
   ];
 
-  buildInputs = [ libtirpc ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
-  NIX_LDFLAGS = [ "-ltirpc" ];
+  buildInputs = [
+    libtirpc
+  ];
 
   meta = {
     description = "Secure replacement for inetd";
     platforms = lib.platforms.linux;
-    homepage = "http://xinetd.org";
+    homepage = "https://github.com/openSUSE/xinetd";
     license = lib.licenses.free;
   };
 }