diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-02-21 13:21:13 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-22 18:14:52 -0800 |
commit | 678320933c6818e8cc7a11f14301fea1f095a67e (patch) | |
tree | 47eb39426c88951b7fd5e8291bdc1f7b5ac0fba0 /meta-oe/recipes-support | |
parent | d46861867e131592379f8bf1cfec4ab928757a76 (diff) | |
download | meta-openembedded-678320933c6818e8cc7a11f14301fea1f095a67e.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch | 43 | ||||
-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 ac18f0830..870fc98ad 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 @@ | |||
1 | diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion | 1 | From 868a04b0596e2df708ba14ed70815b1411db3db1 Mon Sep 17 00:00:00 2001 |
2 | --- openldap-2.4.46.orig/build/mkversion 2018-10-25 18:46:10.383750480 +1300 | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | +++ openldap-2.4.46/build/mkversion 2018-10-25 18:46:33.156232586 +1300 | 3 | Date: Thu, 21 Feb 2019 11:33:24 +0800 |
4 | @@ -50,7 +50,15 @@ | 4 | Subject: [PATCH] mkversion: remove user host pwd from version |
5 | fi | 5 | |
6 | 6 | Upstream-Status: Pending | |
7 | APPLICATION=$1 | 7 | |
8 | -WHOWHERE="$USER@`uname -n`:`pwd`" | 8 | Update this patch to version 2.4.47 |
9 | +if [ -n "${SOURCE_DATE_EPOCH}" ]; then | 9 | |
10 | + WHOWHERE="openldap" | 10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
11 | --- | ||
12 | build/mkversion | 8 ++++++-- | ||
13 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/build/mkversion b/build/mkversion | ||
16 | index 4e35723..9fa3bee 100755 | ||
17 | --- a/build/mkversion | ||
18 | +++ b/build/mkversion | ||
19 | @@ -53,8 +53,12 @@ APPLICATION=$1 | ||
20 | # Reproducible builds set SOURCE_DATE_EPOCH, want constant strings | ||
21 | if [ -n "${SOURCE_DATE_EPOCH}" ]; then | ||
22 | WHOWHERE="openldap" | ||
11 | + DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ') | 23 | + DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ') |
12 | + TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ') | 24 | + TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ') |
13 | +else | 25 | else |
26 | - WHOWHERE="$USER@$(uname -n):$(pwd)" | ||
14 | + WHOWHERE="openldap" | 27 | + WHOWHERE="openldap" |
15 | + DATE='" __DATE__ "' | 28 | + DATE='" __DATE__ "' |
16 | + TIME='" __TIME__ "' | 29 | + TIME='" __TIME__ "' |
17 | +fi | 30 | fi |
18 | 31 | ||
19 | cat << __EOF__ | 32 | cat << __EOF__ |
20 | /* This work is part of OpenLDAP Software <http://www.openldap.org/>. | 33 | @@ -77,7 +81,7 @@ static const char copyright[] = |
21 | @@ -72,7 +80,7 @@ | ||
22 | "COPYING RESTRICTIONS APPLY\n"; | 34 | "COPYING RESTRICTIONS APPLY\n"; |
23 | 35 | ||
24 | $static $const char $SYMBOL[] = | 36 | $static $const char $SYMBOL[] = |
@@ -27,3 +39,6 @@ diff -ru openldap-2.4.46.orig/build/mkversion openldap-2.4.46/build/mkversion | |||
27 | "\t$WHOWHERE\n"; | 39 | "\t$WHOWHERE\n"; |
28 | 40 | ||
29 | __EOF__ | 41 | __EOF__ |
42 | -- | ||
43 | 2.7.4 | ||
44 | |||
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 7fe9fb0d7..4345d7d89 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" | |||
14 | 14 | ||
15 | LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 15 | LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
16 | 16 | ||
17 | SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ | 17 | SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ |
18 | file://openldap-m4-pthread.patch \ | 18 | file://openldap-m4-pthread.patch \ |
19 | file://kill-icu.patch \ | 19 | file://kill-icu.patch \ |
20 | file://openldap-2.4.28-gnutls-gcrypt.patch \ | 20 | file://openldap-2.4.28-gnutls-gcrypt.patch \ |
@@ -26,8 +26,8 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ | |||
26 | file://remove-user-host-pwd-from-version.patch \ | 26 | file://remove-user-host-pwd-from-version.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | SRC_URI[md5sum] = "829016c5a9f45c51adc50073ac6f9fd7" | 29 | SRC_URI[md5sum] = "e508f97bfd778fec7799f286e5c07176" |
30 | SRC_URI[sha256sum] = "9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d" | 30 | SRC_URI[sha256sum] = "f54c5877865233d9ada77c60c0f69b3e0bfd8b1b55889504c650047cc305520b" |
31 | 31 | ||
32 | DEPENDS = "util-linux groff-native" | 32 | DEPENDS = "util-linux groff-native" |
33 | 33 | ||