From f2a4adfec2d594eb134d09c06cd77370196ff600 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 31 Aug 2018 00:04:15 +0200
Subject: rpcbind: switch to upstream git repo, drop patch

---
 pkgs/servers/rpcbind/default.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 654c0bfd279..fc28f621959 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,40 +1,36 @@
-{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc, fetchpatch
+{ fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook
 , useSystemd ? true, systemd }:
 
 stdenv.mkDerivation rec {
   name = "rpcbind-${version}";
   version = "1.2.5";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
-    sha256 = "0ynszy5hpc7wbz8xngqwyhgbi9cay73y43izqhcmrcv375l61qrc";
+  src = fetchgit {
+    url = "git://git.linux-nfs.org/projects/steved/rpcbind.git";
+    rev = "c0c89b3bf2bdf304a5fe3cab626334e0cdaf1ef2";
+    sha256 = "1k5rr0pia70ifyp877rbjdd82377fp7ii0sqvv18qhashr6489va";
   };
 
   patches = [
     ./sunrpc.patch
-    (fetchpatch {
-      name = "CVE-2017-8779.patch";
-      url = "https://raw.githubusercontent.com/guidovranken/rpcbomb/e6da9e489aa8ad000b0ad5ac9abc5b4eefc3a769/rpcbind_patch.txt";
-      sha256 = "0w231w8fxihgrn526np078j3vbj3ylvjvxjmfpjvqhga5zg821ab";
-    })
   ];
 
   buildInputs = [ libnsl libtirpc ]
              ++ stdenv.lib.optional useSystemd systemd;
 
   configureFlags = [
-    "--with-systemdsystemunitdir=${if useSystemd then "$(out)/etc/systemd/system" else "no"}"
+    "--with-systemdsystemunitdir=${if useSystemd then "${placeholder "out"}/etc/systemd/system" else "no"}"
     "--enable-warmstarts"
     "--with-rpcuser=rpc"
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "ONC RPC portmapper";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    homepage = https://sourceforge.net/projects/rpcbind/;
+    homepage = https://linux-nfs.org/;
     maintainers = with maintainers; [ abbradar ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
-- 
cgit 1.4.1