diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2023-09-01 00:30:42 +0200 |
|---|---|---|
| committer | omni <omni+alpine@hack.org> | 2023-08-31 23:31:35 +0000 |
| commit | d2c64be8d05aa1acd0e8dc5eb79a6c0160f0905d (patch) | |
| tree | f0b257b5beac1a770f278d88753c9ecc968258e8 | |
| parent | b85e253123eb45074c60ba12869faaa840f64399 (diff) | |
main/procps-ng: security upgrade to 4.0.4
| -rw-r--r-- | main/procps-ng/APKBUILD | 15 | ||||
| -rw-r--r-- | main/procps-ng/musl-fixes.patch | 29 |
2 files changed, 8 insertions, 36 deletions
diff --git a/main/procps-ng/APKBUILD b/main/procps-ng/APKBUILD index f2e7ac51caf..31e78a8021b 100644 --- a/main/procps-ng/APKBUILD +++ b/main/procps-ng/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=procps-ng -pkgver=4.0.3 -pkgrel=2 +pkgver=4.0.4 +pkgrel=0 pkgdesc="Utilities for monitoring your system and processes on your system" url="https://gitlab.com/procps-ng/procps" arch="all" @@ -12,9 +12,7 @@ makedepends=" " checkdepends="dejagnu" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc2" -source="$pkgname-$pkgver.tar.xz::https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$pkgver.tar.xz/download - musl-fixes.patch - " +source="$pkgname-$pkgver.tar.xz::https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$pkgver.tar.xz/download" # used to be named procps provides="procps=$pkgver-r$pkgrel" @@ -28,6 +26,10 @@ x86) ;; esac +# secfixes: +# 4.0.4-r0: +# - CVE-2023-4016 + build() { export LIBS="$LIBS -lintl" ./configure \ @@ -82,6 +84,5 @@ libproc2() { } sha512sums=" -be9dc5ac4a50fc1b8256af44ac2c5b50f74ef5e48c5c3dcac2779d508988daf3b60989d22db8fc8b699c2f2f338ad367e91b9c01ab46ac9fa0d5c5bbec6f16af procps-ng-4.0.3.tar.xz -c2422153df17b35a8e1d1bacb5d988100b24f6f480b817cb04d3264c7a102c361319fa666f8e677d73bcc79715ff64c500a82d9193005a1c135522b137dcc2d1 musl-fixes.patch +94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4 procps-ng-4.0.4.tar.xz " diff --git a/main/procps-ng/musl-fixes.patch b/main/procps-ng/musl-fixes.patch deleted file mode 100644 index dd599cf215b..00000000000 --- a/main/procps-ng/musl-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -Pulling in utmpx.h which does not have UT_HOSTSIZE, UT_LINESIZE & UT_NAMESIZE defined. - -Causing: -w.c: In function 'print_from': -w.c:236:43: error: 'UT_HOSTSIZE' undeclared (first use in this function) - 236 | print_display_or_interface(u->ut_host, UT_HOSTSIZE, fromlen - len); - | ^~~~~~~~~~~ -w.c:236:43: note: each undeclared identifier is reported only once for each function it appears in -w.c: In function 'getproc': -w.c:357:12: error: 'UT_NAMESIZE' undeclared (first use in this function) - 357 | char buf[UT_NAMESIZE + 1]; -.... -diff --git a/src/w.c b/src/w.c -index 5e878f0..568db02 100644 ---- a/src/w.c -+++ b/src/w.c -@@ -46,11 +46,7 @@ - #include <termios.h> - #include <time.h> - #include <unistd.h> --#ifdef HAVE_UTMPX_H --# include <utmpx.h> --#else --# include <utmp.h> --#endif -+#include <utmp.h> - #include <arpa/inet.h> - - #include "c.h" |