Update skarnet.org software for 2.0 release.

New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:

execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0

2 files changed, 11 insertions, 39 deletions

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 55c69b137e5..3fe8e275ea9 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -1,11 +1,11 @@
 { stdenv
-, skarnetConfCompile
 , fetchurl
+, gnumake40
 }:
 
 let
 
-  version = "1.6.0.0";
+  version = "2.0.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -13,19 +13,19 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://skarnet.org/software/skalibs/${name}.tar.gz";
-    sha256 = "0jz3farll9n5jvz3g6wri99s6njkgmnf0r9jqjlg03f20dzv8c8w";
+    sha256 = "0cz30wqg8fnkwjlacs4s3sjs3l34sa91xgci95fmb187zhiq693n";
   };
 
-  sourceRoot = "prog/${name}";
+  dontDisableStatic = true;
 
-  # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje
-  patches = [ ./getpeereid.patch ];
+  buildInputs = [ gnumake40 ];
 
-  buildInputs = [ skarnetConfCompile ];
-
-  preInstall = ''
-    mkdir -p "$out/etc"
-  '';
+  configureFlags = [
+    "--enable-force-devr"       # assume /dev/random works
+    "--libdir=\${prefix}/lib"
+    "--includedir=\${prefix}/include"
+    "--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
+  ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
 
   meta = {
     homepage = http://skarnet.org/software/skalibs/;
diff --git a/pkgs/development/libraries/skalibs/getpeereid.patch b/pkgs/development/libraries/skalibs/getpeereid.patch
deleted file mode 100644
index c366780e267..00000000000
--- a/pkgs/development/libraries/skalibs/getpeereid.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/libstddjb/getpeereid.h
-+++ b/src/libstddjb/getpeereid.h
-@@ -3,6 +3,14 @@
- #ifndef GETPEEREID_H
- #define GETPEEREID_H
- 
-+#include "sysdeps.h"
-+
-+#ifdef HASGETPEEREID
-+/* syscall exists - do nothing */
-+
-+#else
-+
- extern int getpeereid (int, int *, int *) ;
- 
- #endif
-+#endif
---- a/src/libstddjb/ipc_eid.c
-+++ b/src/libstddjb/ipc_eid.c
-@@ -5,7 +5,7 @@
- 
- int ipc_eid (int s, unsigned int *u, unsigned int *g)
- {
--  int dummyu, dummyg ;
-+  unsigned int dummyu, dummyg ;
-   if (getpeereid(s, &dummyu, &dummyg) < 0) return -1 ;
-   *u = (unsigned int)dummyu ;
-   *g = (unsigned int)dummyg ;