diff options
Diffstat (limited to 'system/procps')
| -rw-r--r-- | system/procps/0001-pt_BR-fix-translation-error.patch | 29 | ||||
| -rw-r--r-- | system/procps/APKBUILD | 24 | ||||
| -rw-r--r-- | system/procps/add-langinfo-header.patch | 11 | ||||
| -rw-r--r-- | system/procps/use-utmpx.patch | 104 |
4 files changed, 26 insertions, 142 deletions
diff --git a/system/procps/0001-pt_BR-fix-translation-error.patch b/system/procps/0001-pt_BR-fix-translation-error.patch deleted file mode 100644 index 68b06406f..000000000 --- a/system/procps/0001-pt_BR-fix-translation-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8e56c510e49330031c454481380552623eadf38f Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sat, 16 Jun 2018 21:37:27 -0500 -Subject: [PATCH] pt_BR: fix translation error - -"agora" means "now"; "gora" is not a Portuguese word. - -\a is 'bell' character, which means the string will cause a bell to -sound instead of printing the correct word. ---- - po/pt_BR.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/pt_BR.po b/po/pt_BR.po -index e7a859f..3f0106e 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -3072,7 +3072,7 @@ msgstr "nome de campo não reconhecido \"%s\"" - - #: top/top_nls.c:429 - msgid "even using field names only, window is now too small" --msgstr "mesmo usando nomes de campo apenas, janela é pequena demais \agora" -+msgstr "mesmo usando nomes de campo apenas, janela é pequena demais agora" - - #: top/top_nls.c:431 - msgid "Open Files" --- -2.15.0 - diff --git a/system/procps/APKBUILD b/system/procps/APKBUILD index f16c674ae..11ccc7172 100644 --- a/system/procps/APKBUILD +++ b/system/procps/APKBUILD @@ -1,30 +1,29 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=procps -pkgver=3.3.15 -pkgrel=1 +pkgver=3.3.17 +pkgrel=0 pkgdesc="Utilities for monitoring your system and processes on your system" url="https://gitlab.com/procps-ng/procps" arch="all" license="GPL-2.0+ LGPL-2.0+" +depends="" +checkdepends="dejagnu" makedepends_build="autoconf automake libtool gettext-tiny" makedepends_host="ncurses-dev utmps-dev" -checkdepends="dejagnu" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc" source="https://gitlab.com/procps-ng/procps/-/archive/v$pkgver/procps-v$pkgver.tar.bz2 - 0001-pt_BR-fix-translation-error.patch - use-utmpx.patch" + use-utmpx.patch + add-langinfo-header.patch + " builddir="$srcdir/$pkgname-v$pkgver" prepare() { - cd "$builddir" default_prepare printf "$pkgver" > .tarball-version ./autogen.sh } build() { - cd "$builddir" - export LIBS="$LIBS -lutmps -lskarnet" export VERSION="$pkgver" ./configure \ @@ -47,14 +46,11 @@ build() { } check() { - cd "$builddir" # can't use `make check`; 'po' dir has no check target make check-TESTS } package() { - cd "$builddir" - make DESTDIR="$pkgdir" ldconfig=true install="install -D" \ install @@ -74,6 +70,6 @@ libproc() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="0c50ef0f19305f1b53089f20f29d8058b23dde20983dbed759ea0fe8128b22518fd137dec389c3630988b6bbf0cf485418a328153b89ec4e1dfbf6d89322c064 procps-v3.3.15.tar.bz2 -d63c8df42f74f08f19276a8f4d0260624313801b138aa2b430a105328c3230427d3e81bc016ddde9fc995575e97961a3be8e4f5ded34c874cc613c645605a976 0001-pt_BR-fix-translation-error.patch -6683b94f64848721ebce8254461fbd70a3efd048bf9579c5bbe298bd1ec00594c05640327f0e03475e583607f1f7405139b93fc9f06592d5593174cbf6d4119f use-utmpx.patch" +sha512sums="7f4ad6a76b042a2478fa866ea63d6826129b08b734c6341155134fcc73c0cf0df429c369dbd5aa65b28ebeeb1ab6ee8df4f2dab2083951bad539bce916e14b64 procps-v3.3.17.tar.bz2 +77cfd89cf75e937806dd068a83da3ad548000b941401fce49a482988dc8db82438ade2a939cf6fe795a59059275ffc4a61520b169da60f53ecef408a24042bcf use-utmpx.patch +f1085cec2fab869b94d2a4b45baf68d6316e8f2ac729cd23341ef27c871df91f83f8953a777a0e858b244d8faf5171f9c640b9e7616c9a5d9c816fa044b92a78 add-langinfo-header.patch" diff --git a/system/procps/add-langinfo-header.patch b/system/procps/add-langinfo-header.patch new file mode 100644 index 000000000..8498271e8 --- /dev/null +++ b/system/procps/add-langinfo-header.patch @@ -0,0 +1,11 @@ +diff -ur a/proc/escape.c b/proc/escape.c +--- a/proc/escape.c 2022-05-04 06:50:01.750000000 +0000 ++++ b/proc/escape.c 2022-05-04 06:50:29.050000000 +0000 +@@ -20,6 +20,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <string.h> ++#include <langinfo.h> + #include <limits.h> + #include "procps.h" + #include "escape.h" diff --git a/system/procps/use-utmpx.patch b/system/procps/use-utmpx.patch index 83047cf22..608ea6182 100644 --- a/system/procps/use-utmpx.patch +++ b/system/procps/use-utmpx.patch @@ -1,20 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index bc84a0d..da2916e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,7 +44,7 @@ AC_PROG_MAKE_SET - - # Checks for header files. - AC_HEADER_MAJOR --AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h]) -+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_CHECK_HEADER_STDBOOL -diff --git a/proc/whattime.c b/proc/whattime.c -index c223cad..d55fd22 100644 ---- a/proc/whattime.c -+++ b/proc/whattime.c +diff -ur a/proc/whattime.c b/proc/whattime.c +--- a/proc/whattime.c 2022-05-04 07:08:11.390000000 +0000 ++++ b/proc/whattime.c 2022-05-04 07:08:42.860000000 +0000 @@ -33,7 +33,7 @@ #include <fcntl.h> #include <unistd.h> @@ -24,7 +10,7 @@ index c223cad..d55fd22 100644 #include <sys/ioctl.h> #include "whattime.h" #include "sysinfo.h" -@@ -42,7 +42,7 @@ static char buf[256]; +@@ -42,7 +43,7 @@ static double av[3]; char *sprint_uptime(int human_readable) { @@ -33,7 +19,7 @@ index c223cad..d55fd22 100644 int upminutes, uphours, updays, upweeks, upyears, updecades; int pos; int comma; -@@ -98,13 +98,13 @@ char *sprint_uptime(int human_readable) { +@@ -98,13 +99,13 @@ /* count the number of users */ numuser = 0; @@ -50,83 +36,3 @@ index c223cad..d55fd22 100644 pos += sprintf(buf + pos, "%2d user%s, ", numuser, numuser == 1 ? "" : "s"); -diff --git a/w.c b/w.c -index 35710a3..6caa8a6 100644 ---- a/w.c -+++ b/w.c -@@ -23,6 +23,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include "config.h" - #include "c.h" - #include "fileutils.h" - #include "nls.h" -@@ -54,14 +55,22 @@ - #include <termios.h> - #include <time.h> - #include <unistd.h> --#include <utmp.h> -+#ifdef HAVE_UTMPX_H -+# include <utmpx.h> -+#else -+# include <utmp.h> -+#endif - #include <arpa/inet.h> - - static int ignoreuser = 0; /* for '-u' */ - static int oldstyle = 0; /* for '-o' */ - static proc_t **procs; /* our snapshot of the process table */ - -+#ifdef HAVE_UTMPX_H -+typedef struct utmpx utmp_t; -+#else - typedef struct utmp utmp_t; -+#endif - - #ifdef W_SHOWFROM - # define FROM_STRING "on" -@@ -604,11 +613,19 @@ int main(int argc, char **argv) - printf(_(" IDLE WHAT\n")); - } - -+#ifdef HAVE_UTMPX_H -+ setutxent(); -+#else - utmpname(UTMP_FILE); - setutent(); -+#endif - if (user) { - for (;;) { -+#ifdef HAVE_UTMPX_H -+ u = getutxent(); -+#else - u = getutent(); -+#endif - if (unlikely(!u)) - break; - if (u->ut_type != USER_PROCESS) -@@ -619,7 +636,11 @@ int main(int argc, char **argv) - } - } else { - for (;;) { -+#ifdef HAVE_UTMPX_H -+ u = getutxent(); -+#else - u = getutent(); -+#endif - if (unlikely(!u)) - break; - if (u->ut_type != USER_PROCESS) -@@ -629,7 +650,11 @@ int main(int argc, char **argv) - fromlen, ip_addresses); - } - } -+#ifdef HAVE_UTMPX_H -+ endutxent(); -+#else - endutent(); -+#endif - - return EXIT_SUCCESS; - } |