summaryrefslogtreecommitdiff
path: root/system/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'system/util-linux')
-rw-r--r--system/util-linux/0000-utmps-paths.patch59
-rw-r--r--system/util-linux/APKBUILD23
2 files changed, 73 insertions, 9 deletions
diff --git a/system/util-linux/0000-utmps-paths.patch b/system/util-linux/0000-utmps-paths.patch
new file mode 100644
index 000000000..861e38ff3
--- /dev/null
+++ b/system/util-linux/0000-utmps-paths.patch
@@ -0,0 +1,59 @@
+diff -rNU3 util-linux-2.38.1.old/include/pathnames.h util-linux-2.38.1/include/pathnames.h
+--- util-linux-2.38.1.old/include/pathnames.h 2022-08-04 08:21:36.041638477 +0000
++++ util-linux-2.38.1/include/pathnames.h 2023-08-30 15:08:07.990025756 +0000
+@@ -67,9 +67,10 @@
+ # define _PATH_TMP "/tmp/"
+ #endif
+
+-#ifndef _PATH_BTMP
+-# define _PATH_BTMP "/var/log/btmp"
+-#endif
++#undef _PATH_WTMP
++#define _PATH_WTMP "/var/log/wtmpd/wtmp"
++#undef _PATH_BTMP
++#define _PATH_BTMP "/var/log/wtmpd/btmp"
+
+ #define _PATH_ISSUE_FILENAME "issue"
+ #define _PATH_ISSUE_DIRNAME _PATH_ISSUE_FILENAME ".d"
+diff -rNU3 util-linux-2.38.1.old/login-utils/login.c util-linux-2.38.1/login-utils/login.c
+--- util-linux-2.38.1.old/login-utils/login.c 2022-05-11 08:13:10.903531622 +0000
++++ util-linux-2.38.1/login-utils/login.c 2023-08-30 14:57:20.930021550 +0000
+@@ -71,6 +71,9 @@
+ # include <libaudit.h>
+ #endif
+
++#include <utmps/config.h>
++#include <utmps/utmps.h>
++
+ #include "c.h"
+ #include "pathnames.h"
+ #include "strutils.h"
+@@ -623,7 +626,8 @@
+ sizeof(ut.ut_addr_v6));
+ }
+
+- updwtmpx(_PATH_BTMP, &ut);
++ // updwtmpx(_PATH_BTMP, &ut);
++ utmps_updwtmpx_g("/run/utmps/.btmpd-socket", &ut, 0);
+ }
+
+ #ifdef HAVE_LIBAUDIT
+@@ -731,7 +735,7 @@
+ struct utmpx *utp = NULL;
+ struct timeval tv = { 0 };
+
+- utmpxname(_PATH_UTMP);
++ // utmpxname(_PATH_UTMP);
+ setutxent();
+
+ /* Find pid in utmp.
+@@ -794,7 +798,8 @@
+ pututxline(&ut);
+ endutxent();
+
+- updwtmpx(_PATH_WTMP, &ut);
++ // updwtmpx(_PATH_WTMP, &ut);
++ utmps_updwtmpx_g("/run/utmps/.wtmpd-socket", &ut, 0);
+ }
+
+ static void log_syslog(struct login_context *cxt)
diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD
index 48bf1387d..b532a613b 100644
--- a/system/util-linux/APKBUILD
+++ b/system/util-linux/APKBUILD
@@ -2,14 +2,14 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=util-linux
-pkgver=2.34
+pkgver=2.38.1
case $pkgver in
*.*.*) _v=${pkgver%.*};;
*.*) _v=$pkgver;;
esac
-pkgrel=1
+pkgrel=2
pkgdesc="Official Linux system management utilities"
url="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
arch="all"
@@ -17,12 +17,13 @@ options="!check suid" # multibyte input fails because of musl locale stuff
license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1+ AND Public-Domain"
depends=""
makedepends_build="autoconf automake libtool"
-makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev utmps-dev"
+makedepends_host="zlib-dev ncurses-dev linux-headers linux-pam-dev libcap-ng-dev
+ utmps-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
libuuid $pkgname-lang"
makedepends="$makedepends_build $makedepends_host"
replaces="e2fsprogs util-linux-ng sfdisk cfdisk findmnt mcookie blkid setpriv
- libblkid libsmartcols libmount libfdisk"
+ libblkid libsmartcols libmount libfdisk shadow"
provides="sfdisk=$pkgver-r$pkgrel cfdisk=$pkgver-r$pkgrel
findmnt=$pkgver-r$pkgrel mcookie=$pkgver-r$pkgrel
blkid=$pkgver-r$pkgrel libblkid=$pkgver-r$pkgrel
@@ -30,6 +31,7 @@ provides="sfdisk=$pkgver-r$pkgrel cfdisk=$pkgver-r$pkgrel
libfdisk=$pkgver-r$pkgrel"
source="https://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.tar.xz
ttydefaults.h
+ 0000-utmps-paths.patch
"
prepare() {
@@ -47,13 +49,12 @@ build() {
--host=$CHOST \
--with-sysroot=$CBUILDROOT \
--prefix=/usr \
- --enable-raw \
+ --enable-su \
+ --disable-raw \
--disable-uuidd \
--disable-tls \
--disable-kill \
--disable-login \
- --disable-sulogin \
- --disable-su \
--disable-chfn-chsh \
--without-python
make
@@ -61,6 +62,9 @@ build() {
package() {
make -j1 DESTDIR="$pkgdir" install
+
+ mkdir -p "$pkgdir"/etc/default
+ printf "ALWAYS_SET_PATH yes\n" > "$pkgdir"/etc/default/su
}
dev() {
@@ -94,5 +98,6 @@ libmount() {
mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/
}
-sha512sums="2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7 util-linux-2.34.tar.xz
-876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h"
+sha512sums="07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957 util-linux-2.38.1.tar.xz
+876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h
+b1d992b58af516bd4c19dfa3f7df2680f4d0c31608fd20b5ae5eab23138df00666a8b1895d8d19d8afb66ce5f535f04a1ce81b248ae69b1f68c991d6549e6726 0000-utmps-paths.patch"