summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/openldap/openldap/install-strip.patch2
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch2
-rw-r--r--meta-oe/recipes-support/openldap/openldap/use-urandom.patch2
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.5.9.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.5.8.bb)6
4 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
index b757aabb00..fb7ad8f59f 100644
--- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch
+++ b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
@@ -2,7 +2,7 @@
2# programs and libraries (LTINSTALL) work in a cross build 2# programs and libraries (LTINSTALL) work in a cross build
3# environment. 3# environment.
4 4
5Upstream-Status: Pending 5Upstream-Status: Inappropriate [embedded specific]
6 6
7--- a/build/top.mk 7--- a/build/top.mk
8+++ b/build/top.mk 8+++ b/build/top.mk
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
index f551861a3e..8cfd0033c8 100644
--- a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
@@ -1,6 +1,6 @@
1From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ 1From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/
2 2
3Upstream-status: Pending 3Upstream-Status: Pending
4 4
5--- a/configure.ac 5--- a/configure.ac
6+++ b/configure.ac 6+++ b/configure.ac
diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
index 6783b5175b..0b7e3a28a6 100644
--- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
+++ b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
@@ -4,7 +4,7 @@ When we are cross-compiling, we want to assume
4that /dev/urandom exists. We could change the source 4that /dev/urandom exists. We could change the source
5code to look for it, but this is the easy way out. 5code to look for it, but this is the easy way out.
6 6
7Upstream-Status: pending 7Upstream-Status: Inappropriate [embedded specific]
8 8
9Signed-off-by: Joe Slater <jslater@windriver.com> 9Signed-off-by: Joe Slater <jslater@windriver.com>
10 10
diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.8.bb b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb
index 17e6f72dcf..d95d6912e1 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.8.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb
@@ -23,8 +23,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
23 file://0001-ldif-filter-fix-parallel-build-failure.patch \ 23 file://0001-ldif-filter-fix-parallel-build-failure.patch \
24" 24"
25 25
26SRC_URI[md5sum] = "86e3ffce4adfc57cbb76ac0ff48b2614" 26SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11"
27SRC_URI[sha256sum] = "366ea1c3b24202de4481978b632128c0cfe4148d4ae13cabf93a1f38c56472dc" 27SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e"
28 28
29DEPENDS = "util-linux groff-native" 29DEPENDS = "util-linux groff-native"
30 30
@@ -179,7 +179,7 @@ do_install:append() {
179 # Installing slapd under ${sbin} is more FHS and LSB compliance 179 # Installing slapd under ${sbin} is more FHS and LSB compliance
180 mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd 180 mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd
181 rmdir --ignore-fail-on-non-empty ${D}${libexecdir} 181 rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
182 SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" 182 SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify"
183 cd ${D}/${sbindir}/ 183 cd ${D}/${sbindir}/
184 rm -f ${SLAPTOOLS} 184 rm -f ${SLAPTOOLS}
185 for i in ${SLAPTOOLS}; do ln -sf slapd $i; done 185 for i in ${SLAPTOOLS}; do ln -sf slapd $i; done