util-linux: update to 2.33.1.

This commit is contained in:
maxice8 2019-01-24 15:15:04 -02:00 committed by maxice8
parent 1127fd37ca
commit e6c8634c2a
2 changed files with 43 additions and 3 deletions

View file

@ -0,0 +1,36 @@
From 70c364b4db6530ada12f7103b5c5d8ceb777307f Mon Sep 17 00:00:00 2001
From: Johannes Nixdorf <mixi@shadowice.org>
Date: Tue, 22 Jan 2019 19:17:55 +0100
Subject: build-sys: fix crypt() detection without -lcrypt
The check tested whether code using crypt() links without -lcrypt, but
didn't set have_crypt to yes if it succeeded.
This fixes the check erroneously failing when compiling against musl
libc.
Signed-off-by: Johannes Nixdorf <mixi@shadowice.org>
---
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4c8de521f..0bf422cda 100644
--- configure.ac
+++ configure.ac
@@ -798,7 +798,10 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#endif
]], [[
char *c = crypt("abc","pw");
-]])],[],[
+]])],[
+ have_libcrypt=no
+ have_crypt=yes
+],[
LIBS="$LIBS -lcrypt"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_CRYPT_H
--
cgit 1.2-0.3.lf.el7

View file

@ -1,7 +1,7 @@
# Template file for 'util-linux'
pkgname=util-linux
version=2.33
revision=2
version=2.33.1
revision=1
hostmakedepends="automake bison gettext-devel libtool pkg-config"
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
checkdepends="ncurses" # Some tests require terminfo-entries
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.1}/${pkgname}-${version}.tar.xz"
checksum=f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a
checksum=c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21
# Create uuidd system account for uuidd.
system_accounts="_uuidd"
@ -30,6 +30,7 @@ alternatives="
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
do_configure() {
./configure ${configure_args} \
--exec-prefix=/usr --libdir=/usr/lib \
@ -42,12 +43,15 @@ do_configure() {
--without-udev --without-python \
--enable-write
}
do_build() {
make ${makejobs}
}
do_check() {
make -k check
}
do_install() {
make usrsbin_execdir=/usr/bin DESTDIR=${DESTDIR} install