packages/procinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!4 修复procinfo在master分支编译失败

Browse Source 
From: @caodongxia
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-08-07 08:23:10 +00:00 committed by Gitee
commit 9c0ceb2acf
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
procinfo-strsignal.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/routines.c b/routines.c
index 15dcb50..35b2c1d 100644
--- a/routines.c
+++ b/routines.c
@@ -146,7 +146,7 @@ quit (int i)
exit (0);
} else {
printf ("%s%s%s", ve, se, tgoto (cm, 0, li));
- printf ("[%s]\n", sys_siglist[i]);
+ printf ("[%s]\n", strsignal(i));
exit (128 + i);
}
}

7
procinfo.spec
View File

@ -1,6 +1,6 @@
Name: procinfo Name: procinfo
Version: 18 Version: 18
Release: 42 Release: 43
Summary: A tool for displaying system information Summary: A tool for displaying system information
License: GPL+ License: GPL+
Source: ftp://ftp.cistron.nl/pub/people/00-OLD/svm/procinfo-%{version}.tar.gz Source: ftp://ftp.cistron.nl/pub/people/00-OLD/svm/procinfo-%{version}.tar.gz
@ -19,6 +19,7 @@ Patch14: procinfo-18-version.patch
Patch15: procinfo-18-man-comment.patch Patch15: procinfo-18-man-comment.patch
Patch16: procinfo-18-socklist.patch Patch16: procinfo-18-socklist.patch
Patch17: procinfo-18-idle-overflow.patch Patch17: procinfo-18-idle-overflow.patch
Patch18: procinfo-strsignal.patch
BuildRequires: ncurses-devel gcc BuildRequires: ncurses-devel gcc
@ -49,6 +50,7 @@ This package contains documentation for procinfo.
%patch15 -p1 %patch15 -p1
%patch16 -p0 %patch16 -p0
%patch17 -p1 %patch17 -p1
%patch18 -p1
%build %build
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses" LDFLAGS= LDLIBS=-lncurses make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses" LDFLAGS= LDLIBS=-lncurses
@ -71,5 +73,8 @@ make install prefix=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT/%{_mandir}
%{_mandir}/man8/socklist.8* %{_mandir}/man8/socklist.8*
%changelog %changelog
* Sat Aug 07 2021 caodongxia<caodongxia@huawei.com> - 18-43
- Use strsignal not sys_siglist
* Thu Feb 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 18-42 * Thu Feb 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 18-42
- DESC:update the spec - DESC:update the spec