Commit Graph

63 Commits

Author SHA1 Message Date
whispers
b1a505fe96 util-linux: do not run unnecessary autoreconf
since #402852 (and made unconditional in
41205c0e6c), we run autoreconf for
util-linux. this is because we needed to patch configure.ac. this is no
longer the case, as the patch for which we did this was accepted
upstream and we've had it since v2.42:
https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/.
accordingly, we can now remove this

if we still want to autoreconf for some reason, despite it not being
needed, we should at least unpin automake116x, as we have no reason to
require an old automake anymore.
2026-09-11 00:55:14 -04:00
Julian Stecklina
02db679c80 util-linux: 2.42.2 -> 2.42.3
Fixes: CVE-2026-76642
Fixes: CVE-2026-78410
Fixes: CVE-2026-78409
Fixes: CVE-2026-78408
Fixes: GHSA-4558-p62c-vv5v
2026-09-04 22:47:26 +02:00
Stefan Frijters
3fc9dda8d5 util-linux: enable structuredAttrs 2026-08-12 20:34:20 +02:00
Stefan Frijters
75bd101d26 util-linux: enable strictDeps 2026-08-12 20:34:12 +02:00
jopejoe1
bd32872e96 util-linux: update license 2026-08-07 12:17:45 +02:00
Morgan Jones
c1ea0a5d47 util-linux: 2.42.1 -> 2.42.2
https://www.kernel.org/pub/linux/utils/util-linux/v2.42/v2.42.2-ReleaseNotes

Fix some CVEs in mount(8) and a UAF in libblkid.
2026-06-18 01:51:45 -07:00
Morgan Jones
28dd6b9df1 util-linux: 2.42 -> 2.42.1 2026-05-18 11:43:52 -07:00
r-vdp
b6377c3648 util-linux: set --sysconfdir=/etc
Upstream's configure.ac only defaults sysconfdir to /etc when prefix is
unset or /usr. With a Nix store prefix it stays at $out/etc.

Until 2.42 this was harmless because every /etc path in pathnames.h was
a hardcoded literal. 2.42 rewrote agetty's issue-file lookup and now
derives the search root from _PATH_SYSCONFDIR.
So agetty now looks for out/etc/issue and never finds it.

Nothing is installed into ${sysconfdir}, so this does not write to /etc
during the build.

Fixes #514060
2026-04-27 20:23:03 +02:00
Morgan Jones
5a6a0c6d7a util-linux: update patches
Seems like util-linux had a regression in `script`. Waiting for 2.41.1
to be tagged, but in the meantime, let's apply this patch:

https://lore.kernel.org/util-linux/adi3573O-5gr9m2q@per.namespace.at/T/#t

Since we're causing a mass rebuild anyway, ensure we also apply all the
final upstream versions of the last patches that we applied.
2026-04-19 17:11:08 -07:00
Vladimír Čunát
582d8cde6d Revert "util-linux: avoid rebuild on non-musl for now"
This reverts commit 31fb6927a8.
2026-04-08 09:38:10 +02:00
Vladimír Čunát
31fb6927a8 util-linux: avoid rebuild on non-musl for now 2026-04-08 08:41:10 +02:00
Aleksi Hannula
392dd53f82 pkgsMusl.util-linuxMinimal: fix build 2026-04-07 20:18:08 +03:00
Morgan Jones
40316d7ea7 util-linux: only add updateScript for non-minimal build
We choose the non-minimal build because minimal encompasses libuuid and
util-linuxMinimal.
2026-04-05 19:12:26 -07:00
Morgan Jones
8d4e67943e util-linux: fix 2.42 compile on Darwin
Patch submitted upstream:

