aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-02-21 13:21:13 +0800
committerKhem Raj <raj.khem@gmail.com>2019-02-22 18:14:52 -0800
commit678320933c6818e8cc7a11f14301fea1f095a67e (patch)
tree47eb39426c88951b7fd5e8291bdc1f7b5ac0fba0
parentd46861867e131592379f8bf1cfec4ab928757a76 (diff)
downloadmeta-openembedded-contrib-678320933c6818e8cc7a11f14301fea1f095a67e.tar.gz
meta-openembedded-contrib-678320933c6818e8cc7a11f14301fea1f095a67e.tar.bz2
meta-openembedded-contrib-678320933c6818e8cc7a11f14301fea1f095a67e.zip
openldap: upgrade 2.4.46 -> 2.4.47
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch43
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.4.47.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.4.46.bb)6
2 files changed, 32 insertions, 17 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
index ac18f08305..870fc98adf 100644
--- a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
+++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
@@ -1,24 +1,36 @@
-diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion
---- openldap-2.4.46.orig/build/mkversion 2018-10-25 18:46:10.383750480 +1300
-+++ openldap-2.4.46/build/mkversion 2018-10-25 18:46:33.156232586 +1300
-@@ -50,7 +50,15 @@
- fi
-
- APPLICATION=$1
--WHOWHERE="$USER@`uname -n`:`pwd`"
-+if [ -n "${SOURCE_DATE_EPOCH}" ]; then
-+ WHOWHERE="openldap"
+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(-)
+
+diff --git a/build/mkversion b/build/mkversion
+index 4e35723..9fa3bee 100755
+--- 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
+ else
+- WHOWHERE="$USER@$(uname -n):$(pwd)"
+ WHOWHERE="openldap"
+ DATE='" __DATE__ "'
+ TIME='" __TIME__ "'
-+fi
+ fi
cat << __EOF__
- /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
-@@ -72,7 +80,7 @@
+@@ -77,7 +81,7 @@ static const char copyright[] =
"COPYING RESTRICTIONS APPLY\n";
$static $const char $SYMBOL[] =
@@ -27,3 +39,6 @@ diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion
"\t$WHOWHERE\n";
__EOF__
+--
+2.7.4
+
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.46.bb b/meta-oe/recipes-support/openldap/openldap_2.4.47.bb
index 7fe9fb0d77..4345d7d892 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.46.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.47.bb
@@ -14,7 +14,7 @@ SECTION = "libs"
LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
-SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \
+SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \
file://openldap-m4-pthread.patch \
file://kill-icu.patch \
file://openldap-2.4.28-gnutls-gcrypt.patch \
@@ -26,8 +26,8 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "829016c5a9f45c51adc50073ac6f9fd7"
-SRC_URI[sha256sum] = "9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
+SRC_URI[md5sum] = "e508f97bfd778fec7799f286e5c07176"
+SRC_URI[sha256sum] = "f54c5877865233d9ada77c60c0f69b3e0bfd8b1b55889504c650047cc305520b"
DEPENDS = "util-linux groff-native"