diff options
| author | William A. Kennington III <william@wkennington.com> | 2013-11-20 14:40:45 -0600 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2013-11-28 00:52:11 -0600 |
| commit | 0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33 (patch) | |
| tree | 01ed1c53d2e04f7a346683c72ea2549a8540841e | |
| parent | 19478d83e412eb0d2c68986d438f17d4948451a1 (diff) | |
| download | nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.tar nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.tar.gz nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.tar.bz2 nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.tar.lz nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.tar.xz nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.tar.zst nixpkgs-0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33.zip | |
Upgrade cifs-utils from 5.7 -> 6.2
Additonally remove the systemd-ask-password patch since this was fixed upstream.
| -rw-r--r-- | pkgs/os-specific/linux/cifs-utils/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch | 22 |
2 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 0f8801ef58e..bef8de495ad 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cifs-utils-5.6"; + name = "cifs-utils-6.2"; src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; + sha256 = "0cydya7l7xwxk2j1g1659kbvb4jzql11ivb6cldwwfg19qvnwrrl"; }; - patches = [ ./find-systemd-ask-password-via-path.patch ]; - makeFlags = "root_sbindir=$(out)/sbin"; meta = { diff --git a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch b/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch deleted file mode 100644 index 428cb75edad..00000000000 --- a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ubr cifs-utils-5.9-orig/mount.cifs.c cifs-utils-5.9/mount.cifs.c ---- cifs-utils-5.9-orig/mount.cifs.c 2013-03-05 10:53:19.375464790 +0100 -+++ cifs-utils-5.9/mount.cifs.c 2013-03-05 11:41:40.704946110 +0100 -@@ -1634,7 +1634,7 @@ - } - - /* -- * If systemd is running and /bin/systemd-ask-password -- -+ * If systemd is running and systemd-ask-password -- - * is available, then use that else fallback on getpass(..) - * - * Returns: @input or NULL on error -@@ -1657,7 +1657,7 @@ - FILE *ask_pass_fp = NULL; - - cmd = ret = NULL; -- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) { -+ if (asprintf(&cmd, "/run/current-system/sw/bin/systemd-ask-password \"%s\"", prompt) >= 0) { - ask_pass_fp = popen (cmd, "re"); - free (cmd); - } -Only in cifs-utils-5.9/: mount.cifs.c.orig |