From 1e593edbf19f8ff03f4030e48b6d44870b60c933 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 18 Sep 2015 04:57:51 +0200
Subject: autofs: 5.0.8 -> 5.1.1

---
 pkgs/os-specific/linux/autofs/autofs-v5.nix        | 42 ----------------------
 pkgs/os-specific/linux/autofs/create-patches-v5.sh | 19 ----------
 pkgs/os-specific/linux/autofs/default.nix          | 41 +++++++++++++++++++++
 pkgs/os-specific/linux/autofs/patches-v5.nix       |  7 ----
 4 files changed, 41 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/autofs/autofs-v5.nix
 delete mode 100644 pkgs/os-specific/linux/autofs/create-patches-v5.sh
 create mode 100644 pkgs/os-specific/linux/autofs/default.nix
 delete mode 100644 pkgs/os-specific/linux/autofs/patches-v5.nix

(limited to 'pkgs/os-specific/linux/autofs')

diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix
deleted file mode 100644
index 787cd34180e..00000000000
--- a/pkgs/os-specific/linux/autofs/autofs-v5.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{stdenv, fetchurl, flex, bison, linuxHeaders}:
-
-let
-  baseURL = mirror://kernel/linux/daemons/autofs/v5;
-in
-stdenv.mkDerivation {
-  name = "autofs-5.0.8";
-
-  src = fetchurl {
-    url = "${baseURL}/autofs-5.0.8.tar.bz2";
-    sha256 = "0zczihrqdamj43401v2pczf7zi94f8qk20gc6l92nxmpak3443if";
-  };
-
-  patches = import ./patches-v5.nix fetchurl;
-
-  preConfigure = ''
-    configureFlags="--disable-move-mount --with-path=$PATH"
-    export MOUNT=/var/run/current-system/sw/bin/mount
-    export UMOUNT=/var/run/current-system/sw/bin/umount
-    export MODPROBE=/var/run/current-system/sw/bin/modprobe
-    # Grrr, rpcgen can't find cpp. (NIXPKGS-48)
-    mkdir rpcgen
-    echo "#! $shell" > rpcgen/rpcgen
-    echo "exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \"\$@\"" >> rpcgen/rpcgen
-    chmod +x rpcgen/rpcgen
-    export RPCGEN=$(pwd)/rpcgen/rpcgen
-  '';
-
-  installPhase = ''
-    make install SUBDIRS="lib daemon modules man" # all but samples
-    #make install SUBDIRS="samples" # impure!
-  '';
-
-  buildInputs = [flex bison linuxHeaders];
-
-  meta = { 
-    description="Kernel based automounter";
-    homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html";
-    license = stdenv.lib.licenses.gpl2;
-    executables = [ "automount" ];
-  };
-}
diff --git a/pkgs/os-specific/linux/autofs/create-patches-v5.sh b/pkgs/os-specific/linux/autofs/create-patches-v5.sh
deleted file mode 100644
index 1fe6b503288..00000000000
--- a/pkgs/os-specific/linux/autofs/create-patches-v5.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Use this script with the upstream sorted list of patches
-# curl ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/patches-5.0.{x+1}/patch_order-5.0.x | 
-#   grep -v '^#' | sh create-patches-v5.sh
-
-BASEURL=mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9;
-
-echo '# File created automatically' > patches-v5.nix
-echo 'fetchurl :' >> patches-v5.nix
-echo '[' >> patches-v5.nix
-
-while read a; do
-  URL=$BASEURL/$a
-  HASH=`nix-prefetch-url $URL`
-  echo "(fetchurl { url = $URL; sha256 = \"$HASH\"; })" >> patches-v5.nix
-done
-
-echo ']' >> patches-v5.nix
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
new file mode 100644
index 00000000000..3a8aa08d8a3
--- /dev/null
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, flex, bison, linuxHeaders }:
+
+let
+  version = "5.1.1";
+  name = "autofs-${version}";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
+    sha256 = "1hr1f11wp538h7r298wpa5khfkhfs8va3p1kdixxhrgkkzpz13z0";
+  };
+
+  preConfigure = ''
+    configureFlags="--disable-move-mount --with-path=$PATH"
+    export MOUNT=/var/run/current-system/sw/bin/mount
+    export UMOUNT=/var/run/current-system/sw/bin/umount
+    export MODPROBE=/var/run/current-system/sw/bin/modprobe
+    # Grrr, rpcgen can't find cpp. (NIXPKGS-48)
+    mkdir rpcgen
+    echo "#! $shell" > rpcgen/rpcgen
+    echo "exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \"\$@\"" >> rpcgen/rpcgen
+    chmod +x rpcgen/rpcgen
+    export RPCGEN=$(pwd)/rpcgen/rpcgen
+  '';
+
+  installPhase = ''
+    make install SUBDIRS="lib daemon modules man" # all but samples
+    #make install SUBDIRS="samples" # impure!
+  '';
+
+  buildInputs = [ flex bison linuxHeaders ];
+
+  meta = {
+    inherit version;
+    description = "Kernel-based automounter";
+    homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html;
+    license = stdenv.lib.licenses.gpl2;
+    executables = [ "automount" ];
+  };
+}
diff --git a/pkgs/os-specific/linux/autofs/patches-v5.nix b/pkgs/os-specific/linux/autofs/patches-v5.nix
deleted file mode 100644
index a577beefbe7..00000000000
--- a/pkgs/os-specific/linux/autofs/patches-v5.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-# File created automatically
-fetchurl :
-[
-(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch; sha256 = "11v1a32rx57ylp8scswpk41jl9n4kfx55nvdlzhvfs4rhws18rpx"; })
-(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-master-map-type-check.patch; sha256 = "1nkq0y6j7dc6214af3q9bxvy7pv9kak0q9chijxcj6zkhfzwrjy3"; })
-(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-task-manager-not-getting-signaled.patch; sha256 = "17h06wk4x0rqiky6pm9dglbc5ycxxrd3438a9snnlysl4zzgrqhx"; })
-]
-- 
cgit 1.4.1