diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-support/openldap | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/openldap')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch | 45 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.47.bb (renamed from meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.46.bb) | 6 |
2 files changed, 33 insertions, 18 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch index 4eb389797..870fc98ad 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch +++ b/meta-openembedded/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 -+ WHOWHERE="$USER@$(uname -n):$(pwd)" + 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-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.46.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.47.bb index 7fe9fb0d7..4345d7d89 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.46.bb +++ b/meta-openembedded/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" |