Commit Graph

77 Commits

Author SHA1 Message Date
Linus Heckemann
7e34a9c397 util-linux: fix path to umount in eject 2017-04-20 15:52:31 +01:00
Franz Pletz
9d14ea4295
utillinux: 2.29 -> 2.29.2 for CVE-2017-2616
cc #23072
2017-02-25 09:40:36 +01:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Jörg Thalheim
104a37a9fb
util-linux: improve purity by using login from shadow
replacing shutdown in postPatch phase is not necessary as rtcwake was already
patched to use the search path (the only user of shutdown)
2017-01-19 15:13:38 +01:00
Jörg Thalheim
4b9b1fa945
util-linux: remove seccomp sandbox for CVE-2016-2279
the patch for CVE-2016-2779 was reverted by upstream and was not adopted
by any other downstream distributions. Upstream waits for a better fix
in the kernel:
https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28-ReleaseNotes
2017-01-19 15:10:18 +01:00
Tim Steinbach
e8d3c74b49
util-linux: 2.28.1 -> 2.29 2017-01-14 12:57:58 -05:00
Vladimír Čunát
1525568c74 util-linux: fixup patch hash from grandparent merge
And name the file, too.
2016-10-03 23:06:51 +02:00
Jörg Thalheim
ba00ba65eb
util-linux: workaround CVE-2016-2779
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2779
2016-10-03 08:49:56 +02:00
Tuomas Tynkkynen
35ec0e72e3 util-linux: Split 'dev' 2016-09-10 19:05:05 +03:00
Eelco Dolstra
78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Eelco Dolstra
8295089e6a utillinuxMinimal: Make more minimal
This removes locales, bash completion and crap like that. This cuts
6.5 MiB from the NixOS system closure (which unfortunately contains
two copies of util-linux, because of the need to break a dependency
cycle with systemd).
2016-09-05 13:45:59 +02:00
Parnell Springmeyer
98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Franz Pletz
f0f95d03ca utillinux: 2.28 -> 2.28.1 2016-08-25 01:55:42 +02:00
Vladimír Čunát
26e8e3e654 util-linux: use sha256 instead of sha512 again
/cc #15048. I believe the usage of sha512 here at this point
brings very little gain and can be quite painful to some users.
2016-05-14 22:19:28 +02:00
Aneesh Agrawal
279a01d0dc util-linux: 2.27.1 -> 2.28 2016-04-27 23:26:46 -04:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Kevin Cox
eead3bc536 util-linux: create -Minimal and utillinux (full)
Close #12952. Now the full version is used by default,
supporting systemd and curses.
2016-02-25 08:52:05 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
64e262dd91 util-linux: 2.27 -> 2.27.1 2015-11-07 18:51:07 -08:00
Eelco Dolstra
256438659c util-linux: Update to 2.27
This version is required by systemd 227.

CVE-2015-5224
2015-10-07 20:15:00 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Eelco Dolstra
e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
William A. Kennington III
7a9e0a5ae4 util-linux: 2.26.1 -> 2.26.2 2015-05-28 02:20:08 -07:00
Vladimír Čunát
fc20660945 util-linux, e2fsprogs: fixup multiple outputs
Also revert back to using util-linux as the default libuuid provider,
and make e2fsprogs use shared libs from util-linux.
2015-04-19 15:16:05 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Tobias Geerinckx-Rice
487b200ea1 util-linux: ddate was removed in 2.23 2015-04-16 06:29:11 +02:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
William A. Kennington III
ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
William A. Kennington III
5e33c85248 util-linux: 2.26 -> 2.26.1 2015-03-26 00:57:59 -07:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Alexander V. Nikolaev
bd87d32efc util-linux: update to 2.26 (close #6553)
Patch unshare-fix-map-root-user.patch appiled upstream, and removed.

Trigger mass-rebuild, so PR will be to staging
2015-03-03 11:36:53 +01:00
Nikolay Amiantov
dee90b2c25 util-linux: fix unshare -r on linux >=3.19 (close #6130) 2015-02-05 00:22:10 +01:00
Vladimír Čunát
1575bc652e Merge branch 'master' into staging
Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Tobias Geerinckx-Rice
14eff8f7fa util-linux: fix rtcwake(8) to search $PATH for shutdown(8)
This makes "rtcwake -m off" actually work on NixOS without breaking it
on other platforms.
2015-01-01 22:23:22 +01:00
Vladimír Čunát
88fd7f4527 Re-Revert merge #5505: util-linux: use /run/current-system/sw/bin/*
This reverts commit 6222093eec.
2014-12-30 10:53:41 +01:00
Vladimír Čunát
6222093eec Revert "merge #5505: use /run/current-system/sw/bin/*"
I didn't realize it causes a nontrivial rebuild (through systemd).
I'll re-push to staging.

This reverts commit 8cf4ef7ab7.
2014-12-30 10:51:36 +01:00
Tobias Geerinckx-Rice
8cf4ef7ab7 merge #5505: use /run/current-system/sw/bin/*
A working /sbin/shutdown (usually provided by systemd) is required by
"rtcwake -m off". Creating a circular dependency on systemd for this
just isn't worth the trouble, so take the straightforward way out.

One could easily make the argument that rtcwake wants to shut down the
*currently running system*, and that the correct API for that *is* in
fact /run/current-system. And it makes a very tempting sort of sense.

@vcunat moved to postPatch and added #FIXME.
2014-12-30 10:31:20 +01:00
Eelco Dolstra
e7ad8af28e util-linux: Update to 2.25.2 2014-12-17 13:47:27 +01:00
Shea Levy
e2331b52cd util-linux: bump 2014-09-16 11:53:20 -04:00
Vladimír Čunát
abbc93f783 WIP: getting better 2014-08-30 19:11:52 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
69deced59b util-linux: Update to 2.24.2 2014-06-24 14:01:54 +02:00
Eelco Dolstra
7438b95437 util-linux: Update to 2.24.1 2014-04-16 16:31:58 +02:00
William A. Kennington III
28ab3acb58 su: Make the su package a provider of only the su binary
Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
2014-04-05 16:01:52 -05:00
William A. Kennington III
f6503e5e35 Upgrade util-linux from 2.22 -> 2.24 2013-11-28 00:52:13 -06:00
Eelco Dolstra
cc8db57097 util-linux: Install all binaries in $bin 2013-06-12 17:12:30 +02:00
Eelco Dolstra
99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00