BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade cifs-utils from 5.7 -> 6.2

Browse source 
Additonally remove the systemd-ask-password patch since this was fixed
upstream.
This commit is contained in:
William A. Kennington III 2013-11-20 14:40:45 -06:00
parent 19478d83e4
commit 0e4937ce4c
2 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/cifs-utils/default.nix
View file

@ -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 = {

22
pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch
View file

@ -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