https://lore.kernel.org/util-linux/CAEUYr6ZjVX1bd-xcBGtFN_ZYwQnXDYsw7d1-7sTpF2BbgfrR+g@mail.gmail.com/T/
2026-04-05 18:21:55 -07:00
Morgan Jones
4096ee569c util-linux: 2.41.3 -> 2.42
Drop a patch that has been merged upstream.
2026-04-05 17:21:03 -07:00
Morgan Jones
9cb7c50195 util-linux: 2.41.3 -> 2.41.4
Pick up the patch from #507036.
2026-04-05 17:09:48 -07:00
nixpkgs-ci[bot]
23ee7d594c Merge master into staging-next 2026-03-14 00:21:49 +00:00
Alexander Bantyev
2839911e81 various: add security-review team as a maintainer
Adds the @NixOS/security-review team as a maintainer to multiple
packages deemed to be important security-wise.

For the motivation of the package list, see:
https://github.com/NixOS/nixpkgs/issues/494349#issuecomment-4005099033
2026-03-05 15:19:44 +01:00
Morgan Jones
71feb7ecf2 util-linux: Ensure that liblastlog is linked with libpam
If we don't add this, we don't actually link with PAM; compare the
before and after of `lib/security/pam_lastlog2.so`.

```
Dynamic section at offset 0x2ce8 contains 31 entries:
  Tag        Type                         Name/Value
 0x0000000000000001 (NEEDED)             Shared library: [liblastlog2.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libsqlite3.so]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
 0x000000000000000e (SONAME)             Library soname: [pam_lastlog2.so]
```

```
Dynamic section at offset 0x2cd8 contains 32 entries:
  Tag        Type                         Name/Value
 0x0000000000000001 (NEEDED)             Shared library: [libpam.so.0]
 0x0000000000000001 (NEEDED)             Shared library: [liblastlog2.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libsqlite3.so]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
 0x000000000000000e (SONAME)             Library soname: [pam_lastlog2.so]
```

This causes issues like https://github.com/NixOS/nixpkgs/issues/493934
where the library has trouble linking with PAM symbols because it is not
linked.
2026-03-02 11:23:45 -08:00
Alexander Bantyev
22ca96f3a9 various: add meta.identifier.cpeParts to a batch of packages
Co-Authored-By: Silvan Mosberger <silvan.mosberger@tweag.io>
2026-02-16 17:11:52 +01:00
Morgan Jones
ce227d4c5d util-linux: 2.41.2 -> 2.41.3 2025-12-23 14:51:20 -08:00
nixpkgs-ci[bot]
88a060a996 Merge staging-next into staging 2025-12-12 18:06:38 +00:00
Alexander Bantyev
9754f5e62e util-linux: add in-tree comments for patches
Adds in-tree comments for all patches, to better comply with the style
guide.
2025-12-11 10:11:37 +01:00
Philip Kannegaard Hayes
e17130a3fe util-linux: fix error message sourcing bash completions
`util-linux.bin` is accidentally copying over a Makefile into its
`share/bash-completion/completions/` output directory, which leads to
these annoying error messages when opening a new shell:

```
-bash: /run/current-system/sw/share/bash-completion/completions/Makemodule.am: line 198: syntax error near unexpected token `else'
-bash: /run/current-system/sw/share/bash-completion/completions/Makemodule.am: line 198: `else'
```

We'll fix the issue by removing the `Makemodule.am` file before it gets
copied over.
2025-11-28 14:13:19 -08:00
Pol Dellaiera
44c10fbfc2 util-linux: remove unused systemd parameter 2025-11-21 15:42:34 +01:00
Morgan Jones
6fe0bb189f util-linux: 2.41.1 -> 2.41.2 2025-10-05 22:55:25 -07:00
Pol Dellaiera
6fdf69579f util-linux: replace hardcoded path to /usr/bin/mv
See TODO in https://github.com/NixOS/nixpkgs/pull/432567 for context

