Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-25 12:15:32 +03:00
Code Issues Wiki Activity

main/util-linux: align pkg-config use with utmps change (now libutmps)

Browse source 
Also, remove a patch that's not needed anymore because utmps provides
its own utmp definitions now.
This commit is contained in:
Laurent Bercot 2025-05-05 12:43:55 +02:00 • committed by Celeste
parent 46bbaee322
commit 779eb28e59
2 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/util-linux/APKBUILD
View file

@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-linux pkgname=util-linux
pkgver=2.41 pkgver=2.41
pkgrel=6 pkgrel=7
pkgdesc="Random collection of Linux utilities" pkgdesc="Random collection of Linux utilities"
url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git" url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all" arch="all"
@ -84,7 +84,6 @@ case $pkgver in
*.*) _v=$pkgver;; *.*) _v=$pkgver;;
esac esac
source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz
utmps.patch
ttydefaults.h ttydefaults.h
rfkill.confd rfkill.confd
rfkill.initd rfkill.initd
@ -137,8 +136,8 @@ build() {
# 20 kiB in total for util-linux-*, versus 196 kiB (libskarnet.so). # 20 kiB in total for util-linux-*, versus 196 kiB (libskarnet.so).
# TODO: Find a better way (libutmps.so w/o dependency on libskarnet.so)? # TODO: Find a better way (libutmps.so w/o dependency on libskarnet.so)?
# also throw in lto when not bootstrapping # also throw in lto when not bootstrapping
export CFLAGS="$CFLAGS -ffat-lto-objects -flto=auto $(pkg-config --cflags --static utmps)" export CFLAGS="$CFLAGS -ffat-lto-objects -flto=auto $(pkg-config --cflags --static libutmps)"
export LDFLAGS="$LDFLAGS $(pkg-config --libs --static utmps)" export LDFLAGS="$LDFLAGS $(pkg-config --libs --static libutmps)"
fi fi
# --disable-chfn-chsh - chfn and chsh are provided by shadow package # --disable-chfn-chsh - chfn and chsh are provided by shadow package
@ -379,7 +378,6 @@ _py3() {
sha512sums=" sha512sums="
800ff92ee7a047732c0accb9dd759d6ed659947373ca72e0dd3ca601d0a6fed9db92c0838cfaff6bcdb8c08bdc1ffa675721893f42945885c57ccd59ab676318 util-linux-2.41.tar.xz 800ff92ee7a047732c0accb9dd759d6ed659947373ca72e0dd3ca601d0a6fed9db92c0838cfaff6bcdb8c08bdc1ffa675721893f42945885c57ccd59ab676318 util-linux-2.41.tar.xz
c1c9cd816d20582438cda75a9c0ea4e687eee124e657172729aff410f52558be19cc5d649dae07c03f7618411e5aa6c23bcebc3fdf25529517a61b6b343966ef utmps.patch
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h
401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97 rfkill.confd 401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97 rfkill.confd
b0e11226c611fd52d54f599a40d23c4f748d5bd6971732dba2d25581aedaf5d2c62bcb49515d175569ff9aa1cf49a3dff25d1a5d4dcd89428c7020fc7ea3a581 rfkill.initd b0e11226c611fd52d54f599a40d23c4f748d5bd6971732dba2d25581aedaf5d2c62bcb49515d175569ff9aa1cf49a3dff25d1a5d4dcd89428c7020fc7ea3a581 rfkill.initd

25
main/util-linux/utmps.patch
View file

@ -1,25 +0,0 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 20 Dec 2021 18:52:00 +0100
Subject: [PATCH] Add support for utmps
The following programs use utmpx.h: last, login, lslogins, agetty, wall, write.
Programs 'su' and 'runuser' include utmpx.h, but use only btmp which is not
supported on Alpine.
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -214,5 +214,13 @@
#define _PATH_DEV_RFKILL "/dev/rfkill"
#define _PATH_SYS_RFKILL "/sys/class/rfkill"
+#ifdef UTMPS_UTMPX_H
+/* override stub paths from <paths.h> with ones for utmps */
+# undef _PATH_UTMP
+# define _PATH_UTMP UTMPX_FILE
+# undef _PATH_WTMP
+# define _PATH_WTMP "/var/log/wtmp"
+#endif
+
#endif /* PATHNAMES_H */