From a7a1e3155287d3bac7ab83e58d53ee2a364f2e29 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 9 May 2018 07:51:48 -0700 Subject: util-linux: update to 2.32 rfkill moved locations, update accordingly refactored avoid_parallel_tests.patch includes security fix: CVE-2018-7738 (score: 7.2) affects: < 2.32-rc1 see changelog for other bugfixes: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32-ChangeLog Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 5 ++-- .../util-linux/avoid_parallel_tests.patch | 15 ++++++----- meta/recipes-core/util-linux/util-linux_2.31.bb | 30 ---------------------- meta/recipes-core/util-linux/util-linux_2.32.bb | 30 ++++++++++++++++++++++ 4 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux_2.31.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.32.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 157416df48..0b7db529fd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -86,7 +86,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" -FILES_util-linux-rfkill = "${base_bindir}/rfkill*" +FILES_util-linux-rfkill = "${sbindir}/rfkill*" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" @@ -157,7 +157,7 @@ do_install () { sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" - binprogs_a="dmesg getopt kill more umount mount login rfkill su mountpoint" + binprogs_a="dmesg getopt kill more umount mount login su mountpoint" if [ "${base_sbindir}" != "${sbindir}" ]; then mkdir -p ${D}${base_sbindir} @@ -272,7 +272,6 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_util-linux-rfkill = "rfkill" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" -ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill" ALTERNATIVE_util-linux-getopt = "getopt" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch index 46d4d37650..748b6ef096 100644 --- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch @@ -5,15 +5,16 @@ Revert run.sh script accordingly to serialize running tests Signed-off-by: Tudor Florea Upstream-Status: Inappropriate -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-27 12:37:42.119772658 +0200 -+++ b/configure.ac 2014-05-27 12:41:46.225573272 +0200 -@@ -10,7 +10,7 @@ +Index: util-linux-2.32/configure.ac +=================================================================== +--- util-linux-2.32.orig/configure.ac ++++ util-linux-2.32/configure.ac +@@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS --AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects]) -+AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects serial-tests]) - +-AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz subdir-objects serial-tests]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) diff --git a/meta/recipes-core/util-linux/util-linux_2.31.bb b/meta/recipes-core/util-linux/util-linux_2.31.bb deleted file mode 100644 index 7f7a78ef60..0000000000 --- a/meta/recipes-core/util-linux/util-linux_2.31.bb +++ /dev/null @@ -1,30 +0,0 @@ -MAJOR_VERSION = "2.31" -require util-linux.inc - -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - -SRC_URI += "file://configure-sbindir.patch \ - file://runuser.pamd \ - file://runuser-l.pamd \ - ${OLDHOST} \ - file://ptest.patch \ - file://run-ptest \ - file://display_testname_for_subtest.patch \ - file://avoid_parallel_tests.patch \ -" -SRC_URI[md5sum] = "5b6821c403c3cc6e7775f74df1882a20" -SRC_URI[sha256sum] = "f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a" - -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" - -EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ - --disable-fallocate \ - --disable-use-tty-group \ -" -EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ - --disable-fallocate \ - --disable-use-tty-group \ -" diff --git a/meta/recipes-core/util-linux/util-linux_2.32.bb b/meta/recipes-core/util-linux/util-linux_2.32.bb new file mode 100644 index 0000000000..55cc98c200 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.32.bb @@ -0,0 +1,30 @@ +MAJOR_VERSION = "2.32" +require util-linux.inc + +# To support older hosts, we need to patch and/or revert +# some upstream changes. Only do this for native packages. +OLDHOST = "" +OLDHOST_class-native = "file://util-linux-native-qsort.patch" + +SRC_URI += "file://configure-sbindir.patch \ + file://runuser.pamd \ + file://runuser-l.pamd \ + ${OLDHOST} \ + file://ptest.patch \ + file://run-ptest \ + file://display_testname_for_subtest.patch \ + file://avoid_parallel_tests.patch \ +" +SRC_URI[md5sum] = "e0d8a25853f88cd15ff557e5d8cb4ea7" +SRC_URI[sha256sum] = "6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734" + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" + +EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate \ + --disable-use-tty-group \ +" +EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate \ + --disable-use-tty-group \ +" -- cgit 1.2.3-korg