diff options
| author | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-03-29 15:47:26 -0300 |
|---|---|---|
| committer | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-03-29 15:47:26 -0300 |
| commit | 82a9c20ffb045011b53f3188d04d79f440ee8b06 (patch) | |
| tree | 8309cc593f59861ed4848dea09b09b3f04e18416 /recipes-support | |
| parent | 2619e3f3312713f4077d83b2f2e5f9c7de66d12b (diff) | |
| parent | b1a114da280a05cfc2b7b099c97101bd20cc6b8f (diff) | |
| download | meta-updater-82a9c20ffb045011b53f3188d04d79f440ee8b06.tar.gz | |
Merge remote-tracking branch 'origin/rocko' into rocko-merge
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
Diffstat (limited to 'recipes-support')
| -rw-r--r-- | recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | 2 | ||||
| -rw-r--r-- | recipes-support/libp11/libp11_0.4.7.bb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch index 0538eff..bd233ee 100644 --- a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch +++ b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | |||
| @@ -17,7 +17,7 @@ index 45d5ad3..75625e6 100644 | |||
| 17 | 17 | ||
| 18 | -#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER) | 18 | -#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER) |
| 19 | -static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, | 19 | -static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, |
| 20 | +#if OPENSSL_VERSION_NUMBER <= 0x100020e0L || defined(LIBRESSL_VERSION_NUMBER) | 20 | +#if OPENSSL_VERSION_NUMBER < 0x100020f0L || defined(LIBRESSL_VERSION_NUMBER) |
| 21 | + | 21 | + |
| 22 | +# if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L | 22 | +# if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L |
| 23 | +# undef EVP_PKEY_meth_get_sign | 23 | +# undef EVP_PKEY_meth_get_sign |
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb index 7a93102..02d9e50 100644 --- a/recipes-support/libp11/libp11_0.4.7.bb +++ b/recipes-support/libp11/libp11_0.4.7.bb | |||
| @@ -7,6 +7,7 @@ SECTION = "Development/Libraries" | |||
| 7 | LICENSE = "LGPLv2+" | 7 | LICENSE = "LGPLv2+" |
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" |
| 9 | DEPENDS = "libtool openssl" | 9 | DEPENDS = "libtool openssl" |
| 10 | RDEPENDS_${PN} += " opensc" | ||
| 10 | 11 | ||
| 11 | SRC_URI = "git://github.com/OpenSC/libp11.git \ | 12 | SRC_URI = "git://github.com/OpenSC/libp11.git \ |
| 12 | file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch" | 13 | file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch" |