diff --git a/python-libmount.changes b/python-libmount.changes index d19368a..78edcf5 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com +Wed Jan 31 20:34:56 CET 2018 - sbrabec@suse.com - Update to version 2.31.1: * blkid: Add support for LUKS2 and new LABEL attributes. @@ -15,8 +15,9 @@ Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com * 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). + * sha1 on s390* (update util_linux_bigendian.patch) + * fsck.cramfs on ppc64le (util-linux-cramfs.patch) + * fincore/count (disable, util-linux-fincore-count.patch) ------------------------------------------------------------------- Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de diff --git a/python-libmount.spec b/python-libmount.spec index 9174caa..b16a042 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -168,6 +168,8 @@ Patch3: util-linux-lsmem-memory-zone-3.patch Patch4: util_linux_bigendian.patch # PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le. Patch5: util-linux-cramfs.patch +# PATCH-FIX-UPSTREAM util-linux-fincore-count.patch sbrabec@suse.com -- Disable bad test fincore/count. +Patch6: util-linux-fincore-count.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -410,6 +412,7 @@ library. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # # setctsid cp -p %{S:22} %{S:23} . diff --git a/util-linux-fincore-count.patch b/util-linux-fincore-count.patch new file mode 100644 index 0000000..b7a79a7 --- /dev/null +++ b/util-linux-fincore-count.patch @@ -0,0 +1,34 @@ +commit 839203c00ecb6b3dffd0d3eb8c77dac87584c241 +Author: Ruediger Meier +Date: Tue Jan 23 16:59:27 2018 +0100 + + tests: fix fincore/count KNOWN_FAIL + + It has to be set after calling ts_init. + + Signed-off-by: Ruediger Meier + +commit 88e5d289d5dcec3dfb7bc8f8fac89ce789e69d3f +Author: Karel Zak +Date: Wed Jan 17 14:41:56 2018 +0100 + + tests: mark fincore/count as KNOWN_FAIL + + The test (or our expectations about Direct-IO) seems not robust + enough. I guess this is not fincore problem. + + Signed-off-by: Karel Zak + +diff -urN util-linux-2.31.1.orig/tests/ts/fincore/count util-linux-2.31.1/tests/ts/fincore/count +--- util-linux-2.31.1.orig/tests/ts/fincore/count 2017-11-23 13:42:05.508423452 +0100 ++++ util-linux-2.31.1/tests/ts/fincore/count 2018-01-31 20:33:12.838715727 +0100 +@@ -8,6 +8,9 @@ + + ts_check_test_command "$TS_HELPER_SYSINFO" + ++# Send patch if you know how to keep it portable and robust. Thanks. ++TS_KNOWN_FAIL="yes" ++ + function header + { + echo "[" "$1" "]" diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index d19368a..78edcf5 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com +Wed Jan 31 20:34:56 CET 2018 - sbrabec@suse.com - Update to version 2.31.1: * blkid: Add support for LUKS2 and new LABEL attributes. @@ -15,8 +15,9 @@ Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com * 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). + * sha1 on s390* (update util_linux_bigendian.patch) + * fsck.cramfs on ppc64le (util-linux-cramfs.patch) + * fincore/count (disable, util-linux-fincore-count.patch) ------------------------------------------------------------------- Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 9463dcc..10e20c1 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -168,6 +168,8 @@ Patch3: util-linux-lsmem-memory-zone-3.patch Patch4: util_linux_bigendian.patch # PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le. Patch5: util-linux-cramfs.patch +# PATCH-FIX-UPSTREAM util-linux-fincore-count.patch sbrabec@suse.com -- Disable bad test fincore/count. +Patch6: util-linux-fincore-count.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -410,6 +412,7 @@ library. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # # setctsid cp -p %{S:22} %{S:23} . diff --git a/util-linux.changes b/util-linux.changes index d19368a..78edcf5 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com +Wed Jan 31 20:34:56 CET 2018 - sbrabec@suse.com - Update to version 2.31.1: * blkid: Add support for LUKS2 and new LABEL attributes. @@ -15,8 +15,9 @@ Mon Jan 29 16:39:59 CET 2018 - sbrabec@suse.com * 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). + * sha1 on s390* (update util_linux_bigendian.patch) + * fsck.cramfs on ppc64le (util-linux-cramfs.patch) + * fincore/count (disable, util-linux-fincore-count.patch) ------------------------------------------------------------------- Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de diff --git a/util-linux.spec b/util-linux.spec index bd65ce8..e91bfd3 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -168,6 +168,8 @@ Patch3: util-linux-lsmem-memory-zone-3.patch Patch4: util_linux_bigendian.patch # PATCH-FIX-UPSTREAM util-linux-cramfs.patch sbrabec@suse.com -- Fix fsck.cramfs failure on ppc64le. Patch5: util-linux-cramfs.patch +# PATCH-FIX-UPSTREAM util-linux-fincore-count.patch sbrabec@suse.com -- Disable bad test fincore/count. +Patch6: util-linux-fincore-count.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -410,6 +412,7 @@ library. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # # setctsid cp -p %{S:22} %{S:23} .