diff --git a/util-linux/.signature b/util-linux/.signature index 97ed4882..97163f84 100644 --- a/util-linux/.signature +++ b/util-linux/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqgqpYHdPX/CEOzaJ65eSpLkIM59q6750DvQ7niKz8Z4aUq9TO8v+nnKUC2X7Sg49eCqvdH3H8lgf5yn9ZGXTmAk= -SHA256 (Pkgfile) = 618658002c3f063e43a98c95567d28fb0cfcf697d6e25590b31cc66c72b1d962 +RWRJc1FUaeVeqhhcYV8Mj1epcbiJjojx8Wyszpq10F9NAvur29htW9LGX2MykBuQJtFsSnn7ZCN1heoSfCojrb/5zwaopWcJrQ4= +SHA256 (Pkgfile) = 21dddb72c212746841544407b3865eeb243be86d9c026c7c82c335e3ff191f6e SHA256 (.footprint) = 3847de47444494a7817db23a570db60e78a1904eca16bd867dc320a4d15c7e83 SHA256 (util-linux-2.40.tar.xz) = d57a626081f9ead02fa44c63a6af162ec19c58f53e993f206ab7c3a6641c2cd7 +SHA256 (pam_lastlog2.patch) = 638dd140a0643730d43ed693bbe58e53881eb8e1117d1d8e0bfae765c758be4b diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile index 1b96106d..73c92b82 100644 --- a/util-linux/Pkgfile +++ b/util-linux/Pkgfile @@ -5,12 +5,15 @@ name=util-linux version=2.40 -release=1 -source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz) +release=2 +source=(https://www.kernel.org/pub/linux/utils/$name/v${version:0:4}/$name-$version.tar.xz + pam_lastlog2.patch) build() { cd $name-$version + patch -p1 -i $SRC/pam_lastlog2.patch + ./configure \ --prefix=/usr \ --enable-{write,kill} \ diff --git a/util-linux/pam_lastlog2.patch b/util-linux/pam_lastlog2.patch new file mode 100644 index 00000000..a60d0de4 --- /dev/null +++ b/util-linux/pam_lastlog2.patch @@ -0,0 +1,32 @@ +From 2722b40012740372daf3585b7c071fcbede13359 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Mon, 1 Apr 2024 22:53:32 +0200 +Subject: [PATCH] pam_lastlog2: link against liblastlog +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While at it also drop the duplicated include path. + +Fixes #2897 +Signed-off-by: Thomas Weißschuh +--- + pam_lastlog2/src/Makemodule.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am +index 988441676f..f9a9b6b41f 100644 +--- a/pam_lastlog2/src/Makemodule.am ++++ b/pam_lastlog2/src/Makemodule.am +@@ -10,8 +10,9 @@ EXTRA_pam_lastlog2_la_DEPENDENCIES = \ + pam_lastlog2_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SOLIB_CFLAGS) \ +- -I$(ul_liblastlog2_incdir) \ +- -Iliblastlog2/src ++ -I$(ul_liblastlog2_incdir) ++ ++pam_lastlog2_la_LIBADD = liblastlog2.la + + pam_lastlog2_la_LDFLAGS = $(SOLIB_LDFLAGS) -module -avoid-version -shared + if HAVE_VSCRIPT