p11-kit: Update to 0.23.12
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
39f3aa2277
commit
21f2894120
2 changed files with 50 additions and 2 deletions
|
@ -8,14 +8,15 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=p11-kit
|
PKG_NAME:=p11-kit
|
||||||
PKG_VERSION:=0.23.10
|
PKG_VERSION:=0.23.12
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
|
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_HASH:=f9212a3f225ef543e13fae9945527d66c0cbb67246320035dd94fab2bce5ae43
|
PKG_HASH:=58bae22f19db1de1a1103e7ca4149eed6e303e727878c2cd5ea9e6fe445fd403
|
||||||
PKG_SOURCE_URL:=https://github.com/p11-glue/$(PKG_NAME)/releases/download/$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/p11-glue/$(PKG_NAME)/releases/download/$(PKG_VERSION)
|
||||||
|
|
||||||
|
PKG_FIXUP:=autoreconf
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
From dec5f888a457e36d81065ebc69f7d8d966be527d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daiki Ueno <dueno@redhat.com>
|
||||||
|
Date: Thu, 31 May 2018 11:02:51 +0200
|
||||||
|
Subject: [PATCH] build: Ease issetugid() check when cross-compiling
|
||||||
|
|
||||||
|
When cross-compiling, the configure check for issetugid() aborts,
|
||||||
|
because of the pessimistic default of AC_RUN_IFELSE. This patch
|
||||||
|
provides the non-pessimistic default to AC_RUN_IFELSE and wrap the
|
||||||
|
macro invocation with AC_CACHE_CHECK so that the user can override the
|
||||||
|
check by setting ac_cv_issetugid_openbsd=yes, as suggested in:
|
||||||
|
https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Runtime.html#Runtime
|
||||||
|
---
|
||||||
|
configure.ac | 16 +++++++++-------
|
||||||
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index e99a3c7..bd6ece0 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -115,15 +115,17 @@ if test "$os_unix" = "yes"; then
|
||||||
|
|
||||||
|
# Check if issetugid() is available and has compatible behavior with OpenBSD
|
||||||
|
AC_CHECK_FUNCS([issetugid], [
|
||||||
|
- AC_MSG_CHECKING([whether issetugid() can detect setuid/setgid])
|
||||||
|
- issetugid_openbsd=no
|
||||||
|
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
|
||||||
|
- [[return issetugid ();]])],
|
||||||
|
- [chmod 02777 ./conftest$EXEEXT; ./conftest$EXEEXT || issetugid_openbsd=yes])
|
||||||
|
- if test "$issetugid_openbsd" = yes; then
|
||||||
|
+ AC_CACHE_CHECK([whether issetugid() can detect setuid/setgid],
|
||||||
|
+ [ac_cv_issetugid_openbsd],
|
||||||
|
+ [ac_cv_issetugid_openbsd=no
|
||||||
|
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
|
||||||
|
+ [[return issetugid ();]])],
|
||||||
|
+ [chmod 02777 ./conftest$EXEEXT; ./conftest$EXEEXT || ac_cv_issetugid_openbsd=yes],
|
||||||
|
+ [ac_cv_issetugid_openbsd=no],
|
||||||
|
+ [ac_cv_issetugid_openbsd="guessing no"])])
|
||||||
|
+ if test "$ac_cv_issetugid_openbsd" = yes; then
|
||||||
|
AC_DEFINE([HAVE_ISSETUGID_OPENBSD], [1], [Whether issetugid() has compatible behavior with OpenBSD])
|
||||||
|
fi
|
||||||
|
- AC_MSG_RESULT([$issetugid_openbsd])
|
||||||
|
])
|
||||||
|
|
||||||
|
# Required functions
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
Loading…
Reference in a new issue