Move all to deprecated folder.

This commit is contained in:
2016-11-16 21:57:57 +01:00
parent 01738a7684
commit 05de7d6c04
9777 changed files with 0 additions and 0 deletions

View File

@@ -0,0 +1,74 @@
Fix stripping when cross-compiling
Probably-Signed-off-by: Dave Bender <bender@benegon.com>
[yann.morin.1998@free.fr: patch was made by Dave, but he
forgot his SoB line, so I added it]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -rupN openldap-2.4.40/build/shtool openldap-2.4.40-br/build/shtool
--- openldap-2.4.40/build/shtool 2014-09-18 21:48:49.000000000 -0400
+++ openldap-2.4.40-br/build/shtool 2015-01-21 13:21:35.689829372 -0500
@@ -981,7 +981,7 @@ install )
if [ ".$opt_t" = .yes ]; then
echo "strip $dsttmp" 1>&2
fi
- strip $dsttmp || shtool_exit $?
+ $STRIP $dsttmp || shtool_exit $?
fi
if [ ".$opt_o" != . ]; then
if [ ".$opt_t" = .yes ]; then
diff -rupN openldap-2.4.40/build/top.mk openldap-2.4.40-br/build/top.mk
--- openldap-2.4.40/build/top.mk 2014-09-18 21:48:49.000000000 -0400
+++ openldap-2.4.40-br/build/top.mk 2015-01-21 13:23:41.027810097 -0500
@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_SCRIPT = $(INSTALL)
-STRIP = -s
+STRIP_OPTS = -s
LINT = lint
5LINT = 5lint
diff -rupN openldap-2.4.40/clients/tools/Makefile.in openldap-2.4.40-br/clients/tools/Makefile.in
--- openldap-2.4.40/clients/tools/Makefile.in 2014-09-18 21:48:49.000000000 -0400
+++ openldap-2.4.40-br/clients/tools/Makefile.in 2015-01-21 13:23:35.827727946 -0500
@@ -120,7 +120,7 @@ install-local: FORCE
-$(MKDIR) $(DESTDIR)$(bindir)
@( \
for prg in $(PROGRAMS); do \
- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \
+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 $$prg$(EXEEXT) \
$(DESTDIR)$(bindir); \
done \
)
diff -rupN openldap-2.4.40/configure.in openldap-2.4.40-br/configure.in
--- openldap-2.4.40/configure.in 2014-09-18 21:48:49.000000000 -0400
+++ openldap-2.4.40-br/configure.in 2015-01-16 15:50:48.874816786 -0500
@@ -669,6 +669,15 @@ if test -z "${AR}"; then
fi
fi
+if test -z "${STRIP}"; then
+ AC_CHECK_PROGS(STRIP,strip,missing)
+
+ if test "${STRIP}" = "missing" ; then
+ AC_MSG_ERROR([Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP.])
+ fi
+fi
+
+
AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
diff -rupN openldap-2.4.40/servers/slapd/Makefile.in openldap-2.4.40-br/servers/slapd/Makefile.in
--- openldap-2.4.40/servers/slapd/Makefile.in 2015-01-16 15:04:52.507473256 -0500
+++ openldap-2.4.40-br/servers/slapd/Makefile.in 2015-01-16 15:05:02.299627229 -0500
@@ -378,7 +378,7 @@ install-local-srv: install-slapd install
install-slapd: FORCE
-$(MKDIR) $(DESTDIR)$(libexecdir)
-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
@for i in $(SUBDIRS); do \
if test -d $$i && test -f $$i/Makefile ; then \

View File

@@ -0,0 +1,38 @@
configure: correctly detect bignum
Building with bignum is currently not possible, since we're checking
ol_with_tls against a value it is never assigned in any case.
Since bignum is from openssl, and openssl is the preferred TLS
implementation, if the bignum headers are found, it means we do have
TLS and it is opensl.
So, keep the check for the bignum header, but check against ol_link_tls
which means that openssl is enabled when we find the bignum headers.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure
--- openldap-2.4.40.orig/configure 2014-09-19 03:48:49.000000000 +0200
+++ openldap-2.4.40/configure 2015-01-25 18:44:54.216879362 +0100
@@ -23478,7 +23478,7 @@
if test "$ac_cv_header_openssl_bn_h" = "yes" &&
test "$ac_cv_header_openssl_crypto_h" = "yes" &&
- test "$ol_with_tls" = "found" ; then
+ test "$ol_link_tls" = "yes" ; then
ol_with_mp=bignum
$as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h
diff -durN openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
--- openldap-2.4.40.orig/configure.in 2014-09-19 03:48:49.000000000 +0200
+++ openldap-2.4.40/configure.in 2015-01-25 18:44:37.628676446 +0100
@@ -2367,7 +2367,7 @@
AC_CHECK_HEADERS(openssl/crypto.h)
if test "$ac_cv_header_openssl_bn_h" = "yes" &&
test "$ac_cv_header_openssl_crypto_h" = "yes" &&
- test "$ol_with_tls" = "found" ; then
+ test "$ol_link_tls" = "yes" ; then
ol_with_mp=bignum
AC_DEFINE(USE_MP_BIGNUM,1,[define to use OpenSSL BIGNUM for MP])
elif test $ol_with_mp = bignum ; then

