Re: [ptxdist] [PATCH] New package: openldap

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Jun 18, 2012 at 09:41:24PM +0200, Bernhard Walle wrote:
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  rules/openldap.in   |   54 ++++++++++++++++++
>  rules/openldap.make |  155 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 Dateien geändert, 209 Zeilen hinzugefügt(+)
>  create mode 100644 rules/openldap.in
>  create mode 100644 rules/openldap.make
> 
> diff --git a/rules/openldap.in b/rules/openldap.in
> new file mode 100644
> index 0000000..2b44127
> --- /dev/null
> +++ b/rules/openldap.in
> @@ -0,0 +1,54 @@
> +## SECTION=networking
> +
> +menuconfig OPENLDAP
> +	tristate
> +	prompt "openldap                      "

You're missing some dependencies here. Check with readelf. I'm seeing
several libc libraries and zlib.

> +	select OPENSSL 	if OPENLDAP_TLS_OPENSSL

remove the <space> before the <tab>

> +	select GNUTLS	if OPENLDAP_TLS_GNUTLS
> +	help
> +	  OpenLDAP Software is an open source implementation of the Lightweight
> +	  Directory Access Protocol. The suite includes:
> +
> +	    - slapd: stand-alone LDAP daemon (server)
> +	    - libraries implementing the LDAP protocol, and
> +	    - utilities, tools, and sample clients.
> +
> +if OPENLDAP
> +
> +config OPENLDAP_SLAPD
> +	bool
> +	prompt "slapd support"
> +	help
> +	  Enable/disable building and installation of slapd (the server).
> +
> +config OPENLDAP_THREADS
> +	bool
> +	prompt "Build with multi-thread support (libldap_r)"
> +	help
> +	  Enables the reentrant version of libldap. When this option is
> +	  enabled, libldap_r is built and installed. (The non-reentrant version
> +	  libldap is always installed and built.)
> +
> +choice
> +	prompt "TLS/SSL support"
> +	depends on OPENLDAP

redundant depends

> +
> +	config OPENLDAP_TLS_DISABLED
> +		bool "disabled"
> +
> +	config OPENLDAP_TLS_OPENSSL
> +		bool "openssl"
> +
> +	config OPENLDAP_TLS_GNUTLS
> +		bool "gnutls"

add spaces to align the '-->'. Same length here and the rest in the choice
prompt.

> +
> +endchoice
> +
> +config OPENLDAP_INSTALL_UTILITIES
> +	bool
> +	prompt "install utilities"
> +	help
> +	  Installs various utilities: ldapadd, ldapcompare, ldapdelete, ldapexop,
> +	  ldapmodify, ldapmodrdn, ldappasswd, ldapsearch, ldapurl, ldapwhoami.
> +
> +endif
> diff --git a/rules/openldap.make b/rules/openldap.make
> new file mode 100644
> index 0000000..3739cdc
> --- /dev/null
> +++ b/rules/openldap.make
> @@ -0,0 +1,155 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Bernhard Walle <bernhard@bwalle.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPENLDAP) += openldap
> +
> +#
> +# Paths and names
> +#
> +OPENLDAP_VERSION	:= 2.4.31
> +OPENLDAP_LIBVERSION	:= 2.4
> +OPENLDAP_MD5		:= 804c6cb5698db30b75ad0ff1c25baefd
> +OPENLDAP		:= openldap-$(OPENLDAP_VERSION)
> +OPENLDAP_SUFFIX		:= tgz
> +OPENLDAP_URL		:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$(OPENLDAP).$(OPENLDAP_SUFFIX)
> +OPENLDAP_SOURCE		:= $(SRCDIR)/$(OPENLDAP).$(OPENLDAP_SUFFIX)
> +OPENLDAP_DIR		:= $(BUILDDIR)/$(OPENLDAP)
> +# http://www.openldap.org/software/release/license.html
> +OPENLDAP_LICENSE	:= OpenLDAP Public License
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +ifdef PTXCONF_OPENLDAP_TLS_GNUTLS
> +OPENLDAP_TLS_CONF_OPT := gnutls
> +endif
> +ifdef PTXCONF_OPENLDAP_TLS_OPENSSL
> +OPENLDAP_TLS_CONF_OPT := openssl
> +endif
> +ifdef PTXCONF_OPENLDAP_TLS_DISABLED
> +OPENLDAP_TLS_CONF_OPT := no
> +endif

