util-linux: update to 2.33.2.
This commit is contained in:
parent
520d3afd39
commit
27e6f82a9e
2 changed files with 4 additions and 40 deletions
|
@ -1,36 +0,0 @@
|
||||||
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
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'util-linux'
|
# Template file for 'util-linux'
|
||||||
pkgname=util-linux
|
pkgname=util-linux
|
||||||
version=2.33.1
|
version=2.33.2
|
||||||
revision=2
|
revision=1
|
||||||
hostmakedepends="automake bison gettext-devel libtool pkg-config"
|
hostmakedepends="automake bison gettext-devel libtool pkg-config"
|
||||||
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
|
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
|
||||||
checkdepends="ncurses" # Some tests require terminfo-entries
|
checkdepends="ncurses" # Some tests require terminfo-entries
|
||||||
|
@ -9,8 +9,8 @@ short_desc="Miscellaneous linux utilities"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
||||||
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.1}/${pkgname}-${version}.tar.xz"
|
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.*}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21
|
checksum=631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97
|
||||||
|
|
||||||
# Create uuidd system account for uuidd.
|
# Create uuidd system account for uuidd.
|
||||||
system_accounts="_uuidd"
|
system_accounts="_uuidd"
|
||||||
|
|
Loading…
Reference in a new issue