<div><div dir="auto">We still need to set pv </div></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Apr 15, 2019 at 1:23 PM Vernon Mauery <<a href="mailto:vernon.mauery@linux.intel.com">vernon.mauery@linux.intel.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The ipmitool project has moved from sourceforge to github and is under<br>
new management. This updates the source so that it pulls directly from<br>
git rather than a tarball. Eventually, once the next release is tagged,<br>
the new SRCREV can be updated to that. But for now, the project is under<br>
active development and could probably benefit from periodic updates<br>
anyway.<br>
<br>
The SRCREV and SRC_URI links point to code that already has been patched<br>
to work with the new openssl 1.1 APIs, so the patch is no longer needed.<br>
<br>
Signed-off-by: Vernon Mauery <<a href="mailto:vernon.mauery@linux.intel.com" target="_blank">vernon.mauery@linux.intel.com</a>><br>
---<br>
.../0001-Migrate-to-openssl-1.1.patch | 152 ------------------<br>
.../{<a href="http://ipmitool_1.8.18.bb" rel="noreferrer" target="_blank">ipmitool_1.8.18.bb</a> => <a href="http://ipmitool_git.bb" rel="noreferrer" target="_blank">ipmitool_git.bb</a>} | 9 +-<br>
2 files changed, 3 insertions(+), 158 deletions(-)<br>
delete mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-Migrate-to-openssl-1.1.patch<br>
rename meta-oe/recipes-kernel/ipmitool/{<a href="http://ipmitool_1.8.18.bb" rel="noreferrer" target="_blank">ipmitool_1.8.18.bb</a> => <a href="http://ipmitool_git.bb" rel="noreferrer" target="_blank">ipmitool_git.bb</a>} (80%)<br>
<br>
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-Migrate-to-openssl-1.1.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-Migrate-to-openssl-1.1.patch<br>
deleted file mode 100644<br>
index 394aa16ad..000000000<br>
--- a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-Migrate-to-openssl-1.1.patch<br>
+++ /dev/null<br>
@@ -1,152 +0,0 @@<br>
-From c9dcb6afef9c343d070aaff208d11a997a45a105 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
-Date: Wed, 5 Sep 2018 22:19:38 -0700<br>
-Subject: [PATCH] Migrate to openssl 1.1<br>
-<br>
-Upstream-Status: Backport [<a href="https://sourceforge.net/p/ipmitool/source/ci/1664902525a1c3771b4d8b3ccab7ea1ba6b2bdd1/" rel="noreferrer" target="_blank">https://sourceforge.net/p/ipmitool/source/ci/1664902525a1c3771b4d8b3ccab7ea1ba6b2bdd1/</a>]<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
----<br>
- src/plugins/lanplus/lanplus_crypt_impl.c | 50 ++++++++++++++----------<br>
- 1 file changed, 29 insertions(+), 21 deletions(-)<br>
-<br>
-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c<br>
-index d5fac37..9652a5e 100644<br>
---- a/src/plugins/lanplus/lanplus_crypt_impl.c<br>
-+++ b/src/plugins/lanplus/lanplus_crypt_impl.c<br>
-@@ -164,11 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,<br>
- uint8_t * output,<br>
- uint32_t * bytes_written)<br>
- {<br>
-- EVP_CIPHER_CTX ctx;<br>
-- EVP_CIPHER_CTX_init(&ctx);<br>
-- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);<br>
-- EVP_CIPHER_CTX_set_padding(&ctx, 0);<br>
-- <br>
-+ EVP_CIPHER_CTX *ctx = NULL;<br>
- <br>
- *bytes_written = 0;<br>
- <br>
-@@ -182,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,<br>
- printbuf(input, input_length, "encrypting this data");<br>
- }<br>
- <br>
-+ ctx = EVP_CIPHER_CTX_new();<br>
-+ if (ctx == NULL) {<br>
-+ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");<br>
-+ return;<br>
-+ }<br>
-+ EVP_CIPHER_CTX_init(ctx);<br>
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);<br>
-+ EVP_CIPHER_CTX_set_padding(ctx, 0);<br>
- <br>
- /*<br>
- * The default implementation adds a whole block of padding if the input<br>
-@@ -191,28 +195,28 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,<br>
- assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);<br>
- <br>
- <br>
-- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))<br>
-+ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))<br>
- {<br>
- /* Error */<br>
- *bytes_written = 0;<br>
-- return;<br>
- }<br>
- else<br>
- {<br>
- uint32_t tmplen;<br>
- <br>
-- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))<br>
-+ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))<br>
- {<br>
-+ /* Error */<br>
- *bytes_written = 0;<br>
-- return; /* Error */<br>
- }<br>
- else<br>
- {<br>
- /* Success */<br>
- *bytes_written += tmplen;<br>
-- EVP_CIPHER_CTX_cleanup(&ctx);<br>
- }<br>
- }<br>
-+ /* performs cleanup and free */<br>
-+ EVP_CIPHER_CTX_free(ctx);<br>
- }<br>
- <br>
- <br>
-@@ -239,11 +243,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,<br>
- uint8_t * output,<br>
- uint32_t * bytes_written)<br>
- {<br>
-- EVP_CIPHER_CTX ctx;<br>
-- EVP_CIPHER_CTX_init(&ctx);<br>
-- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);<br>
-- EVP_CIPHER_CTX_set_padding(&ctx, 0);<br>
--<br>
-+ EVP_CIPHER_CTX *ctx = NULL;<br>
- <br>
- if (verbose >= 5)<br>
- {<br>
-@@ -252,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,<br>
- printbuf(input, input_length, "decrypting this data");<br>
- }<br>
- <br>
--<br>
- *bytes_written = 0;<br>
- <br>
- if (input_length == 0)<br>
- return;<br>
- <br>
-+ ctx = EVP_CIPHER_CTX_new();<br>
-+ if (ctx == NULL) {<br>
-+ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");<br>
-+ return;<br>
-+ }<br>
-+ EVP_CIPHER_CTX_init(ctx);<br>
-+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);<br>
-+ EVP_CIPHER_CTX_set_padding(ctx, 0);<br>
-+<br>
- /*<br>
- * The default implementation adds a whole block of padding if the input<br>
- * data is perfectly aligned. We would like to keep that from happening.<br>
-@@ -266,33 +274,33 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,<br>
- assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);<br>
- <br>
- <br>
-- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))<br>
-+ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))<br>
- {<br>
- /* Error */<br>
- lprintf(LOG_DEBUG, "ERROR: decrypt update failed");<br>
- *bytes_written = 0;<br>
-- return;<br>
- }<br>
- else<br>
- {<br>
- uint32_t tmplen;<br>
- <br>
-- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))<br>
-+ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))<br>
- {<br>
-+ /* Error */<br>
- char buffer[1000];<br>
- ERR_error_string(ERR_get_error(), buffer);<br>
- lprintf(LOG_DEBUG, "the ERR error %s", buffer);<br>
- lprintf(LOG_DEBUG, "ERROR: decrypt final failed");<br>
- *bytes_written = 0;<br>
-- return; /* Error */<br>
- }<br>
- else<br>
- {<br>
- /* Success */<br>
- *bytes_written += tmplen;<br>
-- EVP_CIPHER_CTX_cleanup(&ctx);<br>
- }<br>
- }<br>
-+ /* performs cleanup and free */<br>
-+ EVP_CIPHER_CTX_free(ctx);<br>
- <br>
- if (verbose >= 5)<br>
- {<br>
diff --git a/meta-oe/recipes-kernel/ipmitool/<a href="http://ipmitool_1.8.18.bb" rel="noreferrer" target="_blank">ipmitool_1.8.18.bb</a> b/meta-oe/recipes-kernel/ipmitool/<a href="http://ipmitool_git.bb" rel="noreferrer" target="_blank">ipmitool_git.bb</a><br>
similarity index 80%<br>
rename from meta-oe/recipes-kernel/ipmitool/<a href="http://ipmitool_1.8.18.bb" rel="noreferrer" target="_blank">ipmitool_1.8.18.bb</a><br>
rename to meta-oe/recipes-kernel/ipmitool/<a href="http://ipmitool_git.bb" rel="noreferrer" target="_blank">ipmitool_git.bb</a><br>
index b7f1aa914..cf6b9065d 100644<br>
--- a/meta-oe/recipes-kernel/ipmitool/<a href="http://ipmitool_1.8.18.bb" rel="noreferrer" target="_blank">ipmitool_1.8.18.bb</a><br>
+++ b/meta-oe/recipes-kernel/ipmitool/<a href="http://ipmitool_git.bb" rel="noreferrer" target="_blank">ipmitool_git.bb</a><br>
@@ -14,7 +14,7 @@ Log (SEL), printing Field Replaceable Unit (FRU) information, reading and \<br>
setting LAN configuration, and chassis power control. \<br>
"<br>
<br>
-HOMEPAGE = "<a href="http://ipmitool.sourceforge.net/" rel="noreferrer" target="_blank">http://ipmitool.sourceforge.net/</a>"<br>
+HOMEPAGE = "<a href="https://github.com/ipmitool/ipmitool" rel="noreferrer" target="_blank">https://github.com/ipmitool/ipmitool</a>"<br>
SECTION = "kernel/userland"<br>
<br>
LICENSE = "BSD-3-Clause"<br>
@@ -22,11 +22,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184"<br>
<br>
DEPENDS = "openssl readline ncurses"<br>
<br>
-SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \<br>
- file://0001-Migrate-to-openssl-1.1.patch \<br>
- "<br>
-SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3"<br>
-SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01"<br>
+SRC_URI = "git://<a href="http://github.com/ipmitool/ipmitool.git;protocol=https" rel="noreferrer" target="_blank">github.com/ipmitool/ipmitool.git;protocol=https</a>"<br>
+SRCREV = "b0d84e0f15b2120eaf9fe1301cf02c24eebcfb37"<br>
<br>
inherit autotools<br>
<br>
-- <br>
2.17.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>