[packages/procps] up to 4.0.5 (new soname)
atler
atler at pld-linux.org
Sun May 18 19:38:55 CEST 2025
commit ee69f0281f64b66e8a25bcd8d1d3e82b7f5f3c01
Author: Jan Palus <atler at pld-linux.org>
Date: Sun May 18 19:20:02 2025 +0200
up to 4.0.5 (new soname)
79042e07fab9956135a21b1df7a69d1fbde7ef79.patch | 161 -------------------------
procps.spec | 20 ++-
2 files changed, 7 insertions(+), 174 deletions(-)
---
diff --git a/procps.spec b/procps.spec
index b000773..f08f530 100644
--- a/procps.spec
+++ b/procps.spec
@@ -22,13 +22,13 @@ Summary(pl.UTF-8): Narzędzia do monitorowania procesów
Summary(pt_BR.UTF-8): Utilitários de monitoração de processos
Summary(tr.UTF-8): Süreç izleme araçları
Name: procps
-Version: 4.0.4
-Release: 3
+Version: 4.0.5
+Release: 1
Epoch: 1
License: GPL v2+
Group: Applications/System
Source0: https://downloads.sourceforge.net/procps-ng/%{name}-ng-%{version}.tar.xz
-# Source0-md5: 2f747fc7df8ccf402d03e375c565cf96
+# Source0-md5: 90803e64f51f192f3325d25c3335d057
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: 60d24720b76c10553ed4abf68b76e079
Source2: top.desktop
@@ -38,8 +38,6 @@ Source4: XConsole.sh
Patch1: %{name}-FILLBUG_backport.patch
Patch2: %{name}-pl.po-update.patch
-# [PATCH] w: Don't crash when using short option
-Patch3: 79042e07fab9956135a21b1df7a69d1fbde7ef79.patch
URL: https://gitlab.com/procps-ng/procps
BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.11
@@ -153,7 +151,6 @@ Statyczna wersja biblioteki libproc.
%patch -P1 -p1
%patch -P2 -p1
-%patch -P3 -p1
%{__sed} -i -e "s#usrbin_execdir=.*#usrbin_execdir='\${bindir}'#g" configure.ac
@@ -235,7 +232,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS doc/{FAQ,TODO,bugs.md} NEWS
%attr(755,root,root) /%{_lib}/libproc2.so.*.*
-%ghost %attr(755,root,root) /%{_lib}/libproc2.so.0
+%ghost %attr(755,root,root) /%{_lib}/libproc2.so.1
%attr(755,root,root) /bin/ps
%if %{with pidof}
%attr(755,root,root) /bin/pidof
@@ -243,6 +240,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /sbin/sysctl
%attr(755,root,root) %{_bindir}/XConsole
%attr(755,root,root) %{_bindir}/free
+%attr(755,root,root) %{_bindir}/hugetop
%attr(755,root,root) %{_bindir}/pgrep
%attr(755,root,root) %{_bindir}/pkill
%attr(755,root,root) %{_bindir}/pmap
@@ -260,6 +258,7 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/top.desktop
%{_pixmapsdir}/top.png
%{_mandir}/man1/free.1*
+%{_mandir}/man1/hugetop.1*
%if %{with pidof}
%{_mandir}/man1/pidof.1*
%endif
@@ -295,6 +294,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(ro) %{_mandir}/ro/man[158]/*
%lang(sv) %{_mandir}/sv/man[158]/*
%lang(uk) %{_mandir}/uk/man[158]/*
+%lang(zh_CN) %{_mandir}/zh_CN/man[158]/*
%files devel
%defattr(644,root,root,755)
@@ -304,15 +304,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/procps.3*
%{_mandir}/man3/procps_misc.3*
%{_mandir}/man3/procps_pids.3*
-%lang(pl) %{_mandir}/pl/man3/procps.3*
-%lang(pl) %{_mandir}/pl/man3/procps_misc.3*
-%lang(pl) %{_mandir}/pl/man3/procps_pids.3*
%lang(ro) %{_mandir}/ro/man3/procps.3*
%lang(ro) %{_mandir}/ro/man3/procps_misc.3*
%lang(ro) %{_mandir}/ro/man3/procps_pids.3*
-%lang(sv) %{_mandir}/sv/man3/procps.3*
-%lang(sv) %{_mandir}/sv/man3/procps_misc.3*
-%lang(sv) %{_mandir}/sv/man3/procps_pids.3*
%lang(uk) %{_mandir}/uk/man3/procps.3*
%lang(uk) %{_mandir}/uk/man3/procps_misc.3*
%lang(uk) %{_mandir}/uk/man3/procps_pids.3*
diff --git a/79042e07fab9956135a21b1df7a69d1fbde7ef79.patch b/79042e07fab9956135a21b1df7a69d1fbde7ef79.patch
deleted file mode 100644
index 7fd3da2..0000000
--- a/79042e07fab9956135a21b1df7a69d1fbde7ef79.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 79042e07fab9956135a21b1df7a69d1fbde7ef79 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall at dropbear.xyz>
-Date: Tue, 12 Sep 2023 16:59:18 +1000
-Subject: [PATCH] ps: Don't crash when using short option
-
-ps would crash with the -si or -sf options with systemd enabled.
-The issue was the utmp wasn't filled in, the long option checked, the
-short option did not.
-
-Refactored the showinfo() function so instead of a branch with duplicate
-prints for the items in both long and short we just branch on the items
-for long output.
-
-Also, made the function prototypes not dependendent on systemd enabled,
-it was too messy that way and passing a char* NULL is not really going
-to hurt anything.
-
-References:
- #301
-
-Signed-off-by: Craig Small <csmall at dropbear.xyz>
- ---------------
-diff --git a/src/w.c b/src/w.c
-index fd6e75f7..e2d754b5 100644
---- a/src/w.c
-+++ b/src/w.c
-@@ -207,9 +207,7 @@ static void print_display_or_interface(const char *restrict host, int len, int r
-
- /* This routine prints either the hostname or the IP address of the remote */
- static void print_from(
--#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- const char *session,
--#endif
- const utmp_t *restrict const u, const int ip_addresses, const int fromlen) {
- #if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- if (session) {
-@@ -508,11 +506,10 @@ static int find_best_proc(
- #undef PIDS_GETSTR
- }
-
-+
- static void showinfo(
--#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- const char *session, const char *name,
--#endif
-- utmp_t * u, int formtype, int maxcmd, int from,
-+ utmp_t * u, const int longform, int maxcmd, int from,
- const int userlen, const int fromlen, const int ip_addresses,
- const int pids)
- {
-@@ -575,25 +572,20 @@ static void showinfo(
- /* force NUL term for printf */
- uname[UT_NAMESIZE] = '\0';
-
-- if (formtype) {
-- printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, tty + 5);
-+ printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, tty + 5);
-+ if (from)
-+ print_from(session, u, ip_addresses, fromlen);
-+
-+ /* login time */
-+ if (longform) {
- #if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- if (session) {
- uint64_t ltime;
-
-- if (from)
-- print_from(session, NULL, ip_addresses, fromlen);
--
- sd_session_get_start_time(session, <ime);
- print_logintime(ltime/((uint64_t) 1000000ULL), stdout);
- } else {
- #endif
-- if (from)
-- print_from(
--#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-- NULL,
--#endif
-- u, ip_addresses, fromlen);
-
- #ifdef HAVE_UTMPX_H
- print_logintime(u->ut_tv.tv_sec, stdout);
-@@ -603,11 +595,16 @@ static void showinfo(
- #if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- }
- #endif
-- if (u && *u->ut_line == ':')
-- /* idle unknown for xdm logins */
-- printf(" ?xdm? ");
-- else
-- print_time_ival7(idletime(tty), 0, stdout);
-+ }
-+ /* idle */
-+ if (u && *u->ut_line == ':')
-+ /* idle unknown for xdm logins */
-+ printf(" ?xdm? ");
-+ else
-+ print_time_ival7(idletime(tty), 0, stdout);
-+
-+ /* jpcpu/pcpu */
-+ if (longform) {
- print_time_ival7(jcpu / hertz, (jcpu % hertz) * (100. / hertz),
- stdout);
- if (pcpu > 0)
-@@ -616,20 +613,8 @@ static void showinfo(
- stdout);
- else
- printf(" ? ");
-- } else {
-- printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, tty + 5);
-- if (from)
-- print_from(
--#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
-- NULL,
--#endif
-- u, ip_addresses, fromlen);
-- if (u && *u->ut_line == ':')
-- /* idle unknown for xdm logins */
-- printf(" ?xdm? ");
-- else
-- print_time_ival7(idletime(tty), 0, stdout);
- }
-+ /* what */
- if (pids) {
- pid_t ut_pid = -1;
- if (u)
-@@ -798,9 +783,9 @@ int main(int argc, char **argv)
- * headers. Try to keep alignment intact. */
- printf(_("%-*s TTY "), userlen, _("USER"));
- if (from)
-- printf("%-*s", fromlen - 1, _("FROM"));
-+ printf("%-*s", fromlen, _("FROM"));
- if (longform)
-- printf(_(" LOGIN@ IDLE JCPU PCPU WHAT\n"));
-+ printf(_(" LOGIN@ IDLE JCPU PCPU WHAT\n"));
- else
- printf(_(" IDLE WHAT\n"));
- }
-@@ -857,9 +842,7 @@ int main(int argc, char **argv)
- continue;
- if (!strncmp(u->ut_user, user, UT_NAMESIZE))
- showinfo(
--#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- NULL, NULL,
--#endif
- u, longform, maxcmd, from, userlen,
- fromlen, ip_addresses, pids);
- }
-@@ -876,9 +859,7 @@ int main(int argc, char **argv)
- continue;
- if (*u->ut_user)
- showinfo(
--#if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER)
- NULL, NULL,
--#endif
- u, longform, maxcmd, from, userlen,
- fromlen, ip_addresses, pids);
- }
---
-GitLab
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/procps.git/commitdiff/ee69f0281f64b66e8a25bcd8d1d3e82b7f5f3c01
More information about the pld-cvs-commit
mailing list