3
0
forked from pool/util-linux
Commit Graph

299 Commits

Author SHA256 Message Date
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
afb635ea16 Accepting request 389157 from home:rudi_m:branches:Base:System
- Update to version 2.28:
  * Many changes and improvements, most notably ...
  * Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch

OBS-URL: https://build.opensuse.org/request/show/389157
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=302
2016-04-13 16:27:53 +00:00
ad43cdf969 Accepting request 346995 from home:rudi_m:branches:Base:System
- enable last binary

OBS-URL: https://build.opensuse.org/request/show/346995
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=300
2015-12-02 15:46:14 +00:00
8ae9c81d4b Accepting request 344239 from home:rudi_m:branches:Base:System
- Update to version 2.27.1, bugfix release, see
  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes

OBS-URL: https://build.opensuse.org/request/show/344239
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=298
2015-11-18 13:40:14 +00:00
Ruediger Meier
0f95aba1a5 Accepting request 343844 from home:Andreas_Schwab:Factory
- Change condition for known fail markers from test for armv6 and aarch64
  architecture to test for qemu user-space build

OBS-URL: https://build.opensuse.org/request/show/343844
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=297
2015-11-11 15:13:29 +00:00
3e79b1f05f Accepting request 333182 from home:sbrabec:branches:util-linux-2.27
- Update to version 2.27:
  * Many changes and improvements, most notably:
    * lsipc: new command
    * unshare provides a new option --propagation=
    * mount(8) supports read-only binds in one (not atomic) step by
      "bind,ro".
    * GNU readline support in fdisk and sfdisk.
    * JSON support in libsmartcols and findmnt, losetup, lsblk,
      lslocks, sfdisk and lsipc.
    * script has been massively improved to be more robust and less
      complex (bsc#888678, bsc#930236).
    * sulogin supports locked root accounts by --force.
    * colors support by default. It is possible to change this
      with --disable-colors-default.
    * more information in cfdisk
    * fdisk provides new commands 'F' and 'i'
    * cal supports the new options --twelve and --months <n>
    * rtcwake supports a news option --list-modes and --date, no
      support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
  * Many fixes, most notably:
    * fsck: now supports -r {fd} (bsc#903738)
    * better handling of multi-path devices
      (bsc#880468, bsc#924994)
    * flock: improve timeout handling (bsc#926945)
    * lsblk: display mountpoint even for top-level device
      (bsc#943415)

OBS-URL: https://build.opensuse.org/request/show/333182
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=293
2015-09-27 10:49:19 +00:00