diff options
| -rw-r--r-- | packages/openldap/openldap-2.2.29/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/openldap/openldap-2.2.29/openldap-autoconf.patch (renamed from packages/openldap/files/openldap-autoconf.patch) | 0 | ||||
| -rw-r--r-- | packages/openldap/openldap-2.2.29/ucgendat.patch (renamed from packages/openldap/files/ucgendat.patch) | 0 | ||||
| -rw-r--r-- | packages/openldap/openldap_2.2.29.bb (renamed from packages/openldap/openldap_2.2.24.bb) | 118 |
4 files changed, 59 insertions, 59 deletions
diff --git a/packages/openldap/openldap-2.2.29/.mtn2git_empty b/packages/openldap/openldap-2.2.29/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openldap/openldap-2.2.29/.mtn2git_empty diff --git a/packages/openldap/files/openldap-autoconf.patch b/packages/openldap/openldap-2.2.29/openldap-autoconf.patch index c173838492..c173838492 100644 --- a/packages/openldap/files/openldap-autoconf.patch +++ b/packages/openldap/openldap-2.2.29/openldap-autoconf.patch diff --git a/packages/openldap/files/ucgendat.patch b/packages/openldap/openldap-2.2.29/ucgendat.patch index 6f04844e0a..6f04844e0a 100644 --- a/packages/openldap/files/ucgendat.patch +++ b/packages/openldap/openldap-2.2.29/ucgendat.patch diff --git a/packages/openldap/openldap_2.2.24.bb b/packages/openldap/openldap_2.2.29.bb index 7c1f7f8b10..cbb968f673 100644 --- a/packages/openldap/openldap_2.2.24.bb +++ b/packages/openldap/openldap_2.2.29.bb @@ -12,18 +12,18 @@ PRIORITY = "optional" LICENSE = "OpenLDAP" SECTION = "libs" -PR = "r4" +PR = "r0" SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" -SRC_URI += " file://openldap-autoconf.patch;patch=1" +SRC_URI += "file://openldap-autoconf.patch;patch=1" # The build tries to run a host executable, this fails. The patch # causes the executable and its data to be installed instead of # the output - ucgendat must be run after the ipkg install! -SRC_URI += " file://ucgendat.patch;patch=1" +SRC_URI += "file://ucgendat.patch;patch=1" # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when # installing .so and executables, this fails in cross compilation # environments -SRC_URI += " file://install-strip.patch;patch=1" +SRC_URI += "file://install-strip.patch;patch=1" inherit autotools @@ -34,36 +34,36 @@ inherit autotools # the two variables into the setting of the options below (please use # += because that means this can be done in *both* distro.conf and # local.conf! -OPENLDAP_OPTIONS ?= -OPENLDAP_DEPENDS ?= +OPENLDAP_OPTIONS ?= "" +OPENLDAP_DEPENDS ?= "" # CONFIG DEFINITIONS # The following is necessary because it cannot be determined for a # cross compile automagically. Select should yield fine on all OE # systems... -EXTRA_OECONF += " --with-yielding-select=yes" +EXTRA_OECONF += "--with-yielding-select=yes" # Shared libraries are nice... -EXTRA_OECONF += " --enable-dynamic" +EXTRA_OECONF += "--enable-dynamic" # # Disable TLS to remove the need for openssl/libcrypto -OPENLDAP_OPTION_tls ?= --without-tls +OPENLDAP_OPTION_tls ?= "--without-tls" # set the following to " openssl" to build tls support OPENLDAP_DEPENDS_tls ?= -EXTRA_OECONF += " ${OPENLDAP_OPTION_tls}" -DEPENDS += ${OPENLDAP_DEPENDS_tls} +EXTRA_OECONF += "${OPENLDAP_OPTION_tls}" +DEPENDS += "${OPENLDAP_DEPENDS_tls}" # SLAPD options # # UNIX crypt(3) passwd support: -EXTRA_OECONF += " --enable-crypt" +EXTRA_OECONF += "--enable-crypt" # # Enable dynamic module loading. If this is *disabled* the # dependency on libtool is removed (to disable set the following # to variables to "" in a .conf file). OPENLDAP_OPTION_modules += "lt_cv_dlopen_self=yes --enable-modules" -OPENLDAP_DEPENDS_modules += libtool +OPENLDAP_DEPENDS_modules += "libtool" EXTRA_OECONF += " ${OPENLDAP_OPTION_modules}" -DEPENDS += ${OPENLDAP_DEPENDS_modules} +DEPENDS += "${OPENLDAP_DEPENDS_modules}" # SLAPD BACKEND # @@ -73,7 +73,7 @@ DEPENDS += ${OPENLDAP_DEPENDS_modules} # is also disabled. If you try to change the backends but fail to # enable a single one the build will fail in an obvious way. # -EXTRA_OECONF += " --disable-bdb --disable-monitor" +EXTRA_OECONF += "--disable-bdb --disable-monitor" # # Backends="bdb dnssrv hdb ldap ldbm meta monitor null passwd perl shell sql" # @@ -88,35 +88,35 @@ md = "${libexecdir}/openldap" # the version 4 implementation or better. # To disable this set all three of the following variables to <empty> in # a .conf file (this will allow ldbm to be build with gdbm). -OPENLDAP_OPTION_bdb ?= --enable-bdb=mod -OPENLDAP_DEPENDS_bdb ?= db +OPENLDAP_OPTION_bdb ?= "--enable-bdb=mod" +OPENLDAP_DEPENDS_bdb ?= "db" OPENLDAP_PACKAGE_bdb ?= "${PN}-backend-bdb" FILES_${PN}-backend-bdb = "${md}/back_bdb.so ${md}/back_bdb.la ${md}/back_bdb-*.so.*" -EXTRA_OECONF += " ${OPENLDAP_OPTION_bdb}" -DEPENDS += ${OPENLDAP_DEPENDS_bdb} -PACKAGES += " ${OPENLDAP_PACKAGE_bdb}" +EXTRA_OECONF += "${OPENLDAP_OPTION_bdb}" +DEPENDS += "${OPENLDAP_DEPENDS_bdb}" +PACKAGES += "${OPENLDAP_PACKAGE_bdb}" # #--enable-dnssrv enable dnssrv backend no|yes|mod no # This has no dependencies. FILES_${PN}-backend-dnssrv = "${md}/back_dnssrv.so ${md}/back_dnssrv.la ${md}/back_dnssrv-*.so.*" -EXTRA_OECONF += " --enable-dnssrv=mod" -PACKAGES += " ${PN}-backend-dnssrv" +EXTRA_OECONF += "--enable-dnssrv=mod" +PACKAGES += "${PN}-backend-dnssrv" # #--enable-hdb enable Hierarchical DB backend no|yes|mod no # This forces ldbm to use Berkeley too, remove to use gdbm -OPENLDAP_OPTION_hdb ?= --enable-hdb=mod -OPENLDAP_DEPENDS_hdb ?= db +OPENLDAP_OPTION_hdb ?= "--enable-hdb=mod" +OPENLDAP_DEPENDS_hdb ?= "db" OPENLDAP_PACKAGE_hdb ?= "${PN}-backend-hdb" FILES_${PN}-backend-hdb = "${md}/back_hdb.so ${md}/back_hdb.la ${md}/back_hdb-*.so.*" -EXTRA_OECONF += " ${OPENLDAP_OPTION_hdb}" +EXTRA_OECONF += "${OPENLDAP_OPTION_hdb}" DEPENDS += ${OPENLDAP_DEPENDS_hdb} -PACKAGES += " ${OPENLDAP_PACKAGE_hdb}" +PACKAGES += "${OPENLDAP_PACKAGE_hdb}" # #--enable-ldap enable ldap backend no|yes|mod no # This has no dependencies -EXTRA_OECONF += " --enable-ldap=mod" +EXTRA_OECONF += "--enable-ldap=mod" FILES_${PN}-backend-ldap = "${md}/back_ldap.so ${md}/back_ldap.la ${md}/back_ldap-*.so.*" -PACKAGES += " ${PN}-backend-ldap" +PACKAGES += "${PN}-backend-ldap" # #--enable-ldbm enable ldbm backend no|yes|mod no # ldbm requires further specification of the underlying database API, because @@ -129,79 +129,79 @@ PACKAGES += " ${PN}-backend-ldap" #OPENLDAP_OPTION_ldbm = "--enable-ldbm=mod --with-ldbm-api=gdbm" #OPENLDAP_DEPENDS_ldbm = gdbm # And clear the bdb and hdb settings. -OPENLDAP_OPTION_ldbm ?= --enable-ldbm=mod -OPENLDAP_DEPENDS_ldbm ?= +OPENLDAP_OPTION_ldbm ?= "--enable-ldbm=mod" +OPENLDAP_DEPENDS_ldbm ?= "" OPENLDAP_PACKAGES_ldbm ?= "${PN}-backend-ldbm" FILES_${PN}-backend-ldbm = "${md}/back_ldbm.so ${md}/back_ldbm.la ${md}/back_ldbm-*.so.*" -EXTRA_OECONF += " ${OPENLDAP_OPTION_ldbm}" -DEPENDS += ${OPENLDAP_DEPENDS_ldbm} -PACKAGES += " ${PN}-backend-ldbm" +EXTRA_OECONF += "${OPENLDAP_OPTION_ldbm}" +DEPENDS += "${OPENLDAP_DEPENDS_ldbm}" +PACKAGES += "${PN}-backend-ldbm" # #--enable-meta enable metadirectory backend no|yes|mod no # No dependencies -EXTRA_OECONF += " --enable-meta=mod" +EXTRA_OECONF += "--enable-meta=mod" FILES_${PN}-backend-meta = "${md}/back_meta.so ${md}/back_meta.la ${md}/back_meta-*.so.*" -PACKAGES += " ${PN}-backend-meta" +PACKAGES += "${PN}-backend-meta" # #--enable-monitor enable monitor backend no|yes|mod yes -EXTRA_OECONF += " --enable-monitor=mod" +EXTRA_OECONF += "--enable-monitor=mod" FILES_${PN}-backend-monitor = "${md}/back_monitor.so ${md}/back_monitor.la ${md}/back_monitor-*.so.*" -PACKAGES += " ${PN}-backend-monitor" +PACKAGES += "${PN}-backend-monitor" # #--enable-null enable null backend no|yes|mod no -EXTRA_OECONF += " --enable-null=mod" +EXTRA_OECONF += "--enable-null=mod" FILES_${PN}-backend-null = "${md}/back_null.so ${md}/back_null.la ${md}/back_null-*.so.*" -PACKAGES += " ${PN}-backend-null" +PACKAGES += "${PN}-backend-null" # #--enable-passwd enable passwd backend no|yes|mod no EXTRA_OECONF += " --enable-passwd=mod" FILES_${PN}-backend-passwd = "${md}/back_passwd.so ${md}/back_passwd.la ${md}/back_passwd-*.so.*" -PACKAGES += " ${PN}-backend-passwd" +PACKAGES += "${PN}-backend-passwd" # #--enable-perl enable perl backend no|yes|mod no # This requires a loadable perl dynamic library, if enabled without # doing something appropriate (building perl?) the build will pick # up the build machine perl - not good. -OPENLDAP_OPTION_perl ?= --enable-perl=mod -OPENLDAP_DEPENDS_perl ?= perl +OPENLDAP_OPTION_perl ?= "--enable-perl=mod" +OPENLDAP_DEPENDS_perl ?= "perl" OPENLDAP_PACKAGES_perl ?= "${PN}-backend-perl" FILES_${PN}-backend-perl = "${md}/back_perl.so ${md}/back_perl.la ${md}/back_perl-*.so.*" -#EXTRA_OECONF += " ${OPENLDAP_OPTION_perl}" -#DEPENDS += ${OPENLDAP_DEPENDS_perl} -#PACKAGES += " ${PN}-backend-perl" +#EXTRA_OECONF += "${OPENLDAP_OPTION_perl}" +#DEPENDS += "${OPENLDAP_DEPENDS_perl}" +#PACKAGES += "${PN}-backend-perl" # #--enable-shell enable shell backend no|yes|mod no -EXTRA_OECONF += " --enable-shell=mod" +EXTRA_OECONF += "--enable-shell=mod" FILES_${PN}-backend-shell = "${md}/back_shell.so ${md}/back_shell.la ${md}/back_shell-*.so.*" -PACKAGES += " ${PN}-backend-shell" +PACKAGES += "${PN}-backend-shell" # #--enable-sql enable sql backend no|yes|mod no # sql requires some sql backend which provides sql.h, sqlite* provides # sqlite.h (which may be compatible but hasn't been tried.) -OPENLDAP_OPTION_sql ?= --enable-sql=mod -OPENLDAP_DEPENDS_sql ?= sql +OPENLDAP_OPTION_sql ?= "--enable-sql=mod" +OPENLDAP_DEPENDS_sql ?= "sql" OPENLDAP_PACKAGES_sql ?= "${PN}-backend-sql" FILES_${PN}-backend-sql = "${md}/back_sql.so ${md}/back_sql.la ${md}/back_sql-*.so.*" -#EXTRA_OECONF += " ${OPENLDAP_OPTION_sql}" -#DEPENDS += ${OPENLDAP_DEPENDS_sql} -#PACKAGES += " ${PN}-backend-sql" +#EXTRA_OECONF += "${OPENLDAP_OPTION_sql}" +#DEPENDS += "${OPENLDAP_DEPENDS_sql}" +#PACKAGES += "${PN}-backend-sql" # #--enable-dyngroup Dynamic Group overlay no|yes|mod no # This is a demo, Proxy Cache defines init_module which conflicts with the # same symbol in dyngroup -#EXTRA_OECONF += " --enable-dyngroup=mod" +#EXTRA_OECONF += "--enable-dyngroup=mod" #FILES_${PN}-overlay-dyngroup = "${md}/back_dyngroup.so ${md}/back_dyngroup.la ${md}/back_dyngroup-*.so.*" -#PACKAGES += " ${PN}-overlay-dyngroup" +#PACKAGES += "${PN}-overlay-dyngroup" # #--enable-proxycache Proxy Cache overlay no|yes|mod no -EXTRA_OECONF += " --enable-proxycache=mod" +EXTRA_OECONF += "--enable-proxycache=mod" FILES_${PN}-overlay-proxycache = "${md}/pcache.so ${md}/pcache.la ${md}/pcache-*.so.*" -PACKAGES += " ${PN}-overlay-proxycache" +PACKAGES += "${PN}-overlay-proxycache" # # LOCAL OPTION OVERRIDES # The distro/lcoal options must be added in *last* -EXTRA_OECONF += " ${OPENLDAP_OPTIONS}" -DEPENDS += ${OPENLDAP_DEPENDS} +EXTRA_OECONF += "${OPENLDAP_OPTIONS}" +DEPENDS += "${OPENLDAP_DEPENDS}" do_stage() { autotools_stage_includes @@ -223,7 +223,7 @@ LEAD_SONAME = "libldap-2.2.so.*" # The executables go in a separate package. This allows the # installation of the libraries with no daemon support. # Each module also has its own package - see above. -PACKAGES += " ${PN}-slapd ${PN}-slurpd ${PN}-bin" +PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" # Package contents - shift most standard contents to -bin FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/openldap-data" |