开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:procps-ng.spec Changed

@@ -1,6 +1,6 @@
 Name: 		procps-ng
-Version: 	4.0.0
-Release:	4
+Version: 	4.0.2
+Release:	1
 Summary: 	Utilities that provide system information.
 License: 	GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
 URL: 		https://sourceforge.net/projects/procps-ng/
@@ -9,10 +9,9 @@
 Source1: 	README.md
 Source2: 	README.top
 
-Patch1: 	0001-add-M-and-N-options-for-top.patch
-Patch2: 	0002-top-exit-with-error-when-pid-overflow.patch
-Patch3:		0003-top-eliminate-a-potential-abend-when-exiting-A-mode.patch
-Patch4:		0004-skill-Restore-the-p-flag-functionality.patch
+Patch1: 	openeuler-add-M-and-N-options-for-top.patch
+Patch2: 	openeuler-top-exit-with-error-when-pid-overflow.patch
+Patch3:		skill-Restore-the-p-flag-functionality.patch
 
 BuildRequires: 	ncurses-devel libtool autoconf automake gcc gettext-devel systemd-devel
 
@@ -47,7 +46,7 @@
 %autosetup -n procps-ng-%{version} -p1
 
 cp -p %{SOURCE1} .
-cp -p %{SOURCE2} top/
+cp -p %{SOURCE2} src/top/
 
 %build
 autoreconf -ivf