Co-authored-by: Grimmauld <soeren@benjos.de>
2025-09-02 14:05:59 +02:00
Pol Dellaiera
64d3b1c1df util-linux: use systemdLibs 2025-09-01 11:40:04 +02:00
Pol Dellaiera
8ad6e0a266 util-linux: re-organize attributes and simplify post-install step 2025-09-01 11:40:04 +02:00
Pol Dellaiera
307592818c util-linux: fix the use of finalAttrs pattern, remove rec 2025-09-01 11:40:04 +02:00
Alyssa Ross
69ed93c6a7 util-linux: fix build with systemd disabled
Fixes: 025e637434 ("util-linux: split lastlog into dedicated output")
2025-08-29 12:59:33 +02:00
Philip Taron
31af84ca65 {bash-completion,util-linux}: fix mount -t tab completion (#434773) 2025-08-21 12:25:44 -07:00
Sandro Jäckel
0e11324196 util-linux: fix mount -t tab completion 2025-08-21 15:14:55 +02:00
Sandro Jäckel
cedc84cf81 util-linux: use --replace-fail everywhere 2025-08-21 15:14:55 +02:00
Grimmauld
002e2897e6 util-linux: don't build pam support on static 2025-08-12 20:27:54 +02:00
K900
801b363af8 nixos/pam: switch to lastlog2 (#429203) 2025-08-10 11:13:57 +03:00
Alyssa Ross
41205c0e6c util-linux: apply patch unconditionally
This was applied conditionally on staging-next to avoid throwing away
Linux builds.  It should have been changed to unconditional on
staging after that was merged, but I guess I forgot.  We generally
avoid conditional patch application wherever possible as it makes it
far too easy to miss when a patch needs to be removed or updated.
2025-08-08 11:11:28 +02:00
Grimmauld
0efdf36544 nixos/tests/lastlog: init 2025-07-31 22:38:53 +02:00
Grimmauld
025e637434 util-linux: split lastlog into dedicated output 2025-07-31 16:58:48 +02:00
Wolfgang Walther
90604d95bc Merge branch 'staging-next' into staging 2025-07-24 14:33:09 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Morgan Jones
e6b8ad33ff util-linux: 2.41 -> 2.41.1
Drop most of our patches, since they were fixed:

libmount:
    - (subdir) restrict for real mounts only (by Karel Zak)
    - (subdir) remove unused code (by Karel Zak)
    - fix --no-canonicalize regression (by Karel Zak)

libuuid:
    - fix uuid_time on macOS without attribute((alias)) (by Eugene Gershnik)

https://lore.kernel.org/util-linux/wnfaquaapqknjnu2bdvddkp2xbleowfcr2g3cqiewpl54oclmi@mrseflcu5nyk/T/#u
2025-07-19 12:00:23 -07:00
nixpkgs-ci[bot]
2d8cca0a45 Merge master into staging-next 2025-07-05 06:05:38 +00:00
Morgan Jones
91a3afac52 util-linux: drop withPatches
Closes #409339. This API was intended to be a temporary hack to fix
Kubernetes and other consumers that relied on this specific util-linux
mount behavior. Now that util-linux is correctly patched, we can drop
this passthru.
2025-07-02 23:52:26 -07:00
Chet Gurevitch
5d8f5a0f8e util-linux: restrict X-mount.subdir to real mounts
Fixes errors in stage-1 as well as from systemd-remount-fs for systems
using X-mount.subdir for root
2025-06-15 00:41:30 -07:00
K900
37a72a5aa2 Merge remote-tracking branch 'origin/staging-next' into staging 2025-05-29 12:02:16 +03:00
Morgan Jones
99e6554fea util-linux: hack: add withPatches passthru
TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild
for the 25.05 release to fix Kubernetes. Once the staging cycle referenced
in the above PR completes, this passthru and all consumers of it should go away.
2025-05-21 12:51:45 -07:00
RockWolf
97e21e3f5f util-linux: fix mount regression 2025-05-17 12:14:04 +02:00
Alyssa Ross
822c7d7c9c util-linux: fix build on Darwin
Fixes: 562035c6bd ("util-linux: 2.40.4 -> 2.41")
2025-05-01 10:02:11 +02:00
misilelaboratory
562035c6bd util-linux: 2.40.4 -> 2.41
https://lore.kernel.org/util-linux/2cifsg7vkdiivfsmmximhbzybrsopn7zfqgwz2f6hyflh35pjr@ecyicq2cbsro
2025-04-13 07:47:00 +02:00