Initial commit
This commit is contained in:
+38
@@ -0,0 +1,38 @@
|
||||
From 321839cbd1d57f12d3d6695254d2003473d8dd1a Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Wed, 8 Dec 2021 16:58:55 +0800
|
||||
Subject: [PATCH] build/top.mk: unset STRIP_OPTS
|
||||
|
||||
Unset STRIP_OPTS to disable strip to fix QA errors:
|
||||
|
||||
ERROR: openldap-2.5.9-r0 do_package: QA Issue: File
|
||||
'/usr/bin/ldapcompare' from openldap was already stripped, this will
|
||||
prevent future debugging! [already-stripped]
|
||||
|
||||
ERROR: openldap-2.5.9-r0 do_package: QA Issue: File
|
||||
'/usr/bin/ldapdelete' from openldap was already stripped, this will
|
||||
prevent future debugging! [already-stripped]
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
build/top.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/top.mk b/build/top.mk
|
||||
index 38ce146..6e9fe1f 100644
|
||||
--- a/build/top.mk
|
||||
+++ b/build/top.mk
|
||||
@@ -60,7 +60,7 @@ INSTALL_PROGRAM = $(INSTALL)
|
||||
INSTALL_DATA = $(INSTALL) -m 644
|
||||
INSTALL_SCRIPT = $(INSTALL)
|
||||
|
||||
-STRIP_OPTS = -s
|
||||
+STRIP_OPTS =
|
||||
|
||||
LINT = lint
|
||||
5LINT = 5lint
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
From 7577b120acda087bf3f5f613c2c72663b3864ad8 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 4 Sep 2022 09:43:06 -0700
|
||||
Subject: [PATCH] configure: Pass pthread_t to pthread_detach
|
||||
|
||||
This helps compilers when using C2X standard
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure.ac | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0978eeb..58d15f8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1467,10 +1467,7 @@ pthread_rwlock_t rwlock;
|
||||
dnl save the flags
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include <pthread.h>
|
||||
-#ifndef NULL
|
||||
-#define NULL (void*)0
|
||||
-#endif
|
||||
-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
|
||||
+]], [[pthread_detach((pthread_t)-1);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
|
||||
])
|
||||
|
||||
if test $ol_cv_func_pthread_detach = no ; then
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# This is an init script for openembedded
|
||||
# Copy it to /etc/init.d/openldap and type
|
||||
# > update-rc.d openldap defaults 60
|
||||
#
|
||||
|
||||
# Source function library.
|
||||
. /etc/init.d/functions
|
||||
|
||||
slapd=/usr/sbin/slapd
|
||||
test -x "$slapd" || exit 0
|
||||
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting OpenLDAP: "
|
||||
start-stop-daemon --start --quiet --exec $slapd
|
||||
echo "."
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping OpenLDAP: "
|
||||
start-stop-daemon --stop --quiet --pidfile /var/run/slapd.pid
|
||||
echo "."
|
||||
;;
|
||||
status)
|
||||
status $slapd;
|
||||
exit $?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/openldap {start|stop|status}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
From 868a04b0596e2df708ba14ed70815b1411db3db1 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Thu, 21 Feb 2019 11:33:24 +0800
|
||||
Subject: [PATCH] mkversion: remove user host pwd from version
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Update this patch to version 2.4.47
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
build/mkversion | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/build/mkversion
|
||||
+++ b/build/mkversion
|
||||
@@ -53,8 +53,12 @@ APPLICATION=$1
|
||||
# Reproducible builds set SOURCE_DATE_EPOCH, want constant strings
|
||||
if [ -n "${SOURCE_DATE_EPOCH}" ]; then
|
||||
WHOWHERE="openldap"
|
||||
+ DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ')
|
||||
+ TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ')
|
||||
else
|
||||
- WHOWHERE="$USER@$(uname -n):$(pwd)"
|
||||
+ WHOWHERE="openldap"
|
||||
+ DATE='" __DATE__ "'
|
||||
+ TIME='" __TIME__ "'
|
||||
fi
|
||||
|
||||
cat << __EOF__
|
||||
@@ -77,7 +81,7 @@ static const char copyright[] =
|
||||
"COPYING RESTRICTIONS APPLY\n";
|
||||
|
||||
$static $const char $SYMBOL[] =
|
||||
-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n"
|
||||
+"@(#) \$$PACKAGE: $APPLICATION $VERSION ($DATE $TIME) \$\n"
|
||||
"\t$WHOWHERE\n";
|
||||
|
||||
__EOF__
|
||||
@@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Standalone LDAP Daemon
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=@SBINDIR@/slapd
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,238 @@
|
||||
SUMMARY = "OpenLDAP Directory Service"
|
||||
DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
|
||||
HOMEPAGE = "http://www.OpenLDAP.org/license.html"
|
||||
# The OpenLDAP Public License - see the HOMEPAGE - defines
|
||||
# the license. www.openldap.org claims this is Open Source
|
||||
# (see http://www.openldap.org), the license appears to be
|
||||
# basically BSD. opensource.org does not record this license
|
||||
# at present (so it is apparently not OSI certified).
|
||||
LICENSE = "OpenLDAP"
|
||||
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \
|
||||
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
|
||||
"
|
||||
SECTION = "libs"
|
||||
|
||||
LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
||||
|
||||
SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \
|
||||
file://initscript \
|
||||
file://slapd.service \
|
||||
file://remove-user-host-pwd-from-version.patch \
|
||||
file://0001-build-top.mk-unset-STRIP_OPTS.patch \
|
||||
file://0001-configure-Pass-pthread_t-to-pthread_detach.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "ee3c430c4ef7b87c57b622108c7339376d6c27fbbf2767770be3de1df63d008c"
|
||||
|
||||
DEPENDS = "util-linux groff-native"
|
||||
|
||||
inherit autotools-brokensep update-rc.d systemd pkgconfig
|
||||
|
||||
# CV SETTINGS
|
||||
# Required to work round AC_FUNC_MEMCMP which gets the wrong answer
|
||||
# when cross compiling (should be in site?)
|
||||
EXTRA_OECONF += "ac_cv_func_memcmp_working=yes"
|
||||
|
||||
# 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"
|
||||
# Shared libraries are nice...
|
||||
EXTRA_OECONF += "--enable-dynamic"
|
||||
|
||||
PACKAGECONFIG ??= "asyncmeta gnutls modules \
|
||||
mdb ldap meta null passwd proxycache dnssrv \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
|
||||
"
|
||||
#--with-tls with TLS/SSL support auto|openssl|gnutls [auto]
|
||||
PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls"
|
||||
PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl"
|
||||
|
||||
PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl"
|
||||
PACKAGECONFIG[modules] = "lt_cv_dlopen_self=yes --enable-modules,--disable-modules,libtool"
|
||||
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
|
||||
|
||||
# SLAPD options
|
||||
#
|
||||
# UNIX crypt(3) passwd support:
|
||||
EXTRA_OECONF += "--enable-crypt"
|
||||
|
||||
# SLAPD BACKEND
|
||||
#
|
||||
# The backend must be set by the configuration. This controls the
|
||||
# required database.
|
||||
#
|
||||
# Backends="asyncmeta dnssrv ldap mdb meta ndb null passwd perl relay sock sql wt"
|
||||
#
|
||||
# Note that multiple backends can be built. The ldbm backend requires a
|
||||
# build-time choice of database API. To use the gdbm (or other) API the
|
||||
# Berkely database module must be removed from the build.
|
||||
md = "${libexecdir}/openldap"
|
||||
#
|
||||
|
||||
#--enable-asyncmeta enable asyncmeta backend no|yes|mod no
|
||||
PACKAGECONFIG[asyncmeta] = "--enable-asyncmeta=mod,--enable-asyncmeta=no"
|
||||
|
||||
#--enable-dnssrv enable dnssrv backend no|yes|mod no
|
||||
PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no"
|
||||
|
||||
#--enable-ldap enable ldap backend no|yes|mod no
|
||||
PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no,"
|
||||
|
||||
#--enable-mdb enable mdb database backend no|yes|mod [yes]
|
||||
PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no,"
|
||||
|
||||
#--enable-meta enable metadirectory backend no|yes|mod no
|
||||
PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no,"
|
||||
|
||||
#--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no]
|
||||
PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no,"
|
||||
|
||||
#--enable-null enable null backend no|yes|mod no
|
||||
PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no,"
|
||||
|
||||
#--enable-passwd enable passwd backend no|yes|mod no
|
||||
PACKAGECONFIG[passwd] = "--enable-passwd=mod,--enable-passwd=no,"
|
||||
|
||||
#--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 (inherit perlnative?)
|
||||
PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl"
|
||||
|
||||
#--enable-relay enable relay backend no|yes|mod [yes]
|
||||
PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no,"
|
||||
|
||||
#--enable-sock enable sock backend no|yes|mod [no]
|
||||
PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no,"
|
||||
|
||||
#--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.)
|
||||
PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3"
|
||||
|
||||
#--enable-wt enable wt backend no|yes|mod no
|
||||
# back-wt is marked currently as experimental
|
||||
PACKAGECONFIG[wt] = "--enable-wt=mod,--enable-wt=no"
|
||||
|
||||
#--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
|
||||
PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no,"
|
||||
|
||||
#--enable-proxycache Proxy Cache overlay no|yes|mod no
|
||||
PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no,"
|
||||
FILES:${PN}-overlay-proxycache = "${md}/pcache-*.so.*"
|
||||
PACKAGES += "${PN}-overlay-proxycache"
|
||||
|
||||
# Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS:
|
||||
# This allows tls to obtain random bits from /dev/urandom, by default
|
||||
# it was disabled for cross-compiling.
|
||||
CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC"
|
||||
|
||||
LDFLAGS:append = " -pthread"
|
||||
|
||||
do_configure() {
|
||||
rm -f ${S}/libtool
|
||||
aclocal
|
||||
libtoolize --force --copy
|
||||
gnu-configize
|
||||
cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build
|
||||
cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/missing ${S}/build
|
||||
cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/compile ${S}/build
|
||||
autoconf
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
LEAD_SONAME = "libldap-${LDAP_VER}.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"
|
||||
|
||||
# Package contents - shift most standard contents to -bin
|
||||
FILES:${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data"
|
||||
FILES:${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \
|
||||
${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \
|
||||
${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*"
|
||||
FILES:${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp"
|
||||
FILES:${PN}-bin = "${bindir}"
|
||||
FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so ${libdir}/pkgconfig/*.pc"
|
||||
FILES:${PN}-dbg += "${libexecdir}/openldap/.debug"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap
|
||||
chmod 755 ${D}${sysconfdir}/init.d/openldap
|
||||
# This is duplicated in /etc/openldap and is for slapd
|
||||
rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example
|
||||
|
||||
# Installing slapd under ${sbin} is more FHS and LSB compliance
|
||||
mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd
|
||||
rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
|
||||
SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify"
|
||||
cd ${D}/${sbindir}/
|
||||
rm -f ${SLAPTOOLS}
|
||||
for i in ${SLAPTOOLS}; do ln -sf slapd $i; done
|
||||
|
||||
rmdir "${D}${localstatedir}/run"
|
||||
rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system/
|
||||
install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/
|
||||
sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service
|
||||
|
||||
# Uses mdm as the database
|
||||
# and localstatedir as data directory ...
|
||||
sed -e 's/# modulepath/modulepath/' \
|
||||
-e 's/# moduleload\s*back_bdb.*/moduleload back_mdb/' \
|
||||
-e 's/database\s*bdb/database mdb/' \
|
||||
-e 's%^directory\s*.*%directory ${localstatedir}/${BPN}/data/%' \
|
||||
-i ${D}${sysconfdir}/openldap/slapd.conf
|
||||
|
||||
mkdir -p ${D}${localstatedir}/${BPN}/data
|
||||
}
|
||||
|
||||
INITSCRIPT_PACKAGES = "${PN}-slapd"
|
||||
INITSCRIPT_NAME:${PN}-slapd = "openldap"
|
||||
INITSCRIPT_PARAMS:${PN}-slapd = "defaults"
|
||||
SYSTEMD_PACKAGES = "${PN}-slapd"
|
||||
SYSTEMD_SERVICE:${PN}-slapd = "slapd.service"
|
||||
SYSTEMD_AUTO_ENABLE:${PN}-slapd ?= "disable"
|
||||
|
||||
PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*"
|
||||
|
||||
# The modules require their .so to be dynamicaly loaded
|
||||
INSANE_SKIP:${PN}-backend-asyncmeta += "dev-so"
|
||||
INSANE_SKIP:${PN}-backend-dnssrv += "dev-so"
|
||||
INSANE_SKIP:${PN}-backend-ldap += "dev-so"
|
||||
INSANE_SKIP:${PN}-backend-meta += "dev-so"
|
||||
INSANE_SKIP:${PN}-backend-mdb += "dev-so"
|
||||
INSANE_SKIP:${PN}-backend-null += "dev-so"
|
||||
INSANE_SKIP:${PN}-backend-passwd += "dev-so"
|
||||
|
||||
python populate_packages:prepend () {
|
||||
backend_dir = d.expand('${libexecdir}/openldap')
|
||||
do_split_packages(d, backend_dir, r'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True)
|
||||
do_split_packages(d, backend_dir, r'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True)
|
||||
|
||||
metapkg = "${PN}-backends"
|
||||
d.setVar('ALLOW_EMPTY:' + metapkg, "1")
|
||||
d.setVar('FILES:' + metapkg, "")
|
||||
metapkg_rdepends = []
|
||||
packages = d.getVar('PACKAGES').split()
|
||||
for pkg in packages[1:]:
|
||||
if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"):
|
||||
metapkg_rdepends.append(pkg)
|
||||
d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
|
||||
d.setVar('DESCRIPTION:' + metapkg, 'OpenLDAP backends meta package')
|
||||
packages.append(metapkg)
|
||||
d.setVar('PACKAGES', ' '.join(packages))
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
# CVE-2015-3276 has no target code.
|
||||
CVE_CHECK_IGNORE += "CVE-2015-3276"
|
||||
Reference in New Issue
Block a user