@@ -73,10 +72,10 @@
 %doc COPYING COPYING.LIB
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LIB
-%{_libdir}/libproc-2.so.*
+%{_libdir}/libproc2.so.*
 %{_bindir}/*
 %{_sbindir}/*
-%exclude %{_libdir}/libproc-2.la
+%exclude %{_libdir}/libproc2.la
 %exclude /unwanted/*
 %exclude %{_libdir}/*.a
 
@@ -84,17 +83,20 @@
 %doc COPYING COPYING.LIB
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LIB
-%{_libdir}/libproc-2.so
-%{_libdir}/pkgconfig/libproc-2.pc
-%{_includedir}/procps
+%{_libdir}/libproc2.so
+%{_libdir}/pkgconfig/libproc2.pc
+%{_includedir}/libproc2
 
 %files i18n -f %{name}.lang
 
 %files help
-%doc AUTHORS Documentation/bugs.md Documentation/FAQ NEWS README.md top/README.top Documentation/TODO
+%doc AUTHORS NEWS README.md
 %{_mandir}/man*
 
 %changelog
+* Wed Feb 1 2023 Qiang Wei <qiang.wei@suse.com> - 4.0.2-1
+- Update to 4.0.2.
+
 * Mon Dec 12 2022 Liu Chao <liuchao173@huawei.com> - 4.0.0-4
 - skill: Restore the -p flag functionality

_service:tar_scm:0001-add-M-and-N-options-for-top.patch Deleted

@@ -1,68 +0,0 @@
-From 6e59f5e746c15df4d4b53f2df85b64aa1f10d0c3 Mon Sep 17 00:00:00 2001
-From: xuchunmei <xuchunmei@huawei.com>
-Date: Fri, 11 Jan 2019 01:29:55 -0500
-Subject: PATCH procps-ng: add -M and -N options for top
-
-Signed-off-by: xuchunmei <xuchunmei@huawei.com>
-Signed-off-by: zhoujie <zhoujie133@huawei.com>
----
- top/top.c     | 15 ++++++++++++++-
- top/top_nls.c |  2 ++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/top/top.c b/top/top.c
-index 04cf084..fbf0236 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -4076,7 +4076,7 @@ default_or_error:
-          *       overridden -- we'll force some on and negate others in our
-          *       best effort to honor the loser's (oops, user's) wishes... */
- static void parse_args (int argc, char **argv) {
--    static const char sopts = "bcd:E:e:Hhin:Oo:p:SsU:u:Vw::1";
-+    static const char sopts = "bcd:E:e:Hhin:Oo:p:SsU:u:Vw::1MN:";
-     static const struct option lopts = {
-        { "batch-mode",        no_argument,       NULL, 'b' },
-        { "cmdline-toggle",    no_argument,       NULL, 'c' },
-@@ -4097,6 +4097,8 @@ static void parse_args (int argc, char **argv) {
-        { "version",           no_argument,       NULL, 'V' },
-        { "width",             optional_argument, NULL, 'w' },
-        { "single-cpu-toggle", no_argument,       NULL, '1' },
-+       { "sort-by-mem",       no_argument,       NULL, 'M' },
-+       { "display-task-num",  required_argument, NULL, 'N' },
-        { NULL, 0, NULL, 0 }
-    };
-    float tmp_delay = FLT_MAX;
-@@ -4219,6 +4221,17 @@ static void parse_args (int argc, char **argv) {
-                error_exit(fmtmk(N_fmt(BAD_widtharg_fmt), cp));
-             Width_mode = (int)tmp;
-             continue;
-+	 case 'M':
-+         {
-+            Curwin->rc.sortindx = EU_MEM;
-+               break;
-+         }
-+         case 'N':
-+         {
-+            if (sscanf(cp, "%d", &Curwin->rc.maxtasks) != 1 || Curwin->rc.maxtasks < 0)
-+               error_exit(fmtmk("bad iterations arg '%s'", cp));
-+            continue;
-+         }
-          default:
-             // we'll rely on getopt for any error message ...
-             bye_bye(NULL);
-diff --git a/top/top_nls.c b/top/top_nls.c
-index 92f12ba..2e9c7fd 100644
---- a/top/top_nls.c
-+++ b/top/top_nls.c
-@@ -409,6 +409,8 @@ static void build_norm_nlstab (void) {
-       " -u, --filter-only-euser =USER   show only processes owned by USER\n"
-       " -w, --width =COLUMNS          change print width ,use COLUMNS\n"
-       " -1, --single-cpu-toggle         reverse last remembered '1' state\n"
-+      " -M, --sort-by-mem               show tasks by memory usage\n"
-+      " -N, --show-task-num		show the specified number of tasks\n"
-       "\n"
-       " -h, --help                      display this help text, then exit\n"
-       " -V, --version                   output version information & exit\n"
--- 
-2.33.0
-

_service:tar_scm:0002-top-exit-with-error-when-pid-overflow.patch Deleted

_service:tar_scm:0003-top-eliminate-a-potential-abend-when-exiting-A-mode.patch Deleted

@@ -1,207 +0,0 @@
-From ad4429ade07abe2133dd53341fa91639625f09a0 Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner@comcast.net>
-Date: Wed, 27 Jul 2022 00:00:00 -0500
-Subject: PATCH top: eliminate a potential abend when exiting 'A' mode <=== 
- port of newlib 80e2a7a6
-
-______________________________ original newlib message
------------------------------------ ( minus git hash )
-
-In that issue cited below, Tyson Nottingham identified
-a potential abend which was associated with 'alternate
-display mode' plus that troublesome 'mkVIZrow1' macro.
-He also offered a perfectly adequate fix for that bug.
-
-I refer to that macro as troublesome since it's now so
-widely used and sometimes (by design) causes 'begtask'
-to go negative (invalid). And now I found yet one more
-place where it should have been used but wasn't ('f').
-
-It's also troublesome as evidenced by some git history
-listed below. Heck, there was even a commit addressing
-the same symptoms (alternate display mode abend) which
-Tyson suffered. Clearly, the current design is flawed.
-
-So, with those two issues in mind, I've refactored the
-approach to maintaining a visible task in the 1st row.
-Henceforth, a 'mkVIZrow1' macro will be issued in only
-two places: once at startup and after most keystrokes.
-
-Such an approach likely results in additional calls to
-the 'window_hlp' routine that aren't really necessary.
-But, it provides a cleaner design less prone to errors
-in the future. Besides, such additional overhead would
-only be incurred when interacting with the user. Thus,
-new costs are of no concern and will never be noticed.
-
-Reference(s):
-. Tyson Nottingham reported problem
-https://gitlab.com/procps-ng/procps/-/issues/245
-. Jun, 2018 - visible row 1 tasks first addressed
-commit ........................................
-. Jun, 2018 - adressed edge case, new bugs created
-commit ........................................
-. Sep, 2018 - additional edge case addressed
-commit ........................................
-. May, 2021 - some abends fixed, new error created
-commit ........................................
-. Jun, 2021 - try to prorect against future errors
-commit ........................................
-. Sep, 2021 - integrate mkVIZ & 'focused' tasks
-commit ........................................
-
-Discovered by: Tyson Nottingham
-Signed-off-by: Jim Warner <james.warner@comcast.net>
----
- top/top.c | 44 +++++++++++++++++++-------------------------
- top/top.h |  3 ++-
- 2 files changed, 21 insertions(+), 26 deletions(-)
-
-diff --git a/top/top.c b/top/top.c
-index 51bf563..204e66a 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -4329,10 +4329,11 @@ static void win_names (WIN_t *q, const char *name) {
- static void win_reset (WIN_t *q) {
-          SETw(q, Show_IDLEPS | Show_TASKON);
- #ifndef SCROLLVAR_NO
--         q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->begnext = q->varcolbeg = q->focus_pid = 0;
-+         q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->varcolbeg = q->focus_pid = 0;
- #else
--         q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->begnext = q->focus_pid = 0;
-+         q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->focus_pid = 0;
- #endif
-+	 mkVIZoff(q)
-          // these next two are global, not really windows based
-          Monpidsidx = 0;
-          Rc.tics_scaled = 0;
-@@ -5116,7 +5117,6 @@ static void keys_global (int ch) {
-       case '?':
-       case 'h':
-          help_view();
--         mkVIZrow1
-          break;
-       case 'B':
-          TOGw(w, View_NOBOLD);
-@@ -5143,7 +5143,6 @@ static void keys_global (int ch) {
-          break;
-       case 'g':
-          win_select(0);
--         mkVIZrow1
-          break;
-       case 'H':
-          Thread_mode = !Thread_mode;
-@@ -5224,7 +5223,6 @@ static void keys_global (int ch) {
-          break;
-       case 'Z':
-          wins_colors();
--         mkVIZrow1
-          break;
-       case '0':
-          Rc.zero_suppress = !Rc.zero_suppress;
-@@ -5446,10 +5444,7 @@ static void keys_task (int ch) {
-       case 'O':
-       case 'o':
-       case kbd_CtrlO:
--         if (VIZCHKw(w)) {
--            other_filters(ch);
--            mkVIZrow1
--         }
-+         if (VIZCHKw(w)) other_filters(ch);
-          break;
-       case 'U':
-       case 'u':
-@@ -5458,7 +5453,6 @@ static void keys_task (int ch) {
-             if (*str != kbd_ESC
-             && (errmsg = user_certify(w, str, ch)))
-                 show_msg(errmsg);
--            mkVIZrow1
-          }
-          break;
-       case 'V':
-@@ -5565,10 +5559,7 @@ static void keys_window (int ch) {
-          break;
-       case 'a':
-       case 'w':
--         if (ALTCHKw) {
--            win_select(ch);
--            mkVIZrow1
--         }
-+         if (ALTCHKw) win_select(ch);
-          break;
-       case 'G':
-          if (ALTCHKw) {
-@@ -5665,10 +5656,8 @@ static void keys_window (int ch) {
-       case kbd_HOME:
- #ifndef SCROLLVAR_NO
-          if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS)) w->begtask = w->begpflg = w->varcolbeg = 0;
--         mkVIZrow1
- #else
-          if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS)) w->begtask = w->begpflg = 0;
--         mkVIZrow1
- #endif
-          break;
-       case kbd_END:
-@@ -6109,6 +6098,14 @@ static void do_key (int ch) {
-             if (strchr(key_tabi.keys, ch)) {
-                key_tabi.func(ch);
-                Frames_signal = BREAK_kbd;
-+	       /* due to the proliferation of the need for 'mkVIZrow1', |
-+                  aside from 'wins_stage_2' use, we'll now issue it one |
-+                  time here. there will remain several places where the |
-+                  companion 'mkVIZrowX' macro is issued, thus the check |
-+                  for a value already in 'begnext' in this conditional. | */
-+               if (CHKw(Curwin, Show_TASKON) && !mkVIZyes)
-+                  mkVIZrow1
-+
-                goto all_done;
-             }
-    };
-@@ -6493,14 +6490,11 @@ static const char *task_show (const WIN_t *q, int idx) {
- 
- 
-         /*
--         * A window_show *Helper* function ensuring that Curwin's 'begtask'
--         * represents a visible process (not any hidden/filtered-out task).
--         * In reality, this function is called:
--         *   1) exclusively for the 'current' window
--         *   2) immediately after interacting with the user
--         *   3) who struck: up, down, pgup, pgdn, home, end, 'o/O' or 'u/U'
--         *   4) or upon the user switching from one window to another window
--         * ( note: it's entirely possible there are NO visible tasks to show ) */
-+	 * A window_show *Helper* function ensuring that a window 'begtask' |
-+         * represents a visible process (not any hidden/filtered-out task). |
-+         * In reality this function is called exclusively for the 'current' |
-+         * window and only after available user keystroke(s) are processed. |
-+         * Note: it's entirely possible there are NO visible tasks to show! | */
- static void window_hlp (void) {
-    WIN_t *w = Curwin;             // avoid gcc bloat with a local copy
-    int i, reversed;
-@@ -6548,7 +6542,7 @@ fwd_redux:
-    }
- 
- wrap_up:
--   w->begnext = 0;
-+   mkVIZoff(w)
-    OFFw(w, NOPRINT_xxx);
- } // end: window_hlp
- 
-diff --git a/top/top.h b/top/top.h
-index 40fe0ec..9d44669 100644
---- a/top/top.h
-+++ b/top/top.h
-@@ -427,9 +427,10 @@ typedef struct WIN_t {
- 
-         // Support for a proper (visible) row #1 whenever Curwin changes
-         // ( or a key which might affect vertical scrolling was struck )
--#define mkVIZyes       Curwin->begnext != 0
-+#define mkVIZyes     ( Curwin->begnext != 0 )
- #define mkVIZrow1    { Curwin->begnext = +1; Curwin->begtask -= 1; }

_service:tar_scm:0004-skill-Restore-the-p-flag-functionality.patch Deleted

@@ -1,72 +0,0 @@
-From f7a33746f8484629df9055f9a2dc5654f377c2fe Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@dropbear.xyz>
-Date: Mon, 12 Dec 2022 16:46:36 +1100
-Subject: PATCH skill: Restore the -p flag functionality
-
-When the skill program was ported to the new API the code to filter
-on PID, used by the -p option, was missed. It is now restored.
-
-References:
- https://bugs.debian.org/1025915
-
-Conflict:remove NES part and change src/skill.c to skill.c
----
- skill.c                        |  2 ++
- testsuite/skill.test/skill.exp | 32 ++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
- create mode 100644 testsuite/skill.test/skill.exp
-
-diff --git a/skill.c b/skill.c
-index 9f617bfd..c2e52744 100644
---- a/skill.c
-+++ b/skill.c
-@@ -287,6 +287,8 @@ static void scan_procs(struct run_time_conf_t *run_time)
-     for (i=0; i < total_procs; i++) {
-         if (PIDS_GETINT(PID) == my_pid || PIDS_GETINT(PID) == 0)
-             continue;
-+	if (pids && !match_intlist(PIDS_GETINT(PID), pid_count, pids))
-+	    continue;
-         if (uids && !match_intlist(PIDS_GETUNT(EUID), uid_count, (int *)uids))
-             continue;
-         if (ttys && !match_intlist(PIDS_GETINT(TTY), tty_count, ttys))
-diff --git a/testsuite/skill.test/skill.exp b/testsuite/skill.test/skill.exp
-new file mode 100644
-index 00000000..162d9610
---- /dev/null
-+++ b/testsuite/skill.test/skill.exp
-@@ -0,0 +1,32 @@
-+#
-+# Dejagnu testsuite for skill - part of procps
-+#
-+set skill ${topdir}src/skill
-+set tty  get_tty 
-+
-+if { ! file exists $skill  } {
-+    untested { skipping (not built)}
-+    return
-+}
-+
-+set test "skill with no arguments"
-+spawn $skill
-+expect_pass "$test" "Usage:\\s+$lt-$?skill \\\signal\\\ \\\options\\\ <expression>"
-+
-+set test "skill list signal names"
-+spawn $skill -l
-+expect_pass "$test" "^$\A-Z12+-\\\s*$+$"
-+
-+set test "skill list signal names in table"
-+spawn $skill -L
-+expect_pass "$test" "^$\\s+\\d+ \A-Z12+-\+$+\\s*$"
-+
-+make_testproc
-+
-+# Debian 1025915
-+set test "skill find one process"
-+spawn $skill -n -p $testproc1_pid
-+expect_pass "$test" "^$testproc1_pid\\s*$"
-+
-+# Cleanup
-+kill_testproc
--- 
-2.27.0
-

_service:tar_scm:openeuler-add-M-and-N-options-for-top.patch Added

@@ -0,0 +1,62 @@
+From 6e59f5e746c15df4d4b53f2df85b64aa1f10d0c3 Mon Sep 17 00:00:00 2001
+From: xuchunmei <xuchunmei@huawei.com>
+Date: Fri, 11 Jan 2019 01:29:55 -0500
+Subject: PATCH procps-ng: add -M and -N options for top
+
+Signed-off-by: xuchunmei <xuchunmei@huawei.com>
+Signed-off-by: zhoujie <zhoujie133@huawei.com>
+Signed-off-by: Qiang Wei <qiang.wei@suse.com>
+---
+ top/top.c     | 15 ++++++++++++++-
+ top/top_nls.c |  2 ++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -4227,7 +4227,7 @@ default_or_error:
+          *       overridden -- we'll force some on and negate others in our
+          *       best effort to honor the loser's (oops, user's) wishes... */
+ static void parse_args (int argc, char **argv) {
+-    static const char sopts = "bcd:E:e:Hhin:Oo:p:SsU:u:Vw::1";
++    static const char sopts = "bcd:E:e:Hhin:Oo:p:SsU:u:Vw::1MN:";
+     static const struct option lopts = {
+        { "batch-mode",        no_argument,       NULL, 'b' },
+        { "cmdline-toggle",    no_argument,       NULL, 'c' },
+@@ -4248,6 +4248,8 @@ static void parse_args (int argc, char *
+        { "version",           no_argument,       NULL, 'V' },
+        { "width",             optional_argument, NULL, 'w' },
+        { "single-cpu-toggle", no_argument,       NULL, '1' },
++       { "sort-by-mem",       no_argument,       NULL, 'M' },
++       { "display-task-num",  required_argument, NULL, 'N' },
+        { NULL, 0, NULL, 0 }
+    };
+    float tmp_delay = FLT_MAX;
+@@ -4370,6 +4372,17 @@ static void parse_args (int argc, char *
+                error_exit(fmtmk(N_fmt(BAD_widtharg_fmt), cp));
+             Width_mode = (int)tmp;
+             continue;
++	 case 'M':
++         {
++            Curwin->rc.sortindx = EU_MEM;
++               break;
++         }
++         case 'N':
++         {
++            if (sscanf(cp, "%d", &Curwin->rc.maxtasks) != 1 || Curwin->rc.maxtasks < 0)
++               error_exit(fmtmk("bad iterations arg '%s'", cp));
++            continue;
++         }
+          default:
+             // we'll rely on getopt for any error message ...
+             bye_bye(NULL);
+--- a/src/top/top_nls.c
++++ b/src/top/top_nls.c
+@@ -431,6 +431,8 @@ static void build_norm_nlstab (void) {
+       " -u, --filter-only-euser =USER   show only processes owned by USER\n"
+       " -w, --width =COLUMNS          change print width ,use COLUMNS\n"
+       " -1, --single-cpu-toggle         reverse last remembered '1' state\n"
++      " -M, --sort-by-mem               show tasks by memory usage\n"
++      " -N, --show-task-num		show the specified number of tasks\n"
+       "\n"
+       " -h, --help                      display this help text, then exit\n"
+       " -V, --version                   output version information & exit\n"

_service:tar_scm:openeuler-top-exit-with-error-when-pid-overflow.patch Added

_service:tar_scm:skill-Restore-the-p-flag-functionality.patch Added

@@ -0,0 +1,85 @@
+From f7a33746f8484629df9055f9a2dc5654f377c2fe Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@dropbear.xyz>
+Date: Mon, 12 Dec 2022 16:46:36 +1100
+Subject: PATCH skill: Restore the -p flag functionality
+
+When the skill program was ported to the new API the code to filter
+on PID, used by the -p option, was missed. It is now restored.
+
+References:
+ https://bugs.debian.org/1025915
+
+Signed-off-by: Qiang Wei <qiang.wei@suse.com>
+---
+ NEWS                           |  4 ++++
+ src/skill.c                    |  2 ++
+ testsuite/skill.test/skill.exp | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 38 insertions(+)
+ create mode 100644 testsuite/skill.test/skill.exp
+
+diff --git a/NEWS b/NEWS
+index d334c0d6..2d13978d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,7 @@
++procps-ng-NEXT
++---------------
++  * docs: Don't install English manpages twice
++  * skill: Match on -p again                               Debian #1025915
+ procps-ng-4.0.2
+ ---------------
+   * library revision - 0:1:0
+diff --git a/src/skill.c b/src/skill.c
+index 9f617bfd..c2e52744 100644
+--- a/src/skill.c
++++ b/src/skill.c
+@@ -287,6 +287,8 @@ static void scan_procs(struct run_time_conf_t *run_time)
+     for (i=0; i < total_procs; i++) {
+         if (PIDS_GETINT(PID) == my_pid || PIDS_GETINT(PID) == 0)
+             continue;
++	if (pids && !match_intlist(PIDS_GETINT(PID), pid_count, pids))
++	    continue;
+         if (uids && !match_intlist(PIDS_GETUNT(EUID), uid_count, (int *)uids))
+             continue;
+         if (ttys && !match_intlist(PIDS_GETINT(TTY), tty_count, ttys))
+diff --git a/testsuite/skill.test/skill.exp b/testsuite/skill.test/skill.exp
+new file mode 100644
+index 00000000..162d9610
+--- /dev/null
++++ b/testsuite/skill.test/skill.exp
+@@ -0,0 +1,32 @@
++#
++# Dejagnu testsuite for skill - part of procps
++#
++set skill ${topdir}src/skill
++set tty  get_tty 
++
++if { ! file exists $skill  } {
++    untested { skipping (not built)}
++    return
++}
++
++set test "skill with no arguments"
++spawn $skill
++expect_pass "$test" "Usage:\\s+$lt-$?skill \\\signal\\\ \\\options\\\ <expression>"
++
++set test "skill list signal names"
++spawn $skill -l
++expect_pass "$test" "^$\A-Z12+-\\\s*$+$"
++
++set test "skill list signal names in table"
++spawn $skill -L
++expect_pass "$test" "^$\\s+\\d+ \A-Z12+-\+$+\\s*$"
++
++make_testproc
++
++# Debian 1025915
++set test "skill find one process"
++spawn $skill -n -p $testproc1_pid
++expect_pass "$test" "^$testproc1_pid\\s*$"
++
++# Cleanup
++kill_testproc
+-- 
+2.33.0
+

_service:tar_scm:procps-ng-4.0.0.tar.xz -> _service:tar_scm:procps-ng-4.0.2.tar.xz Changed