Patchwork [meta-oe,dylan,2/2] krb5: Add PACKAGECONFIG and new configure param to disable keyutils detection

login
register
mail settings
Submitter Martin Jansa
Date Oct. 1, 2013, 11:34 p.m.
Message ID <1380670450-16802-2-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/59177/
State Accepted, archived
Headers show

Comments

Martin Jansa - Oct. 1, 2013, 11:34 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...d-parameter-to-disable-keyutils-detection.patch | 33 ++++++++++++++++++++++
 meta-oe/recipes-connectivity/krb5/krb5_1.11.bb     |  3 ++
 2 files changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
Eric BENARD - Oct. 2, 2013, 9:07 a.m.
Hi Martin,

Le Wed,  2 Oct 2013 01:34:10 +0200,
Martin Jansa <martin.jansa@gmail.com> a écrit :

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  ...d-parameter-to-disable-keyutils-detection.patch | 33 ++++++++++++++++++++++
>  meta-oe/recipes-connectivity/krb5/krb5_1.11.bb     |  3 ++
>  2 files changed, 36 insertions(+)

both pushed to dylan-next.

Thanks
Eric

Patch

diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
new file mode 100644
index 0000000..f0c310c
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
@@ -0,0 +1,33 @@ 
+From ecb62f3467f493cc0d679323f05367eebbf0fb67 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 1 Oct 2013 22:22:57 +0200
+Subject: [PATCH] aclocal: Add parameter to disable keyutils detection
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ aclocal.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 210c473..83b1f02 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1650,11 +1650,15 @@ fi
+ dnl
+ dnl If libkeyutils exists (on Linux) include it and use keyring ccache
+ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[
++AC_ARG_ENABLE([keyutils],
++AC_HELP_STRING([--disable-keyutils],don't enable using keyutils for keyring ccache @<:@enabled@:>@), , enable_keyutils=yes)
++if test "$enable_keyutils" = yes; then
+   AC_CHECK_HEADERS([keyutils.h],
+     AC_CHECK_LIB(keyutils, add_key, 
+       [dnl Pre-reqs were found
+        AC_DEFINE(USE_KEYRING_CCACHE, 1, [Define if the keyring ccache should be enabled])
+        LIBS="-lkeyutils $LIBS"
+       ]))
++fi
+ ])dnl
+ dnl
+-- 
+1.8.3.2
+
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
index 63676fd..00ad9f9 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
@@ -11,6 +11,7 @@  PR = "r2"
 
 SRC_URI = "http://web.mit.edu/kerberos/dist/${PN}/${PV}/${P}-signed.tar \
            file://055d1ffa81d0730e92aa3f1ed5045cd805c74957.patch \
+           file://0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch \
 "
 SRC_URI[md5sum] = "1a13c53899806c4da99a798a04d25545"
 SRC_URI[sha256sum] = "fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651"
@@ -20,6 +21,7 @@  S = "${WORKDIR}/${P}/src/"
 PACKAGECONFIG ??= "openssl"
 PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
 PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl"
+PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils"
 
 EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath"
 CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \
@@ -45,5 +47,6 @@  python do_unpack() {
 
 do_configure() {
     gnu-configize --force
+    autoreconf
     oe_runconf
 }