diff --git a/python-libmount.changes b/python-libmount.changes index 6bfa847..2790010 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de + +- Update RPM categories and summaries. + Do not ignore errors from useradd. + +------------------------------------------------------------------- +Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de + +- Ensure libreadline usage as well as _GNU_SOURCE + +------------------------------------------------------------------- +Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com + +- Fix prerequirement of groups tty and uuidd (boo#1057937). + +------------------------------------------------------------------- +Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de + +- 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 + +------------------------------------------------------------------- +Mon Jul 3 12:38:36 UTC 2017 - schwab@suse.de + +- Make sure group tty is defined + ------------------------------------------------------------------- Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de diff --git a/python-libmount.spec b/python-libmount.spec index 5615295..89b3e7d 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -42,7 +42,7 @@ Name: python-libmount %define summary_pl Python bindings for the libmount library %define group_ul System/Base %define group_uls System/Base -%define group_pl System/Filesystems +%define group_pl Development/Languages/Python %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 @@ -73,7 +73,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %main_group +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -116,7 +116,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.30 +Version: 2.30.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -157,12 +157,13 @@ Source51: blkid.conf Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare@suse.de -- Add support for setting logical blocksizes. Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch -# PATCH-BUG-FIX util-linux-lscpu-cleanup-DMI-detection-return-codes.patch bsc#1039360 msuchanek@suse.de -- lscpu: cleanup DMI detection return codes -Patch2: util-linux-lscpu-cleanup-DMI-detection-return-codes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux Supplements: filesystem(minix) +%if 0%{?suse_version} >= 1330 +Requires(pre): group(tty) +%endif Provides: fsck-with-dev-lock = %{version} # bnc#651598: Provides: util-linux(fake+no-canonicalize) @@ -240,7 +241,7 @@ mount program, the fdisk configuration tool, and more. %package -n libblkid1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libblkid1 Library for filesystem detection. @@ -265,13 +266,13 @@ detection. %package -n libuuid1 Summary: Library to generate UUIDs -Group: System/Filesystems +Group: System/Libraries %description -n libuuid1 A library to generate universally unique IDs (UUIDs). %package -n libuuid-devel -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid1 = %{version} @@ -280,7 +281,7 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). %package -n libuuid-devel-static -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid-devel = %{version} @@ -290,19 +291,19 @@ unique IDs (UUIDs). %package -n libmount1 Summary: Device mount library -Group: System/Filesystems +Group: System/Libraries %description -n libmount1 Library designed to be used in low-level utils like mount(8) and /usr/sbin/mount. helpers. %package -n libmount-devel -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} %package -n libmount-devel-static -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount-devel = %{version} @@ -320,7 +321,7 @@ Group: System/Libraries Library to sort human readable column-based text output. %package -n libsmartcols-devel -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols1 = %{version} @@ -328,7 +329,7 @@ Requires: libsmartcols1 = %{version} Files to develop applications using the libsmartcols library. %package -n libsmartcols-devel-static -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols-devel = %{version} @@ -337,7 +338,7 @@ Files to develop applications using the libsmartcols library. %package -n libfdisk1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libfdisk1 Library for filesystem detection. @@ -382,8 +383,12 @@ This package contains low-level util-linux utilities that use systemd. %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems +%if 0%{?suse_version} >= 1330 +Requires(pre): group(uuidd) +%else Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +%endif # uuidd bash-completion moved to a correct package Conflicts: util-linux < 2.25 %systemd_requires @@ -398,13 +403,14 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl +License: GPL-2.0+ Group: %group_pl %description -n python-libmount %else %description %endif -This package contains the python bindings for util-linux libmount +This package contains the Python bindings for util-linux libmount library. %endif @@ -415,7 +421,6 @@ library. # logical block size support in loop does not exist in Tumbleweed and upstream kernel yet %patch1 -p1 %endif -%patch2 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -538,6 +543,8 @@ fi export SUID_CFLAGS="-fpie" export SUID_LDFLAGS="-pie" export LDFLAGS="-Wl,-z,relro,-z,now" +export CFLAGS="%{optflags} -D_GNU_SOURCE" +export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # override default localstatedir to /run # only used for volatile data # @@ -549,8 +556,10 @@ AUTOPOINT=true autoreconf -vfi --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ + --with-btrfs \ --with-gnu-ld \ --with-ncursesw \ + --with-readline \ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion/completions \ @@ -850,10 +859,15 @@ done %postun -n util-linux-systemd %{service_del_postun fstrim.service fstrim.timer} -%pre -p /bin/bash -n uuidd -/usr/sbin/groupadd -r uuidd 2>/dev/null || : -/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ - -d /var/run/uuidd uuidd 2>/dev/null || : +%if 0%{?suse_version} >= 1330 +%pre -n uuidd +%else +%pre -n uuidd +getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd +getent passwd uuidd >/dev/null || \ + /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd +%endif %{service_add_pre uuidd.socket uuidd.service} %post -n uuidd diff --git a/util-linux-2.30.1.tar.sign b/util-linux-2.30.1.tar.sign new file mode 100644 index 0000000..91fb9b4 --- /dev/null +++ b/util-linux-2.30.1.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABCAAGBQJZcHfsAAoJEOS3HV7sOcKEl7wP/jnzss0+A1BW5EVZywk69lDa +534rzlHJVyvysOXKD+zDk+Ky4Q8BYPizGQ4hYg/fhHvxgPVb8jrynwcNzdGEPjHV +OCQ1fikRgun2i77KoU2vZJ6vvo66mFRytKaoRAJRHhkkQQkcGlNPCcN0V+ZlBfn+ +RWL50P0knqw/LK9NfKhASoI315p7nUypmqf+g3jxFNLjXXnHefUDLlZNn85oJLgf +Vsx/1IYk3MTOgDjAx5K24H31XNWOKaO/pvPezd1RPt6gc4EcKc2I/8AY+5yM5XAF +sCk6wCIjvf3+2B8K6XgUIBhABxgDnyQi8+lNqDUfR4NbufonzBZDpQLHfjN7XWgg +Zgfo7as21fM1vCuEuwOQbkbDFA4wso5kRgof+HfTDnLU3hDtbNiI/5ZH0cTf2qp9 +8CwnSpxdES3Hw/eFkOaVMlwE4CoGJqZejMnOzNWo+b5lVqfmeSUgUxyvW3IDSUfm ++Zu9+MVL+T9YDkVuqB+rCeWSBxShev0+cRHP6p5NkWkGRgbCHkecZ7zZ9aFZ9Dsm +OE6nOot05oS8mUjpXyUs96VwbRqqBR54Tc3+DjBUjrpzlwajhz++g+XjAiwON5NT +ex30EbDFW/VRm3cWo4YH1MdesVcWqrqsrDRN0RyqZ/ctqOMgkQG6vNaQ6f3O2wgc +qFbsvhGu7NctRjuOj9UP +=cMtf +-----END PGP SIGNATURE----- diff --git a/util-linux-2.30.1.tar.xz b/util-linux-2.30.1.tar.xz new file mode 100644 index 0000000..bb34c59 --- /dev/null +++ b/util-linux-2.30.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 +size 4459284 diff --git a/util-linux-2.30.tar.sign b/util-linux-2.30.tar.sign deleted file mode 100644 index c1e2ca1..0000000 --- a/util-linux-2.30.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJZMUBLAAoJEOS3HV7sOcKEr9IP/i90Hc8Tiukh8Hlap02p4uWa -t083KEdi79a7H7vhCKNPjM8bkeod8F5/I+61uhSc9r4QoEpKX0vk8UU69NVK3gn1 -RntwmuXjZB4ZR+aDN6vmp3uuZlPEMG6em8dgiO+Gjy61xRGw9Krxo6+jyTvTzouT -bZsPy3JnVRXg0toawyR39ScRjGiLjb5P+3KMoJK8R6MUbkOMCgAN73yx6UHBkzb3 -n0zAALs10Y4OfYaIA4R+mcq4AKvPPsb/eCXTia75aThv/uFvdEpXK2wDYeUmjJmH -eVqTU2zYrhWvueu3FW7suAx/6o+ijGWD8ROu9Dd6sHnUK9mGLomxfxTthh2UlBES -23ZJBLLoIDPL+aUKq3EYeIsqLMf4eRaRUb5VIHwEZwcMqWvSvVZJGlk0WR3SzhfQ -UCAGWEE6ifQskVg6QbAZe8qFybbiTcH5onqKUJ2DlDiP53Kk8+0YKxhkNLulFoU1 -XrN0hqRP7z2BtlrSzhGt25heExfnMMIelpiqYb2jVtbXV9s5/0jKZT4x2CRFhZ86 -EHKvN1W0gtzMD1ZOLVEj1MaopS68TvmLooxf+x4Ns5GPGMReILWqwNWklwqXFGjs -P91JD3l6opcoUMO2xjVpVIcH6oLhXeLfAFEmUggrdmk/Jm4kjYQZAUi1ByWrJg30 -3fOzxEEoirUWP5cZoV5B -=8KFU ------END PGP SIGNATURE----- diff --git a/util-linux-2.30.tar.xz b/util-linux-2.30.tar.xz deleted file mode 100644 index ef2c745..0000000 --- a/util-linux-2.30.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d -size 4478016 diff --git a/util-linux-lscpu-cleanup-DMI-detection-return-codes.patch b/util-linux-lscpu-cleanup-DMI-detection-return-codes.patch deleted file mode 100644 index 13c00b5..0000000 --- a/util-linux-lscpu-cleanup-DMI-detection-return-codes.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c972852b29391c35b1d5c7d3e1e6413e0cc86908 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Tue, 13 Jun 2017 12:15:11 +0200 -Subject: [PATCH] lscpu: cleanup DMI detection return codes - -Michal wrote: - There is weird mix of logic in lscpu-dmi.c which sometimes returns 0 and - sometimes -1 on error. Since most checks are if (rc) goto done; this - bails out early on error skipping some detection methods. Further, in - lscpu.c all following detections are guarder by if(hyper) so returning - -1 causes all following methods to be skipped. - -Reported-by: Michal Suchanek -Signed-off-by: Karel Zak ---- - sys-utils/lscpu-dmi.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/sys-utils/lscpu-dmi.c b/sys-utils/lscpu-dmi.c -index 3ba999124a2e..4b845b97ccd9 100644 ---- a/sys-utils/lscpu-dmi.c -+++ b/sys-utils/lscpu-dmi.c -@@ -174,7 +174,7 @@ done: - static int hypervisor_decode_legacy(uint8_t *buf, const char *devmem) - { - if (!checksum(buf, 0x0F)) -- return HYPER_NONE; -+ return -1; - - return hypervisor_from_dmi_table(DWORD(buf + 0x08), WORD(buf + 0x06), - WORD(buf + 0x0C), -@@ -254,11 +254,15 @@ int read_hypervisor_dmi(void) - || sizeof(uint16_t) != 2 - || sizeof(uint32_t) != 4 - || '\0' != 0) -- return rc; -+ goto done; - -+ /* -1 : no DMI in /sys, -+ * 0 : DMI exist, nothing detected (HYPER_NONE) -+ * >0 : hypervisor detected -+ */ - rc = hypervisor_decode_sysfw(); -- if (rc >= 0) -- return rc; -+ if (rc >= HYPER_NONE) -+ goto done; - - /* First try EFI (ia64, Intel-based Mac) */ - switch (address_from_efi(&fp)) { -@@ -273,8 +277,9 @@ int read_hypervisor_dmi(void) - goto done; - - rc = hypervisor_decode_smbios(buf, _PATH_DEV_MEM); -- if (rc) -+ if (rc >= HYPER_NONE) - goto done; -+ - free(buf); - buf = NULL; - memory_scan: -@@ -287,17 +292,17 @@ memory_scan: - for (fp = 0; fp <= 0xFFF0; fp += 16) { - if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) { - rc = hypervisor_decode_smbios(buf + fp, _PATH_DEV_MEM); -- if (rc == -1) -+ if (rc < 0) - fp += 16; - - } else if (memcmp(buf + fp, "_DMI_", 5) == 0) - rc = hypervisor_decode_legacy(buf + fp, _PATH_DEV_MEM); - -- if (rc >= 0) -+ if (rc >= HYPER_NONE) - break; - } - #endif - done: - free(buf); -- return rc; -+ return rc < 0 ? HYPER_NONE : rc; - } --- -2.12.3 - diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 6bfa847..2790010 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de + +- Update RPM categories and summaries. + Do not ignore errors from useradd. + +------------------------------------------------------------------- +Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de + +- Ensure libreadline usage as well as _GNU_SOURCE + +------------------------------------------------------------------- +Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com + +- Fix prerequirement of groups tty and uuidd (boo#1057937). + +------------------------------------------------------------------- +Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de + +- 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 + +------------------------------------------------------------------- +Mon Jul 3 12:38:36 UTC 2017 - schwab@suse.de + +- Make sure group tty is defined + ------------------------------------------------------------------- Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 2ddc222..1512344 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -42,7 +42,7 @@ Name: util-linux-systemd %define summary_pl Python bindings for the libmount library %define group_ul System/Base %define group_uls System/Base -%define group_pl System/Filesystems +%define group_pl Development/Languages/Python %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 @@ -116,7 +116,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.30 +Version: 2.30.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -157,12 +157,13 @@ Source51: blkid.conf Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare@suse.de -- Add support for setting logical blocksizes. Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch -# PATCH-BUG-FIX util-linux-lscpu-cleanup-DMI-detection-return-codes.patch bsc#1039360 msuchanek@suse.de -- lscpu: cleanup DMI detection return codes -Patch2: util-linux-lscpu-cleanup-DMI-detection-return-codes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux Supplements: filesystem(minix) +%if 0%{?suse_version} >= 1330 +Requires(pre): group(tty) +%endif Provides: fsck-with-dev-lock = %{version} # bnc#651598: Provides: util-linux(fake+no-canonicalize) @@ -240,7 +241,7 @@ mount program, the fdisk configuration tool, and more. %package -n libblkid1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libblkid1 Library for filesystem detection. @@ -265,13 +266,13 @@ detection. %package -n libuuid1 Summary: Library to generate UUIDs -Group: System/Filesystems +Group: System/Libraries %description -n libuuid1 A library to generate universally unique IDs (UUIDs). %package -n libuuid-devel -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid1 = %{version} @@ -280,7 +281,7 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). %package -n libuuid-devel-static -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid-devel = %{version} @@ -290,19 +291,19 @@ unique IDs (UUIDs). %package -n libmount1 Summary: Device mount library -Group: System/Filesystems +Group: System/Libraries %description -n libmount1 Library designed to be used in low-level utils like mount(8) and /usr/sbin/mount. helpers. %package -n libmount-devel -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} %package -n libmount-devel-static -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount-devel = %{version} @@ -320,7 +321,7 @@ Group: System/Libraries Library to sort human readable column-based text output. %package -n libsmartcols-devel -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols1 = %{version} @@ -328,7 +329,7 @@ Requires: libsmartcols1 = %{version} Files to develop applications using the libsmartcols library. %package -n libsmartcols-devel-static -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols-devel = %{version} @@ -337,7 +338,7 @@ Files to develop applications using the libsmartcols library. %package -n libfdisk1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libfdisk1 Library for filesystem detection. @@ -382,8 +383,12 @@ This package contains low-level util-linux utilities that use systemd. %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems +%if 0%{?suse_version} >= 1330 +Requires(pre): group(uuidd) +%else Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +%endif # uuidd bash-completion moved to a correct package Conflicts: util-linux < 2.25 %systemd_requires @@ -404,7 +409,7 @@ Group: %group_pl %else %description %endif -This package contains the python bindings for util-linux libmount +This package contains the Python bindings for util-linux libmount library. %endif @@ -415,7 +420,6 @@ library. # logical block size support in loop does not exist in Tumbleweed and upstream kernel yet %patch1 -p1 %endif -%patch2 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -538,6 +542,8 @@ fi export SUID_CFLAGS="-fpie" export SUID_LDFLAGS="-pie" export LDFLAGS="-Wl,-z,relro,-z,now" +export CFLAGS="%{optflags} -D_GNU_SOURCE" +export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # override default localstatedir to /run # only used for volatile data # @@ -549,8 +555,10 @@ AUTOPOINT=true autoreconf -vfi --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ + --with-btrfs \ --with-gnu-ld \ --with-ncursesw \ + --with-readline \ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion/completions \ @@ -850,10 +858,15 @@ done %postun -n util-linux-systemd %{service_del_postun fstrim.service fstrim.timer} -%pre -p /bin/bash -n uuidd -/usr/sbin/groupadd -r uuidd 2>/dev/null || : -/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ - -d /var/run/uuidd uuidd 2>/dev/null || : +%if 0%{?suse_version} >= 1330 +%pre -n uuidd +%else +%pre -n uuidd +getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd +getent passwd uuidd >/dev/null || \ + /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd +%endif %{service_add_pre uuidd.socket uuidd.service} %post -n uuidd diff --git a/util-linux.changes b/util-linux.changes index 6bfa847..2790010 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de + +- Update RPM categories and summaries. + Do not ignore errors from useradd. + +------------------------------------------------------------------- +Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de + +- Ensure libreadline usage as well as _GNU_SOURCE + +------------------------------------------------------------------- +Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com + +- Fix prerequirement of groups tty and uuidd (boo#1057937). + +------------------------------------------------------------------- +Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de + +- 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 + +------------------------------------------------------------------- +Mon Jul 3 12:38:36 UTC 2017 - schwab@suse.de + +- Make sure group tty is defined + ------------------------------------------------------------------- Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de diff --git a/util-linux.spec b/util-linux.spec index fa84494..0070347 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -42,7 +42,7 @@ Name: util-linux %define summary_pl Python bindings for the libmount library %define group_ul System/Base %define group_uls System/Base -%define group_pl System/Filesystems +%define group_pl Development/Languages/Python %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 @@ -116,7 +116,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.30 +Version: 2.30.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -157,12 +157,13 @@ Source51: blkid.conf Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare@suse.de -- Add support for setting logical blocksizes. Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch -# PATCH-BUG-FIX util-linux-lscpu-cleanup-DMI-detection-return-codes.patch bsc#1039360 msuchanek@suse.de -- lscpu: cleanup DMI detection return codes -Patch2: util-linux-lscpu-cleanup-DMI-detection-return-codes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux Supplements: filesystem(minix) +%if 0%{?suse_version} >= 1330 +Requires(pre): group(tty) +%endif Provides: fsck-with-dev-lock = %{version} # bnc#651598: Provides: util-linux(fake+no-canonicalize) @@ -240,7 +241,7 @@ mount program, the fdisk configuration tool, and more. %package -n libblkid1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libblkid1 Library for filesystem detection. @@ -265,13 +266,13 @@ detection. %package -n libuuid1 Summary: Library to generate UUIDs -Group: System/Filesystems +Group: System/Libraries %description -n libuuid1 A library to generate universally unique IDs (UUIDs). %package -n libuuid-devel -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid1 = %{version} @@ -280,7 +281,7 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). %package -n libuuid-devel-static -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid-devel = %{version} @@ -290,19 +291,19 @@ unique IDs (UUIDs). %package -n libmount1 Summary: Device mount library -Group: System/Filesystems +Group: System/Libraries %description -n libmount1 Library designed to be used in low-level utils like mount(8) and /usr/sbin/mount. helpers. %package -n libmount-devel -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} %package -n libmount-devel-static -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount-devel = %{version} @@ -320,7 +321,7 @@ Group: System/Libraries Library to sort human readable column-based text output. %package -n libsmartcols-devel -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols1 = %{version} @@ -328,7 +329,7 @@ Requires: libsmartcols1 = %{version} Files to develop applications using the libsmartcols library. %package -n libsmartcols-devel-static -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols-devel = %{version} @@ -337,7 +338,7 @@ Files to develop applications using the libsmartcols library. %package -n libfdisk1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libfdisk1 Library for filesystem detection. @@ -382,8 +383,12 @@ This package contains low-level util-linux utilities that use systemd. %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems +%if 0%{?suse_version} >= 1330 +Requires(pre): group(uuidd) +%else Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +%endif # uuidd bash-completion moved to a correct package Conflicts: util-linux < 2.25 %systemd_requires @@ -404,7 +409,7 @@ Group: %group_pl %else %description %endif -This package contains the python bindings for util-linux libmount +This package contains the Python bindings for util-linux libmount library. %endif @@ -415,7 +420,6 @@ library. # logical block size support in loop does not exist in Tumbleweed and upstream kernel yet %patch1 -p1 %endif -%patch2 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -538,6 +542,8 @@ fi export SUID_CFLAGS="-fpie" export SUID_LDFLAGS="-pie" export LDFLAGS="-Wl,-z,relro,-z,now" +export CFLAGS="%{optflags} -D_GNU_SOURCE" +export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # override default localstatedir to /run # only used for volatile data # @@ -549,8 +555,10 @@ AUTOPOINT=true autoreconf -vfi --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ + --with-btrfs \ --with-gnu-ld \ --with-ncursesw \ + --with-readline \ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion/completions \ @@ -850,10 +858,15 @@ done %postun -n util-linux-systemd %{service_del_postun fstrim.service fstrim.timer} -%pre -p /bin/bash -n uuidd -/usr/sbin/groupadd -r uuidd 2>/dev/null || : -/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ - -d /var/run/uuidd uuidd 2>/dev/null || : +%if 0%{?suse_version} >= 1330 +%pre -n uuidd +%else +%pre -n uuidd +getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd +getent passwd uuidd >/dev/null || \ + /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd +%endif %{service_add_pre uuidd.socket uuidd.service} %post -n uuidd