Merge pull request #1290 from wkennington/sysworking

Update lots of Linux Utilities
This commit is contained in:
Michael Raskin 2013-11-28 02:40:31 -08:00
commit 4d416e58b7
17 changed files with 43 additions and 99 deletions

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "acpi-${version}";
version = "1.6";
version = "1.7";
src = fetchurl {
url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd";
sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp";
};
meta = {

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "acpid-2.0.17";
name = "acpid-2.0.20";
src = fetchurl {
url = "http://tedfelix.com/linux/${name}.tar.xz";
sha256 = "0gksl6z3sb6yyk7bdmldxsrncvprd3rny0i8ggl4m95nvv3x5drn";
url = "mirror://sourceforge/acpid2/${name}.tar.xz";
sha256 = "0l7pzjcpf1935bn44kzgc16h00clbx73cjm2dlyhzvvb5ksvl7ka";
};
preBuild = ''

View file

@ -37,16 +37,13 @@ let
in
stdenv.mkDerivation rec {
name = "busybox-1.20.2";
name = "busybox-1.21.1";
src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb";
sha256 = "00qk938q90jv14mxmadm8pgs3jymkknc6xicw4512mn85s8y0nyd";
};
# Remove this patch after the next busybox update.
patches = [ ./include-missing-sys-resource-header.patch ];
configurePhase = ''
make defconfig
${configParser}

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

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

View file

@ -1,13 +1,12 @@
{ stdenv, fetchgit, SDL }:
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation rec {
name = "linuxconsoletools-${version}";
version = "1.4.3";
version = "1.4.6";
src = fetchgit {
url = "git://linuxconsole.git.sourceforge.net/gitroot/linuxconsole/linuxconsole";
rev = "dac2cae0e5795ddc27b76a92767dd9e07a10621e";
sha256 = "350b008e614923dbd548fcaaf2842b39433acdcf595e2ce8aaf1599f076d331d";
src = fetchurl {
url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
sha256 = "0035yhjbjdis5wqmbdz67xq61065x7vrx5mb7kb1rhrx3ag43wcf";
};
buildInputs = [ SDL ];

View file

@ -6,8 +6,8 @@ stdenv.mkDerivation {
name = "cpufrequtils-008";
src = fetchurl {
url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz;
md5 = "52d3e09e47ffef634833f7fab168eccf";
url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz";
sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0";
};
patchPhase = ''

View file

@ -1,12 +1,12 @@
{ fetchurl, stdenv, kernelDev, onlyHeaders ? false }:
stdenv.mkDerivation rec {
pname = "cryptodev-linux-1.5";
pname = "cryptodev-linux-1.6";
name = "${pname}-${kernelDev.version}";
src = fetchurl {
url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0";
sha256 = "0bryzdb4xz3fp2q00a0mlqkj629md825lnlh4gjwmy51irf45wbm";
};
buildPhase = if !onlyHeaders then ''

View file

@ -5,11 +5,11 @@
assert enablePython -> python != null;
stdenv.mkDerivation rec {
name = "cryptsetup-1.5.1";
name = "cryptsetup-1.6.2";
src = fetchurl {
url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn";
sha256 = "16hh7v8bsqy0i1wlaj03kwqjv3liffkvg06lk75lng9hk00kywhm";
};
configureFlags = [ "--enable-cryptsetup-reencrypt" ]

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dmidecode-2.11";
name = "dmidecode-2.12";
src = fetchurl {
url = "mirror://savannah/dmidecode/${name}.tar.bz2";
sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd";
sha256 = "122hgaw8mpqdfra159lfl6pyk3837giqx6vq42j64fjnbl2z6gwi";
};
makeFlags = "prefix=$(out)";

View file

@ -3,11 +3,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "drbd-8.4.0";
name = "drbd-8.4.4";
src = fetchurl {
url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz";
sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg";
sha256 = "0hm1cnd7vsccyc22sg85f9aj48nijl2f1kgbvl5crv414ihv5giq";
};
patches = [ ./pass-force.patch ];

View file

@ -1,24 +1,17 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iptables-1.4.16.2";
name = "iptables-1.4.21";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
md5 = "57220bb26866a713073e5614f88071fc";
sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j";
};
# Install header files required by miniupnpd.
postInstall =
''
cp include/iptables.h $out/include
cp include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h $out/include/libiptc
mkdir $out/include/iptables
cp include/iptables/internal.h $out/include/iptables
mkdir $out/include/net
cp -prd include/net/netfilter $out/include/net/netfilter
mkdir $out/include/linux
'';
configureFlags = ''
--enable-devel
--enable-shared
'';
meta = {
description = "A program to configure the Linux IP packet filtering ruleset";

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, libnl, pkgconfig}:
stdenv.mkDerivation rec {
name = "iw-3.10";
name = "iw-3.11";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
sha256 = "1sagsrl2s0d3ar3q2yc5qxk2d47zgn551akwcs9f4a5prw9f4vj5";
sha256 = "1zrh0pjcy0kg6n8wlr34cg3bmi3nj28rhqn5pad23a1170r2f0z9";
};
buildInputs = [ libnl pkgconfig ];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
let
v = "2.02.100";
v = "2.02.104";
in
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz";
md5 = "9629cf5728544d7e637cafde1f73d777";
sha256 = "1xa7hvp8bsx96nncgksxrqxaqcgipfmmpr8aysayb8aisyjvas0d";
};
configureFlags =

View file

@ -1,16 +1,13 @@
{ stdenv, fetchurl, groff }:
stdenv.mkDerivation rec {
name = "mdadm-3.1.2";
name = "mdadm-3.3";
src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz";
sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww";
};
# Enable incremental activation of swraid arrays from udev.
patches = [ ./udev.patch ];
nativeBuildInputs = [ groff ];
preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
# /dev/.mdadm/map as a fallback).
preBuild =
''
makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man VAR_RUN=/var/run/mdadm ALT_RUN=/dev/.mdadm)
makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm)
if [[ -n "$crossConfig" ]]; then
makeFlagsArray+=(CROSS_COMPILE=$crossConfig-)
fi

View file

@ -1,20 +0,0 @@
diff --exclude '*~' -rc mdadm-3.1.2-orig/udev-md-raid.rules mdadm-3.1.2/udev-md-raid.rules
*** mdadm-3.1.2-orig/udev-md-raid.rules 2010-02-22 21:14:58.000000000 +0100
--- mdadm-3.1.2/udev-md-raid.rules 2010-05-16 20:45:22.000000000 +0200
***************
*** 5,11 ****
ACTION=="change", GOTO="md_no_incr"
# import data from a raid member and activate it
! #ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
# import data from a raid set
LABEL="md_no_incr"
KERNEL!="md*", GOTO="md_end"
--- 5,11 ----
ACTION=="change", GOTO="md_no_incr"
# import data from a raid member and activate it
! ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
# import data from a raid set
LABEL="md_no_incr"
KERNEL!="md*", GOTO="md_end"

View file

@ -1,11 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
let
ver = "2.24";
in
stdenv.mkDerivation rec {
name = "util-linux-2.22.2";
name = "util-linux-${ver}";
src = fetchurl {
url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.22/${name}.tar.bz2";
sha256 = "0vf3ifb45gr4cd27pmmxk8y5b3r0920mv16fv0vfwz5705xa2qvl";
url = "http://www.kernel.org/pub/linux/utils/util-linux/v${ver}/${name}.tar.bz2";
sha256 = "1nfnymj03rdcxjb677a9qq1zirppr8csh32cb85qm23x5xndi6v3";
};
crossAttrs = {