diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-support/openldap | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
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/install-strip.patch | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch | 29 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.46.bb (renamed from meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb) | 11 |
7 files changed, 43 insertions, 8 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch index 2992b7030..7c675962b 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch @@ -1,6 +1,9 @@ # This patch ensures that the install operations which strip # programs and libraries (LTINSTALL) work in a cross build # environment. + +Upstream-Status: Pending + --- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 +++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 @@ -116,7 +116,7 @@ diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch index dcf541137..35e46465a 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch @@ -2,7 +2,7 @@ From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> slapd depends on ICU if it was built first. -Upstream-status: inappropiate [embedded specific] +Upstream-Status: inappropiate [embedded specific] --- configure.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch index c7b1552c1..86d0767a4 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch @@ -1,6 +1,6 @@ From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ -Upstream-status: Unknown +Upstream-status: Pending -- diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch index de9ca528a..25e148ed0 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch @@ -10,6 +10,8 @@ cipher strings, which might cause a weaker than intended cipher to be used and allow remote attackers to have unspecified impact via unknown vectors. +Upstream-Status: Pending + Signed-off-by: Li Wang <li.wang@windriver.com> --- libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch index b669b7254..38c0a5af2 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 +++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 @@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ 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 new file mode 100644 index 000000000..4eb389797 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -0,0 +1,29 @@ +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" ++ DATE=$(date -d@$SOURCE_DATE_EPOCH +' %b %d %Y ') ++ TIME=$(date -d@$SOURCE_DATE_EPOCH +' %H:%M:%S ') ++else ++ WHOWHERE="$USER@$(uname -n):$(pwd)" ++ DATE='" __DATE__ "' ++ TIME='" __TIME__ "' ++fi + + cat << __EOF__ + /* This work is part of OpenLDAP Software <http://www.openldap.org/>. +@@ -72,7 +80,7 @@ + "COPYING RESTRICTIONS APPLY\n"; + + $static $const char $SYMBOL[] = +-"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n" ++"@(#) \$$PACKAGE: $APPLICATION $VERSION ($DATE $TIME) \$\n" + "\t$WHOWHERE\n"; + + __EOF__ diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.46.bb index 82d661983..7fe9fb0d7 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.46.bb @@ -1,5 +1,3 @@ -# OpenLDAP, a license free (see http://www.OpenLDAP.org/license.html) -# SUMMARY = "OpenLDAP Directory Service" DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." HOMEPAGE = "http://www.OpenLDAP.org/license.html" @@ -9,9 +7,9 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=25fd3721960f39128cd15a749fd21139 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=25b4ead0e45182e7c2914e59ff57009f \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ -" + " SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" @@ -25,10 +23,11 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \ file://slapd.service \ file://thread_stub.patch \ file://openldap-CVE-2015-3276.patch \ + file://remove-user-host-pwd-from-version.patch \ " -SRC_URI[md5sum] = "00ff8301277cdfd0af728a6927042a13" -SRC_URI[sha256sum] = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824" +SRC_URI[md5sum] = "829016c5a9f45c51adc50073ac6f9fd7" +SRC_URI[sha256sum] = "9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d" DEPENDS = "util-linux groff-native" |