* [PATCH] curl: add krb5 to PACKAGECONFIG
@ 2016-04-08 9:02 rongqing.li
2016-04-08 10:04 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: rongqing.li @ 2016-04-08 9:02 UTC (permalink / raw)
To: openembedded-core
From: Roy Li <rongqing.li@windriver.com>
krb5 is needed to enables GSS-Negotiate authentication
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
.../0001-replace-krb5-config-with-pkg-config.patch | 43 ++++++++++++++++++++++
meta/recipes-support/curl/curl_7.47.1.bb | 6 ++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
diff --git a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
new file mode 100644
index 0000000..74e5d99
--- /dev/null
+++ b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
@@ -0,0 +1,43 @@
+[PATCH] replace krb5-config with pkg-config
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e99b303..dc93f39 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi,
+ fi
+ ])
+
+-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
++KRB5CONFIG=`which pkg-config`
+
+ save_CPPFLAGS="$CPPFLAGS"
+ AC_MSG_CHECKING([if GSS-API support is requested])
+@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then
+ if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+ elif test -f "$KRB5CONFIG"; then
+- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++ GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+ fi
+@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then
+ elif test -f "$KRB5CONFIG"; then
+ dnl krb5-config doesn't have --libs-only-L or similar, put everything
+ dnl into LIBS
+- gss_libs=`$KRB5CONFIG --libs gssapi`
++ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
+ LIBS="$gss_libs $LIBS"
+ else
+ case $host in
+--
+1.9.1
+
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index 7e2664c..85d291c 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -5,7 +5,9 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+ file://0001-replace-krb5-config-with-pkg-config.patch \
+"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
@@ -40,6 +42,8 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss
PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[krb5] = "--with-gssapi-includes=${STAGING_INCDIR}/gssapi/, \
+ --without-gssapi,krb5"
EXTRA_OECONF = " \
--enable-crypto-auth \
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] curl: add krb5 to PACKAGECONFIG
2016-04-08 9:02 [PATCH] curl: add krb5 to PACKAGECONFIG rongqing.li
@ 2016-04-08 10:04 ` Burton, Ross
2016-04-19 2:21 ` Rongqing Li
0 siblings, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2016-04-08 10:04 UTC (permalink / raw)
To: rongqing.li; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
On 8 April 2016 at 10:02, <rongqing.li@windriver.com> wrote:
> +PACKAGECONFIG[krb5] = "--with-gssapi-includes=${STAGING_INCDIR}/gssapi/, \
> + --without-gssapi,krb5"
>
If you're using pkgconfig why do you need to pass paths?
Ross
[-- Attachment #2: Type: text/html, Size: 705 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] curl: add krb5 to PACKAGECONFIG
2016-04-08 10:04 ` Burton, Ross
@ 2016-04-19 2:21 ` Rongqing Li
0 siblings, 0 replies; 6+ messages in thread
From: Rongqing Li @ 2016-04-19 2:21 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 2016年04月08日 18:04, Burton, Ross wrote:
>
> On 8 April 2016 at 10:02, <rongqing.li@windriver.com
> <mailto:rongqing.li@windriver.com>> wrote:
>
> +PACKAGECONFIG[krb5] =
> "--with-gssapi-includes=${STAGING_INCDIR}/gssapi/, \
> + --without-gssapi,krb5"
>
>
> If you're using pkgconfig why do you need to pass paths?
>
this is similar with --with-gssapi, but which can not the header files.
so I use --with-gssapi-includes=${STAGING_INCDIR}/gssapi/
-Roy
> Ross
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] curl: add krb5 to PACKAGECONFIG
@ 2016-04-26 5:13 rongqing.li
0 siblings, 0 replies; 6+ messages in thread
From: rongqing.li @ 2016-04-26 5:13 UTC (permalink / raw)
To: openembedded-core
From: Roy Li <rongqing.li@windriver.com>
krb5 is needed to enables GSS-Negotiate authentication
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
.../0001-replace-krb5-config-with-pkg-config.patch | 43 ++++++++++++++++++++++
meta/recipes-support/curl/curl_7.47.1.bb | 5 ++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
diff --git a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
new file mode 100644
index 0000000..74e5d99
--- /dev/null
+++ b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
@@ -0,0 +1,43 @@
+[PATCH] replace krb5-config with pkg-config
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e99b303..dc93f39 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi,
+ fi
+ ])
+
+-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
++KRB5CONFIG=`which pkg-config`
+
+ save_CPPFLAGS="$CPPFLAGS"
+ AC_MSG_CHECKING([if GSS-API support is requested])
+@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then
+ if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+ elif test -f "$KRB5CONFIG"; then
+- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++ GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+ fi
+@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then
+ elif test -f "$KRB5CONFIG"; then
+ dnl krb5-config doesn't have --libs-only-L or similar, put everything
+ dnl into LIBS
+- gss_libs=`$KRB5CONFIG --libs gssapi`
++ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
+ LIBS="$gss_libs $LIBS"
+ else
+ case $host in
+--
+1.9.1
+
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index c2173d8..b237b4e 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -5,7 +5,9 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+ file://0001-replace-krb5-config-with-pkg-config.patch \
+"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
@@ -40,6 +42,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss
PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5"
EXTRA_OECONF = " \
--enable-crypto-auth \
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] curl: add krb5 to PACKAGECONFIG
2016-04-08 6:36 rongqing.li
@ 2016-04-08 6:54 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2016-04-08 6:54 UTC (permalink / raw)
To: rongqing.li, openembedded-core
On Fri, 2016-04-08 at 14:36 +0800, rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
> meta/recipes-support/curl/curl_7.44.0.bb | 5 +++++
This file doesn't exist in master?
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] curl: add krb5 to PACKAGECONFIG
@ 2016-04-08 6:36 rongqing.li
2016-04-08 6:54 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: rongqing.li @ 2016-04-08 6:36 UTC (permalink / raw)
To: openembedded-core
From: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
meta/recipes-support/curl/curl_7.44.0.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-support/curl/curl_7.44.0.bb b/meta/recipes-support/curl/curl_7.44.0.bb
index 84894eb..856f002 100644
--- a/meta/recipes-support/curl/curl_7.44.0.bb
+++ b/meta/recipes-support/curl/curl_7.44.0.bb
@@ -32,6 +32,11 @@ PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
+PACKAGECONFIG[krb5] = "--with-gssapi-libdir=${STAGING_LIBDIR}/ \
+ --with-gssapi-includes=${STAGING_INCDIR}/gssapi/, \
+ --without-gssapi,krb5"
+
+export KRB5CONFIG="${STAGING_BINDIR_CROSS}/krb5-config"
EXTRA_OECONF = "--without-libidn \
--enable-crypto-auth \
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-26 5:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-08 9:02 [PATCH] curl: add krb5 to PACKAGECONFIG rongqing.li
2016-04-08 10:04 ` Burton, Ross
2016-04-19 2:21 ` Rongqing Li
-- strict thread matches above, loose matches on Subject: below --
2016-04-26 5:13 rongqing.li
2016-04-08 6:36 rongqing.li
2016-04-08 6:54 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.