I'd prefer
OPENLDAP_TLS_CONF_OPT-$(PTXCONF_OPENLDAP_TLS_GNUTLS) := gnutls
[...]

and use $(OPENLDAP_TLS_CONF_OPT-y) below

Michael

> +
> +#
> +# autoconf
> +#
> +OPENLDAP_CONF_TOOL	:= autoconf
> +OPENLDAP_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-ipv6 \
> +	--enable-syslog \
> +	--enable-local \
> +	--enable-proctitle \
> +	--enable-dynamic \
> +	\
> +	--$(call ptx/endis, PTXCONF_OPENLDAP_SLAPD)-slapd \
> +	--disable-dynacl \
> +	--disable-aci \
> +	--enable-cleartext \
> +	--enable-crypt \
> +	--disable-lmpasswd \
> +	--disable-spasswd \
> +	--disable-modules \
> +	--enable-rewrite \
> +	--disable-rlookups \
> +	--disable-slapi \
> +	--disable-slp \
> +	--disable-wrappers \
> +	\
> +	--enable-hdb=no \
> +	--enable-dnssrv=no \
> +	--enable-bdb=no \
> +	--enable-ldap=yes \
> +	--enable-mdb=yes \
> +	--enable-meta=no \
> +	--enable-monitor=yes \
> +	--enable-ndb=no \
> +	--enable-null=yes \
> +	--enable-passwd=yes \
> +	--enable-perl=no \
> +	--enable-relay=yes \
> +	--enable-shell=no \
> +	--enable-sock=no \
> +	--enable-sql=no \
> +	\
> +	--enable-overlays=no \
> +	\
> +	--without-cyrus-sasl \
> +	--without-fetch \
> +	--with-yielding_select=yes \
> +	--$(call ptx/wwo, PTXCONF_OPENLDAP_THREADS)-threads \
> +	--with-tls=$(OPENLDAP_TLS_CONF_OPT)
> +
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/openldap.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, openldap)
> +	@$(call install_fixup, openldap,PRIORITY,optional)
> +	@$(call install_fixup, openldap,SECTION,base)
> +	@$(call install_fixup, openldap,AUTHOR,"Bernhard Walle <bernhard@bwalle.de>")
> +	@$(call install_fixup, openldap,DESCRIPTION,missing)
> +
> +#	slapd
> +
> +ifdef PTXCONF_OPENLDAP_SLAPD
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/libexec/slapd)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapacl)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapadd)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapauth)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapcat)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapdn)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapindex)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slappasswd)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slapschema)
> +	@$(call install_link, openldap, ../libexec/slapd, /usr/bin/slaptest)
> +endif
> +
> +#	libraries
> +
> +	@$(call install_lib, openldap, 0, 0, 0644, liblber-$(OPENLDAP_LIBVERSION))
> +	@$(call install_lib, openldap, 0, 0, 0644, libldap-$(OPENLDAP_LIBVERSION))
> +ifdef PTXCONF_OPENLDAP_THREADS
> +	@$(call install_lib, openldap, 0, 0, 0644, libldap_r-$(OPENLDAP_LIBVERSION))
> +endif
> +
> +#	tools
> +
> +ifdef PTXCONF_OPENLDAP_INSTALL_UTILITIES
> +	@$(call install_link, openldap, ldapmodify, /usr/bin/ldapadd)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapcompare)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapdelete)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapexop)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapmodify)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapmodrdn)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldappasswd)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapsearch)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapurl)
> +	@$(call install_copy, openldap, 0, 0, 0755, -, /usr/bin/ldapwhoami)
> +endif
> +
> +#	configuration files
> +
> +	@$(call install_tree, openldap, 0, 0, -, /etc/openldap)
> +	@$(call install_alternative, openldap, 0, 0, 0644, /etc/openldap/ldap.conf)
> +
> +	@$(call install_finish, openldap)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de