diff --git a/.OpenIPMI.metadata b/.OpenIPMI.metadata index d1b8c78..c6845c5 100644 --- a/.OpenIPMI.metadata +++ b/.OpenIPMI.metadata @@ -1,2 +1,2 @@ -746cd619a704811df7c9944011d4d645f8cc6823 SOURCES/OpenIPMI-2.0.23.tar.gz +043738af9e1aaa6ae4f372d4af7870683e68faf8 SOURCES/OpenIPMI-2.0.27.tar.gz ade00c8a47a576e677ffc2efefca2d7269f175d6 SOURCES/openipmi.sysconf diff --git a/.gitignore b/.gitignore index 5acf080..3f2811e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/OpenIPMI-2.0.23.tar.gz +SOURCES/OpenIPMI-2.0.27.tar.gz SOURCES/openipmi.sysconf diff --git a/SOURCES/OpenIPMI-2.0.18-pthread-pkgconfig.patch b/SOURCES/OpenIPMI-2.0.18-pthread-pkgconfig.patch deleted file mode 100644 index 9a76208..0000000 --- a/SOURCES/OpenIPMI-2.0.18-pthread-pkgconfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -468067 - "pkg-config --libs OpenIPMIpthread" fails - -Fix the pkgconfig file. - -Reported upstream as http://sourceforge.net/tracker/index.php?func=detail&aid=2188750&group_id=36127&atid=416301 - -diff -up OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig OpenIPMI-2.0.18/OpenIPMIpthread.pc.in ---- OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig 2005-08-17 05:56:02.000000000 +0200 -+++ OpenIPMI-2.0.18/OpenIPMIpthread.pc.in 2010-05-20 15:48:07.000000000 +0200 -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: OpenIPMIpthread - Description: Pthread OS handler for OpenIPMI - Version: @VERSION@ --Requires: OpenIPMI pthread -+Requires: OpenIPMI - Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread --Cflags: -I${includedir} -+Cflags: -I${includedir} -pthread diff --git a/SOURCES/OpenIPMI-2.0.19-man.patch b/SOURCES/OpenIPMI-2.0.19-man.patch index da1a2fd..3ba57e4 100644 --- a/SOURCES/OpenIPMI-2.0.19-man.patch +++ b/SOURCES/OpenIPMI-2.0.19-man.patch @@ -1,4 +1,4 @@ -From dfca464e5fe4c9107f08bff7e6e2730a504945b7 Mon Sep 17 00:00:00 2001 +From 3e9c10af0d8fe307408bb82048637b5030d43002 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 2 Jun 2016 12:47:22 +0200 Subject: [PATCH] Apply './OpenIPMI-2.0.19-man.patch' @@ -54,7 +54,7 @@ index ff43d5c..9360507 100644 .SH CONFIGURATION diff --git a/man/ipmi_cmdlang.7 b/man/ipmi_cmdlang.7 -index 4d18e76..a6d73b9 100644 +index 917b7f5..7562cb0 100644 --- a/man/ipmi_cmdlang.7 +++ b/man/ipmi_cmdlang.7 @@ -246,7 +246,7 @@ instance, the command to create a domain is @@ -450,7 +450,7 @@ index 1479a1b..ada15d8 100644 .TP diff --git a/sample/ipmicmd.c b/sample/ipmicmd.c -index 6cbcdc5..5f5c1ec 100644 +index 37fb913..af1ef6b 100644 --- a/sample/ipmicmd.c +++ b/sample/ipmicmd.c @@ -124,6 +124,7 @@ void usage(void) @@ -462,7 +462,7 @@ index 6cbcdc5..5f5c1ec 100644 char * diff --git a/sample/rmcp_ping.c b/sample/rmcp_ping.c -index 7814792..5778fea 100644 +index c03fb5e..10a9ca4 100644 --- a/sample/rmcp_ping.c +++ b/sample/rmcp_ping.c @@ -156,6 +156,11 @@ main(int argc, char *argv[]) @@ -478,10 +478,10 @@ index 7814792..5778fea 100644 i++; if (i >= argc) { diff --git a/sample/solterm.c b/sample/solterm.c -index 38a3f9d..a3e52de 100644 +index 8adfb69..966b6ac 100644 --- a/sample/solterm.c +++ b/sample/solterm.c -@@ -743,7 +743,12 @@ int main(int argc, char *argv[]) +@@ -745,7 +745,12 @@ int main(int argc, char *argv[]) /* Now we make sure "lan" is the first argument so we get the right connection type... */ @@ -496,7 +496,7 @@ index 38a3f9d..a3e52de 100644 progname); exit(1); diff --git a/ui/basic_ui.c b/ui/basic_ui.c -index 6993eb2..84889cb 100644 +index 5676ce4..3c10868 100644 --- a/ui/basic_ui.c +++ b/ui/basic_ui.c @@ -306,6 +306,26 @@ snmp_init(os_handler_t *os_hnd) @@ -539,5 +539,5 @@ index 6993eb2..84889cb 100644 full_screen = 0; } else if (strcmp(arg, "-dlock") == 0) { -- -2.7.4 +2.20.1 diff --git a/SOURCES/OpenIPMI-2.0.27-readline.patch b/SOURCES/OpenIPMI-2.0.27-readline.patch new file mode 100644 index 0000000..3232cdd --- /dev/null +++ b/SOURCES/OpenIPMI-2.0.27-readline.patch @@ -0,0 +1,21 @@ +commit 06522ed09da752da33279ac624a44630645edf0b +Author: Vaclav Dolezal +Date: Wed Mar 20 15:10:45 2019 +0100 + + Use readline instead of editline in sample/ipmi_serial_bmc_emu.c + + Signed-off-by: Vaclav Dolezal + +diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c +index e0ae0197..1b8bb9ac 100644 +--- a/sample/ipmi_serial_bmc_emu.c ++++ b/sample/ipmi_serial_bmc_emu.c +@@ -42,7 +42,7 @@ + #include + #include + #include +-#include ++#include + + #define _GNU_SOURCE + #include diff --git a/SPECS/OpenIPMI.spec b/SPECS/OpenIPMI.spec index e042119..53acfee 100644 --- a/SPECS/OpenIPMI.spec +++ b/SPECS/OpenIPMI.spec @@ -1,13 +1,12 @@ %global _hardened_build 1 -# TODO: uses private copy of libedit, should be modified to use system one %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI %global once %{_localstatedir}/run/%{name}.first_installation -Version: 2.0.23 -Release: 2%{?dist} +Version: 2.0.27 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -18,22 +17,17 @@ Source3: ipmi.service Source4: openipmi.modalias BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter +BuildRequires: readline-devel BuildRequires: desktop-file-utils BuildRequires: systemd-units -# aarch64 workaround remove once released package's config.sub contains aarch64 -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: libtool -# aarch64 end - Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires(post): systemd-sysv Requires:%{name}-libs = %{version}-%{release} -Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch +Patch1: OpenIPMI-2.0.27-readline.patch Patch2: OpenIPMI-2.0.19-man.patch %description @@ -45,7 +39,7 @@ This package contains the tools of the OpenIPMI project. Group: System Environment/Kernel Summary: Module aliases for IPMI subsystem Requires: systemd -Requires: kmod +Requires: kmod, %{name} %description modalias The OpenIPMI-modalias provides configuration file with module aliases @@ -91,20 +85,12 @@ of the OpenIPMI project. %prep %setup -q -%patch1 -p1 -b .pthread +%patch1 -p1 -b .readline %patch2 -p1 -b .manscan %build export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" -# aarch64 workaround remove once released package's config.sub contains aarch64 -%{__libtoolize} --copy --force --automake -%{__aclocal} -%{__autoheader} -%{__automake} --add-missing --copy --foreign --force-missing -%{__autoconf} -# aarch64 end - %configure \ --with-pythoninstall=%{python_sitearch} \ --disable-dependency-tracking \ @@ -117,7 +103,7 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make # not %{?_smp_mflags} safe +make # not %%{?_smp_mflags} safe %install make install DESTDIR=$RPM_BUILD_ROOT @@ -155,8 +141,18 @@ if [ -f "%{once}" ]; then /sbin/modprobe ipmi_ssif fi - /sbin/modprobe ipmi_devintf || :; - /sbin/modprobe ipmi_msghandler || :; + if /usr/bin/udevadm info --export-db | grep -qie 'ipmi_devintf'; then + /sbin/modprobe ipmi_devintf || :; + else + echo "WARNING: ipmi_devintf module isn't available." + fi + + if /usr/bin/udevadm info --export-db | grep -qie 'ipmi_msghandler'; then + /sbin/modprobe ipmi_msghandler || :; + else + echo "WARNING: ipmi_msghandler module isn't available." + fi + %{__rm} -f %{once} || :; /usr/bin/udevadm settle fi @@ -249,6 +245,12 @@ fi %config(noreplace) %{_prefix}/lib/modprobe.d/OpenIPMI.conf %changelog +* Wed Mar 20 2019 Vaclav Dolezal - 2.0.27-1 +- New upstream release 2.0.27 + +* Wed Jan 16 2019 Josef Ridky - 2.0.23-3 +- Resolves: #1608245 - fix issue with sed + * Tue Oct 24 2017 Josef Ridky - 2.0.23-2 - Related: #1458422 - fix startup failure on aarch64