public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util-linux: Update to 2.27

Browse Source 
This version is required by systemd 227.

CVE-2015-5224
This commit is contained in:
Eelco Dolstra 2015-10-07 20:06:40 +02:00
parent b23038dd80
commit 256438659c
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "util-linux-2.26.2"; name = "util-linux-2.27";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz"; url = "mirror://kernel/linux/utils/util-linux/v2.27/${name}.tar.xz";
sha256 = "0rlnzmiqdannzf81fbh41541lrck63v9zhskm6h4i2jj8ahvsa8f"; sha256 = "1ivdx1bhjbakf77agm9dn3wyxia1wgz9lzxgd61zqxw3xzih9gzw";
}; };
outputs = [ "out" "man" ];
patches = [ patches = [
./rtcwake-search-PATH-for-shutdown.patch ./rtcwake-search-PATH-for-shutdown.patch
]; ];

22
pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
View File

@ -4,10 +4,10 @@ distros anyway).
-- nckx <tobias.geerinckx.rice@gmail.com> -- nckx <tobias.geerinckx.rice@gmail.com>
diff -Naur a/include/pathnames.h b/include/pathnames.h diff -ru util-linux-2.27-orig/include/pathnames.h util-linux-2.27/include/pathnames.h
--- a/include/pathnames.h 2014-09-16 14:37:06.138551680 +0200 --- util-linux-2.27-orig/include/pathnames.h 2015-06-29 13:13:14.669847478 +0200
+++ b/include/pathnames.h 2015-01-01 20:41:02.510948314 +0100 +++ util-linux-2.27/include/pathnames.h 2015-10-07 20:09:17.401022602 +0200
@@ -43,7 +43,7 @@ @@ -54,7 +54,7 @@
#define _PATH_INITTAB "/etc/inittab" #define _PATH_INITTAB "/etc/inittab"
#define _PATH_RC "/etc/rc" #define _PATH_RC "/etc/rc"
#define _PATH_REBOOT "/sbin/reboot" #define _PATH_REBOOT "/sbin/reboot"
@ -16,15 +16,15 @@ diff -Naur a/include/pathnames.h b/include/pathnames.h
#define _PATH_SINGLE "/etc/singleboot" #define _PATH_SINGLE "/etc/singleboot"
#define _PATH_SHUTDOWN_CONF "/etc/shutdown.conf" #define _PATH_SHUTDOWN_CONF "/etc/shutdown.conf"
diff -Naur a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c diff -ru util-linux-2.27-orig/sys-utils/rtcwake.c util-linux-2.27/sys-utils/rtcwake.c
--- a/sys-utils/rtcwake.c 2014-10-24 11:21:20.447389309 +0200 --- util-linux-2.27-orig/sys-utils/rtcwake.c 2015-08-05 11:32:44.453821232 +0200
+++ b/sys-utils/rtcwake.c 2015-01-01 20:57:59.398911209 +0100 +++ util-linux-2.27/sys-utils/rtcwake.c 2015-10-07 20:09:37.834032536 +0200
@@ -582,7 +582,7 @@ @@ -576,7 +576,7 @@
arg[i++] = "now";
arg[i] = NULL; arg[i] = NULL;
if (!ctl.dryrun) {
if (!dryrun) {
- execv(arg[0], arg); - execv(arg[0], arg);
+ execvp(arg[0], arg); + execvp(arg[0], arg);
warn(_("failed to execute %s"), _PATH_SHUTDOWN); warn(_("failed to execute %s"), _PATH_SHUTDOWN);
rc = EXIT_FAILURE; rc = EXIT_FAILURE;
}