mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-13 15:47:23 +00:00
ipmiutil: Upgrade 3.2.2 -> 3.2.3
Upgrade to release 3.2.3: - configure.ac: add 0800-openssl-4.patch from Brent Kirby - util/ipmiutil.c: set ver 3.23 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 parent
4b1d4ef798
commit
1b422e3bc4
4 files changed
+20
-38
No files matched your search
+1
-4
@@ -1,4 +1,4 @@
|
||||
From 097e108b81f2571c4c51871044adf409b6954649 Mon Sep 17 00:00:00 2001
|
||||
From a43ea47f1a1011ea9e9a365e4fb3612c7703f15e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 3 Sep 2022 00:44:52 -0700
|
||||
Subject: [PATCH] ihpm: Include stdlib.h for malloc/free/atoi functions
|
||||
@@ -21,6 +21,3 @@ index 740ab74..5ad9ef6 100644
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
From: Alper Ak <alperyasinak1@gmail.com>
|
||||
Date: Wed, 9 Sep 2026 23:00:00 +0300
|
||||
Subject: [PATCH] configure: enable SSL11 for OpenSSL 4
|
||||
|
||||
OpenSSL 4 keeps EVP_CIPHER_CTX opaque, so it cannot go on the stack.
|
||||
The heap path behind SSL11 is already there, configure just does not
|
||||
turn it on for major version 4.
|
||||
|
||||
Upstream-Status: Submitted [https://sourceforge.net/p/ipmiutil/feature-requests/13/]
|
||||
Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -443,7 +443,7 @@
|
||||
MD2_CFLAGS="-DSKIP_MD2 -DSSL11"
|
||||
sslnew=1
|
||||
fi
|
||||
- if test "$sslrel" = "3"; then
|
||||
+ if test "$sslrel" = "3" -o "$sslrel" = "4"; then
|
||||
echo "Detected openssl-$sslver"
|
||||
MD2_CFLAGS="-DSKIP_MD2 -DSSL11"
|
||||
sslnew=1
|
||||
@@ -1,11 +1,20 @@
|
||||
allow systemd path to be defined by configure option.
|
||||
From 4e40e47ff5e128a0763e648180fe8ad01027f7c4 Mon Sep 17 00:00:00 2001
|
||||
From: Armin Kuster <akuster@mvista.com>
|
||||
Date: Sun, 16 Aug 2015 15:02:20 -0700
|
||||
Subject: [PATCH] allow systemd path to be defined by configure option.
|
||||
|
||||
The configure probes the host for systemd path information.
|
||||
|
||||
Upstream-Status: Inappropriate [Embedded]
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
---
|
||||
configure.ac | 60 +++++++++++++++++++++++++++------------------
|
||||
scripts/Makefile.am | 14 +++++++----
|
||||
2 files changed, 45 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index aaab77e..b540fdd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -151,7 +151,6 @@ CROSS_LFLAGS=""
|
||||
@@ -13,11 +22,11 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
LIBSENSORS=""
|
||||
SAM2OBJ="isensor2.o ievents2.o"
|
||||
-SYSTEMD_DIR=/usr/share/ipmiutil
|
||||
|
||||
|
||||
AC_ARG_ENABLE([useflags],
|
||||
[ --enable-useflags include environment CFLAGS and LDFLAGS.],
|
||||
@@ -211,29 +210,42 @@ AC_ARG_ENABLE([gpl],
|
||||
|
||||
|
||||
dnl Does this Linux have systemd enabled? Otherwise use sysv init.
|
||||
AC_ARG_ENABLE([systemd],
|
||||
- [ --enable-systemd enable systemd service type=notify support and %_unitdir [[default=disabled]]],)
|
||||
@@ -79,7 +88,7 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
+ fi
|
||||
+fi
|
||||
fi
|
||||
|
||||
|
||||
dnl start main logic
|
||||
@@ -563,7 +575,7 @@ AC_SUBST(INS_LIB)
|
||||
AC_SUBST(SUBDIR_S)
|
||||
@@ -89,7 +98,9 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
+AC_SUBST(systemddir)
|
||||
AC_SUBST(SHR_LINK)
|
||||
AC_SUBST(pkgconfigdir)
|
||||
|
||||
|
||||
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
|
||||
index 9a89e3b..fbc074a 100755
|
||||
--- a/scripts/Makefile.am
|
||||
+++ b/scripts/Makefile.am
|
||||
@@ -17,7 +17,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily
|
||||
@@ -101,7 +112,7 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
+systemddir = @systemddir@
|
||||
sysvinit = ${datato}
|
||||
sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm iuser
|
||||
|
||||
|
||||
@@ -47,10 +48,13 @@ install:
|
||||
${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port
|
||||
${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info
|
||||
|
||||
+2
-3
@@ -22,9 +22,8 @@ PARALLEL_MAKE = ""
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \
|
||||
file://fix_systemd_path.patch \
|
||||
file://0001-ihpm-Include-stdlib.h-for-malloc-free-atoi-functions.patch \
|
||||
file://0002-configure-enable-SSL11-for-OpenSSL-4.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "37f9bc8e6b18c1155e4d5ea38c87b83908b7acc7a44fbc5e3af493f26ef8b767"
|
||||
"
|
||||
SRC_URI[sha256sum] = "d26cae7318f12ab1098ec6c8ef2f017722659dda26eb81ebc6b50edc0453867a"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ipmiutil/files/"
|
||||
UPSTREAM_CHECK_REGEX = "ipmiutil-(?P<pver>\d+(\.\d+)+)\.tar\.gz"
|
||||
Reference in new issue
Block a user