From cb3074af094e5d9981396255934b6b4efd14f0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E8=BF=9B?= Date: Thu, 5 Jun 2025 12:00:02 +0000 Subject: [PATCH 1/3] sync bugfix patches sync bugfix patches --- ...d-if-pwcache-returns-empty-user-grou.patch | 46 +++++++++++++++++++ ...2-ps-check-for-null-on-escape-source.patch | 34 ++++++++++++++ ...null-from-escape_str_utf8-to-escape_.patch | 40 ++++++++++++++++ procps-ng.spec | 5 ++ 4 files changed, 125 insertions(+) create mode 100644 backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch create mode 100644 backport-0002-ps-check-for-null-on-escape-source.patch create mode 100644 huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch diff --git a/backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch b/backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch new file mode 100644 index 0000000..82903a6 --- /dev/null +++ b/backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch @@ -0,0 +1,46 @@ +From 681e55bc03d99d9542a675c2a0509d6c5c149358 Mon Sep 17 00:00:00 2001 +From: Craig Small +Date: Thu, 24 Apr 2025 20:50:36 +1000 +Subject: [PATCH 1/2] library: Use u/gid if pwcache returns empty user/group + +pwcache_get_user returns the uid if getpwuid fails or the username is +too long. However if getpwuid succeeds but there is no usename then +we get a blank username. Instead use the uid fallback. + +Same for pwcache_get_group + +May fix #380 + +Reference:https://gitlab.com/procps-ng/procps/-/commit/681e55bc03d99d9542a675c2a0509d6c5c149358 +Conflict: adapt context, add ; after ERRname + +Signed-off-by: Craig Small +--- + library/pwcache.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/library/pwcache.c b/library/pwcache.c +index 9293c002..2f1e0e78 100644 +--- a/library/pwcache.c ++++ b/library/pwcache.c +@@ -61,7 +61,7 @@ char *pwcache_get_user(uid_t uid) { + return ERRname; + (*p)->uid = uid; + pw = getpwuid(uid); +- if(!pw || strlen(pw->pw_name) >= P_G_SZ) ++ if(!pw || strlen(pw->pw_name) >= P_G_SZ || pw->pw_name[0] == '\0') + sprintf((*p)->name, "%u", uid); + else + strcpy((*p)->name, pw->pw_name); +@@ -90,7 +90,7 @@ char *pwcache_get_group(gid_t gid) { + return ERRname;; + (*g)->gid = gid; + gr = getgrgid(gid); +- if (!gr || strlen(gr->gr_name) >= P_G_SZ) ++ if (!gr || strlen(gr->gr_name) >= P_G_SZ || gr->gr_name[0] == '\0') + sprintf((*g)->name, "%u", gid); + else + strcpy((*g)->name, gr->gr_name); +-- +2.23.0 + diff --git a/backport-0002-ps-check-for-null-on-escape-source.patch b/backport-0002-ps-check-for-null-on-escape-source.patch new file mode 100644 index 0000000..08e1b35 --- /dev/null +++ b/backport-0002-ps-check-for-null-on-escape-source.patch @@ -0,0 +1,34 @@ +From 3484ac479ed586fa7d801e20fded3cbfee92ffad Mon Sep 17 00:00:00 2001 +From: Craig Small +Date: Thu, 24 Apr 2025 20:58:50 +1000 +Subject: [PATCH 2/2] ps: check for null on escape source + +return 0 if source string for escape is null + +May fix #380 + +Reference:https://gitlab.com/procps-ng/procps/-/commit/3484ac479ed586fa7d801e20fded3cbfee92ffad +Conflict:NA + +Signed-off-by: Craig Small +--- + src/ps/output.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/ps/output.c b/src/ps/output.c +index ba52d14e..4d9b690c 100644 +--- a/src/ps/output.c ++++ b/src/ps/output.c +@@ -157,6 +157,9 @@ static int escape_str_utf8 (char *dst, const char *src, int bufsize, int *maxcel + + SECURE_ESCAPE_ARGS(dst, bufsize, *maxcells); + ++ if (NULL == src) ++ return 0; ++ + memset(&s, 0, sizeof (s)); + + for(;;) { +-- +2.23.0 + diff --git a/huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch b/huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch new file mode 100644 index 0000000..7b2eff8 --- /dev/null +++ b/huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch @@ -0,0 +1,40 @@ +From a81ecea2821302e6f612bc889a001713794dc556 Mon Sep 17 00:00:00 2001 +From: Liu Chao +Date: Tue, 13 May 2025 12:41:07 +0300 +Subject: [PATCH] ps: mv check for null from escape_str_utf8 to escape_str + +https://gitlab.com/procps-ng/procps/-/issues/380 coredump in escape_str +check in escape_str_utf8 cannot fix it. + +Signed-off-by: Liu Chao +--- + src/ps/output.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ps/output.c b/src/ps/output.c +index 4d9b690c..bfb1bb08 100644 +--- a/src/ps/output.c ++++ b/src/ps/output.c +@@ -157,9 +157,6 @@ static int escape_str_utf8 (char *dst, const char *src, int bufsize, int *maxcel + + SECURE_ESCAPE_ARGS(dst, bufsize, *maxcells); + +- if (NULL == src) +- return 0; +- + memset(&s, 0, sizeof (s)); + + for(;;) { +@@ -233,6 +230,9 @@ static int escape_str (char *dst, const char *src, int bufsize, int *maxcells) { + "????????????????????????????????"; + static int utf_init=0; + ++ if (NULL == src) ++ return 0; ++ + if(utf_init==0){ + /* first call -- check if UTF stuff is usable */ + char *enc = nl_langinfo(CODESET); +-- +2.23.0 + diff --git a/procps-ng.spec b/procps-ng.spec index 4a0bac7..0f39bf3 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -20,6 +20,11 @@ Patch8: openeuler-w-Fix-w-print-0-user-when-systemd-pam-is-not-install.patch Patch9: backport-library-implement-guest-total-tics-change-stat-api.patch Patch10: backport-top-adapt-to-that-guest-total-tics-change-stat-api.patch +Patch6000: backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch +Patch6001: backport-0002-ps-check-for-null-on-escape-source.patch + +Patch9001: huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch + BuildRequires: ncurses-devel libtool autoconf automake gcc gettext-devel systemd-devel Provides: procps = %{version}-%{release} -- Gitee From 9eea7775a9b0c05cdda301c6d81d831935a13fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E8=BF=9B?= Date: Thu, 5 Jun 2025 12:25:07 +0000 Subject: [PATCH 2/3] Revert "!142 [sync] PR-137: top: adapt to guest/total tics change, api" This reverts commit 51229322b2ebc86f3fa02200c7f6c4574486a8f4. --- ...ent-guest-total-tics-change-stat-api.patch | 75 ------------------ ...hat-guest-total-tics-change-stat-api.patch | 78 ------------------- procps-ng.spec | 7 +- 3 files changed, 1 insertion(+), 159 deletions(-) delete mode 100644 backport-library-implement-guest-total-tics-change-stat-api.patch delete mode 100644 backport-top-adapt-to-that-guest-total-tics-change-stat-api.patch diff --git a/backport-library-implement-guest-total-tics-change-stat-api.patch b/backport-library-implement-guest-total-tics-change-stat-api.patch deleted file mode 100644 index af4b8d9..0000000 --- a/backport-library-implement-guest-total-tics-change-stat-api.patch +++ /dev/null @@ -1,75 +0,0 @@ -From e1df029e6c8bb166a6cec05dc12f699d84631bc9 Mon Sep 17 00:00:00 2001 -From: Jim Warner -Date: Sat, 22 Jun 2024 00:00:00 -0500 -Subject: [PATCH 1/3] library: implement guest/total tics change, api - -This patch removes guest tics from the total lest they -be counted twice. Such tics have already been included -in user/nice values. For proof, just follow this path: - - fs/proc/stat.c: show_stat() ---> - kernel/sched/cputime.c: kcpustat_cpu_fetch() - -Reference(s): -https://gitlab.com/procps-ng/procps/-/issues/339 - -. Sep, 2020 - where guest distortion occurred -commit ec21588be108d092804eb72edbba2ba214bc6190 - -Signed-off-by: Jim Warner ---- - library/include/stat.h | 6 +++--- - library/stat.c | 12 ++++++++---- - 2 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/library/include/stat.h b/library/include/stat.h -index ff7c5b17..d8ca2add 100644 ---- a/library/include/stat.h -+++ b/library/include/stat.h -@@ -45,8 +45,8 @@ enum stat_item { - STAT_TIC_IRQ, // ull_int " - STAT_TIC_SOFTIRQ, // ull_int " - STAT_TIC_STOLEN, // ull_int " -- STAT_TIC_GUEST, // ull_int " -- STAT_TIC_GUEST_NICE, // ull_int " -+ STAT_TIC_GUEST, // ull_int " (note: also included in USER) -+ STAT_TIC_GUEST_NICE, // ull_int " (note: also included in NICE) - - STAT_TIC_DELTA_USER, // sl_int derived from above - STAT_TIC_DELTA_NICE, // sl_int " -@@ -63,7 +63,7 @@ enum stat_item { - STAT_TIC_SUM_SYSTEM, // ull_int derived from SYSTEM + IRQ + SOFTIRQ tics - STAT_TIC_SUM_IDLE, // ull_int derived from IDLE + IOWAIT tics - STAT_TIC_SUM_BUSY, // ull_int derived from SUM_TOTAL - SUM_IDLE tics -- STAT_TIC_SUM_TOTAL, // ull_int derived from sum of all 10 tics -+ STAT_TIC_SUM_TOTAL, // ull_int derived from sum of all tics, minus 2 GUEST tics - - STAT_TIC_SUM_DELTA_USER, // sl_int derived from above - STAT_TIC_SUM_DELTA_SYSTEM, // sl_int " -diff --git a/library/stat.c b/library/stat.c -index 202dfa52..96672431 100644 ---- a/library/stat.c -+++ b/library/stat.c -@@ -572,11 +572,15 @@ static inline void stat_derive_unique ( - this->new.xidl - = this->new.idle - + this->new.iowait; -+ /* note: we exclude guest tics from xtot since ... -+ 'user' already includes 'guest' -+ 'nice' already includes 'gnice' -+ ( see linux sources: ./kernel/sched/cputime.c, kcpustat_cpu_fetch ) */ - this->new.xtot -- = this->new.xusr + this->new.xsys + this->new.xidl -- + this->new.stolen -- + this->new.guest -- + this->new.gnice; -+ = this->new.xusr -+ + this->new.xsys -+ + this->new.xidl -+ + this->new.stolen; - this->new.xbsy - = this->new.xtot - this->new.xidl; - --- -2.33.0 - diff --git a/backport-top-adapt-to-that-guest-total-tics-change-stat-api.patch b/backport-top-adapt-to-that-guest-total-tics-change-stat-api.patch deleted file mode 100644 index c1955c7..0000000 --- a/backport-top-adapt-to-that-guest-total-tics-change-stat-api.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 3fb34669d3a7e1c0c013a907aeae2c4117ba617e Mon Sep 17 00:00:00 2001 -From: Jim Warner -Date: Sat, 22 Jun 2024 00:00:00 -0500 -Subject: [PATCH 3/3] top: adapt to that guest/total tics change, api - -Signed-off-by: Jim Warner ---- - man/top.1 | 5 +---- - src/top/top.c | 9 --------- - 2 files changed, 1 insertion(+), 13 deletions(-) - -diff --git a/man/top.1 b/man/top.1 -index 2e4f252d..067c2ef7 100644 ---- a/man/top.1 -+++ b/man/top.1 -@@ -59,7 +59,7 @@ memory statistics and data for other users requires root privileges - . - .\" Document ///////////////////////////////////////////////////////////// - .\" ---------------------------------------------------------------------- --.TH TOP 1 "August 2023" "procps-ng" "User Commands" -+.TH TOP 1 "June 2024" "procps-ng" "User Commands" - .\" ---------------------------------------------------------------------- - .nh - -@@ -542,9 +542,6 @@ Depending on your kernel version, the \fBst\fR field may not be shown. - \fBst\fR : time stolen from this vm by the hypervisor - .fi - --The `sy' value above also reflects the time running a virtual \*(Pu --for guest operating systems, including those that have been niced. -- - Beyond the first tasks/threads line, there are alternate \*(PU display - modes available via the 4-way `t' \*(CT. - They show an abbreviated summary consisting of these elements: -diff --git a/src/top/top.c b/src/top/top.c -index 1383a17a..c1a08dc2 100644 ---- a/src/top/top.c -+++ b/src/top/top.c -@@ -286,7 +286,6 @@ static enum stat_item Stat_items[] = { - STAT_TIC_DELTA_NICE, STAT_TIC_DELTA_IDLE, - STAT_TIC_DELTA_IOWAIT, STAT_TIC_DELTA_IRQ, - STAT_TIC_DELTA_SOFTIRQ, STAT_TIC_DELTA_STOLEN, -- STAT_TIC_DELTA_GUEST, STAT_TIC_DELTA_GUEST_NICE, - STAT_TIC_SUM_DELTA_USER, STAT_TIC_SUM_DELTA_SYSTEM, - #ifdef CORE_TYPE_NO - STAT_TIC_SUM_DELTA_TOTAL }; -@@ -299,7 +298,6 @@ enum Rel_statitems { - stat_NI, stat_IL, - stat_IO, stat_IR, - stat_SI, stat_ST, -- stat_GU, stat_GN, - stat_SUM_USR, stat_SUM_SYS, - #ifdef CORE_TYPE_NO - stat_SUM_TOT }; -@@ -6410,11 +6408,6 @@ static int sum_tics (struct stat_stack *this, const char *pfx, int nobuf) { - if (1 > tot_frme) idl_frme = tot_frme = 1; - scale = 100.0 / (float)tot_frme; - -- /* account for VM tics not otherwise provided for ... -- ( with xtra-procps-debug.h, can't use PID_VAL w/ assignment ) */ -- this->head[stat_SY].result.sl_int += rSv(stat_GU) + rSv(stat_GN); -- this->head[stat_SUM_SYS].result.sl_int += rSv(stat_GU) + rSv(stat_GN); -- - /* display some kinda' cpu state percentages - (who or what is explained by the passed prefix) */ - if (Curwin->rc.graph_cpus) { -@@ -6464,8 +6457,6 @@ static int sum_unify (struct stat_stack *this, int nobuf) { - stack[stat_IR].result.sl_int += rSv(stat_IR, sl_int); - stack[stat_SI].result.sl_int += rSv(stat_SI, sl_int); - stack[stat_ST].result.sl_int += rSv(stat_ST, sl_int); -- stack[stat_GU].result.sl_int += rSv(stat_GU, sl_int); -- stack[stat_GN].result.sl_int += rSv(stat_GN, sl_int); - stack[stat_SUM_USR].result.sl_int += rSv(stat_SUM_USR, sl_int); - stack[stat_SUM_SYS].result.sl_int += rSv(stat_SUM_SYS, sl_int); - stack[stat_SUM_TOT].result.sl_int += rSv(stat_SUM_TOT, sl_int); --- -2.33.0 - diff --git a/procps-ng.spec b/procps-ng.spec index 0f39bf3..d14be42 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -1,6 +1,6 @@ Name: procps-ng Version: 4.0.4 -Release: 6 +Release: 5 Summary: Utilities that provide system information. License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ URL: https://sourceforge.net/projects/procps-ng/ @@ -17,8 +17,6 @@ Patch5: backport-ps-don-t-lose-tasks-when-sort-used-with-forest-mode.patch Patch6: backport-acknowledge-fix-for-the-lost-tasks-ps-issue.patch Patch7: openeuler-uptime-Fix-uptime-return-0-user-when-systemd-pam-is-.patch Patch8: openeuler-w-Fix-w-print-0-user-when-systemd-pam-is-not-install.patch -Patch9: backport-library-implement-guest-total-tics-change-stat-api.patch -Patch10: backport-top-adapt-to-that-guest-total-tics-change-stat-api.patch Patch6000: backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch Patch6001: backport-0002-ps-check-for-null-on-escape-source.patch @@ -106,9 +104,6 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof %{_mandir}/man* %changelog -* Tue Jun 25 2024 Liu Chao - 4.0.4-6 -- top: adapt to guest/total tics change, api - * Thu May 9 2024 Liu Chao - 4.0.4-5 - uptime/w: fix print 0 user when systemd-pam is not installed -- Gitee From 5af82a28a59732b62d099a7690afcfc6594343f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E8=BF=9B?= Date: Thu, 5 Jun 2025 12:27:31 +0000 Subject: [PATCH 3/3] =?UTF-8?q?!3=20=E5=9B=9E=E9=80=80=20'Pull=20Request?= =?UTF-8?q?=20!1=20:=20sync=20bugfix=20patches'=20*=20=E5=9B=9E=E9=80=80?= =?UTF-8?q?=20'Pull=20Request=20!1=20:=20sync=20bugfix=20patches'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...d-if-pwcache-returns-empty-user-grou.patch | 46 ------------------- ...2-ps-check-for-null-on-escape-source.patch | 34 -------------- ...null-from-escape_str_utf8-to-escape_.patch | 40 ---------------- procps-ng.spec | 5 -- 4 files changed, 125 deletions(-) delete mode 100644 backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch delete mode 100644 backport-0002-ps-check-for-null-on-escape-source.patch delete mode 100644 huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch diff --git a/backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch b/backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch deleted file mode 100644 index 82903a6..0000000 --- a/backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 681e55bc03d99d9542a675c2a0509d6c5c149358 Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 24 Apr 2025 20:50:36 +1000 -Subject: [PATCH 1/2] library: Use u/gid if pwcache returns empty user/group - -pwcache_get_user returns the uid if getpwuid fails or the username is -too long. However if getpwuid succeeds but there is no usename then -we get a blank username. Instead use the uid fallback. - -Same for pwcache_get_group - -May fix #380 - -Reference:https://gitlab.com/procps-ng/procps/-/commit/681e55bc03d99d9542a675c2a0509d6c5c149358 -Conflict: adapt context, add ; after ERRname - -Signed-off-by: Craig Small ---- - library/pwcache.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/library/pwcache.c b/library/pwcache.c -index 9293c002..2f1e0e78 100644 ---- a/library/pwcache.c -+++ b/library/pwcache.c -@@ -61,7 +61,7 @@ char *pwcache_get_user(uid_t uid) { - return ERRname; - (*p)->uid = uid; - pw = getpwuid(uid); -- if(!pw || strlen(pw->pw_name) >= P_G_SZ) -+ if(!pw || strlen(pw->pw_name) >= P_G_SZ || pw->pw_name[0] == '\0') - sprintf((*p)->name, "%u", uid); - else - strcpy((*p)->name, pw->pw_name); -@@ -90,7 +90,7 @@ char *pwcache_get_group(gid_t gid) { - return ERRname;; - (*g)->gid = gid; - gr = getgrgid(gid); -- if (!gr || strlen(gr->gr_name) >= P_G_SZ) -+ if (!gr || strlen(gr->gr_name) >= P_G_SZ || gr->gr_name[0] == '\0') - sprintf((*g)->name, "%u", gid); - else - strcpy((*g)->name, gr->gr_name); --- -2.23.0 - diff --git a/backport-0002-ps-check-for-null-on-escape-source.patch b/backport-0002-ps-check-for-null-on-escape-source.patch deleted file mode 100644 index 08e1b35..0000000 --- a/backport-0002-ps-check-for-null-on-escape-source.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3484ac479ed586fa7d801e20fded3cbfee92ffad Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 24 Apr 2025 20:58:50 +1000 -Subject: [PATCH 2/2] ps: check for null on escape source - -return 0 if source string for escape is null - -May fix #380 - -Reference:https://gitlab.com/procps-ng/procps/-/commit/3484ac479ed586fa7d801e20fded3cbfee92ffad -Conflict:NA - -Signed-off-by: Craig Small ---- - src/ps/output.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/ps/output.c b/src/ps/output.c -index ba52d14e..4d9b690c 100644 ---- a/src/ps/output.c -+++ b/src/ps/output.c -@@ -157,6 +157,9 @@ static int escape_str_utf8 (char *dst, const char *src, int bufsize, int *maxcel - - SECURE_ESCAPE_ARGS(dst, bufsize, *maxcells); - -+ if (NULL == src) -+ return 0; -+ - memset(&s, 0, sizeof (s)); - - for(;;) { --- -2.23.0 - diff --git a/huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch b/huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch deleted file mode 100644 index 7b2eff8..0000000 --- a/huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a81ecea2821302e6f612bc889a001713794dc556 Mon Sep 17 00:00:00 2001 -From: Liu Chao -Date: Tue, 13 May 2025 12:41:07 +0300 -Subject: [PATCH] ps: mv check for null from escape_str_utf8 to escape_str - -https://gitlab.com/procps-ng/procps/-/issues/380 coredump in escape_str -check in escape_str_utf8 cannot fix it. - -Signed-off-by: Liu Chao ---- - src/ps/output.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ps/output.c b/src/ps/output.c -index 4d9b690c..bfb1bb08 100644 ---- a/src/ps/output.c -+++ b/src/ps/output.c -@@ -157,9 +157,6 @@ static int escape_str_utf8 (char *dst, const char *src, int bufsize, int *maxcel - - SECURE_ESCAPE_ARGS(dst, bufsize, *maxcells); - -- if (NULL == src) -- return 0; -- - memset(&s, 0, sizeof (s)); - - for(;;) { -@@ -233,6 +230,9 @@ static int escape_str (char *dst, const char *src, int bufsize, int *maxcells) { - "????????????????????????????????"; - static int utf_init=0; - -+ if (NULL == src) -+ return 0; -+ - if(utf_init==0){ - /* first call -- check if UTF stuff is usable */ - char *enc = nl_langinfo(CODESET); --- -2.23.0 - diff --git a/procps-ng.spec b/procps-ng.spec index d14be42..21a9dfa 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -18,11 +18,6 @@ Patch6: backport-acknowledge-fix-for-the-lost-tasks-ps-issue.patch Patch7: openeuler-uptime-Fix-uptime-return-0-user-when-systemd-pam-is-.patch Patch8: openeuler-w-Fix-w-print-0-user-when-systemd-pam-is-not-install.patch -Patch6000: backport-0001-library-Use-u-gid-if-pwcache-returns-empty-user-grou.patch -Patch6001: backport-0002-ps-check-for-null-on-escape-source.patch - -Patch9001: huawei-ps-mv-check-for-null-from-escape_str_utf8-to-escape_.patch - BuildRequires: ncurses-devel libtool autoconf automake gcc gettext-devel systemd-devel Provides: procps = %{version}-%{release} -- Gitee