View File

@@ -0,0 +1,23 @@
doc: do not build
Building the documentation fails on some autobuilders,
so disable it as we're not interested in it.
Fixes:
http://autobuild.buildroot.org/results/1dc/1dc17a54e57130bffd19d360c9a7faae440b8916/
http://autobuild.buildroot.org/results/407/40797597024cbb9054fdda8bdf4d011bba966b06/
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN openldap-2.4.40.orig/Makefile.in openldap-2.4.40/Makefile.in
--- openldap-2.4.40.orig/Makefile.in 2014-09-19 03:48:49.000000000 +0200
+++ openldap-2.4.40/Makefile.in 2015-01-31 23:12:54.347678913 +0100
@@ -13,7 +13,7 @@
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
-SUBDIRS= include libraries clients servers tests doc
+SUBDIRS= include libraries clients servers tests
CLEANDIRS=
INSTALLDIRS=

View File

@@ -0,0 +1,27 @@
config BR2_PACKAGE_OPENLDAP
bool "openldap"
depends on BR2_USE_WCHAR
depends on BR2_USE_MMU # needs fork()
help
OpenLDAP Software is an open source implementation of
the Lightweight Directory Access Protocol.
This only installs client-side support.
http://www.openldap.org/
if BR2_PACKAGE_OPENLDAP
config BR2_PACKAGE_OPENLDAP_CLIENTS
bool "openldap client binaries"
default y
help
Install the OpenLDAP client tools (ldapadd, ldapcompare, ldapdelete,
ldapexop, ldapmodify, ldapmodrdn, ldappasswd, ldapsearch, ldapurl,
ldapwhoami)
endif
comment "openldap needs a toolchain w/ wchar"
depends on BR2_USE_MMU # needs fork()
depends on !BR2_USE_WCHAR

View File

@@ -0,0 +1,4 @@
# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.43.md5
md5 49ca65e27891fcf977d78c10f073c705 openldap-2.4.43.tgz
# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.43.sha1
sha1 3b52924df2f45e81f25ecbe37551bc837d090cfa openldap-2.4.43.tgz

View File

@@ -0,0 +1,72 @@
################################################################################
#
# openldap
#
################################################################################
OPENLDAP_VERSION = 2.4.43
OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz
OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release
OPENLDAP_LICENSE = OpenLDAP Public License
OPENLDAP_LICENSE_FILES = LICENSE
OPENLDAP_INSTALL_STAGING = YES
OPENLDAP_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_OPENSSL),y)
OPENLDAP_TLS = openssl
OPENLDAP_DEPENDENCIES += openssl
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
OPENLDAP_TLS = gnutls
OPENLDAP_DEPENDENCIES += gnutls
else ifeq ($(BR2_PACKAGE_LIBNSS),y)
OPENLDAP_TLS = moznss
OPENLDAP_DEPENDENCIES += libnss
OPENLDAP_CPPFLAGS = \
-I$(STAGING_DIR)/usr/include/nss \
-I$(STAGING_DIR)/usr/include/nspr
else
OPENLDAP_TLS = no
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
OPENLDAP_MP = bignum
OPENLDAP_DEPENDENCIES += openssl
OPENLDAP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
else ifeq ($(BR2_PACKAGE_GMP),y)
OPENLDAP_MP = gmp
OPENLDAP_DEPENDENCIES += gmp
else
OPENLDAP_MP = longlong
endif
OPENLDAP_CONF_ENV += ac_cv_func_memcmp_working=yes
OPENLDAP_CONF_OPTS += \
--enable-syslog \
--disable-proctitle \
--disable-slapd \
--with-yielding-select \
--sysconfdir=/etc \
--enable-dynamic=$(if $(BR2_STATIC_LIBS),no,yes) \
--with-tls=$(OPENLDAP_TLS) \
--with-mp=$(OPENLDAP_MP) \
CPPFLAGS="$(TARGET_CPPFLAGS) $(OPENLDAP_CPPFLAGS)"
# Somehow, ${STRIP} does not percolates through to the shtool script
# used to install the executables; thus, that script tries to run the
# executable it is supposed to install, resulting in an error.
OPENLDAP_MAKE_ENV = STRIP="$(TARGET_STRIP)"
ifeq ($(BR2_PACKAGE_OPENLDAP_CLIENTS),)
OPENLDAP_CLIENTS = \
ldapurl ldapexop ldapcompare ldapwhoami \
ldappasswd ldapmodrdn ldapdelete ldapmodify \
ldapsearch
define OPENLDAP_REMOVE_CLIENTS
$(RM) -f $(foreach p,$(OPENLDAP_CLIENTS),$(TARGET_DIR)/usr/bin/$(p))
$(RM) -rf $(TARGET_DIR)/etc/openldap
endef
OPENLDAP_POST_INSTALL_TARGET_HOOKS += OPENLDAP_REMOVE_CLIENTS
endif
$(eval $(autotools-package))