98818bc8ae
Accepting request 960118 from home:sbrabec:branches:util-linux-round14
...
- Update to version 2.37.4...
- Fix "su -s" bash completion.
OBS-URL: https://build.opensuse.org/request/show/960118
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=461
2022-03-08 09:54:48 +00:00
cab3427859
Accepting request 948494 from home:dirkmueller:Factory
...
- update to 2.37.3 (bsc#1194976):
This release fixes two security mount(8) and umount(8) issues:
* CVE-2021-3996
Improper UID check in libmount allows an unprivileged user to unmount FUSE
filesystems of users with similar UID.
* CVE-2021-3995
This issue is related to parsing the /proc/self/mountinfo file allows an
unprivileged user to unmount other user's filesystems that are either
world-writable themselves or mounted in a world-writable directory.
OBS-URL: https://build.opensuse.org/request/show/948494
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=460
2022-01-24 22:38:41 +00:00
2e15cdd619
Accepting request 940498 from home:sbrabec:branches:util-linux-b1192954
...
- The legacy code does not support /etc/login.defs.d used by YaST.
Enable libeconf to read it (bsc#1192954) on released products.
Actually, the change is not needed for Factory, but I like to keep
Factory in sync with released products.
OBS-URL: https://build.opensuse.org/request/show/940498
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=459
2021-12-14 14:40:09 +00:00
c7565d51e2
Accepting request 932031 from home:sbrabec:branches:Base:System
...
Fix download URL.
OBS-URL: https://build.opensuse.org/request/show/932031
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=458
2021-11-17 22:29:29 +00:00
aa79804772
Accepting request 931925 from home:sbrabec:branches:Base:System
...
- Update to version 2.37.2...
OBS-URL: https://build.opensuse.org/request/show/931925
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=456
2021-11-17 09:56:57 +00:00
bcbc304a35
- Remove the raw utility altogether
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=454
2021-09-09 20:58:33 +00:00
83054a757f
Compact symlink lists
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=453
2021-09-09 20:13:02 +00:00
c05781d16a
osc copypac from project:Base:System package:util-linux revision:450
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=452
2021-08-03 13:12:24 +00:00
5dc76a5911
Accepting request 909748 from home:pgajdos
...
- package motd.5 man page as link to login.1 [bsc#1133929]
OBS-URL: https://build.opensuse.org/request/show/909748
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=451
2021-08-03 12:33:00 +00:00
ecb225dbb1
Accepting request 897345 from home:kukuk:tiu
...
- login.pamd: use pam_motd to unify motd handling [bsc#1185897].
Else motd snippets of e.g. cockpit will not be shown.
OBS-URL: https://build.opensuse.org/request/show/897345
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=449
2021-06-04 10:46:54 +00:00
038a3fdb04
Accepting request 873242 from home:sbrabec:branches:util-linux-2.36.2
...
- Update to version 2.36.2...
obsoletes util-linux-libmount-dont-use-symfollow.patch
OBS-URL: https://build.opensuse.org/request/show/873242
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=447
2021-02-18 10:14:50 +00:00
f76dd9471f
Accepting request 871017 from home:sbrabec:branches:util-linux-boo1181750
...
- libmount: don't use "symfollow" for helpers on user mounts
(boo#1181750, util-linux-libmount-dont-use-symfollow.patch)
OBS-URL: https://build.opensuse.org/request/show/871017
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=445
2021-02-10 23:51:24 +00:00
d23ec5587a
Accepting request 870580 from home:jengelh:branches:Base:System
...
- Override GTKDOCIZE with /bin/true so we can run autoreconf
without needing gtk-doc as a dependency.
OBS-URL: https://build.opensuse.org/request/show/870580
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=444
2021-02-10 10:50:18 +00:00
1ca06d70d9
Accepting request 869061 from home:sbrabec:branches:distconfdir-fix
...
- Merge package with SLE15 SP3 and openSUSE Leap 15.3...
- Build with libudev support to support non-root users
(boo#1169006).
- Move findmnt and lsblk to util-linux-systemd, as they use libudev
(bsc#1169006#c10).
OBS-URL: https://build.opensuse.org/request/show/869061
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=442
2021-02-04 10:53:12 +00:00
0f9a19d787
Accepting request 867613 from home:sbrabec:branches:distconfdir-fix
...
- Do not require libeconf-devel on products without /usr/etc.
OBS-URL: https://build.opensuse.org/request/show/867613
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=440
2021-01-30 08:05:30 +00:00
76cdbe85e3
Accepting request 866824 from home:lnussel:usrmove
...
- s/--enable-vendordir/--with-vendordir/
- remove pam_securetty line again. As long as there is no agreement
from pam side having it would fail openQA (boo#1033626)
OBS-URL: https://build.opensuse.org/request/show/866824
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=439
2021-01-26 13:17:45 +00:00
cddb9b57ff
Accepting request 863424 from home:sbrabec:branches:util-linux-2.36.1
...
- Update to version 2.36.1...
- Revert the conversion to multibuild, which coflicts with OBS way it tests built packages.
Successful build requires fix of regression of system-users: rq#863423
OBS-URL: https://build.opensuse.org/request/show/863424
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=438
2021-01-18 10:29:39 +00:00
c8c1379cb6
Accepting request 851169 from home:jengelh:branches:Base:System
...
- Do search /usr/sbin for mount helpers. (This drops /sbin/fs,
/sbin/fs.d, which we do not use in openSUSE.)
OBS-URL: https://build.opensuse.org/request/show/851169
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=437
2021-01-15 18:44:36 +00:00
Dr. Werner Fink
fd21f8d012
sulogin
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=435
2020-10-30 14:33:02 +00:00
9ae5124e0d
Accepting request 834768 from home:sbrabec:branches:util-linux-multibuild
...
Fix flavor names and cross provides.
OBS-URL: https://build.opensuse.org/request/show/834768
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=434
2020-09-16 00:36:58 +00:00
644790947b
Accepting request 833344 from home:sbrabec:branches:util-linux-multibuild
...
- Migrate multi-spec build to multibuild.
- Change packaging from per-partes build to mini+full build.
- Fix default permissions of wall and write.
- Build all python flavors.
- Fix error in scriptlets after migration to /usr/etc.
- Update to version 2.36...
- Refresh Add-documentation-on-blacklisted-modules-to-mount-8-.patch.
- Drop upstreamed libeconf.patch,
libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch.
- util-linux-login_defs-check.sh: Perform all steps to integrate
MOTD_FIRSTONLY.
- Update baselibs.conf.
OBS-URL: https://build.opensuse.org/request/show/833344
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=433
2020-09-09 23:47:10 +00:00
8df1b42ed3
Accepting request 808196 from home:favogt:branches:Base:System
...
- Use plain #!/bin/sh for flushb
OBS-URL: https://build.opensuse.org/request/show/808196
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=431
2020-05-24 22:48:07 +00:00
20b1dd3c6f
Accepting request 808136 from home:mcalabkova:branches:Base:System
...
- Include pam_securetty in login.pamd again (bsc#1033626)
- Update to 2.35.2
* make glibc 2.31 compatible
- Dropped unneeded patch libfdisk-script-accept-sector-size.patch
- Include pam_securetty in login.pamd again (bsc#1033626)
- Update to 2.35.2
* make glibc 2.31 compatible
- Dropped unneeded patch libfdisk-script-accept-sector-size.patch
- Include pam_securetty in login.pamd again (bsc#1033626)
- Update to 2.35.2
* make glibc 2.31 compatible
- Dropped unneeded patch libfdisk-script-accept-sector-size.patch
OBS-URL: https://build.opensuse.org/request/show/808136
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=430
2020-05-24 22:42:32 +00:00
b8b77fde7a
Accepting request 805239 from home:favogt:branches:Base:System
...
Tested, works.
- Add patch to fix sfdisk not reading its own scripts:
* libfdisk-script-accept-sector-size.patch
- Use %autopatch
- Fix verification of mount, su and umount (bsc#1166948)
OBS-URL: https://build.opensuse.org/request/show/805239
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=429
2020-05-19 18:19:32 +00:00
06d1a88bec
Accepting request 791864 from home:sbrabec:branches:Base:System
...
- Update to version 2.35.1:
- Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch:
OBS-URL: https://build.opensuse.org/request/show/791864
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=427
2020-04-06 21:48:18 +00:00
88d010c8af
Accepting request 791807 from home:fos:branches:Base:System
...
Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch: Avoid triggering autofs in lookup_umount_fs_by_statfs (boo#1168389)
OBS-URL: https://build.opensuse.org/request/show/791807
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=426
2020-04-06 18:29:40 +00:00
d87a3bb4cf
Accepting request 734617 from home:kukuk:etc
...
- libeconf.patch: Add support for libeconf
- Move /etc/pam.d/* to /usr/etc/pam.d
- Remove migration code for su from coreutils to util-linux, not
needed anymore
- libeconf.patch: Add support for libeconf
- Move /etc/pam.d/* to /usr/etc/pam.d
- Remove migration code for su from coreutils to util-linux, not
needed anymore
- libeconf.patch: Add support for libeconf
- Move /etc/pam.d/* to /usr/etc/pam.d
- Remove migration code for su from coreutils to util-linux, not
needed anymore
OBS-URL: https://build.opensuse.org/request/show/734617
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=423
2019-10-02 22:24:59 +00:00
3b4c142f6e
Accepting request 731938 from home:lnussel:branches:Base:System
...
- Do not recommend lang package. The lang package already has a
supplements.
OBS-URL: https://build.opensuse.org/request/show/731938
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=421
2019-09-19 16:52:11 +00:00
0d6eab372f
Accepting request 727215 from home:olh:branches:Base:System
...
- lsblk: force to print PKNAME for partition with
e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch
OBS-URL: https://build.opensuse.org/request/show/727215
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=419
2019-09-03 17:01:02 +00:00
fedbd5c3be
Accepting request 724588 from home:kukuk:branches:Base:System
...
- Remove outdated buildignore for pwdutils, had no effect with
shadow anyways
- Remove outdated buildignore for pwdutils, had no effect with
shadow anyways
- Remove outdated buildignore for pwdutils, had no effect with
shadow anyways
OBS-URL: https://build.opensuse.org/request/show/724588
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=418
2019-09-03 16:59:06 +00:00
cb377b82e3
Accepting request 723394 from home:sbrabec:branches:util-linux-2.34
...
- Provide and obsolete hardlink package.
OBS-URL: https://build.opensuse.org/request/show/723394
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=416
2019-08-14 23:24:10 +00:00
f45666d93e
Typo fix.
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=415
2019-08-08 00:23:26 +00:00
762b3880c9
Accepting request 721379 from home:sbrabec:branches:Base:System
...
- Issue a warning for outdated pam files
(bsc#1082293, boo#1081947#c68).
- Fix comments and unify look of PAM files (login.pamd,
remote.pamd, runuser-l.pamd, runuser.pamd, su-l.pamd, su.pamd).
- Revert broken change.
OBS-URL: https://build.opensuse.org/request/show/721379
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=413
2019-08-06 23:09:02 +00:00
fc59bea46e
Accepting request 720086 from home:sbrabec:branches:util-linux-2.34
...
Previous request was declined by factory-auto. Fix download URI.
OBS-URL: https://build.opensuse.org/request/show/720086
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=412
2019-07-31 16:09:54 +00:00
47aaf083a0
Accepting request 719008 from home:sbrabec:branches:util-linux-2.34
...
- Update to version 2.34.
OBS-URL: https://build.opensuse.org/request/show/719008
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=411
2019-07-26 22:24:05 +00:00
e0eedbb342
Accepting request 717649 from home:sbrabec:branches:Base:System
...
- Fix /etc/default/su comments and create /etc/default/runuser
(bsc#1121197#31).
OBS-URL: https://build.opensuse.org/request/show/717649
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=410
2019-07-22 16:53:23 +00:00
59936b0f48
Accepting request 716105 from home:sbrabec:branches:util-linux-pam_d-b1082293
...
- Prevent outdated pam files (bsc#1082293, boo#1081947#c68):
* Remove "(noreplace)". It will enforce update whenever package
changes it.
* Expand tabs to trigger a change and replace potentially
outdated files just now.
* Remove script that migrates old coreutils su pam files.
OBS-URL: https://build.opensuse.org/request/show/716105
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=407
2019-07-17 17:21:26 +00:00
d0f4a733b6
Accepting request 712922 from home:sbrabec:branches:util-linux-license-b1135708
...
- Fix license of libraries: LGPL-2.1-or-later and BSD-3-Clause for
libuuid (bsc#1135708).
OBS-URL: https://build.opensuse.org/request/show/712922
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=405
2019-07-01 22:18:40 +00:00
6bb207a4a8
Accepting request 711045 from home:marxin:branches:Base:System
...
- Use FAT LTO objects in order to provide proper static library (boo#1138795).
OBS-URL: https://build.opensuse.org/request/show/711045
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=404
2019-07-01 09:49:09 +00:00
edfe7ee1c6
Accepting request 701841 from home:sbrabec:branches:util-linux-2.33.2
...
- Update to version 2.33.2:
* agetty: Fix 8-bit processing in get_logname() (bsc#1125886).
* mount: Fix "mount" output for net file systems (bsc#1122417).
* Many Other fixes, see
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33.2-ReleaseNotes
OBS-URL: https://build.opensuse.org/request/show/701841
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=399
2019-05-09 20:06:34 +00:00
fed1a56686
Accepting request 700496 from home:sbrabec:branches:util-linux-2.33.1
...
Depends on https://build.opensuse.org/request/show/700494 !
- Fix problems in reading of login.defs values (bsc#1121197,
util-linux-login_defs-priority1.patch,
util-linux-login_defs-priority2.patch,
util-linux-login_defs-SYS_UID.patch).
- Perform one-time reset of /etc/default/su (bsc#1121197).
- Add virtual symbols for login.defs compatibility (bsc#1121197).
- Add login.defs safety check util-linux-login_defs-check.sh
(bsc#1121197).
- Drop bc BuildRequires: not needed.
OBS-URL: https://build.opensuse.org/request/show/700496
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=398
2019-05-09 15:58:55 +00:00
686870baf8
Accepting request 681415 from home:dimstar:Factory
...
- Drop bc BuildRequires: not needed.
OBS-URL: https://build.opensuse.org/request/show/681415
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=396
2019-03-05 09:05:54 +00:00
6295ab1cea
Accepting request 677957 from home:mwilck:branches:Base:System
...
- libmount: remove jffs2 and ubifs from blacklist (jsc#SLE-4085).
- libmount: print a blacklist hint for "unknown filesystem type"
(jsc#SLE-4085, fate#326832), and add documentation
* add libmount-print-a-blacklist-hint-for-unknown-filesyst.patch
* add Add-documentation-on-blacklisted-modules-to-mount-8-.patch
OBS-URL: https://build.opensuse.org/request/show/677957
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=394
2019-03-01 20:19:58 +00:00
a7ab3a33bc
Accepting request 667887 from home:sbrabec:branches:util-linux-2.33.1
...
- Update to version 2.33.1:
* agetty fixes (drop util-linux-agetty-smart-reload-10.patch,
util-linux-agetty-smart-reload-11.patch,
util-linux-agetty-smart-reload-12.patch).
* Other minor fixes and documentation updates.
OBS-URL: https://build.opensuse.org/request/show/667887
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=392
2019-01-24 15:28:59 +00:00
bb4a013d42
Accepting request 662937 from home:sbrabec:branches:util-linux-b1120298
...
- agetty: Fixes for reload issue only if it is really needed
(bsc#1085196, boo#1120298,
util-linux-agetty-smart-reload-10.patch,
util-linux-agetty-smart-reload-11.patch,
util-linux-agetty-smart-reload-12.patch).
OBS-URL: https://build.opensuse.org/request/show/662937
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=391
2019-01-08 16:41:49 +00:00
91d77c4d90
Accepting request 656921 from home:sbrabec:branches:Base:System
...
- Drop rfkill-block@.service and rfkill-unblock@.service that
functionally conflict with systemd-rfkill@.service
(boo#1092820#c13).
OBS-URL: https://build.opensuse.org/request/show/656921
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=386
2018-12-11 08:41:54 +00:00
97efb9cb53
Accepting request 650772 from home:sbrabec:branches:Base:System
...
- Update to version 2.33:
* choom: new command to adjust and display the current OOM-killer
score.
* libsmartcols has been improved to differentiate between
numbers, booleans and strings in JSON output.
* fstrim(8): trim all mounted filesystems from /etc/fstab
(-A|--fstab), new command line option --dry-run.
* hwclock(8) new command line option --delay.
* mount umount, libmount allow to mount and umount filesystem in
another namespace.
* rename(1) new command line option --interactive.
* setarch(8) does not require architecture when modify
personality like ADDR_NO_RANDOMIZE. The architecture argument
is optional now.
* command su(1) new command line option --whitelist-environment.
* setpriv(1) new command line option --reset-env and --pdeathsig.
* fdisk(8), sfdisk(8): print disk model name to simplify device
identification.
* column --table-empty-lines" allows to use empty lines in
formatted output.
* wipefs improved to postpone BLKRRPART ioctl until all magic
strings are wiped.
* script(1) extended to store more information about terminal
size and type to the typescript header. New command line
option --output-limit.
* libblkid provides BitLocker and basic APFS detection now.
* lsblk is possible to execute against /sys and /proc dumps with
--sysroot is specified.
* agetty(8) reload issue only if it is really needed
(bsc#1085196).
- Drop klogconsole in favor of dmesg --console-level plus
setlogcons (kbd) (boo#1116277).
OBS-URL: https://build.opensuse.org/request/show/650772
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=384
2018-11-27 18:17:59 +00:00
4278302324
Accepting request 644909 from home:sbrabec:branches:numlock-b1113188
...
- Fix runstatedir path (to /run) (boo#1113188#c1).
OBS-URL: https://build.opensuse.org/request/show/644909
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=382
2018-11-07 07:46:39 +00:00
7de341a83d
Accepting request 641677 from home:sbrabec:branches:Base:System
...
- Create empty /etc/issue.d for the new agetty feature.
OBS-URL: https://build.opensuse.org/request/show/641677
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=381
2018-10-15 15:41:28 +00:00
20a7790bbb
Accepting request 638843 from home:sbrabec:branches:util-linux-cleanup
...
- Drop obsolete downstream ppc utilities
chrp-addnote and mkzimage_cmdline (boo#1109284).
- Drop obsolete setctsid (boo#1109290).
OBS-URL: https://build.opensuse.org/request/show/638843
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=380
2018-10-01 15:30:44 +00:00
7bfb1c344a
Accepting request 627729 from home:sbrabec:branches:util-linux-python3
...
- Update to version 2.32.1...
- Switch python-libmount to python3-libmount.
OBS-URL: https://build.opensuse.org/request/show/627729
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=378
2018-08-07 23:53:11 +00:00
2bf68516b3
Accepting request 621187 from SUSE:SLE-15:GA
...
bsc#1091164
bsc#1072947
bsc#1080740
boo#1100255
OBS-URL: https://build.opensuse.org/request/show/621187
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=376
2018-07-09 16:37:09 +00:00
50b0c730e5
Accepting request 611230 from home:scarabeus_iv:branches:Base:System
...
- Do not run rfkill-block@.service and rfkill-unblock@service as it
is just template without parameter bsc#1092820 bsc#1093176
- Do not run rfkill-block@.service and rfkill-unblock@service as it
is just template without parameter bsc#1092820 bsc#1093176
- Do not run rfkill-block@.service and rfkill-unblock@service as it
is just template without parameter bsc#1092820 bsc#1093176
OBS-URL: https://build.opensuse.org/request/show/611230
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=374
2018-05-22 15:37:10 +00:00
3629134835
Accepting request 596302 from home:sbrabec:branches:util-linux-b1081947
...
- Integrate pam_keyinit pam module (boo#1081947, su-l.pamd,
runuser-l.pamd, runuser.pamd).
- su.default: Set ALWAYS_SET_PATH default to "yes" (bsc#353876#c7);
add one-time wrapper forcing ALWAYS_SET_PATH on upgrade.
OBS-URL: https://build.opensuse.org/request/show/596302
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=372
2018-04-13 11:36:33 +00:00
881c2a7ddb
Accepting request 589156 from home:kukuk:branches:Base:System
...
- Use %license instead of %doc [bsc#1082318]
- Use %license instead of %doc [bsc#1082318]
- Use %license instead of %doc [bsc#1082318]
OBS-URL: https://build.opensuse.org/request/show/589156
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=370
2018-03-23 09:33:09 +00:00
8e64fb6586
Accepting request 577314 from home:sbrabec:branches:util-linux-nvme-1078662
...
- Fix lsblk on NVMe
(bsc#1078662, util-linux-sysfs-nvme-devno.patch).
OBS-URL: https://build.opensuse.org/request/show/577314
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=368
2018-02-16 17:10:59 +00:00
d9b0e7db92
Accepting request 571529 from home:sbrabec:branches:util-linux-2.31.1
...
* fincore/count (disable, util-linux-fincore-count.patch)
OBS-URL: https://build.opensuse.org/request/show/571529
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=365
2018-01-31 20:01:48 +00:00
555aba99d9
check script does not support macro inside Source. Hardcode major version.
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=364
2018-01-31 12:46:53 +00:00
5c9bf99a7d
Typo fix.
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=363
2018-01-31 12:14:24 +00:00
556a1747dd
Fix download URL.
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=362
2018-01-31 11:44:15 +00:00
9c657ad4d7
Accepting request 570667 from home:sbrabec:branches:util-linux-2.31.1
...
- Update to version 2.31.1:
* blkid: Add support for LUKS2 and new LABEL attributes.
* move rfkill to /usr/sbin (boo#1076134).
* fsck.cramfs: Fix bus error on broken file system.
* hwclock: add iso-8601 overflow check
* libmount:
* Allow MNT_FORCE and MNT_DETACH at umount
* add nsfs between pseudo filesystems
* lscpu: Treat read failure on Xen Hypervisor properties as
non-fatal
* sha1: endian fixes (affects util_linux_bigendian.patch)
* documentation updates
* other fixes and improvements
- Fix regressions in 2.31.1:
* sha1 on s390* (update util_linux_bigendian.patch).
* fsck.cramfs on ppc64le (util-linux-cramfs.patch).
OBS-URL: https://build.opensuse.org/request/show/570667
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=361
2018-01-29 16:19:06 +00:00
38603b180c
Accepting request 567993 from home:jengelh:branches:Base:System
...
- Combine %service_* calls again.
OBS-URL: https://build.opensuse.org/request/show/567993
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=360
2018-01-23 12:05:34 +00:00
8fe025f04d
Accepting request 567215 from home:bmwiedemann:branches:Base:System
...
Provide /usr/sbin/rfkill from rfkill package (boo#1076134)
OBS-URL: https://build.opensuse.org/request/show/567215
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=359
2018-01-19 13:58:55 +00:00
d28a9129b8
Accepting request 566602 from home:michel_mno:branches:Base:System
...
- Add util_linux_bigendian.patch solve two failing tests on ppc64
(sha1, uuid/oids)
OBS-URL: https://build.opensuse.org/request/show/566602
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=358
2018-01-18 09:07:56 +00:00
e5ed31cfb5
Accepting request 563829 from home:sbrabec:branches:util-linux-1074250
...
Exactly like rq#561705, but path to rfkill is fixed in rfkill-*.service.
- Integrate rfkill-block@.service and rfkill-unblock@.service from
rfkill package (boo#1074250#c4).
- Remove unneeded release based conflicts and obsolescences
(boo#1074250#c18).
- Remove sysvinit requirement.
OBS-URL: https://build.opensuse.org/request/show/563829
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=357
2018-01-16 09:29:10 +00:00
f0504c09e9
Accepting request 561187 from home:1Antoine1:branches:Base:System
...
- Fix Obsoletes for rfkill (boo#1074250).
"<= rfkill-version" instead of "< rfkill-version", see https://en.opensuse.org/openSUSE:Package_dependencies#Merging_a_package .
This allows rfkill to be automatically removed instead of having a file conflict.
OBS-URL: https://build.opensuse.org/request/show/561187
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=356
2018-01-03 10:24:19 +00:00
c8508b94fa
Accepting request 558188 from home:sbrabec:branches:util-linux-2.31-fix
...
- Update bash completion conflict to cover rfkill file conflict.
- Update changes.
OBS-URL: https://build.opensuse.org/request/show/558188
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=355
2017-12-18 15:03:50 +00:00
8d036d9bf7
Accepting request 548188 from home:sbrabec:branches:util-linux-1065471
...
- lsmem: Add support for zone awareness (bsc#1065471, FATE#324252,
util-linux-lsmem-memory-zone-1.patch,
util-linux-lsmem-memory-zone-2.patch,
util-linux-lsmem-memory-zone-3.patch).
- Drop util-linux-losetup-Add-support-for-setting-logical-blocksize.patch.
Different implementations exists in the new kernel, and it has
a conflicting implementation in util-linux.
OBS-URL: https://build.opensuse.org/request/show/548188
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=354
2017-12-06 09:44:40 +00:00
5c789a611b
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=353
2017-11-27 17:13:08 +00:00
7cdd2de735
Accepting request 543952 from home:sbrabec:branches:util-linux-2.31
...
- Update to version 2.31:
* New utilities: uuidparse, rfkill.
* su has been refactored and extended to create pseudo terminal
(new option --pty, CVE-2016-2779, bsc#968674). This new
EXPERIMENTAL feature provides better isolation between root's
terminal and an unprivileged su.
* libuuid: Improved to match
* libuuid, uuidgen: support hash-based UUIDs v3 (md5) and v5
(sha1) as specified by RFC-4122. Provide UUID templates for
dns, url, oid, or x500.
* libblkid: Extended support for DM-integrity, HPE (aka
extended-XFS) and UBI superblock. New API to hide already
detected signatures.
* libfdisk: New API to modify grain, make possible to completely
disable dialog driven partitioning.
* libsmartcols: New API to move columns.
* column: --table-header-repeat to repeat table headers.
* libfdisk: Use BLKPG ioctls to inform the kernel about changes.
* fdisk: Improved ^C and ^D behavior.
* cfdisk: Dialog to resize partition.
* look: Follow the WORDLIST environment variable.
* script: Follow the usual semantics for stop/continue signals.
* setpriv: New command line options --ambient-caps and
--init-groups.
* hwclock: Reduce system shutdown times, log --systz when using
libaudit.
* Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch.
- Update to version 2.31:
OBS-URL: https://build.opensuse.org/request/show/543952
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=352
2017-11-27 10:06:27 +00:00
6025e3d210
Accepting request 530399 from home:sbrabec:branches:util-linux-tinfow-1056171
...
- Link against tinfow instead of tinfo
(bsc#1056171, util-linux-use-tinfow.patch).
OBS-URL: https://build.opensuse.org/request/show/530399
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=351
2017-10-02 10:59:53 +00:00
c2099fa71a
Accepting request 528095 from home:jengelh:branches:Base:System
...
- Update RPM categories and summaries.
Do not ignore errors from useradd.
OBS-URL: https://build.opensuse.org/request/show/528095
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=350
2017-09-25 09:20:17 +00:00
Dr. Werner Fink
0e0c1a8f7e
_GNU_SOURCE
...
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=349
2017-09-15 07:19:46 +00:00
da9c836707
Accepting request 523679 from home:sbrabec:branches:util-linux-1057937
...
Depends on rq#523677.
- Fix prerequirement of groups tty and uuidd (boo#1057937).
OBS-URL: https://build.opensuse.org/request/show/523679
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=347
2017-09-14 11:58:12 +00:00
64e9d40647
Accepting request 511668 from home:rudi_m:branches:Base:System
...
- Update to version 2.30.1:
Bugfix release, more details at:
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30.1-ReleaseNotes
- Drop upstreamed patch
util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
OBS-URL: https://build.opensuse.org/request/show/511668
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=346
2017-07-21 17:58:44 +00:00
533fd04bdd
Accepting request 507837 from home:Andreas_Schwab:Factory
...
- Make sure group tty is defined
OBS-URL: https://build.opensuse.org/request/show/507837
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=345
2017-07-04 06:41:11 +00:00
339c0d8779
Accepting request 504838 from home:sbrabec:branches:util-linux-2.30
...
Merge requests 502438 and 503441.
OBS-URL: https://build.opensuse.org/request/show/504838
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=343
2017-06-19 16:44:47 +00:00
b2cb9e6712
Accepting request 502907 from openSUSE:Leap:15.0:Rings:0-Bootstrap
...
- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
to be discussed with @mlschroe
OBS-URL: https://build.opensuse.org/request/show/502907
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=342
2017-06-16 09:26:52 +00:00
48a100787f
Accepting request 487529 from home:algraf:branches:Base:System
...
- Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
+ arm64-lscpu-use-sysfs-for-table-access-if-available.patch
OBS-URL: https://build.opensuse.org/request/show/487529
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=340
2017-04-12 13:18:50 +00:00
4c87942509
Accepting request 486182 from home:sbrabec:branches:util-linux-leap_42_3-merge-try2
...
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10.
OBS-URL: https://build.opensuse.org/request/show/486182
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=337
2017-04-06 15:40:29 +00:00
Ruediger Meier
3ad23ab3e1
replace outdated ftp links
...
see https://www.kernel.org/shutting-down-ftp-services.html
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=335
2017-03-29 20:01:25 +00:00
Ruediger Meier
b1ff554a5c
Accepting request 480884 from home:sbrabec:branches:util-linux-leap_42_3-merge-try2
...
This is another attempt to create common util-linux package for Tumbleweed and
Leap 42.3, that could be used for SLE12 SP3 as well.
Depends on sr#480879.
- Conflict with old systemd-presets-branding to ensure correct
preset migration (boo#1029775, bsc#1012850).
- Drop "codepage" fstab migration needed for SuSE Linux < 9.1
(bsc#51950 (suse#36950)).
- Keep dependency on insserv and fillup for compatibilitiy reasons
in Leap 42.3. Too many poorly written packages depend on it.
(Marked as "sysv compatibility hack".)
OBS-URL: https://build.opensuse.org/request/show/480884
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=334
2017-03-29 19:38:54 +00:00
ec35687a04
Accepting request 459922 from home:rudi_m:branches:Base:System
...
- Update to version 2.29.2:
* su(1) security issue CVE-2017-2616
* minor bugfixes and enhancements
OBS-URL: https://build.opensuse.org/request/show/459922
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=332
2017-02-23 07:55:30 +00:00
d06095d526
Accepting request 457126 from home:sbrabec:branches:util-linux-raw-fate321122
...
Rebase of https://build.opensuse.org/request/show/455783 . No other changes.
OBS-URL: https://build.opensuse.org/request/show/457126
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=331
2017-02-15 14:53:56 +00:00
783484c315
Accepting request 455978 from home:fbui:branches:Base:System
...
- presets are managed by the branding presets package (bsc#1012850)
The default activation state is defined by the branding preset
package.
This also get rid of the only use of the rpm preset macros so we can
kill them.
OBS-URL: https://build.opensuse.org/request/show/455978
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=330
2017-02-13 12:54:49 +00:00
Ruediger Meier
b385cd6d75
Accepting request 455350 from home:sbrabec:branches:util-linux-raw-fate321122
...
- Update to version 2.29.1:
* lscpu: add aarch64 specific names
* lubmount: Disable disable ro/rw mtab checks (bsc#1012632)
* More details at:
https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.1-ReleaseNotes
- Replace raw initscript by a systemd service doing the same thing.
Based on previous work of fcrozat@suse.com (FATE#321122).
OBS-URL: https://build.opensuse.org/request/show/455350
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=329
2017-02-07 20:47:46 +00:00
0f68d9f586
Accepting request 448848 from home:rudi_m:branches:Base:System
...
- don't install bash-completions for uninstalled binaries (chfn,
chsh, newgrp, pg)
- for now remove procps dependency which is only needed for tests
because it pulls systemd
Note the util-linux bash completions are incompatible to the
installed binaries from the shadow package. We could use the
completions from bash-completion package or we could switch
to the binaries from util-linux. They seem to have more
features and being backward compatible.
I've reverted the previous procps fix. It was not mwerged to
Factory yet.
OBS-URL: https://build.opensuse.org/request/show/448848
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=328
2017-01-05 16:34:46 +00:00
d6eb5f279b
Accepting request 446356 from home:fbui:branches:Base:System
...
- Replace pkgconfig(libsystemd-*) with pkgconfig(libsystemd)
libsystemd-* libs were deprecated and are gone now.
OBS-URL: https://build.opensuse.org/request/show/446356
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=327
2016-12-15 15:49:19 +00:00
44e4360fc8
Accepting request 445689 from home:dimstar:Factory
...
- Move the procps BuildRequires into the systemd conditional block.
procps is only used during the test suite (some tests run 'ps';
even if we ignore a failure for this in util-linux, we catch the
same in util-linux-systemd, which is sufficient.
- Move the procps BuildRequires into the systemd conditional block.
procps is only used during the test suite (some tests run 'ps';
even if we ignore a failure for this in util-linux, we catch the
same in util-linux-systemd, which is sufficient.
- Move the procps BuildRequires into the systemd conditional block.
procps is only used during the test suite (some tests run 'ps';
even if we ignore a failure for this in util-linux, we catch the
same in util-linux-systemd, which is sufficient.
OBS-URL: https://build.opensuse.org/request/show/445689
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=326
2016-12-15 08:06:30 +00:00
Ruediger Meier
4bb1e02c35
Accepting request 444691 from home:sbrabec:branches:util-linux-mtab
...
- Remove no more supported --enable-libmount-force-mountinfo.
There is --enable-libmount-support-mtab, disabled by default,
exactly as we need.
OBS-URL: https://build.opensuse.org/request/show/444691
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=325
2016-12-07 18:49:10 +00:00
3033c21728
Accepting request 439345 from home:rudi_m:branches:Base:System
...
- Update to version 2.29, see
https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29-ReleaseNotes
- refresh make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
OBS-URL: https://build.opensuse.org/request/show/439345
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=320
2016-11-15 22:04:51 +00:00
6772ce0372
Accepting request 425306 from home:rudi_m:branches:Base:System
...
- Update to version 2.28.2, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.2-ReleaseNotes
OBS-URL: https://build.opensuse.org/request/show/425306
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=318
2016-09-08 09:49:59 +00:00
a0042e0514
Accepting request 418731 from home:rudi_m:branches:Base:System
...
- Update to version 2.28.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
- Remove util-linux-libblkid-wipe-offset.patch (upstream)
- use the new configure option --enable-libuuid-force-uuidd
instead of sed'ing configure.ac
OBS-URL: https://build.opensuse.org/request/show/418731
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=316
2016-08-22 14:04:49 +00:00
Ruediger Meier
b4be798d52
Accepting request 418676 from home:olh:branches:Base:System
...
- Install klogconsole with read permissions (bnc#990837)
OBS-URL: https://build.opensuse.org/request/show/418676
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=315
2016-08-11 15:16:05 +00:00
6c8d9abb44
Accepting request 407891 from home:dimstar:Factory
...
- BuildIgnore util-linux: it's part of VMInstall, hence part of
every package build. util-linux itself can be built without its
own presence though. Helps with some rare bootstrap issues (when
librtas changes soname for example).
- Drop usage of gpg-offline: this has long been migrated to a
source service that checks signatures on checkin already (osc
service lr source_validatory).
OBS-URL: https://build.opensuse.org/request/show/407891
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=313
2016-07-13 16:08:18 +00:00
a120c15d72
Accepting request 401620 from home:dimstar:Factory
...
- Do not BuildRequires bash-completion: this is tempting, but it
pulls bash-completion and its entire dependency stack into Ring0,
which is inacceptable. Pass the correct path
(%{_datdir}/bash-completion/completions) via
--with-bashcompletiondir to configure.
- Do not BuildRequires bash-completion: this is tempting, but it
pulls bash-completion and its entire dependency stack into Ring0,
which is inacceptable. Pass the correct path
(%{_datdir}/bash-completion/completions) via
--with-bashcompletiondir to configure.
- Do not BuildRequires bash-completion: this is tempting, but it
pulls bash-completion and its entire dependency stack into Ring0,
which is inacceptable. Pass the correct path
(%{_datdir}/bash-completion/completions) via
--with-bashcompletiondir to configure.
OBS-URL: https://build.opensuse.org/request/show/401620
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=311
2016-06-14 12:46:18 +00:00
02b4738ea8
Accepting request 396830 from home:sbrabec:branches:util-linux-bsc976141
...
According to Arvin Schnell, we need these fixes in openSUSE Factory now.
Otherwise they cannot commit code using parted --wipesignatures.
- blkid: Wipe corect area for probes with offset (bsc#976141,
util-linux-libblkid-wipe-offset.patch).
OBS-URL: https://build.opensuse.org/request/show/396830
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=307
2016-05-23 15:22:26 +00:00
Ruediger Meier
15f40b602e
Accepting request 393319 from home:sbrabec:branches:util-linux-bsc977259
...
- Add librtas-devel to BuildRequires on Power platforms. Needed for
proper function of lscpu (bsc#975082).
Also add Conflicts to bash-completion change.
OBS-URL: https://build.opensuse.org/request/show/393319
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=306
2016-05-02 22:32:08 +00:00
a15bb30f60
Accepting request 391743 from home:sbrabec:branches:util-linux-bsc977259
...
- Remove incorrect --with-bashcompletiondir that breaks
bash-completion, use path in bash-completion.pc instead
(boo#977259).
OBS-URL: https://build.opensuse.org/request/show/391743
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=305
2016-04-26 22:14:30 +00:00
f7f92f04d8
Accepting request 390044 from home:rudi_m:branches:Base:System
...
Just a minor cosmetical cleanup which should not change anything
for the Factory build.
Changes:
- fix build for openSUSE >= 13.1 (inclusive SLE 12)
- drop build for openSUSE < 13.1
- remove old build conditions: sysvinit_tools, enable_su and
enable_eject
- cosmetics: reorder configure options
old: Base:System/util-linux
new: home:rudi_m:branches:Base:System/util-linux rev None
Index: python-libmount.changes
===================================================================
--- python-libmount.changes (revision 302)
+++ python-libmount.changes (revision 13)
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
+
+- fix build for openSUSE >= 13.1 (inclusive SLE 12)
+- drop build for openSUSE < 13.1
+- remove old build conditions: sysvinit_tools, enable_su and
+ enable_eject
+- cosmetics: reorder configure options
+
+-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28:
Index: python-libmount.spec
===================================================================
--- python-libmount.spec (revision 302)
+++ python-libmount.spec (revision 13)
@@ -16,9 +16,6 @@
#
-%bcond_without sysvinit_tools
-%bcond_without enable_su
-%bcond_without enable_eject
%bcond_without enable_last
Name: python-libmount
@@ -97,14 +94,10 @@
%endif
%if %build_util_linux_systemd
BuildRequires: socat
-%if 0%{?suse_version} <= 1230
-BuildRequires: pkgconfig(systemd)
-%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
%endif
-%endif
%if %build_python_libmount
BuildRequires: python-devel
%endif
@@ -170,25 +163,17 @@
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
-%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
-%endif
Provides: login = 4.0-33.7
-%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8
-%endif
# File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7
-%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21
-%endif
-%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
-%endif
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@@ -538,6 +523,7 @@
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \
+ --disable-silent-rules \
--localstatedir=/run \
--docdir=%{_docdir}/%{_name} \
--with-audit \
@@ -546,46 +532,33 @@
--with-selinux \
$uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
- --enable-all-programs \
- --disable-reset \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-libmount-force-mountinfo \
+ --enable-sulogin-emergency-mount \
--disable-use-tty-group \
- --disable-silent-rules \
--enable-static \
--disable-rpath \
+ --enable-all-programs \
+ --disable-reset \
%if %{without enable_last}
--disable-last \
%endif
-%if %{without enable_eject}
- --disable-eject \
-%endif
-%if %{with sysvinit_tools}
- --enable-sulogin-emergency-mount \
-%else
- --disable-sulogin \
- --disable-mountpoint \
-%endif
-%if %{without enable_su}
- --disable-su \
- --disable-kill \
-%endif
%if %build_util_linux_systemd
+ --with-systemd \
--enable-logger \
--enable-lslogins \
--enable-uuidd \
- --with-systemd \
- --with-systemdsystemunitdir=%{_unitdir} \
%else
+ --without-systemd \
--disable-logger \
--disable-lslogins \
--disable-uuidd \
- --without-systemd \
%endif
%if %build_python_libmount
--with-python \
%else
--without-python \
%endif
- --enable-libmount-force-mountinfo \
#
# Safety check: HAVE_UUIDD should be always 1:
@@ -637,11 +610,9 @@
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole
# klogconsole install
@@ -655,10 +626,8 @@
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux
#UsrMerge
-%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin
-%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
@@ -798,7 +767,6 @@
%post
%{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
-%if %{with enable_su}
%set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12)
@@ -817,7 +785,6 @@
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi
done
-%endif
# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
@@ -829,9 +796,7 @@
%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
-%if %{with enable_su}
%verify_permissions -e %{_bindir}/su
-%endif
%post -n libblkid1 -p /sbin/ldconfig
@@ -857,9 +822,8 @@
%endif
%if %build_util_linux_systemd
-# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons).
-# If only util-linux is updated, restart of fstrim service does not happen.
-# Maybe we should move fstrim to util-linux-systemd in the next version.
+# fstrim(8) and fstrim.service are from different packages. But it's a oneshot
+# service (timer), no restart needed on binary updates (unless path is changed).
%pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer}
@@ -877,7 +841,7 @@
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d /var/run/uuidd uuidd 2>/dev/null || :
%{service_add_pre uuidd.socket uuidd.service}
-%systemd_preset_pre
+%{?systemd_preset_pre}
%post -n uuidd
%{service_add_post uuidd.socket uuidd.service}
@@ -889,7 +853,7 @@
%{service_del_postun uuidd.socket uuidd.service}
%posttrans -p /bin/bash -n uuidd
-%systemd_preset_posttrans
+%{?systemd_preset_posttrans}
%endif
%if %build_util_linux
@@ -920,16 +884,12 @@
%config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
-%endif
#UsrMerge
-%if %{with enable_su}
/bin/kill
/bin/su
-%endif
/bin/dmesg
/bin/more
/bin/mount
@@ -963,13 +923,9 @@
/sbin/fstrim
/sbin/chcpu
#EndUsrMerge
-%if %{with enable_su}
%{_bindir}/kill
%{_bindir}/su
-%endif
-%if %{with enable_eject}
%{_bindir}/eject
-%endif
%{_bindir}/cal
%{_bindir}/chrt
%{_bindir}/col
@@ -1018,10 +974,8 @@
%{_bindir}/ul
%{_bindir}/umount
%{_bindir}/unshare
-%if %{with sysvinit_tools}
%{_bindir}/mountpoint
%{_bindir}/utmpdump
-%endif
%{_bindir}/uuidgen
%{_bindir}/uname26
%ifnarch ppc ppc64
@@ -1059,9 +1013,7 @@
%{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/setctsid
-%if %{with sysvinit_tools}
%{_sbindir}/sulogin
-%endif
%{_sbindir}/swaplabel
%{_sbindir}/swapoff
%{_sbindir}/swapon
@@ -1071,10 +1023,8 @@
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
-%if %{with enable_su}
%{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz
-%endif
%{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz
@@ -1082,9 +1032,7 @@
%{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz
-%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz
-%endif
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
@@ -1123,10 +1071,8 @@
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
-%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
-%endif
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz
@@ -1178,9 +1124,7 @@
%{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
-%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz
-%endif
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
Index: util-linux-systemd.changes
===================================================================
--- util-linux-systemd.changes (revision 302)
+++ util-linux-systemd.changes (revision 13)
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
+
+- fix build for openSUSE >= 13.1 (inclusive SLE 12)
+- drop build for openSUSE < 13.1
+- remove old build conditions: sysvinit_tools, enable_su and
+ enable_eject
+- cosmetics: reorder configure options
+
+-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28:
Index: util-linux-systemd.spec
===================================================================
--- util-linux-systemd.spec (revision 302)
+++ util-linux-systemd.spec (revision 13)
@@ -16,9 +16,6 @@
#
-%bcond_without sysvinit_tools
-%bcond_without enable_su
-%bcond_without enable_eject
%bcond_without enable_last
Name: util-linux-systemd
@@ -97,14 +94,10 @@
%endif
%if %build_util_linux_systemd
BuildRequires: socat
-%if 0%{?suse_version} <= 1230
-BuildRequires: pkgconfig(systemd)
-%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
%endif
-%endif
%if %build_python_libmount
BuildRequires: python-devel
%endif
@@ -170,25 +163,17 @@
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
-%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
-%endif
Provides: login = 4.0-33.7
-%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8
-%endif
# File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7
-%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21
-%endif
-%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
-%endif
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@@ -538,6 +523,7 @@
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \
+ --disable-silent-rules \
--localstatedir=/run \
--docdir=%{_docdir}/%{_name} \
--with-audit \
@@ -546,46 +532,33 @@
--with-selinux \
$uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
- --enable-all-programs \
- --disable-reset \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-libmount-force-mountinfo \
+ --enable-sulogin-emergency-mount \
--disable-use-tty-group \
- --disable-silent-rules \
--enable-static \
--disable-rpath \
+ --enable-all-programs \
+ --disable-reset \
%if %{without enable_last}
--disable-last \
%endif
-%if %{without enable_eject}
- --disable-eject \
-%endif
-%if %{with sysvinit_tools}
- --enable-sulogin-emergency-mount \
-%else
- --disable-sulogin \
- --disable-mountpoint \
-%endif
-%if %{without enable_su}
- --disable-su \
- --disable-kill \
-%endif
%if %build_util_linux_systemd
+ --with-systemd \
--enable-logger \
--enable-lslogins \
--enable-uuidd \
- --with-systemd \
- --with-systemdsystemunitdir=%{_unitdir} \
%else
+ --without-systemd \
--disable-logger \
--disable-lslogins \
--disable-uuidd \
- --without-systemd \
%endif
%if %build_python_libmount
--with-python \
%else
--without-python \
%endif
- --enable-libmount-force-mountinfo \
#
# Safety check: HAVE_UUIDD should be always 1:
@@ -637,11 +610,9 @@
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole
# klogconsole install
@@ -655,10 +626,8 @@
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux
#UsrMerge
-%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin
-%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
@@ -798,7 +767,6 @@
%post
%{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
-%if %{with enable_su}
%set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12)
@@ -817,7 +785,6 @@
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi
done
-%endif
# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
@@ -829,9 +796,7 @@
%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
-%if %{with enable_su}
%verify_permissions -e %{_bindir}/su
-%endif
%post -n libblkid1 -p /sbin/ldconfig
@@ -857,9 +822,8 @@
%endif
%if %build_util_linux_systemd
-# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons).
-# If only util-linux is updated, restart of fstrim service does not happen.
-# Maybe we should move fstrim to util-linux-systemd in the next version.
+# fstrim(8) and fstrim.service are from different packages. But it's a oneshot
+# service (timer), no restart needed on binary updates (unless path is changed).
%pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer}
@@ -877,7 +841,7 @@
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d /var/run/uuidd uuidd 2>/dev/null || :
%{service_add_pre uuidd.socket uuidd.service}
-%systemd_preset_pre
+%{?systemd_preset_pre}
%post -n uuidd
%{service_add_post uuidd.socket uuidd.service}
@@ -889,7 +853,7 @@
%{service_del_postun uuidd.socket uuidd.service}
%posttrans -p /bin/bash -n uuidd
-%systemd_preset_posttrans
+%{?systemd_preset_posttrans}
%endif
%if %build_util_linux
@@ -920,16 +884,12 @@
%config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
-%endif
#UsrMerge
-%if %{with enable_su}
/bin/kill
/bin/su
-%endif
/bin/dmesg
/bin/more
/bin/mount
@@ -963,13 +923,9 @@
/sbin/fstrim
/sbin/chcpu
#EndUsrMerge
-%if %{with enable_su}
%{_bindir}/kill
%{_bindir}/su
-%endif
-%if %{with enable_eject}
%{_bindir}/eject
-%endif
%{_bindir}/cal
%{_bindir}/chrt
%{_bindir}/col
@@ -1018,10 +974,8 @@
%{_bindir}/ul
%{_bindir}/umount
%{_bindir}/unshare
-%if %{with sysvinit_tools}
%{_bindir}/mountpoint
%{_bindir}/utmpdump
-%endif
%{_bindir}/uuidgen
%{_bindir}/uname26
%ifnarch ppc ppc64
@@ -1059,9 +1013,7 @@
%{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/setctsid
-%if %{with sysvinit_tools}
%{_sbindir}/sulogin
-%endif
%{_sbindir}/swaplabel
%{_sbindir}/swapoff
%{_sbindir}/swapon
@@ -1071,10 +1023,8 @@
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
-%if %{with enable_su}
%{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz
-%endif
%{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz
@@ -1082,9 +1032,7 @@
%{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz
-%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz
-%endif
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
@@ -1123,10 +1071,8 @@
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
-%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
-%endif
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz
@@ -1178,9 +1124,7 @@
%{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
-%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz
-%endif
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
Index: util-linux.changes
===================================================================
--- util-linux.changes (revision 302)
+++ util-linux.changes (revision 13)
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
+
+- fix build for openSUSE >= 13.1 (inclusive SLE 12)
+- drop build for openSUSE < 13.1
+- remove old build conditions: sysvinit_tools, enable_su and
+ enable_eject
+- cosmetics: reorder configure options
+
+-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28:
Index: util-linux.spec
===================================================================
--- util-linux.spec (revision 302)
+++ util-linux.spec (revision 13)
@@ -16,9 +16,6 @@
#
-%bcond_without sysvinit_tools
-%bcond_without enable_su
-%bcond_without enable_eject
%bcond_without enable_last
Name: util-linux
@@ -97,14 +94,10 @@
%endif
%if %build_util_linux_systemd
BuildRequires: socat
-%if 0%{?suse_version} <= 1230
-BuildRequires: pkgconfig(systemd)
-%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
%endif
-%endif
%if %build_python_libmount
BuildRequires: python-devel
%endif
@@ -170,25 +163,17 @@
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
-%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
-%endif
Provides: login = 4.0-33.7
-%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8
-%endif
# File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7
-%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21
-%endif
-%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
-%endif
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@@ -538,6 +523,7 @@
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \
+ --disable-silent-rules \
--localstatedir=/run \
--docdir=%{_docdir}/%{_name} \
--with-audit \
@@ -546,46 +532,33 @@
--with-selinux \
$uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
- --enable-all-programs \
- --disable-reset \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-libmount-force-mountinfo \
+ --enable-sulogin-emergency-mount \
--disable-use-tty-group \
- --disable-silent-rules \
--enable-static \
--disable-rpath \
+ --enable-all-programs \
+ --disable-reset \
%if %{without enable_last}
--disable-last \
%endif
-%if %{without enable_eject}
- --disable-eject \
-%endif
-%if %{with sysvinit_tools}
- --enable-sulogin-emergency-mount \
-%else
- --disable-sulogin \
- --disable-mountpoint \
-%endif
-%if %{without enable_su}
- --disable-su \
- --disable-kill \
-%endif
%if %build_util_linux_systemd
+ --with-systemd \
--enable-logger \
--enable-lslogins \
--enable-uuidd \
- --with-systemd \
- --with-systemdsystemunitdir=%{_unitdir} \
%else
+ --without-systemd \
--disable-logger \
--disable-lslogins \
--disable-uuidd \
- --without-systemd \
%endif
%if %build_python_libmount
--with-python \
%else
--without-python \
%endif
- --enable-libmount-force-mountinfo \
#
# Safety check: HAVE_UUIDD should be always 1:
@@ -637,11 +610,9 @@
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole
# klogconsole install
@@ -655,10 +626,8 @@
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux
#UsrMerge
-%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin
-%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
@@ -798,7 +767,6 @@
%post
%{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
-%if %{with enable_su}
%set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12)
@@ -817,7 +785,6 @@
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi
done
-%endif
# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
@@ -829,9 +796,7 @@
%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
-%if %{with enable_su}
%verify_permissions -e %{_bindir}/su
-%endif
%post -n libblkid1 -p /sbin/ldconfig
@@ -857,9 +822,8 @@
%endif
%if %build_util_linux_systemd
-# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons).
-# If only util-linux is updated, restart of fstrim service does not happen.
-# Maybe we should move fstrim to util-linux-systemd in the next version.
+# fstrim(8) and fstrim.service are from different packages. But it's a oneshot
+# service (timer), no restart needed on binary updates (unless path is changed).
%pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer}
@@ -877,7 +841,7 @@
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d /var/run/uuidd uuidd 2>/dev/null || :
%{service_add_pre uuidd.socket uuidd.service}
-%systemd_preset_pre
+%{?systemd_preset_pre}
%post -n uuidd
%{service_add_post uuidd.socket uuidd.service}
@@ -889,7 +853,7 @@
%{service_del_postun uuidd.socket uuidd.service}
%posttrans -p /bin/bash -n uuidd
-%systemd_preset_posttrans
+%{?systemd_preset_posttrans}
%endif
%if %build_util_linux
@@ -920,16 +884,12 @@
%config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
-%endif
#UsrMerge
-%if %{with enable_su}
/bin/kill
/bin/su
-%endif
/bin/dmesg
/bin/more
/bin/mount
@@ -963,13 +923,9 @@
/sbin/fstrim
/sbin/chcpu
#EndUsrMerge
-%if %{with enable_su}
%{_bindir}/kill
%{_bindir}/su
-%endif
-%if %{with enable_eject}
%{_bindir}/eject
-%endif
%{_bindir}/cal
%{_bindir}/chrt
%{_bindir}/col
@@ -1018,10 +974,8 @@
%{_bindir}/ul
%{_bindir}/umount
%{_bindir}/unshare
-%if %{with sysvinit_tools}
%{_bindir}/mountpoint
%{_bindir}/utmpdump
-%endif
%{_bindir}/uuidgen
%{_bindir}/uname26
%ifnarch ppc ppc64
@@ -1059,9 +1013,7 @@
%{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/setctsid
-%if %{with sysvinit_tools}
%{_sbindir}/sulogin
-%endif
%{_sbindir}/swaplabel
%{_sbindir}/swapoff
%{_sbindir}/swapon
@@ -1071,10 +1023,8 @@
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
-%if %{with enable_su}
%{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz
-%endif
%{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz
@@ -1082,9 +1032,7 @@
%{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz
-%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz
-%endif
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
@@ -1123,10 +1071,8 @@
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
-%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
-%endif
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz
@@ -1178,9 +1124,7 @@
%{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
-%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz
-%endif
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
OBS-URL: https://build.opensuse.org/request/show/390044
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=304
2016-04-24 09:08:55 +00:00
