[PATCH] Drop util-linux-native-qsort.patch

[PATCH] Drop util-linux-native-qsort.patch

[Adrian Bunk]

CentOS 5.x is no longer supported for 2 years,
and uninative being default since Yocto 2.1 should
in any case already cover this issue better.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
 .../util-linux/util-linux-native-qsort.patch       | 33 ----------------------
 meta/recipes-core/util-linux/util-linux_2.32.1.bb  |  6 ----
 2 files changed, 39 deletions(-)
 delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch

diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
deleted file mode 100644
index 68bf22de8c..0000000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Wed, 26 Mar 2014 01:30:29 +0000
-Subject: [PATCH] sun.c: use qsort() to instead of qsort_r()
-
-qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on
-the host like CentOS 5.x.
-
-Upstream-Status: Inappropriate [Other]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- libfdisk/src/sun.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-Index: util-linux-2.24.2/libfdisk/src/sun.c
-===================================================================
---- util-linux-2.24.2.orig/libfdisk/src/sun.c
-+++ util-linux-2.24.2/libfdisk/src/sun.c
-@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f
-     }
-     verify_sun_starts = starts;
- 
--    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
--	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
--	  verify_sun_starts);
--
-+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
-+         (int (*)(const void *,const void *)) verify_sun_cmp);
-+ 
-     if (array[0] == -1) {
- 	fdisk_info(cxt, _("No partitions defined."));
- 	return 0;
diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
index c909836cbb..0ba218b8f2 100644
--- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
@@ -1,15 +1,9 @@
 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 \
-- 
2.11.0

Re: [PATCH] Drop util-linux-native-qsort.patch

[André Draszik]

This is already part of my util-linux cleanup:
http://lists.openembedded.org/pipermail/openembedded-core/2019-January/278074.html

The issue is more grave than just compatibility, it would appear that it
introduces random memory access.


Cheers,
Andre'


On Wed, 2019-01-30 at 11:34 +0200, Adrian Bunk wrote:
> CentOS 5.x is no longer supported for 2 years,
> and uninative being default since Yocto 2.1 should
> in any case already cover this issue better.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
>  .../util-linux/util-linux-native-qsort.patch       | 33 ---------------
> -------
>  meta/recipes-core/util-linux/util-linux_2.32.1.bb  |  6 ----
>  2 files changed, 39 deletions(-)
>  delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-
> native-qsort.patch
> 
> diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-
> qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-
> qsort.patch
> deleted file mode 100644
> index 68bf22de8c..0000000000
> --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-
> qsort.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001
> -From: Robert Yang <liezhi.yang@windriver.com>
> -Date: Wed, 26 Mar 2014 01:30:29 +0000
> -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r()
> -
> -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on
> -the host like CentOS 5.x.
> -
> -Upstream-Status: Inappropriate [Other]
> -
> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ----
> - libfdisk/src/sun.c | 5 ++---
> - 1 file changed, 2 insertions(+), 3 deletions(-)
> -
> -Index: util-linux-2.24.2/libfdisk/src/sun.c
> -===================================================================
> ---- util-linux-2.24.2.orig/libfdisk/src/sun.c
> -+++ util-linux-2.24.2/libfdisk/src/sun.c
> -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f
> -     }
> -     verify_sun_starts = starts;
> - 
> --    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
> --	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
> --	  verify_sun_starts);
> --
> -+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
> -+         (int (*)(const void *,const void *)) verify_sun_cmp);
> -+ 
> -     if (array[0] == -1) {
> - 	fdisk_info(cxt, _("No partitions defined."));
> - 	return 0;
> diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb
> b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
> index c909836cbb..0ba218b8f2 100644
> --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb
> +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
> @@ -1,15 +1,9 @@
>  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 \
> -- 
> 2.11.0
>