autofs: fails to compile with openldap disabled
PATCH 1/1 autofs: fails to compile with openldap disabled
commit 09947d772a36e4d2c2dc48356281bd3ce0a04b0c
Author: Amy Fong <[email protected]> Date: Fri Jan 18 11:10:35 2013 -0500
autofs: fails to compile with openldap disabled
As of 5.0.6, it appears that changes were introduced so that if you compile with openldap disabled and openldap headers are not available, then autofs fails to build.
Since autofs no longer depends on openldap, remove the dependency
recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +40 -0
@@ -0,0 +1,40 @@ +autofs: fails to compile with openldap disabled + +As of 5.0.6, it appears that changes were introduced so that +if you compile with openldap disabled and openldap headers are not +available, then autofs fails to build. + +Signed-off-by: Amy Fong <[email protected]> +-- + lookup_ldap.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- + include/lookup_ldap.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/include/lookup_ldap.h ++++ b/include/lookup_ldap.h +@@ -1,7 +1,9 @@ + #ifndef LOOKUP_LDAP_H + #define LOOKUP_LDAP_H + ++#ifdef WITH_LDAP + #include <ldap.h> ++#endif + + #ifdef WITH_SASL + #include <openssl/ssl.h> +@@ -109,10 +111,12 @@ + + #define LDAP_AUTH_USESIMPLE 0x0008 + ++#ifdef WITH_LDAP + /* lookup_ldap.c */ + LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt); + int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt); + int authtype_requires_creds(const char *authtype); ++#endif + + #ifdef WITH_SASL + /* cyrus-sasl.c */
recipes-daemons/autofs/autofs_5.0.7.bb +4 -1
@@ -3,7 +3,9 @@ SECTION = "base" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -DEPENDS += "openldap libtirpc flex-native bison-native" +PR = "r1" + +DEPENDS += "libtirpc flex-native bison-native" inherit autotools systemd
@@ -30,6 +32,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \ file://cross.patch \ file://libtirpc.patch \ file://libtirpc-name-clash-backout.patch \ + file://fix_disable_ldap.patch \ " SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431"
Hey Amy,
Quoted 20 lines · [[oe] [meta-networking] [PATCH] autofs: fails to compile with openldap…
commit
09947d772a36e4d2c2dc48356281bd3ce0a04b0cAuthor: Amy Fong <[email protected]> Date: Fri Jan 18 11:10:35 2013 -0500autofs: fails to compile with openldap disabled
As of 5.0.6, it appears that changes were introduced so that if you compile with openldap disabled and openldap headers are not available, then autofs fails to build.
Since autofs no longer depends on openldap, remove the dependency
Signed-off-by Amy Fong <[email protected]>recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +0
-0
recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch line 7
Quoted 7 lines
recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +7
-0@@ -0,0 +1,40 @@ +autofs: fails to compile with openldap disabled + +As of 5.0.6, it appears that changes were introduced so that +if you compile with openldap disabled and openldap headers are not +available, then autofs fails to build. + +Signed-off-by: Amy Fong <[email protected]>
Did you say you'd already sent this upstream? I can put in an upstream-status myself, but I'm not sure what it is right now. :-)
Alternatively, a new version with the upstream-status is good too.
-J.
Quoted 61 lines
recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +33
-0+-- + lookup_ldap.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- + include/lookup_ldap.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/include/lookup_ldap.h ++++ b/include/lookup_ldap.h +@@ -1,7 +1,9 @@ + #ifndef LOOKUP_LDAP_H + #define LOOKUP_LDAP_H + ++#ifdef WITH_LDAP + #include <ldap.h> ++#endif + + #ifdef WITH_SASL + #include <openssl/ssl.h> +@@ -109,10 +111,12 @@ + + #define LDAP_AUTH_USESIMPLE 0x0008 + ++#ifdef WITH_LDAP + /* lookup_ldap.c */ + LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt); + int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt); + int authtype_requires_creds(const char *authtype); ++#endif + + #ifdef WITH_SASL + /* cyrus-sasl.c */recipes-daemons/autofs/autofs_5.0.7.bb +4
-1@@ -3,7 +3,9 @@ SECTION = "base" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -DEPENDS += "openldap libtirpc flex-native bison-native" +PR = "r1" + +DEPENDS += "libtirpc flex-native bison-native" inherit autotools systemd@@ -30,6 +32,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \ file://cross.patch \ file://libtirpc.patch \ file://libtirpc-name-clash-backout.patch \ + file://fix_disable_ldap.patch \ " SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431"_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 2 lines
-Joe MacDonald. :wq
On Mon, Jan 21, 2013 at 02:58:39PM -0500, Joe MacDonald wrote:
Hi Joe,
Quoted 35 lines
Hey Amy,
Quoted 20 lines · [[oe] [meta-networking] [PATCH] autofs: fails to compile with openldap…
commit
09947d772a36e4d2c2dc48356281bd3ce0a04b0cAuthor: Amy Fong <[email protected]> Date: Fri Jan 18 11:10:35 2013 -0500autofs: fails to compile with openldap disabled
As of 5.0.6, it appears that changes were introduced so that if you compile with openldap disabled and openldap headers are not available, then autofs fails to build.
Since autofs no longer depends on openldap, remove the dependency
Signed-off-by Amy Fong <[email protected]>recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +0
-0recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch line 7
Quoted 7 lines
recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +7
-0@@ -0,0 +1,40 @@ +autofs: fails to compile with openldap disabled + +As of 5.0.6, it appears that changes were introduced so that +if you compile with openldap disabled and openldap headers are not +available, then autofs fails to build. + +Signed-off-by: Amy Fong <[email protected]>Did you say you'd already sent this upstream? I can put in an upstream-status myself, but I'm not sure what it is right now. :-)
Quoted 3 lines
Alternatively, a new version with the upstream-status is good too.
-J.
Nope, it wasn't sent upstream. I'd say that the upstream-status should be pending. :)
Thanks!
Amy
Quoted 38 lines · [Re: [oe] [meta-networking] [PATCH] autofs: fails to compile with openldap…
On Mon, Jan 21, 2013 at 02:58:39PM -0500, Joe MacDonald wrote:
Hi Joe,Quoted 35 lines
Hey Amy,
Quoted 20 lines · [[oe] [meta-networking] [PATCH] autofs: fails to compile with openldap…
commit
09947d772a36e4d2c2dc48356281bd3ce0a04b0cAuthor: Amy Fong <[email protected]> Date: Fri Jan 18 11:10:35 2013 -0500autofs: fails to compile with openldap disabled
As of 5.0.6, it appears that changes were introduced so that if you compile with openldap disabled and openldap headers are not available, then autofs fails to build.
Since autofs no longer depends on openldap, remove the dependency
Signed-off-by Amy Fong <[email protected]>recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +0
-0recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch line 7
Quoted 7 lines
recipes-daemons/autofs/autofs-5.0.7/fix_disable_ldap.patch new file +7
-0@@ -0,0 +1,40 @@ +autofs: fails to compile with openldap disabled + +As of 5.0.6, it appears that changes were introduced so that +if you compile with openldap disabled and openldap headers are not +available, then autofs fails to build. + +Signed-off-by: Amy Fong <[email protected]>Did you say you'd already sent this upstream? I can put in an upstream-status myself, but I'm not sure what it is right now. :-)
Quoted 5 lines
Quoted 3 lines
Alternatively, a new version with the upstream-status is good too.
-J.
Nope, it wasn't sent upstream. I'd say that the upstream-status should be pending. :)
Okay, merged. Can you ensure it gets sent up-stream since you authored it?
Thanks Amy.
Signature · 2 lines
-Joe MacDonald. :wq