forked from pool/util-linux
4b9855b405
This update needs a special care:
1)
After first successful build on all platforms, "osc meta prjconf Base:System" must include:
%if 0%{?suse_version} > 1310
Preinstall: libsmartcols1
%endif
2)
You also need to make symlinks to util-linux-systemd and python-libmount.
And finally, this package is intended only for > 1310 (i. e. Factory).
3)
The spec file can have problems with (buggy) Factory check-in check:
ERROR: python-libmount: group for main package not set
There is false error and I have no work-around for this just now.
(If you want, please ping me (by mail) after package review, and I'll do all needed changes.)
- Update to version 2.25
(using work of Ruediger Meier <sweet_f_a@gmx.de>):
* based on the git master branch of util-linux
* many fixes (including bnc#869355, bnc#871951 and
bnc#871698#c49)
* new Python binding sub-package for libmount: python-libmount
* new library: libsmartcols
* new commands: lslogins, setpriv
* add fstrim systemd timer
* better systemd integration
* DROPPED command:
* cytune: Upstream decided to remove tool untested for years
that supports this old hardware.
- Dropped patches included in the upstream:
(*git) Included with no changes
(+git) Included with improvements
(!git) Included with differences
* support-other-tty-lines-not-vconsole.patch (*b9c7390)
* agetty-fooled-on-serial-line-due-plymouth.patch,
* sulogin-fooled-on-tty-line-due-plymouth.patch (*bb280f7)
* agetty-on-s390-on-dev-3270-tty1-line.patch (*f2bcda5)
* sulogin-does-not-find-any-console.patch (*624b204)
* util-linux-setarch-uname26.patch (*f6eb160)
* util-linux-ng-2.16-squashfs3-detect.patch (*11402f5)
* util-linux-lscpu-improve-hypervisor-detection.patch
(!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475)
WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports
hypervisor, as it breaks standard behavior. Use standard output
instead! (FATE#310255)
* blkid-stop-scanning-on-I-O-error.patch (+296d96e)
* blkid-convert-superblocks-to-new-calling-convention.patch
(+37f4060)
* util-linux-libblkid-ext-probe.patch (*a1ca32f)
* util-linux-hwclock-drift-check.patch (*f196fd1)
* util-linux-hwclock-adjtime-check.patch (*db8fc5f)
- Dropped obsolete patch:
* util-linux-2.23.1-eject-fpie.patch (eject is no more SUID)
* util-linux-2.24-fdisk_remove_bogus_warnings.patch
(upstream fixed it in a different way)
* util-linux-HACK-boot.localfs.diff
(MOUNT_PRINT_SOURCE is no more referenced)
- Ported and renamed:
* util-linux-2.23.1-noenc-suse.diff
-> util-linux-noenc-suse.patch
- Split spec file to three stages:
* util-linux.spec: Everything that do not need python or systemd.
* util-linux-systemd.spec: Stuff that needs systemd:
util-linux-systemd and uuidd
NOTE: Not building systemd-less variants of utilities.
* python-libmount.spec: Just python-libmount
- Move bash-completion files to correct packages.
- Add patch util-linux-bash-completion-blockdev.patch.
- Add hacks to prevent damaging of spec files by format_spec_file
(bnc#891152, also edited util-linux-rpmlintrc).
- use nologin from upstream (was added in 2.24)
OBS-URL: https://build.opensuse.org/request/show/244468
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=248
15 lines
710 B
Diff
15 lines
710 B
Diff
Index: util-linux/libmount/src/context_loopdev.c
|
|
===================================================================
|
|
--- util-linux.orig/libmount/src/context_loopdev.c
|
|
+++ util-linux/libmount/src/context_loopdev.c
|
|
@@ -212,6 +212,9 @@ int mnt_context_setup_loopdev(struct lib
|
|
if (rc == 0 && (cxt->user_mountflags & MNT_MS_ENCRYPTION) &&
|
|
mnt_optstr_get_option(optstr, "encryption", &val, &len) == 0) {
|
|
DBG(CXT, ul_debugobj(cxt, "encryption no longer supported"));
|
|
+ // XXX: nasty for the lib but there's on better way to give a hint atm
|
|
+ fprintf(stderr, "mount: encryption no longer supported.\n"
|
|
+ " Please use /etc/crypttab instead (man 5 crypttab)\n");
|
|
rc = -MNT_ERR_MOUNTOPT;
|
|
}
|
|
|