diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-support/openldap/openldap-2.4.39 | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-support/openldap/openldap-2.4.39')
8 files changed, 236 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch new file mode 100644 index 000000000..9a0f4cb14 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 59688044386dfeee0c837a15133f4e878f1bb661 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Synacek <jsynacek@redhat.com> | ||
3 | Date: Wed, 13 Nov 2013 09:06:54 +0100 | ||
4 | Subject: [PATCH] ITS#7723 fix reference counting | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Commit 59688044386dfeee0c837a15133f4e878f1bb661 upstream | ||
9 | |||
10 | Signed-off-by: Yue Tao <Yue.Tao@windriver.com> | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | --- | ||
13 | libraries/librewrite/session.c | 2 ++ | ||
14 | 1 files changed, 2 insertions(+), 0 deletions(-) | ||
15 | |||
16 | diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c | ||
17 | index fcc7698..02fc054 100644 | ||
18 | --- a/libraries/librewrite/session.c | ||
19 | +++ b/libraries/librewrite/session.c | ||
20 | @@ -161,6 +161,7 @@ rewrite_session_find( | ||
21 | #ifdef USE_REWRITE_LDAP_PVT_THREADS | ||
22 | if ( session ) { | ||
23 | ldap_pvt_thread_mutex_lock( &session->ls_mutex ); | ||
24 | + session->ls_count++; | ||
25 | } | ||
26 | ldap_pvt_thread_rdwr_runlock( &info->li_cookies_mutex ); | ||
27 | #endif /* USE_REWRITE_LDAP_PVT_THREADS */ | ||
28 | @@ -178,6 +179,7 @@ rewrite_session_return( | ||
29 | ) | ||
30 | { | ||
31 | assert( session != NULL ); | ||
32 | + session->ls_count--; | ||
33 | ldap_pvt_thread_mutex_unlock( &session->ls_mutex ); | ||
34 | } | ||
35 | |||
36 | -- | ||
37 | 1.7.5.4 | ||
38 | |||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch new file mode 100644 index 000000000..dffd3ca51 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 0205e83f4670d10ad3c6ae4b8fc5ec1d0c7020c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Howard Chu <hyc@openldap.org> | ||
3 | Date: Sat, 7 Sep 2013 09:39:24 -0700 | ||
4 | Subject: [PATCH] ITS#7430 GnuTLS: Avoid use of deprecated function | ||
5 | |||
6 | Upstream-status: Backport | ||
7 | |||
8 | --- | ||
9 | libraries/libldap/tls_g.c | 12 ++++++++++++ | ||
10 | 1 files changed, 12 insertions(+), 0 deletions(-) | ||
11 | |||
12 | diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c | ||
13 | index 9acffaf..c793828 100644 | ||
14 | --- a/libraries/libldap/tls_g.c | ||
15 | +++ b/libraries/libldap/tls_g.c | ||
16 | @@ -368,6 +368,17 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server ) | ||
17 | * then we have to build the cert chain. | ||
18 | */ | ||
19 | if ( max == 1 && !gnutls_x509_crt_check_issuer( certs[0], certs[0] )) { | ||
20 | +#if GNUTLS_VERSION_NUMBER >= 0x020c00 | ||
21 | + unsigned int i; | ||
22 | + for ( i = 1; i<VERIFY_DEPTH; i++ ) { | ||
23 | + if ( gnutls_certificate_get_issuer( ctx->cred, certs[i-1], &certs[i], 0 )) | ||
24 | + break; | ||
25 | + max++; | ||
26 | + /* If this CA is self-signed, we're done */ | ||
27 | + if ( gnutls_x509_crt_check_issuer( certs[i], certs[i] )) | ||
28 | + break; | ||
29 | + } | ||
30 | +#else | ||
31 | gnutls_x509_crt_t *cas; | ||
32 | unsigned int i, j, ncas; | ||
33 | |||
34 | @@ -387,6 +398,7 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server ) | ||
35 | if ( j == ncas ) | ||
36 | break; | ||
37 | } | ||
38 | +#endif | ||
39 | } | ||
40 | rc = gnutls_certificate_set_x509_key( ctx->cred, certs, max, key ); | ||
41 | if ( rc ) return -1; | ||
42 | -- | ||
43 | 1.7.4.2 | ||
44 | |||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/initscript b/meta-oe/recipes-support/openldap/openldap-2.4.39/initscript new file mode 100644 index 000000000..08d1067a7 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/initscript | |||
@@ -0,0 +1,35 @@ | |||
1 | #! /bin/sh | ||
2 | # | ||
3 | # This is an init script for openembedded | ||
4 | # Copy it to /etc/init.d/openldap and type | ||
5 | # > update-rc.d openldap defaults 60 | ||
6 | # | ||
7 | |||
8 | # Source function library. | ||
9 | . /etc/init.d/functions | ||
10 | |||
11 | slapd=/usr/sbin/slapd | ||
12 | test -x "$slapd" || exit 0 | ||
13 | |||
14 | |||
15 | case "$1" in | ||
16 | start) | ||
17 | echo -n "Starting OpenLDAP: " | ||
18 | start-stop-daemon --start --quiet --exec $slapd | ||
19 | echo "." | ||
20 | ;; | ||
21 | stop) | ||
22 | echo -n "Stopping OpenLDAP: " | ||
23 | start-stop-daemon --stop --quiet --pidfile /var/run/slapd.pid | ||
24 | echo "." | ||
25 | ;; | ||
26 | status) | ||
27 | status $slapd; | ||
28 | exit $? | ||
29 | ;; | ||
30 | *) | ||
31 | echo "Usage: /etc/init.d/openldap {start|stop|status}" | ||
32 | exit 1 | ||
33 | esac | ||
34 | |||
35 | exit 0 | ||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/install-strip.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/install-strip.patch new file mode 100644 index 000000000..2992b7030 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/install-strip.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | # This patch ensures that the install operations which strip | ||
2 | # programs and libraries (LTINSTALL) work in a cross build | ||
3 | # environment. | ||
4 | --- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 | ||
5 | +++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 | ||
6 | @@ -116,7 +116,7 @@ | ||
7 | LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ | ||
8 | $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) | ||
9 | |||
10 | -LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) | ||
11 | +LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c | ||
12 | LTFINISH = $(LIBTOOL) --mode=finish | ||
13 | |||
14 | # Misc UNIX commands used in build environment | ||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/kill-icu.patch new file mode 100644 index 000000000..dcf541137 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/kill-icu.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
2 | |||
3 | slapd depends on ICU if it was built first. | ||
4 | |||
5 | Upstream-status: inappropiate [embedded specific] | ||
6 | --- | ||
7 | configure.in | 8 -------- | ||
8 | 1 file changed, 8 deletions(-) | ||
9 | |||
10 | --- openldap-2.4.23.orig/configure.in | ||
11 | +++ openldap-2.4.23/configure.in | ||
12 | @@ -2045,18 +2045,10 @@ if test $ol_enable_ndb != no ; then | ||
13 | SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)" | ||
14 | fi | ||
15 | fi | ||
16 | |||
17 | dnl ---------------------------------------------------------------- | ||
18 | -dnl International Components for Unicode | ||
19 | -OL_ICU | ||
20 | -if test "$ol_icu" = no ; then | ||
21 | - AC_MSG_WARN([ICU not available]) | ||
22 | -else | ||
23 | - ICU_LIBS="$ol_icu" | ||
24 | -fi | ||
25 | -dnl ---------------------------------------------------------------- | ||
26 | dnl | ||
27 | dnl Check for Cyrus SASL | ||
28 | dnl | ||
29 | WITH_SASL=no | ||
30 | ol_link_sasl=no | ||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/openldap-2.4.28-gnutls-gcrypt.patch new file mode 100644 index 000000000..c7b1552c1 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/openldap-2.4.28-gnutls-gcrypt.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ | ||
2 | |||
3 | Upstream-status: Unknown | ||
4 | |||
5 | -- | ||
6 | |||
7 | --- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 | ||
8 | +++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 | ||
9 | @@ -1214,7 +1214,7 @@ | ||
10 | ol_with_tls=gnutls | ||
11 | ol_link_tls=yes | ||
12 | |||
13 | - TLS_LIBS="-lgnutls" | ||
14 | + TLS_LIBS="-lgnutls -lgcrypt" | ||
15 | |||
16 | AC_DEFINE(HAVE_GNUTLS, 1, | ||
17 | [define if you have GNUtls]) | ||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/openldap-m4-pthread.patch new file mode 100644 index 000000000..b669b7254 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/openldap-m4-pthread.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | --- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 | ||
2 | +++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 | ||
3 | @@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ | ||
4 | ]]) | ||
5 | |||
6 | AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], | ||
7 | -AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES | ||
8 | +[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES | ||
9 | |||
10 | int main(argc, argv) | ||
11 | int argc; | ||
12 | @@ -796,7 +796,7 @@ int main(argc, argv) | ||
13 | { | ||
14 | OL_PTHREAD_TEST_FUNCTION | ||
15 | } | ||
16 | -])) | ||
17 | +]])]) | ||
18 | dnl -------------------------------------------------------------------- | ||
19 | AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) | ||
20 | if test "$ol_link_threads" = no ; then | ||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.39/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap-2.4.39/use-urandom.patch new file mode 100644 index 000000000..e7b988faf --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.39/use-urandom.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | openldap: assume /dev/urandom exists | ||
2 | |||
3 | When we are cross-compiling, we want to assume | ||
4 | that /dev/urandom exists. We could change the source | ||
5 | code to look for it, but this is the easy way out. | ||
6 | |||
7 | Upstream-Status: pending | ||
8 | |||
9 | Signed-off-by: Joe Slater <jslater@windriver.com> | ||
10 | |||
11 | |||
12 | --- a/configure.in | ||
13 | +++ b/configure.in | ||
14 | @@ -2142,8 +2142,8 @@ fi | ||
15 | |||
16 | dnl ---------------------------------------------------------------- | ||
17 | dnl Check for entropy sources | ||
18 | +dev=no | ||
19 | if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then | ||
20 | - dev=no | ||
21 | if test -r /dev/urandom ; then | ||
22 | dev="/dev/urandom"; | ||
23 | elif test -r /idev/urandom ; then | ||
24 | @@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test | ||
25 | dev="/idev/random"; | ||
26 | fi | ||
27 | |||
28 | - if test $dev != no ; then | ||
29 | - AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) | ||
30 | - fi | ||
31 | +elif test $cross_compiling == yes ; then | ||
32 | + dev="/dev/urandom"; | ||
33 | +fi | ||
34 | +if test $dev != no ; then | ||
35 | + AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) | ||
36 | fi | ||
37 | |||
38 | dnl ---------------------------------------------------------------- | ||