diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-09-03 17:10:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 17:10:13 +0200 |
| commit | 77cf9a3e34a7db084a61fbf610dc0a778351e477 (patch) | |
| tree | 3747924948c192425f451182be2b66e3e7ec012d | |
| parent | f12efe18a25397ef2c7d1514321b9bf7b2cef2e7 (diff) | |
| parent | 754903a6e45ddc951b967a069f7c717da6b8f0fb (diff) | |
| download | meta-updater-77cf9a3e34a7db084a61fbf610dc0a778351e477.tar.gz | |
Merge pull request #379 from advancedtelematic/bugfix/aktualizr-etc-master
aktualizr: bump to latest version, fix libp11/openssl (master)
| -rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 2 | ||||
| -rw-r--r-- | recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 5af36e9..b8105a0 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
| @@ -26,7 +26,7 @@ SRC_URI = " \ | |||
| 26 | file://aktualizr-secondary.socket \ | 26 | file://aktualizr-secondary.socket \ |
| 27 | file://aktualizr-serialcan.service \ | 27 | file://aktualizr-serialcan.service \ |
| 28 | " | 28 | " |
| 29 | SRCREV = "a94a15e31f3b973966b1afc9081fc1b17a3b9d48" | 29 | SRCREV = "062ab7756c375ee2c913d3197cafe4ee2f97ef2a" |
| 30 | BRANCH ?= "master" | 30 | BRANCH ?= "master" |
| 31 | 31 | ||
| 32 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
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 902352c..55f2ed3 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 < 0x10002100L || defined(LIBRESSL_VERSION_NUMBER) | 20 | +#if OPENSSL_VERSION_NUMBER < 0x10002110L || 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 |