From a625845fbe07da32005c884840970c239974862b Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 26 Oct 2010 10:36:15 +0200 Subject: [PATCH 001/129] Rebuilt for new Net-SNMP --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 8ceda82..ef5c552 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/fedora-openipmigui.desktop %changelog +* Tue Oct 26 2010 Jan Safranek - 2.0.18-5 +- Rebuilt for new Net-SNMP + * Wed Jul 21 2010 David Malcolm - 2.0.18-4 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 6c0e0fe21189d968b369776bba9b17b4eed810e3 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 1 Nov 2010 12:59:30 +0100 Subject: [PATCH 002/129] Removed the openipmigui tool, it does not work with TCL without thread support Resolves: #646184 --- OpenIPMI.spec | 38 +++++++++++++++----------------------- openipmigui.desktop | 7 ------- 2 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 openipmigui.desktop diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ef5c552..f427102 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,15 +4,14 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi.initscript -Source3: openipmigui.desktop -Source4: README.initscript +Source3: README.initscript BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter @@ -60,23 +59,19 @@ Requires: %{name} = %{version}-%{release} The OpenIPMI-devel package contains the development libraries and header files of the OpenIPMI project. -%package gui -Group: System Environment/Base -Summary: IPMI graphical user interface tool -Requires: tix tkinter %{name}-python = %{version}-%{release} - -%description gui -The OpenIPMI-gui package contains the graphical user interface to monitor -and control IPMI-enabled devices. - - %prep %setup -q %patch1 -p1 %build export CFLAGS="-fPIC $RPM_OPT_FLAGS" -%configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --disable-static +%configure \ + --with-pythoninstall=%{python_sitearch} \ + --disable-dependency-tracking \ + --with-tcl=no \ + --disable-static \ + --with-tkinter=no + # get rid of rpath 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 @@ -93,9 +88,9 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi install -d ${RPM_BUILD_ROOT}%{_initrddir} install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/ipmi -desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} +install -m 644 %SOURCE3 . -install -m 644 %SOURCE4 . +rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %post /sbin/chkconfig --add ipmi @@ -159,14 +154,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%files gui -%defattr(-,root,root) -%{_bindir}/openipmigui -%{_mandir}/man1/openipmigui* -%{python_sitearch}/openipmigui -%{_datadir}/applications/fedora-openipmigui.desktop - %changelog +* Mon Nov 1 2010 Jan Safranek - 2.0.18-6 +- Removed the openipmigui tool, it does not work with TCL without thread + support (#646184) + * Tue Oct 26 2010 Jan Safranek - 2.0.18-5 - Rebuilt for new Net-SNMP diff --git a/openipmigui.desktop b/openipmigui.desktop deleted file mode 100644 index dcdd567..0000000 --- a/openipmigui.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=OpenIPMI GUI -Comment=Manage local or remote systems using IPMI protocol -Exec=/usr/bin/openipmigui -Terminal=false -Type=Application -Categories=System; From 5f661f97f8e6de7191ec96b9175104dd4419af39 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:06:49 -0600 Subject: [PATCH 003/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index f427102..a34dffd 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.0.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Nov 1 2010 Jan Safranek - 2.0.18-6 - Removed the openipmigui tool, it does not work with TCL without thread support (#646184) From aa76f1995ddb42353ee2662b380c79be168423f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 10 Jun 2011 16:06:47 +0200 Subject: [PATCH 004/129] Perl 5.14 mass rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a34dffd..9a7c375 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Fri Jun 10 2011 Marcela Mašláňová - 2.0.18-8 +- Perl 5.14 mass rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 2.0.18-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From bc62396d1ce12f166faf826de09dc60de8e443e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 17 Jun 2011 12:34:36 +0200 Subject: [PATCH 005/129] Perl mass rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9a7c375..60c209d 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Fri Jun 17 2011 Marcela Mašláňová - 2.0.18-9 +- Perl mass rebuild + * Fri Jun 10 2011 Marcela Mašláňová - 2.0.18-8 - Perl 5.14 mass rebuild From 67ca76881d5c24f576a02905ca9ce9cc22f967b3 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 8 Jul 2011 14:55:08 +0200 Subject: [PATCH 006/129] Rebuilt for new Net-SNMP --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 60c209d..f7e4539 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Fri Jul 8 2011 Jan Safranek - 2.0.18-10 +- Rebuilt for new Net-SNMP + * Fri Jun 17 2011 Marcela Mašláňová - 2.0.18-9 - Perl mass rebuild From b75b66e397a26304ee4967497eac4056a7d90fa1 Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Wed, 20 Jul 2011 12:31:17 +0200 Subject: [PATCH 007/129] Perl mass rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index f7e4539..5922516 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 20 2011 Petr Sabata - 2.0.18-11 +- Perl mass rebuild + * Fri Jul 8 2011 Jan Safranek - 2.0.18-10 - Rebuilt for new Net-SNMP From 62c955518106959cf280e922cfb80724e070d8f8 Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Thu, 21 Jul 2011 18:59:43 +0200 Subject: [PATCH 008/129] Perl mass rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 5922516..5169983 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 21 2011 Petr Sabata - 2.0.18-12 +- Perl mass rebuild + * Wed Jul 20 2011 Petr Sabata - 2.0.18-11 - Perl mass rebuild From c90df366b72933d71b88775f8ccb7ccdba2a5024 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:28:21 -0600 Subject: [PATCH 009/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 5169983..4ac649b 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.0.18-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Jul 21 2011 Petr Sabata - 2.0.18-12 - Perl mass rebuild From fc0f23c58fae3fe2fb1eff37c2e636fab724c561 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Wed, 9 May 2012 14:19:03 +0200 Subject: [PATCH 010/129] Added systemd unit file. Resolves: #820125 --- OpenIPMI.spec | 59 ++++++++++---- README.initscript | 2 - ipmi.service | 12 +++ openipmi.initscript => openipmi-helper | 108 ++++--------------------- 4 files changed, 71 insertions(+), 110 deletions(-) delete mode 100644 README.initscript create mode 100644 ipmi.service rename openipmi.initscript => openipmi-helper (85%) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 4ac649b..bf9dc8c 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,20 +4,22 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf -Source2: openipmi.initscript -Source3: README.initscript +Source2: openipmi-helper +Source3: ipmi.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter BuildRequires: desktop-file-utils -Requires(post): chkconfig -Requires(preun): chkconfig +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(post): systemd-sysv Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch @@ -85,39 +87,58 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi -install -d ${RPM_BUILD_ROOT}%{_initrddir} -install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/ipmi - -install -m 644 %SOURCE3 . +install -d ${RPM_BUILD_ROOT}%{_libexecdir} +install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper +install -d ${RPM_BUILD_ROOT}%{_unitdir} +install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %post -/sbin/chkconfig --add ipmi +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [ $1 = 0 ]; then - service ipmi stop >/dev/null 2>&1 - /sbin/chkconfig --del ipmi +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable ipmi.service > /dev/null 2>&1 || : + /bin/systemctl stop ipmi.service > /dev/null 2>&1 || : fi %postun -if [ "$1" -ge "1" ]; then - service ipmi condrestart >/dev/null 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart ipmi.service >/dev/null 2>&1 || : fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +### A sysv => systemd migration contains all of the same scriptlets as a +### systemd package. These are additional scriptlets + +%triggerun -- OpenIPMI < 2.0.18-14 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply httpd +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save ipmi >/dev/null 2>&1 ||: +/bin/systemctl --no-reload enable ipmi.service >/dev/null 2>&1 ||: +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del ipmi >/dev/null 2>&1 || : +/bin/systemctl try-restart ipmi.service >/dev/null 2>&1 || : + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ README README.Force README.MotorolaMXP README.initscript +%doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ README README.Force README.MotorolaMXP %config(noreplace) %{_sysconfdir}/sysconfig/ipmi -%{_initrddir}/ipmi +%{_libexecdir}/openipmi-helper %{_bindir}/ipmicmd %{_bindir}/ipmilan %{_bindir}/ipmish @@ -126,6 +147,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/openipmish %{_bindir}/rmcp_ping %{_bindir}/solterm +%{_unitdir}/ipmi.service %{_mandir}/man1/ipmi_ui* %{_mandir}/man1/openipmicmd* %{_mandir}/man1/openipmish* @@ -155,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon May 7 2012 Jan Safranek - 2.0.18-14 +- Added ipmi systemd unit + * Thu Jan 12 2012 Fedora Release Engineering - 2.0.18-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/README.initscript b/README.initscript deleted file mode 100644 index 38d60ca..0000000 --- a/README.initscript +++ /dev/null @@ -1,2 +0,0 @@ -Please note that the /etc/init.d/ipmi init script is not LSB compliant and -uses non-standard exit codes. See the init script for detailed description. diff --git a/ipmi.service b/ipmi.service new file mode 100644 index 0000000..fa14993 --- /dev/null +++ b/ipmi.service @@ -0,0 +1,12 @@ +[Unit] +Description=IPMI Driver +After=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/libexec/openipmi-helper start +ExecStop=/usr/libexec/openipmi-helper stop + +[Install] +WantedBy=multi-user.target diff --git a/openipmi.initscript b/openipmi-helper similarity index 85% rename from openipmi.initscript rename to openipmi-helper index c847fa1..4cebfb9 100644 --- a/openipmi.initscript +++ b/openipmi-helper @@ -1,24 +1,14 @@ #!/bin/sh ############################################################################# # -# ipmi: OpenIPMI Driver init script +# ipmi: OpenIPMI Driver helper script # -# Authors: Matt Domsch +# Authors: Jan Safranek +# +# Based on IPMI init script by: +# Matt Domsch # Chris Poblete # -# chkconfig: - 13 87 -# description: OpenIPMI Driver init script -# -### BEGIN INIT INFO -# Provides: ipmidrv -# Required-Start: $local_fs $remote_fs $syslog -# Required-Stop: $local_fs $remote_fs $syslog -# Default-Start: -# Default-Stop: -# Short-Description: OpenIPMI Driver init script -# Description: OpenIPMI Driver init script -### END INIT INFO -# # Status return code bits # no bits set = no errors # bit 0 set = minimum modules aren't loaded @@ -28,54 +18,6 @@ # bit 4 set = lockfile doesn't exist # bit 5 set = modules are loaded even when asked to be unloaded -# -############################################################################# -# for log_success_msg and friends -if [ -r /lib/lsb/init-functions ]; then -# LSB, SLES, ... - . /lib/lsb/init-functions -elif [ -r /etc/init.d/functions ]; then -# Red Hat / VMware - . /etc/init.d/functions - my_log_message() - { - ACTION=$1 - shift - - case "$ACTION" in - success) - echo -n $* - success "$*" - echo - ;; - failure) - echo -n $* - failure "$*" - echo - ;; - warning) - echo -n $* - warning "$*" - echo - ;; - *) - ;; - esac - } - log_success_msg() - { - my_log_message success "$*" - } - log_failure_msg() - { - my_log_message failure "$*" - } - log_warning_msg() - { - my_log_message warning "$*" - } -fi - CONFIGFILE=/etc/sysconfig/ipmi # source config info [ -r ${CONFIGFILE} ] && . ${CONFIGFILE} @@ -210,49 +152,44 @@ start_watchdog_common() modules_loaded ipmi_watchdog [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2)) && - log_failure_msg && + echo "Watchdog startup failed: cannot load ipmi_watchdog module" && return if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then mknod -m 0600 /dev/watchdog c 10 130 [ $? -ne 0 ] && RETVAL=$((RETVAL | 8)) && - log_failure_msg && + echo "Watchdog startup failed: cannot create /dev/watchdog" && return fi - log_success_msg } start_watchdog_quiet() { [ "${IPMI_WATCHDOG}" != "yes" ] && return - echo -n $"Starting ipmi_watchdog driver: " start_watchdog_common } start_watchdog() { - echo -n $"Starting ipmi_watchdog driver: " [ "${IPMI_WATCHDOG}" != "yes" ] && RETVAL=$((RETVAL | 2)) && - log_failure_msg "not configured" && + echo "Watchdog not configured" && return start_watchdog_common } stop_watchdog() { - echo -n $"Stopping ipmi_watchdog driver: " modprobe -q -r ipmi_watchdog > /dev/null 2>&1 modules_loaded ipmi_watchdog if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) - log_failure_msg + echo "Watchog shutdown failed: cannot unload ipmi_watchdog module" else if [ "${IPMI_WATCHDOG}" = "yes" ]; then [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog fi - log_success_msg fi } @@ -283,39 +220,33 @@ start_powercontrol_common() modules_loaded ipmi_poweroff [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2)) && - log_failure_msg && + echo "Powercontroll startup failed: cannot load ipmi_poweroff module" && return - log_success_msg } start_powercontrol_quiet() { [ "${IPMI_POWEROFF}" != "yes" ] && return - echo -n $"Starting ipmi_poweroff driver: " start_powercontrol_common } start_powercontrol() { - echo -n $"Starting ipmi_poweroff driver: " [ "${IPMI_POWEROFF}" != "yes" ] && RETVAL=$((RETVAL | 2)) && - log_failure_msg "not configured" && + echo "Powercontroll not configured" && return start_powercontrol_common } stop_powercontrol() { - echo -n $"Stopping ipmi_poweroff driver: " modprobe -q -r ipmi_poweroff > /dev/null 2>&1 modules_loaded ipmi_poweroff if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) - log_failure_msg - else - log_success_msg + echo "Powercontroll shutdown failed: cannot unload ipmi_poweroff module" fi } @@ -410,15 +341,14 @@ load_ipmi_modules () ############################################################################# start() { - echo -n "Starting ${MODULE_NAME} drivers: " load_ipmi_modules if [ ${RETVAL} -eq 0 ]; then - touch ${LOCKFILE} && log_success_msg + touch ${LOCKFILE} else if [ $((RETVAL & 1)) -eq 1 ]; then - log_failure_msg + echo "Startup failed." else - touch ${LOCKFILE} && log_warning_msg + touch ${LOCKFILE} && echo "Warning!?" fi fi start_watchdog_quiet @@ -428,29 +358,25 @@ start() ############################################################################# stop() { - echo -n "Stopping ${MODULE_NAME} drivers: " unload_ipmi_modules_leave_features modules_loaded ${MODULES_INTERFACES} if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) - log_failure_msg "may be in use" + echo "Shutdown failed, something may be in use" else rm -f ${LOCKFILE} - log_success_msg fi } stop_all() { - echo -n $"Stopping all ${MODULE_NAME} drivers: " unload_all_ipmi_modules modules_loaded ${MODULES} if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) - log_failure_msg "may be in use" + echo "Shutdown failed, something may be in use" else rm -f ${LOCKFILE} - log_success_msg fi } From 519bcc1e432fd294d2468821ceb487eb7c1647a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 11 Jun 2012 11:40:04 +0200 Subject: [PATCH 011/129] Perl 5.16 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index bf9dc8c..95af24b 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jun 11 2012 Petr Pisar - 2.0.18-15 +- Perl 5.16 rebuild + * Mon May 7 2012 Jan Safranek - 2.0.18-14 - Added ipmi systemd unit From 191307de7b786e628e7375ad2446263ca875cdef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 08:53:31 -0500 Subject: [PATCH 012/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 95af24b..9b84d6a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.18 -Release: 15%{?dist} +Release: 16%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 2.0.18-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jun 11 2012 Petr Pisar - 2.0.18-15 - Perl 5.16 rebuild From dc9d37041c8f8f119a89d8f2e0d5416bb2a540b2 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Wed, 8 Aug 2012 08:56:10 +0200 Subject: [PATCH 013/129] Update to 2.0.19 --- .gitignore | 1 + OpenIPMI.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 92ad568..6ca4d11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ OpenIPMI-2.0.18.tar.gz +/OpenIPMI-2.0.19.tar.gz diff --git a/OpenIPMI.spec b/OpenIPMI.spec index bf9dc8c..f85eebe 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,8 +3,8 @@ %{!?python_sitearch: %define 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 -Version: 2.0.18 -Release: 14%{?dist} +Version: 2.0.19 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -75,8 +75,8 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS" --with-tkinter=no # get rid of rpath -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 +#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 @@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Wed Aug 8 2012 Jan Safranek - 2.0.19-1 +- Update to 2.0.19 + * Mon May 7 2012 Jan Safranek - 2.0.18-14 - Added ipmi systemd unit diff --git a/sources b/sources index 8451ba1..5553fc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8392539200fbda670503770292dfbb8f OpenIPMI-2.0.18.tar.gz +e96e68b972d4b376f239d32cd3629328 OpenIPMI-2.0.19.tar.gz From d21197474f5859c4426c9512878fbf5c6d522fee Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 27 Aug 2012 14:11:33 +0200 Subject: [PATCH 014/129] Updated RPM scriptlets with latest systemd-rpm macros Resolves: #850246 --- OpenIPMI.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 051a456..b6a4621 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -95,24 +95,13 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post ipmi.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ipmi.service > /dev/null 2>&1 || : - /bin/systemctl stop ipmi.service > /dev/null 2>&1 || : -fi +%systemd_preun ipmi.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ipmi.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart ipmi.service %post libs -p /sbin/ldconfig @@ -177,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon Aug 27 2012 Jan Safranek - 2.0.19-2 +- Updated RPM scriptlets with latest systemd-rpm macros (#850246) + * Wed Aug 8 2012 Jan Safranek - 2.0.19-1 - Update to 2.0.19 From 55e230f32f8edb42def1db68dcbf2916dfc7f86a Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 27 Aug 2012 14:44:08 +0200 Subject: [PATCH 015/129] Fixed fedora-review tool complaints: - removed %clean - removed defattr - removed BuildRoot: - use %global --- OpenIPMI.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index b6a4621..14d2a00 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,6 +1,6 @@ # TODO: uses private copy of libedit, should be modified to use system one -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?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 Version: 2.0.19 @@ -12,7 +12,6 @@ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter BuildRequires: desktop-file-utils @@ -81,7 +80,6 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS" make # not %{?_smp_mflags} safe %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la @@ -120,11 +118,7 @@ rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 /sbin/chkconfig --del ipmi >/dev/null 2>&1 || : /bin/systemctl try-restart ipmi.service >/dev/null 2>&1 || : -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root) %doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ README README.Force README.MotorolaMXP %config(noreplace) %{_sysconfdir}/sysconfig/ipmi %{_libexecdir}/openipmi-helper @@ -147,20 +141,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/ipmilan* %files perl -%defattr(-,root,root) %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm %{perl_vendorarch}/auto/OpenIPMI/ %files python -%defattr(-,root,root) %{python_sitearch}/*OpenIPMI* %files libs -%defattr(-,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root) %{_includedir}/OpenIPMI %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -168,6 +158,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Aug 27 2012 Jan Safranek - 2.0.19-2 - Updated RPM scriptlets with latest systemd-rpm macros (#850246) +- Fixed fedora-review tool complaints * Wed Aug 8 2012 Jan Safranek - 2.0.19-1 - Update to 2.0.19 From f631a31bf7a79bc3ff60efe33c0d7648643de0e3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 09:29:17 -0600 Subject: [PATCH 016/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 14d2a00..ef93fbf 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -156,6 +156,9 @@ rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %{_libdir}/pkgconfig/*.pc %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.0.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Aug 27 2012 Jan Safranek - 2.0.19-2 - Updated RPM scriptlets with latest systemd-rpm macros (#850246) - Fixed fedora-review tool complaints From a4471fef33ae3d0c3dcb38171b1fc200a367572e Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Thu, 2 May 2013 11:25:06 +0200 Subject: [PATCH 017/129] rpmdiff fixes --- OpenIPMI.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ef93fbf..6174499 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -19,6 +19,7 @@ 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 @@ -39,6 +40,7 @@ and applications. Group: Development/Libraries Summary: IPMI Perl language bindings Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: %{name}-libs = %{version}-%{release} %description perl The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. @@ -46,6 +48,7 @@ The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. %package python Group: Development/Libraries Summary: IPMI Python language bindings +Requires: %{name}-libs = %{version}-%{release} %description python The OpenIPMI-python package contains the Python language bindings for OpenIPMI. @@ -156,6 +159,9 @@ rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %{_libdir}/pkgconfig/*.pc %changelog +* Thu Apr 25 2013 Ledvinka Ales - 2.0.19-4 +- rpmdiff fixes + * Wed Feb 13 2013 Fedora Release Engineering - 2.0.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 6c5c8e80fed5b816dce7af5570d2654eb842a850 Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Mon, 24 Jun 2013 06:01:31 +0200 Subject: [PATCH 018/129] Build requirements, documentation, aarch64, module loading. --- OpenIPMI-2.0.19-man.patch | 505 ++++++++++++++++ OpenIPMI-aarch64.patch | 1149 +++++++++++++++++++++++++++++++++++++ OpenIPMI.spec | 59 +- openipmi.modalias | 10 + 4 files changed, 1721 insertions(+), 2 deletions(-) create mode 100644 OpenIPMI-2.0.19-man.patch create mode 100644 OpenIPMI-aarch64.patch create mode 100644 openipmi.modalias diff --git a/OpenIPMI-2.0.19-man.patch b/OpenIPMI-2.0.19-man.patch new file mode 100644 index 0000000..42959d9 --- /dev/null +++ b/OpenIPMI-2.0.19-man.patch @@ -0,0 +1,505 @@ +diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 +--- ./man/ipmi_cmdlang.7.manscan 2013-06-05 10:21:15.742099865 +0200 ++++ ./man/ipmi_cmdlang.7 2013-06-05 10:40:49.767658999 +0200 +@@ -246,7 +246,7 @@ instance, the command to create a domain + The command to list all sensors in a domain named domain1 is + .B sensor list domain1. + +-Each command has a reponse for each object operated on, which is ++Each command has a response for each object operated on, which is + listed after the command description. In those responses, anything + that begins with a + .B % +@@ -316,7 +316,7 @@ BMC. For that, notice that the LAN conn + and port for the second IP address. OpenIPMI supports these IP + addresses and connection, detecting failures, switching between + addresses, and other fault-tolerant things. It does this +-transparently to the user. Mutiple connections may require special ++transparently to the user. Multiple connections may require special + OEM support, read the documentation about your specific system if you + need this. + +@@ -336,7 +336,7 @@ or + \fI\fP and \fI\fP are the user name and password of + the IPMI user to use for the connection. + The is the driver number, generally 0. +-Options enable and disable various automitic processing and are: ++Options enable and disable various automatic processing and are: + .PD 0 + .HP + .B -[no]all +@@ -356,7 +356,7 @@ is false by default. + is false by default. + .HP + .B -[no]ipmbscan +-- IPMB bus scanning. This turns on scanning IPMB busses when they are found. ++- IPMB bus scanning. This turns on scanning IPMB buses when they are found. + This is false by default. + .HP + .B -[no]oeminit +@@ -461,7 +461,7 @@ available hacks are: + The -M option sets the maximum outstanding messages. The default is + 2, ranges 1-63. + +-Options enable and disable various automitic processing and are: ++Options enable and disable various automatic processing and are: + .PD 0 + .HP + .B -[no]all +@@ -519,7 +519,7 @@ Domain Created: + .RE + + .B fru +-- dump a fru given all it's insundry information. ++- dump a fru given all it's sundry information. + .TP + Response: + .RS +@@ -533,7 +533,7 @@ Domain + + .B msg [data...] + - Send a command to the given IPMB address on the given channel and +-display the response. Note that this does not require the existance ++display the response. Note that this does not require the existence + of an MC in OpenIPMI. + .TP + Response: +@@ -571,7 +571,7 @@ SEL Rescan done: + .RE + + .B presence +-- Audit the presence of all enities in the domain. Note that this just ++- Audit the presence of all entities in the domain. Note that this just + starts the process; it will run in the background. + .TP + Response is: +@@ -689,7 +689,7 @@ FRU deleted: + - Set the value of a FRU element. The + name is the record name, or multi-record. The number is required + for fields that need it (custom and multi-record). The value is +-an a single value for integers. For strings it is a string ++a single value for integers. For strings it is a string + type (either binary, ascii, or unicode) and the info. Binary and + unicode data is specified as numbers. ascii data is specified in + a string. Note that setting a ascii value with no string will +@@ -770,7 +770,7 @@ Domain + .B info + - Dump information about an entity. + .TP +-Reponse: ++Response: + .RS + .nf + Entity +@@ -784,7 +784,7 @@ Entity + .B fru + - Dump the FRU information about the given entity. + .TP +-Reponse: ++Response: + .RS + .nf + Entity +@@ -813,7 +813,7 @@ Entity + .B set_act_time + - Set the hot-swap auto-activate time. + .TP +-Reponse: ++Response: + .RS + .nf + Set act time: +@@ -981,7 +981,7 @@ Response: + .nf + Sensor + Name: +- Positivie Hysteresis: ++ Positive Hysteresis: + Negative Hysteresis: + .fi + .RE +@@ -1101,7 +1101,7 @@ Set done: + .RE + + .B get +-- Get the value of a control. The reponse depends ++- Get the value of a control. The response depends + on the control type. + .TP + Response: +@@ -1128,7 +1128,7 @@ multiple lights. The options values (ma + ) will not be + present if local control is set to true. Local control means that + the LED takes whatever default function it does on the device +-(like disk activity, ethernet activity, hot-swap LED, etc.). ++(like disk activity, Ethernet activity, hot-swap LED, etc.). + Response for id control: + .RS + .nf +@@ -1325,7 +1325,7 @@ Channel Access + - Set information about the MC's channel access. There are two different + places where this is stored, the present in-use values (volatile) and the + non-volatile storage that is loaded at startup. Note if you specify +-channel 0xe, the modified channel will be the current channel. Parms ++channel 0xe, the modified channel will be the current channel. Parameters + are: + .RS + .nf +@@ -1547,7 +1547,7 @@ PET destroyed: + .SS pef + commands dealing with platform even filters. These are basically + connections to the PEF configuration parameters in an MC. You use a +-pef to fetch a pef config, which you can then modify and write back to ++pef to fetch a pef configuration, which you can then modify and write back to + the MC. Note that when you get a pef config, you claim a lock on the + MC that must be unlocked. + +@@ -1780,7 +1780,7 @@ operational and finished all it SDR, FRU + .fi + .RE + +-The following comes out when domain connection infomration changes: ++The following comes out when domain connection information changes: + .RS + .nf + EVENT +diff -up ./man/ipmilan.8.manscan ./man/ipmilan.8 +--- ./man/ipmilan.8.manscan 2013-06-04 15:43:43.597127168 +0200 ++++ ./man/ipmilan.8 2013-06-05 13:36:31.282753184 +0200 +@@ -29,18 +29,25 @@ address they came in. + + .SH OPTIONS + .TP +-.BI \-c\ config-file ++\fB\-c\fR file,\ \fB\-\-config\-file\fR file + Set the configuration file to one other than the default of + .I "/etc/ipmi_lan.conf" + .TP +-.B \-n ++\fB\-i\fR device,\ \fB\-\-ipmi-dev\fR device ++Sets the desired device ++.TP ++\fB\-n\fR,\ \fB\-\-daemonize\fR + Stops the daemon from forking and detaching from the controlling + terminal. This is useful for running from init. + .TP +-.B \-d ++\fB\-d\fR,\ \fB\-\-debug\fR + Turns on debugging to standard output. You generally have to use + .B \-n + with this. ++.TP ++\fB\-?\fR,\ \fB\-\-help\fR,\ \fB\-\-usage\fR ++Prints brief usage hints message. ++ + + + .SH CONFIGURATION +diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 +--- ./man/ipmi_ui.1.manscan 2013-06-04 15:33:32.206892146 +0200 ++++ ./man/ipmi_ui.1 2013-06-05 10:44:52.592882502 +0200 +@@ -4,7 +4,7 @@ + ipmi_ui \- Crude interface to an IPMI system + + .SH SYNOPSIS +-.B ipmiui ++.B ipmi_ui + .RB [\| \-dmsg \|] + .RB [\| \-dmem \|] + .RB [\| \-c \|] +@@ -34,7 +34,7 @@ Normally, + starts up in a full-screen format. The left window shows the output + of commands, the right window shows the logs from OpenIPMI. Both + windows are scrollable with page up and page down keys, press the "\fBF1\fP" +-key to choose the the left window to scroll, the "\fBF2\fP" key to choose ++key to choose the left window to scroll, the "\fBF2\fP" key to choose + the right window to scroll. + + Note that you must set your environment \fBTERM\fP variable properly for +@@ -48,7 +48,7 @@ the connections are to the same IPMI dom + management controllers. Also, each LAN connection may have two IP + addresses. These are two different addresses to the same management + controller. So you may have a total of 4 IP addresses to an IPMI +-domain, two management controllers and two IP adresses to each ++domain, two management controllers and two IP addresses to each + management controller. + + .SH OPTIONS +@@ -174,12 +174,12 @@ turns events on or off from the sensor ( + turns scanning on or off for the sensor (\fB0\fP or \fB1\fP). + .I "assertion-bitmask" + specifies the bitmask of thresholds or states +-that should be enabled or disabled when a thrshold or state is ++that should be enabled or disabled when a threshold or state is + asserted. It is a bunch of 0's and 1's, where the first one is for + threshold/state 0, the second for threshold/state 1, etc. + .I "deassertion-bitmask" + specifies the bitmask of thresholds or states +-that should be enabled or disabled when a thrshold or state is ++that should be enabled or disabled when a threshold or state is + deasserted. + + .SH CONTROLS +diff -up ./man/openipmicmd.1.manscan ./man/openipmicmd.1 +--- ./man/openipmicmd.1.manscan 2013-06-04 13:57:08.825074711 +0200 ++++ ./man/openipmicmd.1 2013-06-05 10:45:54.938921332 +0200 +@@ -22,7 +22,7 @@ interfaces. + Execute a single command an exit. + + .TP +-.BI ++.BI + The parameters for the connection depend on the connection type. + These are all described in openipmi_conparms (7) + +@@ -32,7 +32,7 @@ Once up, you can execute commands in the + commands and responses are asynchronous, you issue a command and the + interface returns immediately. When the response comes back, it will + be dumped on your console. That's a little strange looking, but IPMI +-is ansychronous underneath. Note that the \fB\-k\fP option is synchronous, ++is asynchronous underneath. Note that the \fB\-k\fP option is synchronous, + it will wait for the response or a timeout before returning. + + .TP +@@ -82,7 +82,7 @@ Remove a command registration. + .BR openipmi_conparms (7) + + .SH "KNOWN PROBLEMS" +-The asychronous nature of the program can be annoying. ++The asynchronous nature of the program can be annoying. + + .SH AUTHOR + .PP +diff -up ./man/openipmi_conparms.7.manscan ./man/openipmi_conparms.7 +--- ./man/openipmi_conparms.7.manscan 2013-06-05 10:46:13.818932142 +0200 ++++ ./man/openipmi_conparms.7 2013-06-05 10:47:48.332980969 +0200 +@@ -1,7 +1,7 @@ + .TH openipmi_conparms 7 05/13/03 OpenIPMI "Connection Parameters for OpenIPMI" + + .SH NAME +-openipmi_cmdparms \- Connection parmeters for OpenIPMI ++openipmi_cmdparms \- Connection parameters for OpenIPMI + + .SH SYNOPSIS + +@@ -97,7 +97,7 @@ use. + .TP + .BI \-Rc\ confidentiality\ algorithm + The \fIRMCP+ confidentiality (encryption) algorithm\fP to use. This keeps +-evesdroppers from seeing the data. Valid values are: \fBbmcpick\fP, ++eavesdroppers from seeing the data. Valid values are: \fBbmcpick\fP, + \fBaes_cbc_128\fP, \fBxrc4_128\fP, and \fBxrc_40\fP. The \fBbmcpick\fP option is used by + default, which means the BMC picks the algorithm it wants to use. + +diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 +--- ./man/openipmigui.1.manscan 2013-06-05 10:48:43.389006143 +0200 ++++ ./man/openipmigui.1 2013-06-05 10:51:13.372066408 +0200 +@@ -38,7 +38,7 @@ Turn on message debugging, this will dum + .TP + .B \-\-drawmsg + Turn on raw message debugging, this will dump all low-level messages to +-debug log output. This differes from normal message debugging in that all ++debug log output. This differs from normal message debugging in that all + protocol messages are also dumped, not just IPMI messages. + .TP + .B \-\-dmem +@@ -81,7 +81,7 @@ tree. + + The tree window has a top-level list of all the domains for which + OpenIPMI has connections (or pending connection). Each domain +-exapands into domain-specific information and a list of entities and ++expands into domain-specific information and a list of entities and + Management Controllers (MCs) for that domain. + + Right click drives most of the operations in the tree window. Many +@@ -92,7 +92,7 @@ Color is used in the GUI to denote error + to denote availability. If a sensor has an error, the tree entry for + that sensor will change colors. Black means no error, yellow means + warning, red means critical, and blue means non-recoverable. These +-errors propigate up, so the entity containing that sensor will be the ++errors propagate up, so the entity containing that sensor will be the + same color as the most critical error for the sensors underneath it. + The same goes for domain, it will be the same color as the most + critical error for the entities underneath it. This way, if you watch +@@ -146,7 +146,7 @@ that sensor. + + .SH CONTROLS + +-Controls are available under the entity they belong to. control ++Controls are available under the entity they belong to. Control + information is beyond the scope of this document, as IPMI controls are + very complex. See the IPMI document from OpenIPMI for information + about controls. +@@ -214,7 +214,7 @@ channel listing. Note that some user se + are global to all channels on the MC. + + Due to the IPMI spec and some unfortunate implementation bugs, some +-wierd issues exist with this information. The user has an Enabled ++weird issues exist with this information. The user has an Enabled + value that tells whether the user is enabled or not. When initially + displayed, this field shows as a "?" because this field is not + readable. It will displayed as the actual value when it is modified, +@@ -247,7 +247,7 @@ changed. + .SH SOLPARMS + + In the channel display on a 8023_LAN channel, a LANPARM configuration +-command is available if the MC supporte SOL (Serial Over LAN). This ++command is available if the MC supports SOL (Serial Over LAN). This + pulls up all the parameters for the LAN and allows them to be set. + Right-clicking on an item allows it to be changed. + +diff -up ./man/openipmish.1.manscan ./man/openipmish.1 +--- ./man/openipmish.1.manscan 2013-06-05 10:52:26.787092815 +0200 ++++ ./man/openipmish.1 2013-06-05 14:01:12.004559270 +0200 +@@ -26,7 +26,7 @@ Turn on message debugging, this will dum + .TP + .B \-\-drawmsg + Turn on raw message debugging, this will dump all low-level messages to +-debug log output. This differes from normal message debugging in that all ++debug log output. This differs from normal message debugging in that all + protocol messages are also dumped, not just IPMI messages. + .TP + .B \-\-dmem +@@ -34,11 +34,21 @@ Turn on memory debugging, this will caus + deallocations to be checked. When the program terminates, it will + dump all memory that was not properly freed (leaked). + .TP ++.B \-\-dmsgerr ++Turn on printing out low-level message errors. ++.TP + .B \-\-dlock + Turn on lock debugging, this will check lock operations to make sure + that locks are help in all the proper places and make sure that locks + are properly nested. + .TP ++\fB-x\fR\ ,\ \fB\-\-execute\fR\ ++Execute the given string at startup. This may be entered multiple times ++for multiple commands. ++.TP ++.B \-\-glib ++Use glib for the OS handler. ++.TP + .B \-\-snmp + Enable the SNMP trap handler. + .B openipmish +diff -up ./man/rmcp_ping.1.manscan ./man/rmcp_ping.1 +--- ./man/rmcp_ping.1.manscan 2013-06-05 10:52:59.704104189 +0200 ++++ ./man/rmcp_ping.1 2013-06-05 10:53:09.788107626 +0200 +@@ -38,7 +38,7 @@ starttag. This is zero by default + Turns on debugging to standard output. + .TP + .I destination +-The target address, default is the boradcast address (default 255.255.255.255) ++The target address, default is the broadcast address (default 255.255.255.255) + + .SH AUTHOR + .PP +diff -up ./man/solterm.1.manscan ./man/solterm.1 +--- ./man/solterm.1.manscan 2013-06-05 10:53:46.923120093 +0200 ++++ ./man/solterm.1 2013-06-05 10:55:59.442162744 +0200 +@@ -37,9 +37,9 @@ These are all described in openipmi_conp + .TP + .BI \-e\ escape_char + The character to use to escape, or exit, the program. Entering this +-chatacter right after a newline is entered causes the program to go ++character right after a newline is entered causes the program to go + into command mode. A single character after this performs a command. +-The default escape character is "~" as shown below. Suppported ++The default escape character is "~" as shown below. Supported + commands are: + .RS + .IP ~. +@@ -98,7 +98,7 @@ the SoL session. This is the default. + .TP + .BI \-holdoff + Specifies that CTS, DTR, and DSR are to be deasserted at the start of +-the SoL session so that the configuration may be modifeid before the ++the SoL session so that the configuration may be modified before the + handshake is released. + + .TP +diff -up ./sample/ipmicmd.c.manscan ./sample/ipmicmd.c +--- ./sample/ipmicmd.c.manscan 2013-06-05 13:55:04.191611230 +0200 ++++ ./sample/ipmicmd.c 2013-06-05 13:55:10.988610133 +0200 +@@ -124,6 +124,7 @@ void usage(void) + printf("%s [-k ] [-v] \n", progname); + printf("Where is one of:"); + ipmi_parse_args_iter_help(con_usage, NULL); ++ printf("\n"); + } + + char * +diff -up ./sample/rmcp_ping.c.manscan ./sample/rmcp_ping.c +--- ./sample/rmcp_ping.c.manscan 2013-06-05 15:17:40.073957820 +0200 ++++ ./sample/rmcp_ping.c 2013-06-05 14:21:05.778697883 +0200 +@@ -156,6 +156,11 @@ main(int argc, char *argv[]) + if (strcmp(argv[i], "--") == 0) { + i++; + break; ++ } else if ((strcmp(argv[i], "--help") == 0) || ++ (strcmp(argv[i], "-?") == 0) || ++ (strcmp(argv[i], "-h") == 0)) { ++ i++; ++ usage(); + } else if (strcmp(argv[i], "-p") == 0) { + i++; + if (i >= argc) { +diff -up ./sample/solterm.c.manscan ./sample/solterm.c +--- ./sample/solterm.c.manscan 2013-06-05 15:17:55.264961190 +0200 ++++ ./sample/solterm.c 2013-06-05 15:15:14.037921308 +0200 +@@ -743,7 +743,12 @@ int main(int argc, char *argv[]) + + /* Now we make sure "lan" is the first argument so we get the + right connection type... */ +- if (strcmp(argv[1], "lan") != 0) { ++ if ((strcmp(argv[1], "-h") == 0) || ++ (strcmp(argv[1], "--help") == 0) || ++ (strcmp(argv[1], "-?") == 0)) { ++ usage(); ++ exit(1); ++ } else if (strcmp(argv[1], "lan") != 0) { + fprintf(stderr, "main: %s only supports lan connections\n", + progname); + exit(1); +diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c +--- ./ui/basic_ui.c.manscan 2013-06-04 14:08:04.538642560 +0200 ++++ ./ui/basic_ui.c 2013-06-05 11:17:41.394541158 +0200 +@@ -225,6 +225,26 @@ snmp_init(selector_t *sel) + } + #endif /* HAVE_UCDSNMP */ + ++void help(void) ++{ ++ fprintf(stdout, "ipmi_ui [ options ] smi smi-num\n"); ++ fprintf(stdout, "ipmi_ui [ oprions ] lan IP port [IP2 port2] auth priv user pass\n"); ++ fprintf(stdout, "\n"); ++ fprintf(stdout, "Options:\n"); ++ fprintf(stdout, " -c Command line mode\n"); ++ fprintf(stdout, " -dlock Lock debugging ON\n"); ++ fprintf(stdout, " -dmem Memory debugging ON\n"); ++ fprintf(stdout, " -drawmsg Raw message ON\n"); ++ fprintf(stdout, " -dmsg Dump all messages.\n"); ++#ifdef HAVE_UCDSNMP ++ fprintf(stdout, " -snmp SNMP trap handler ON\n"); ++#endif ++ fprintf(stdout, "Auth:\n"); ++ fprintf(stdout, " none | straight | md5 | md2\n"); ++ fprintf(stdout, "Priv:\n"); ++ fprintf(stdout, " callback | user | operator | admin\n"); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -249,6 +269,11 @@ main(int argc, char *argv[]) + curr_arg++; + if (strcmp(arg, "--") == 0) { + break; ++ } else if (strcmp(arg, "-?") == 0 || ++ strcmp(arg, "-h") == 0 || ++ strcmp(arg, "--help") == 0) { ++ help(); ++ return(1); + } else if (strcmp(arg, "-c") == 0) { + full_screen = 0; + } else if (strcmp(arg, "-dlock") == 0) { diff --git a/OpenIPMI-aarch64.patch b/OpenIPMI-aarch64.patch new file mode 100644 index 0000000..f8369fc --- /dev/null +++ b/OpenIPMI-aarch64.patch @@ -0,0 +1,1149 @@ +diff -urN OpenIPMI-2.0.19/config.guess OpenIPMI-2.0.19-aarch64/config.guess +--- OpenIPMI-2.0.19/config.guess 2010-05-09 08:32:53.000000000 -0500 ++++ OpenIPMI-2.0.19-aarch64/config.guess 2013-03-03 06:56:09.267032676 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-12-30' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -57,8 +55,8 @@ + + Originally written by Per Bothner. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -145,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -181,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -202,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -224,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -270,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -296,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -395,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -481,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -495,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -552,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -595,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -731,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -770,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -789,30 +794,35 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) +- case ${UNAME_MACHINE} in ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +@@ -858,6 +868,13 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -867,7 +884,7 @@ + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; +- esac ++ esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +@@ -879,20 +896,29 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu +@@ -934,7 +960,7 @@ + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -960,7 +986,7 @@ + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -968,14 +994,17 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -984,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1020,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1048,13 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp +- exit ;; ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1089,8 +1118,8 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1133,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1162,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1179,6 +1208,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1231,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1276,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1300,11 +1335,11 @@ + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -urN OpenIPMI-2.0.19/config.sub OpenIPMI-2.0.19-aarch64/config.sub +--- OpenIPMI-2.0.19/config.sub 2010-05-09 08:32:53.000000000 -0500 ++++ OpenIPMI-2.0.19-aarch64/config.sub 2013-03-03 06:56:09.276031637 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2010-01-22' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -76,8 +74,8 @@ + GNU config.sub ($timestamp) + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -124,13 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -153,12 +156,12 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +- -bluegene*) +- os=-cnk ++ -bluegene*) ++ os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= +@@ -174,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -222,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -246,20 +255,25 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -282,29 +296,39 @@ + | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ +- | v850 | v850e \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -314,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -328,25 +367,30 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -368,26 +412,29 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ +- | tile-* | tilegx-* \ ++ | tile*-* \ + | tron-* \ + | ubicom32-* \ +- | v850-* | v850e-* | vax-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -412,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -482,11 +529,20 @@ + basic_machine=powerpc-ibm + os=-cnk + ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; +- cegcc) ++ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -518,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -676,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -734,9 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -773,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -841,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -923,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -1019,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1075,25 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; +- # This must be matched before tile*. +- tilegx*) +- basic_machine=tilegx-unknown +- os=-linux-gnu +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1163,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1260,11 +1323,11 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. +- -auroraux) +- os=-auroraux ++ -auroraux) ++ os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` +@@ -1294,14 +1357,15 @@ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1348,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1397,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1442,8 +1506,8 @@ + -dicos*) + os=-dicos + ;; +- -nacl*) +- ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1466,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1481,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1502,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1536,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 6174499..f3a8a78 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,10 +1,11 @@ +%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 Version: 2.0.19 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -12,9 +13,18 @@ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper 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: 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 @@ -22,15 +32,25 @@ Requires(post): systemd-sysv Requires:%{name}-libs = %{version}-%{release} Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch +Patch2: OpenIPMI-2.0.19-man.patch %description The Open IPMI project aims to develop an open code base to allow access to platform information using Intelligent Platform Management Interface (IPMI). This package contains the tools of the OpenIPMI project. +%package modalias +Group: System Environment/Kernel +Summary: Module aliases for IPMI subsystem + +%description modalias +The OpenIPMI-modalias provides configuration file with module aliases +of ACPI and PNP wildcards. + %package libs Group: Development/Libraries Summary: The OpenIPMI runtime libraries +Requires:%{name}-modalias = %{version}-%{release} %description libs The OpenIPMI-libs package contains the runtime libraries for shared binaries @@ -65,10 +85,20 @@ of the OpenIPMI project. %prep %setup -q -%patch1 -p1 +%patch1 -p1 -b .pthread +%patch2 -p1 -b .manscan %build export CFLAGS="-fPIC $RPM_OPT_FLAGS" + +# 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 \ @@ -92,9 +122,20 @@ install -d ${RPM_BUILD_ROOT}%{_libexecdir} install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper install -d ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service +install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d +install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/OpenIPMI.conf rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 +# add missing documentation symlinks +if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmicmd && ! test -a ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmicmd.1.gz ; then + %{__ln_s} openipmicmd.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmicmd.1.gz +fi + +if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz ; then + %{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz +fi + %post %systemd_post ipmi.service @@ -139,6 +180,8 @@ rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %{_mandir}/man1/openipmish* %{_mandir}/man1/rmcp_ping* %{_mandir}/man1/solterm* +%{_mandir}/man1/ipmish* +%{_mandir}/man1/ipmicmd* %{_mandir}/man7/ipmi_cmdlang* %{_mandir}/man7/openipmi_conparms* %{_mandir}/man8/ipmilan* @@ -158,7 +201,19 @@ rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files modalias +%config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf + %changelog +* Tue Jun 4 2013 Ledvinka Ales - 2.0.19-5 +- Support aarch64 by replicating release toolchain. +- Configuration subpackage with kernel probed wildcard module aliases. + as workaround for bz#961878 and fesco#1110 +- Man pages symlinks same as bin symlinks. +- ipmi_ui command help argument. +- ipmilan missing options. +- Fixed build requirements. + * Thu Apr 25 2013 Ledvinka Ales - 2.0.19-4 - rpmdiff fixes diff --git a/openipmi.modalias b/openipmi.modalias new file mode 100644 index 0000000..5f635ac --- /dev/null +++ b/openipmi.modalias @@ -0,0 +1,10 @@ +# +# This configuration file was provided +# by OpenIPMI-modalias package. +# Feel free to update as needed. +# + +alias IPI0001 ipmi_si +alias IPI0001 ipmi_devintf +alias IPI0001 ipmi_msghandler + From dee667f1d69cbaac6d22ccbb46834c0375a1a541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 22:09:45 +0200 Subject: [PATCH 019/129] Perl 5.18 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index f3a8a78..da4cc25 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -205,6 +205,9 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf %changelog +* Wed Jul 17 2013 Petr Pisar - 2.0.19-6 +- Perl 5.18 rebuild + * Tue Jun 4 2013 Ledvinka Ales - 2.0.19-5 - Support aarch64 by replicating release toolchain. - Configuration subpackage with kernel probed wildcard module aliases. From 35ceb22efa1fb6fa5ed4f76a136431333813c381 Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Fri, 19 Jul 2013 20:29:08 +0200 Subject: [PATCH 020/129] rPath regression, avoid strict alliasing due to type punning code --- OpenIPMI.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index da4cc25..c50405e 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -78,6 +78,7 @@ Group: Development/Libraries Summary: The development environment for the OpenIPMI project Requires: pkgconfig Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description devel The OpenIPMI-devel package contains the development libraries and header files @@ -89,7 +90,7 @@ of the OpenIPMI project. %patch2 -p1 -b .manscan %build -export CFLAGS="-fPIC $RPM_OPT_FLAGS" +export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" # aarch64 workaround remove once released package's config.sub contains aarch64 %{__libtoolize} --copy --force --automake @@ -106,9 +107,10 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS" --disable-static \ --with-tkinter=no -# get rid of rpath -#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 +# https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Beware_of_Rpath +# get rid of rpath still present in OpenIPMI-perl package +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 @@ -205,6 +207,10 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf %changelog +* Fri Jul 19 2013 Ledvinka Ales - 2.0.19-7 +- Hint compilation to avoid strict aliasing and prevent type-punned pointer issues. +- Fix rPath regression for OpenIPMI-perl library. + * Wed Jul 17 2013 Petr Pisar - 2.0.19-6 - Perl 5.18 rebuild From 962fda0a50e98a9b927dcc7ffc7ec20a24eccc5c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 18:04:24 -0500 Subject: [PATCH 021/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index c50405e..fa6ac5f 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -207,6 +207,9 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf %changelog +* Fri Aug 02 2013 Fedora Release Engineering - 2.0.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jul 19 2013 Ledvinka Ales - 2.0.19-7 - Hint compilation to avoid strict aliasing and prevent type-punned pointer issues. - Fix rPath regression for OpenIPMI-perl library. From 9c367bc8c147a61e1905d3f4df5737392e91c8f2 Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Tue, 5 Nov 2013 17:39:51 +0100 Subject: [PATCH 022/129] Modalias match acpi. --- OpenIPMI.spec | 5 ++++- openipmi.modalias | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index fa6ac5f..819877f 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.19 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -207,6 +207,9 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf %changelog +* Tue Nov 05 2013 Fedora Release Engineering - 2.0.19-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Aug 02 2013 Fedora Release Engineering - 2.0.19-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/openipmi.modalias b/openipmi.modalias index 5f635ac..58950a4 100644 --- a/openipmi.modalias +++ b/openipmi.modalias @@ -4,7 +4,7 @@ # Feel free to update as needed. # -alias IPI0001 ipmi_si -alias IPI0001 ipmi_devintf -alias IPI0001 ipmi_msghandler +alias acpi:IPI000*:* ipmi_si +alias acpi:IPI000*:* ipmi_devintf +alias acpi:IPI000*:* ipmi_msghandler From f699a408e9d37e0faf38167d6b205c1300b4b1f7 Mon Sep 17 00:00:00 2001 From: aledvink Date: Tue, 14 Jan 2014 10:55:53 +0100 Subject: [PATCH 023/129] Module probing right after the installation. Do not wait until reboot kmod/udev. --- OpenIPMI.spec | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 819877f..af0f691 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,8 +4,10 @@ %{!?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.19 -Release: 9%{?dist} +Release: 11%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -42,6 +44,8 @@ This package contains the tools of the OpenIPMI project. %package modalias Group: System Environment/Kernel Summary: Module aliases for IPMI subsystem +Requires: systemd +Requires: kmod %description modalias The OpenIPMI-modalias provides configuration file with module aliases @@ -126,6 +130,7 @@ install -d ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/OpenIPMI.conf +install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name} rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 @@ -138,6 +143,22 @@ if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{ %{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz fi +%posttrans modalias +if [ -f "%{once}" ]; then + if /usr/bin/udevadm info --export-db | grep -qie 'acpi:IPI0'; then + /sbin/modprobe ipmi_si || :; + /sbin/modprobe ipmi_devintf || :; + /sbin/modprobe ipmi_msghandler || :; + %{__rm} -f %{once} || :; + /usr/bin/udevadm settle + fi +fi + +%post modalias +if [ "$1" -eq 1 ]; then + /bin/touch %{once} +fi + %post %systemd_post ipmi.service @@ -205,8 +226,15 @@ fi %files modalias %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf +%{_localstatedir}/run/%{name} %changelog +* Tue Jan 14 2014 Ledvinka Ales - 2.0.19-11 +- Probe modules on installation. Do not wait until reboot. + +* Wed Nov 13 2013 Ledvinka Ales - 2.0.19-10 +- Correct aliases matching module strings. + * Tue Nov 05 2013 Fedora Release Engineering - 2.0.19-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 2935eda02e7276aa55b49cdb4415af31a9074eff Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Mon, 27 Jan 2014 15:36:14 +0100 Subject: [PATCH 024/129] Resolves: #1055942 --- .gitignore | 1 + OpenIPMI-2.0.19-man.patch | 6 +++--- OpenIPMI.spec | 6 +++--- sources | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6ca4d11..3dea063 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.19.tar.gz +/openipmi-2.0.21.tar.gz diff --git a/OpenIPMI-2.0.19-man.patch b/OpenIPMI-2.0.19-man.patch index 42959d9..a584da8 100644 --- a/OpenIPMI-2.0.19-man.patch +++ b/OpenIPMI-2.0.19-man.patch @@ -163,9 +163,9 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 .RS .nf EVENT -diff -up ./man/ipmilan.8.manscan ./man/ipmilan.8 ---- ./man/ipmilan.8.manscan 2013-06-04 15:43:43.597127168 +0200 -+++ ./man/ipmilan.8 2013-06-05 13:36:31.282753184 +0200 +diff -up ./lanserv/ipmilan.8.manscan ./lanserv/ipmilan.8 +--- ./lanserv/ipmilan.8.manscan 2013-06-04 15:43:43.597127168 +0200 ++++ ./lanserv/ipmilan.8 2013-06-05 13:36:31.282753184 +0200 @@ -29,18 +29,25 @@ address they came in. .SH OPTIONS diff --git a/OpenIPMI.spec b/OpenIPMI.spec index af0f691..2a7defd 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -6,12 +6,12 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation -Version: 2.0.19 +Version: 2.0.21 Release: 11%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ -Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz +Source: http://downloads.sourceforge.net/openipmi/openipmi-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service @@ -89,7 +89,7 @@ The OpenIPMI-devel package contains the development libraries and header files of the OpenIPMI project. %prep -%setup -q +%setup -q -n openipmi-%{version} %patch1 -p1 -b .pthread %patch2 -p1 -b .manscan diff --git a/sources b/sources index 5553fc7..77a00ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e96e68b972d4b376f239d32cd3629328 OpenIPMI-2.0.19.tar.gz +fb8933cdd5c91a4f90d8c13d2cb442fe openipmi-2.0.21.tar.gz From 7c01d58f8a58ac5020b0f190338ce25c01771f82 Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Wed, 29 Jan 2014 09:17:47 +0100 Subject: [PATCH 025/129] Resolves: #1055942 --- .gitignore | 1 + OpenIPMI.spec | 24 +++++++++++++++++++++--- sources | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3dea063..423098d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.19.tar.gz /openipmi-2.0.21.tar.gz +/OpenIPMI-2.0.21.tar.gz diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 2a7defd..00ec55c 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,11 +7,11 @@ Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation Version: 2.0.21 -Release: 11%{?dist} +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ -Source: http://downloads.sourceforge.net/openipmi/openipmi-%{version}.tar.gz +Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service @@ -88,8 +88,17 @@ Requires: %{name}-libs = %{version}-%{release} The OpenIPMI-devel package contains the development libraries and header files of the OpenIPMI project. +%package lanserv +Summary: Emulates an IPMI network listener +Group: Utilities +Requires: %{name} = %{version} + +%description lanserv +This package contains a network IPMI listener. + + %prep -%setup -q -n openipmi-%{version} +%setup -q %patch1 -p1 -b .pthread %patch2 -p1 -b .manscan @@ -224,11 +233,20 @@ fi %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files lanserv +%defattr(-,root,root) +%{_bindir}/ipmilan +%{_libdir}/libIPMIlanserv.so.* +%doc %{_mandir}/man8/ipmilan.8* + %files modalias %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf %{_localstatedir}/run/%{name} %changelog +* Wed Jan 29 2014 Ledvinka Ales - 2.0.21-1 +- Update to new upstream (fixed case 2nd) release. + * Tue Jan 14 2014 Ledvinka Ales - 2.0.19-11 - Probe modules on installation. Do not wait until reboot. diff --git a/sources b/sources index 77a00ba..9d0e4a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb8933cdd5c91a4f90d8c13d2cb442fe openipmi-2.0.21.tar.gz +dc0b42ae40b3f1d0db2a94b75b95fae1 OpenIPMI-2.0.21.tar.gz From c0cedde0187b3fd2c7c07193d6e6d21e92e909af Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Tue, 13 May 2014 20:03:41 +0200 Subject: [PATCH 026/129] Fixing FTBFS due to unpackaged files (#1075696) --- OpenIPMI.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 00ec55c..c7afe55 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation Version: 2.0.21 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -235,15 +235,25 @@ fi %files lanserv %defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/ipmi/ipmisim1.emu +%config(noreplace) %{_sysconfdir}/ipmi/lan.conf %{_bindir}/ipmilan +%{_bindir}/ipmi_sim +%{_bindir}/sdrcomp %{_libdir}/libIPMIlanserv.so.* %doc %{_mandir}/man8/ipmilan.8* +%doc %{_mandir}/man1/ipmi_sim.1* +%doc %{_mandir}/man5/ipmi_lan.5* +%doc %{_mandir}/man5/ipmi_sim_cmd.5* %files modalias %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf %{_localstatedir}/run/%{name} %changelog +* Tue May 13 2014 Jaromir Capik - 2.0.21-2 +- Fixing FTBFS due to unpackaged files (#1075696) + * Wed Jan 29 2014 Ledvinka Ales - 2.0.21-1 - Update to new upstream (fixed case 2nd) release. From 0b30e4fecb8a19a5be9cd1f554814475b8acff17 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:58:21 -0500 Subject: [PATCH 027/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index c7afe55..25de441 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation Version: 2.0.21 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -251,6 +251,9 @@ fi %{_localstatedir}/run/%{name} %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 2.0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 13 2014 Jaromir Capik - 2.0.21-2 - Fixing FTBFS due to unpackaged files (#1075696) From d1a383d0ffdab75feb06e37021e8fae731a47e79 Mon Sep 17 00:00:00 2001 From: aledvink Date: Tue, 12 Aug 2014 14:39:46 +0200 Subject: [PATCH 028/129] Resolves: #1079635 --- OpenIPMI-2.0.21-nobundle.patch | 70 ++++++++++++++++++++++++++++++++++ OpenIPMI.spec | 10 ++++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 OpenIPMI-2.0.21-nobundle.patch diff --git a/OpenIPMI-2.0.21-nobundle.patch b/OpenIPMI-2.0.21-nobundle.patch new file mode 100644 index 0000000..039a2e3 --- /dev/null +++ b/OpenIPMI-2.0.21-nobundle.patch @@ -0,0 +1,70 @@ +diff -up ./cmdlang/Makefile.am.nobundle ./cmdlang/Makefile.am +--- ./cmdlang/Makefile.am.nobundle 2013-01-21 18:24:13.000000000 +0100 ++++ ./cmdlang/Makefile.am 2014-08-12 13:35:09.836655867 +0200 +@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 + + AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ ++ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ ++ $(EDIT_CFLAGS) \ + $(TCL_CFLAGS) + + lib_LTLIBRARIES = libOpenIPMIcmdlang.la +@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l + $(top_builddir)/utils/libOpenIPMIutils.la \ + $(top_builddir)/lib/libOpenIPMI.la \ + $(top_builddir)/unix/libOpenIPMIposix.la \ +- $(top_builddir)/libedit/libedit.a \ ++ $(EDIT_LIBS) \ + $(TERM_LIBS) \ + $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ + $(TCL_LIB) $(TCL_LIBS) \ +diff -up ./configure.ac.nobundle ./configure.ac +--- ./configure.ac.nobundle 2014-01-28 20:35:02.000000000 +0100 ++++ ./configure.ac 2014-08-12 13:35:09.836655867 +0200 +@@ -930,7 +930,6 @@ AC_OUTPUT(Makefile + swig/perl/Makefile + swig/python/Makefile + swig/python/openipmigui/Makefile +- libedit/Makefile + cmdlang/Makefile + include/Makefile + include/OpenIPMI/Makefile +diff -up ./Makefile.am.nobundle ./Makefile.am +--- ./Makefile.am.nobundle 2012-07-22 00:01:45.000000000 +0200 ++++ ./Makefile.am 2014-08-12 13:35:09.836655867 +0200 +@@ -1,10 +1,10 @@ + RPM = rpmbuild + RPMFLAGS = -ta + +-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \ ++SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \ + ui lanserv sample doc man $(SWIG_DIR) + +-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \ ++DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \ + ui lanserv sample doc man swig + + EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ +diff -up ./sample/Makefile.am.nobundle ./sample/Makefile.am +--- ./sample/Makefile.am.nobundle 2014-08-12 13:36:19.033804459 +0200 ++++ ./sample/Makefile.am 2014-08-12 13:37:07.478907706 +0200 +@@ -53,8 +53,8 @@ solterm_LDADD = $(POPTLIBS) $(top_buildd + rmcp_ping_SOURCES = rmcp_ping.c + + ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c +-ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) +-ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit ++ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) $(TERM_LIBS) ++ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS) + + EXTRA_DIST = example_oem.c + +@@ -65,4 +65,4 @@ install-data-local: + $(LN_S) openipmicmd $(DESTDIR)$(bindir)/ipmicmd + + uninstall-local: +- rm -f $(DESTDIR)$(bindir)/ipmicmd +\ No newline at end of file ++ rm -f $(DESTDIR)$(bindir)/ipmicmd diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 25de441..9b26ae9 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,5 +1,4 @@ %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 @@ -20,6 +19,8 @@ BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter BuildRequires: desktop-file-utils BuildRequires: systemd-units +BuildRequires: pkgconfig +BuildRequires: libedit-devel # aarch64 workaround remove once released package's config.sub contains aarch64 BuildRequires: automake @@ -27,6 +28,7 @@ BuildRequires: autoconf BuildRequires: libtool # aarch64 end +Requires: libedit Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -35,6 +37,8 @@ Requires:%{name}-libs = %{version}-%{release} Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch Patch2: OpenIPMI-2.0.19-man.patch +# switch from libedit bundle to system libedit +Patch3: OpenIPMI-2.0.21-nobundle.patch %description The Open IPMI project aims to develop an open code base to allow access to @@ -101,8 +105,12 @@ This package contains a network IPMI listener. %setup -q %patch1 -p1 -b .pthread %patch2 -p1 -b .manscan +%patch3 -p1 -b .nobundle +rm -rf ./libedit %build +export EDIT_CFLAGS=`pkg-config --cflags libedit` +export EDIT_LIBS=`pkg-config --libs libedit` export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" # aarch64 workaround remove once released package's config.sub contains aarch64 From 8cae4cd74f9b3f21a1f7e3a9e9ebf6ea910b5223 Mon Sep 17 00:00:00 2001 From: aledvink Date: Tue, 12 Aug 2014 14:42:24 +0200 Subject: [PATCH 029/129] Resolves: #1079635 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9b26ae9..fc67e81 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -6,7 +6,7 @@ Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation Version: 2.0.21 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -259,6 +259,9 @@ fi %{_localstatedir}/run/%{name} %changelog +* Tue Aug 12 2014 Ledvinka Ales - 2.0.21-4 +- Use system libedit instead of the old one bundled with source. + * Fri Jun 06 2014 Fedora Release Engineering - 2.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b017b765f50bb60a17c905149a9f34f0583c9afd Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 18:57:24 +0000 Subject: [PATCH 030/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index fc67e81..44c0bd6 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -6,7 +6,7 @@ Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation Version: 2.0.21 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -259,6 +259,9 @@ fi %{_localstatedir}/run/%{name} %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.0.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Aug 12 2014 Ledvinka Ales - 2.0.21-4 - Use system libedit instead of the old one bundled with source. From 15c3d841c0a989a47cce071c43b1b5c284ee81d0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 00:38:55 +0200 Subject: [PATCH 031/129] Perl 5.20 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 44c0bd6..3362791 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -6,7 +6,7 @@ Name: OpenIPMI %global once %{_localstatedir}/run/%{name}/first_installation Version: 2.0.21 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -259,6 +259,9 @@ fi %{_localstatedir}/run/%{name} %changelog +* Tue Aug 26 2014 Jitka Plesnikova - 2.0.21-6 +- Perl 5.20 rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 2.0.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 26da34ce0086fe652dc20a674f32f870e9732ad3 Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Wed, 22 Apr 2015 14:07:48 +0200 Subject: [PATCH 032/129] Resolves: #1213987 --- OpenIPMI.spec | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 3362791..cc9c345 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,10 +3,9 @@ %{!?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.21 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -14,7 +13,6 @@ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper 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: desktop-file-utils @@ -45,20 +43,9 @@ The Open IPMI project aims to develop an open code base to allow access to platform information using Intelligent Platform Management Interface (IPMI). This package contains the tools of the OpenIPMI project. -%package modalias -Group: System Environment/Kernel -Summary: Module aliases for IPMI subsystem -Requires: systemd -Requires: kmod - -%description modalias -The OpenIPMI-modalias provides configuration file with module aliases -of ACPI and PNP wildcards. - %package libs Group: Development/Libraries Summary: The OpenIPMI runtime libraries -Requires:%{name}-modalias = %{version}-%{release} %description libs The OpenIPMI-libs package contains the runtime libraries for shared binaries @@ -160,22 +147,6 @@ if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{ %{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz fi -%posttrans modalias -if [ -f "%{once}" ]; then - if /usr/bin/udevadm info --export-db | grep -qie 'acpi:IPI0'; then - /sbin/modprobe ipmi_si || :; - /sbin/modprobe ipmi_devintf || :; - /sbin/modprobe ipmi_msghandler || :; - %{__rm} -f %{once} || :; - /usr/bin/udevadm settle - fi -fi - -%post modalias -if [ "$1" -eq 1 ]; then - /bin/touch %{once} -fi - %post %systemd_post ipmi.service @@ -254,11 +225,10 @@ fi %doc %{_mandir}/man5/ipmi_lan.5* %doc %{_mandir}/man5/ipmi_sim_cmd.5* -%files modalias -%config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf -%{_localstatedir}/run/%{name} - %changelog +* Wed Apr 22 2015 Ales Ledvinka - 2.0.21-7 +- Remove modalias subpackage. + * Tue Aug 26 2014 Jitka Plesnikova - 2.0.21-6 - Perl 5.20 rebuild From 4ac15f25e71b4eb45f95085470f2abbb0ee0247a Mon Sep 17 00:00:00 2001 From: Ales Ledvinka Date: Wed, 22 Apr 2015 15:11:00 +0200 Subject: [PATCH 033/129] Resolves: #1213987 --- OpenIPMI.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index cc9c345..9bcad8a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -133,8 +133,6 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper install -d ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d -install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/OpenIPMI.conf -install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name} rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 From 0235d1554d7e709453512e84474c40165534cb9d Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 5 Jun 2015 11:33:49 +0200 Subject: [PATCH 034/129] Perl 5.22 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9bcad8a..7365cd6 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.21 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -224,6 +224,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Jun 05 2015 Jitka Plesnikova - 2.0.21-8 +- Perl 5.22 rebuild + * Wed Apr 22 2015 Ales Ledvinka - 2.0.21-7 - Remove modalias subpackage. From abe20dc9541d122327fad487d3193202a2da4413 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:01:27 +0000 Subject: [PATCH 035/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 7365cd6..a370022 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.21 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -224,6 +224,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.0.21-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 05 2015 Jitka Plesnikova - 2.0.21-8 - Perl 5.22 rebuild From e4ac067b4e1b2db5fefee5aa3260d8b953c3b839 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 24 Nov 2015 21:02:44 +0100 Subject: [PATCH 036/129] Remove duplicities in filelists Resolves: rhbz#1079635 --- OpenIPMI.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a370022..3fd7169 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.21 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -19,12 +19,9 @@ BuildRequires: desktop-file-utils BuildRequires: systemd-units BuildRequires: pkgconfig BuildRequires: libedit-devel - -# aarch64 workaround remove once released package's config.sub contains aarch64 BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool -# aarch64 end Requires: libedit Requires(post): systemd-units @@ -100,13 +97,13 @@ export EDIT_CFLAGS=`pkg-config --cflags libedit` export EDIT_LIBS=`pkg-config --libs libedit` export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" -# aarch64 workaround remove once released package's config.sub contains aarch64 +# generate new configure script we need this since we removed the libedit directory %{__libtoolize} --copy --force --automake %{__aclocal} %{__autoheader} %{__automake} --add-missing --copy --foreign --force-missing %{__autoconf} -# aarch64 end +# libedit end %configure \ --with-pythoninstall=%{python_sitearch} \ @@ -176,7 +173,6 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/ipmi %{_libexecdir}/openipmi-helper %{_bindir}/ipmicmd -%{_bindir}/ipmilan %{_bindir}/ipmish %{_bindir}/ipmi_ui %{_bindir}/openipmicmd @@ -193,7 +189,6 @@ fi %{_mandir}/man1/ipmicmd* %{_mandir}/man7/ipmi_cmdlang* %{_mandir}/man7/openipmi_conparms* -%{_mandir}/man8/ipmilan* %files perl %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm @@ -224,6 +219,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Nov 24 2015 Boris Ranto - 2.0.21-10 +- Remove duplicities in filelists + * Tue Jun 16 2015 Fedora Release Engineering - 2.0.21-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 51d50d9f09a769e70835491bfea8732ec726d707 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Wed, 9 Dec 2015 14:37:24 +0100 Subject: [PATCH 037/129] Avoid warning on update/removal Related: rhbz#1256798 --- OpenIPMI.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 3fd7169..7cd5fa1 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.21 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -151,9 +151,11 @@ fi %postun %systemd_postun_with_restart ipmi.service -%post libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig -%postun libs -p /sbin/ldconfig +%postun libs +/sbin/ldconfig ### A sysv => systemd migration contains all of the same scriptlets as a ### systemd package. These are additional scriptlets @@ -219,6 +221,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Dec 09 2015 Boris Ranto - 2.0.21-11 +- Avoid warning on update/removal (#1256798) + * Tue Nov 24 2015 Boris Ranto - 2.0.21-10 - Remove duplicities in filelists From c33d91fd0fcb0fc0f826f7effb485648207fac18 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:33:46 +0000 Subject: [PATCH 038/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 7cd5fa1..375cad8 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.21 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -221,6 +221,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.21-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Dec 09 2015 Boris Ranto - 2.0.21-11 - Avoid warning on update/removal (#1256798) From 2af2176da41e4bc54d207b32cbe6b75b9fc2afd3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 17 May 2016 04:40:11 +0200 Subject: [PATCH 039/129] Perl 5.24 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 375cad8..648b966 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.21 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -221,6 +221,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue May 17 2016 Jitka Plesnikova - 2.0.21-13 +- Perl 5.24 rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 2.0.21-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From dec645c2a948c950c791323fe89fbbec8d4a467a Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 2 Jun 2016 12:45:27 +0200 Subject: [PATCH 040/129] New version (0:2.0.22-1) - Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' - Apply './OpenIPMI-2.0.19-man.patch' - Apply 'OpenIPMI-2.0.21-nobundle.patch' Resolves: rhbz#1341876 --- .gitignore | 1 + ...nIPMI-2.0.18-pthread-pkgconfig.patch.patch | 26 ++ ...02-Apply-.-OpenIPMI-2.0.19-man.patch.patch | 256 ++++++++++-------- ...Apply-OpenIPMI-2.0.21-nobundle.patch.patch | 107 ++++---- OpenIPMI-2.0.18-pthread-pkgconfig.patch | 18 -- OpenIPMI.spec | 24 +- sources | 2 +- 7 files changed, 251 insertions(+), 183 deletions(-) create mode 100644 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch rename OpenIPMI-2.0.19-man.patch => 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch (81%) rename OpenIPMI-2.0.21-nobundle.patch => 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch (59%) delete mode 100644 OpenIPMI-2.0.18-pthread-pkgconfig.patch diff --git a/.gitignore b/.gitignore index 423098d..9b1e224 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.19.tar.gz /openipmi-2.0.21.tar.gz /OpenIPMI-2.0.21.tar.gz +/OpenIPMI-2.0.22.tar.gz diff --git a/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch b/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch new file mode 100644 index 0000000..5c92eb9 --- /dev/null +++ b/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch @@ -0,0 +1,26 @@ +From d058bc9be5ef521882e3226a27e81cca8aded5ce Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Thu, 2 Jun 2016 12:46:39 +0200 +Subject: [PATCH] Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' + +Signed-off-by: Boris Ranto +--- + OpenIPMIpthread.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/OpenIPMIpthread.pc.in b/OpenIPMIpthread.pc.in +index 59b52e5..fffa0d0 100644 +--- a/OpenIPMIpthread.pc.in ++++ b/OpenIPMIpthread.pc.in +@@ -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 +-- +2.7.4 + diff --git a/OpenIPMI-2.0.19-man.patch b/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch similarity index 81% rename from OpenIPMI-2.0.19-man.patch rename to 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch index a584da8..51ba9d0 100644 --- a/OpenIPMI-2.0.19-man.patch +++ b/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch @@ -1,7 +1,63 @@ -diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 ---- ./man/ipmi_cmdlang.7.manscan 2013-06-05 10:21:15.742099865 +0200 -+++ ./man/ipmi_cmdlang.7 2013-06-05 10:40:49.767658999 +0200 -@@ -246,7 +246,7 @@ instance, the command to create a domain +From dfca464e5fe4c9107f08bff7e6e2730a504945b7 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' + +Signed-off-by: Boris Ranto +--- + lanserv/ipmilan.8 | 13 ++++++++++--- + man/ipmi_cmdlang.7 | 36 ++++++++++++++++++------------------ + man/ipmi_ui.1 | 10 +++++----- + man/openipmi_conparms.7 | 4 ++-- + man/openipmicmd.1 | 6 +++--- + man/openipmigui.1 | 12 ++++++------ + man/openipmish.1 | 12 +++++++++++- + man/rmcp_ping.1 | 2 +- + man/solterm.1 | 6 +++--- + sample/ipmicmd.c | 1 + + sample/rmcp_ping.c | 5 +++++ + sample/solterm.c | 7 ++++++- + ui/basic_ui.c | 25 +++++++++++++++++++++++++ + 13 files changed, 96 insertions(+), 43 deletions(-) + +diff --git a/lanserv/ipmilan.8 b/lanserv/ipmilan.8 +index ff43d5c..9360507 100644 +--- a/lanserv/ipmilan.8 ++++ b/lanserv/ipmilan.8 +@@ -29,18 +29,25 @@ address they came in. + + .SH OPTIONS + .TP +-.BI \-c\ config-file ++\fB\-c\fR file,\ \fB\-\-config\-file\fR file + Set the configuration file to one other than the default of + .I "/etc/ipmi_lan.conf" + .TP +-.B \-n ++\fB\-i\fR device,\ \fB\-\-ipmi-dev\fR device ++Sets the desired device ++.TP ++\fB\-n\fR,\ \fB\-\-daemonize\fR + Stops the daemon from forking and detaching from the controlling + terminal. This is useful for running from init. + .TP +-.B \-d ++\fB\-d\fR,\ \fB\-\-debug\fR + Turns on debugging to standard output. You generally have to use + .B \-n + with this. ++.TP ++\fB\-?\fR,\ \fB\-\-help\fR,\ \fB\-\-usage\fR ++Prints brief usage hints message. ++ + + + .SH CONFIGURATION +diff --git a/man/ipmi_cmdlang.7 b/man/ipmi_cmdlang.7 +index 4d18e76..a6d73b9 100644 +--- a/man/ipmi_cmdlang.7 ++++ b/man/ipmi_cmdlang.7 +@@ -246,7 +246,7 @@ instance, the command to create a domain is The command to list all sensors in a domain named domain1 is .B sensor list domain1. @@ -10,7 +66,7 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 listed after the command description. In those responses, anything that begins with a .B % -@@ -316,7 +316,7 @@ BMC. For that, notice that the LAN conn +@@ -316,7 +316,7 @@ BMC. For that, notice that the LAN connection has an options extra IP and port for the second IP address. OpenIPMI supports these IP addresses and connection, detecting failures, switching between addresses, and other fault-tolerant things. It does this @@ -127,7 +183,7 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 on the control type. .TP Response: -@@ -1128,7 +1128,7 @@ multiple lights. The options values (ma +@@ -1128,7 +1128,7 @@ multiple lights. The options values (marked with ) will not be present if local control is set to true. Local control means that the LED takes whatever default function it does on the device @@ -154,7 +210,7 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 the MC. Note that when you get a pef config, you claim a lock on the MC that must be unlocked. -@@ -1780,7 +1780,7 @@ operational and finished all it SDR, FRU +@@ -1780,7 +1780,7 @@ operational and finished all it SDR, FRU, and bus scans: .fi .RE @@ -163,41 +219,10 @@ diff -up ./man/ipmi_cmdlang.7.manscan ./man/ipmi_cmdlang.7 .RS .nf EVENT -diff -up ./lanserv/ipmilan.8.manscan ./lanserv/ipmilan.8 ---- ./lanserv/ipmilan.8.manscan 2013-06-04 15:43:43.597127168 +0200 -+++ ./lanserv/ipmilan.8 2013-06-05 13:36:31.282753184 +0200 -@@ -29,18 +29,25 @@ address they came in. - - .SH OPTIONS - .TP --.BI \-c\ config-file -+\fB\-c\fR file,\ \fB\-\-config\-file\fR file - Set the configuration file to one other than the default of - .I "/etc/ipmi_lan.conf" - .TP --.B \-n -+\fB\-i\fR device,\ \fB\-\-ipmi-dev\fR device -+Sets the desired device -+.TP -+\fB\-n\fR,\ \fB\-\-daemonize\fR - Stops the daemon from forking and detaching from the controlling - terminal. This is useful for running from init. - .TP --.B \-d -+\fB\-d\fR,\ \fB\-\-debug\fR - Turns on debugging to standard output. You generally have to use - .B \-n - with this. -+.TP -+\fB\-?\fR,\ \fB\-\-help\fR,\ \fB\-\-usage\fR -+Prints brief usage hints message. -+ - - - .SH CONFIGURATION -diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 ---- ./man/ipmi_ui.1.manscan 2013-06-04 15:33:32.206892146 +0200 -+++ ./man/ipmi_ui.1 2013-06-05 10:44:52.592882502 +0200 +diff --git a/man/ipmi_ui.1 b/man/ipmi_ui.1 +index 9c5d9b6..011255f 100644 +--- a/man/ipmi_ui.1 ++++ b/man/ipmi_ui.1 @@ -4,7 +4,7 @@ ipmi_ui \- Crude interface to an IPMI system @@ -216,7 +241,7 @@ diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 the right window to scroll. Note that you must set your environment \fBTERM\fP variable properly for -@@ -48,7 +48,7 @@ the connections are to the same IPMI dom +@@ -48,7 +48,7 @@ the connections are to the same IPMI domain through different management controllers. Also, each LAN connection may have two IP addresses. These are two different addresses to the same management controller. So you may have a total of 4 IP addresses to an IPMI @@ -225,7 +250,7 @@ diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 management controller. .SH OPTIONS -@@ -174,12 +174,12 @@ turns events on or off from the sensor ( +@@ -174,12 +174,12 @@ turns events on or off from the sensor (\fB0\fP or \fB1\fP). turns scanning on or off for the sensor (\fB0\fP or \fB1\fP). .I "assertion-bitmask" specifies the bitmask of thresholds or states @@ -240,39 +265,10 @@ diff -up ./man/ipmi_ui.1.manscan ./man/ipmi_ui.1 deasserted. .SH CONTROLS -diff -up ./man/openipmicmd.1.manscan ./man/openipmicmd.1 ---- ./man/openipmicmd.1.manscan 2013-06-04 13:57:08.825074711 +0200 -+++ ./man/openipmicmd.1 2013-06-05 10:45:54.938921332 +0200 -@@ -22,7 +22,7 @@ interfaces. - Execute a single command an exit. - - .TP --.BI -+.BI - The parameters for the connection depend on the connection type. - These are all described in openipmi_conparms (7) - -@@ -32,7 +32,7 @@ Once up, you can execute commands in the - commands and responses are asynchronous, you issue a command and the - interface returns immediately. When the response comes back, it will - be dumped on your console. That's a little strange looking, but IPMI --is ansychronous underneath. Note that the \fB\-k\fP option is synchronous, -+is asynchronous underneath. Note that the \fB\-k\fP option is synchronous, - it will wait for the response or a timeout before returning. - - .TP -@@ -82,7 +82,7 @@ Remove a command registration. - .BR openipmi_conparms (7) - - .SH "KNOWN PROBLEMS" --The asychronous nature of the program can be annoying. -+The asynchronous nature of the program can be annoying. - - .SH AUTHOR - .PP -diff -up ./man/openipmi_conparms.7.manscan ./man/openipmi_conparms.7 ---- ./man/openipmi_conparms.7.manscan 2013-06-05 10:46:13.818932142 +0200 -+++ ./man/openipmi_conparms.7 2013-06-05 10:47:48.332980969 +0200 +diff --git a/man/openipmi_conparms.7 b/man/openipmi_conparms.7 +index 587da2a..9dc6404 100644 +--- a/man/openipmi_conparms.7 ++++ b/man/openipmi_conparms.7 @@ -1,7 +1,7 @@ .TH openipmi_conparms 7 05/13/03 OpenIPMI "Connection Parameters for OpenIPMI" @@ -291,10 +287,42 @@ diff -up ./man/openipmi_conparms.7.manscan ./man/openipmi_conparms.7 \fBaes_cbc_128\fP, \fBxrc4_128\fP, and \fBxrc_40\fP. The \fBbmcpick\fP option is used by default, which means the BMC picks the algorithm it wants to use. -diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 ---- ./man/openipmigui.1.manscan 2013-06-05 10:48:43.389006143 +0200 -+++ ./man/openipmigui.1 2013-06-05 10:51:13.372066408 +0200 -@@ -38,7 +38,7 @@ Turn on message debugging, this will dum +diff --git a/man/openipmicmd.1 b/man/openipmicmd.1 +index 6bd2401..5d206d1 100644 +--- a/man/openipmicmd.1 ++++ b/man/openipmicmd.1 +@@ -22,7 +22,7 @@ interfaces. + Execute a single command an exit. + + .TP +-.BI ++.BI + The parameters for the connection depend on the connection type. + These are all described in openipmi_conparms (7) + +@@ -32,7 +32,7 @@ Once up, you can execute commands in the user interface. Note that + commands and responses are asynchronous, you issue a command and the + interface returns immediately. When the response comes back, it will + be dumped on your console. That's a little strange looking, but IPMI +-is ansychronous underneath. Note that the \fB\-k\fP option is synchronous, ++is asynchronous underneath. Note that the \fB\-k\fP option is synchronous, + it will wait for the response or a timeout before returning. + + .TP +@@ -82,7 +82,7 @@ Remove a command registration. + .BR openipmi_conparms (7) + + .SH "KNOWN PROBLEMS" +-The asychronous nature of the program can be annoying. ++The asynchronous nature of the program can be annoying. + + .SH AUTHOR + .PP +diff --git a/man/openipmigui.1 b/man/openipmigui.1 +index 04f880b..0c8c10f 100644 +--- a/man/openipmigui.1 ++++ b/man/openipmigui.1 +@@ -38,7 +38,7 @@ Turn on message debugging, this will dump all messages to debug log output. .TP .B \-\-drawmsg Turn on raw message debugging, this will dump all low-level messages to @@ -312,7 +340,7 @@ diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 Management Controllers (MCs) for that domain. Right click drives most of the operations in the tree window. Many -@@ -92,7 +92,7 @@ Color is used in the GUI to denote error +@@ -92,7 +92,7 @@ Color is used in the GUI to denote error status, and shading is used to denote availability. If a sensor has an error, the tree entry for that sensor will change colors. Black means no error, yellow means warning, red means critical, and blue means non-recoverable. These @@ -330,7 +358,7 @@ diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 information is beyond the scope of this document, as IPMI controls are very complex. See the IPMI document from OpenIPMI for information about controls. -@@ -214,7 +214,7 @@ channel listing. Note that some user se +@@ -214,7 +214,7 @@ channel listing. Note that some user setting (the name and password) are global to all channels on the MC. Due to the IPMI spec and some unfortunate implementation bugs, some @@ -348,10 +376,11 @@ diff -up ./man/openipmigui.1.manscan ./man/openipmigui.1 pulls up all the parameters for the LAN and allows them to be set. Right-clicking on an item allows it to be changed. -diff -up ./man/openipmish.1.manscan ./man/openipmish.1 ---- ./man/openipmish.1.manscan 2013-06-05 10:52:26.787092815 +0200 -+++ ./man/openipmish.1 2013-06-05 14:01:12.004559270 +0200 -@@ -26,7 +26,7 @@ Turn on message debugging, this will dum +diff --git a/man/openipmish.1 b/man/openipmish.1 +index 36b1e43..2c902e4 100644 +--- a/man/openipmish.1 ++++ b/man/openipmish.1 +@@ -26,7 +26,7 @@ Turn on message debugging, this will dump all messages to debug log output. .TP .B \-\-drawmsg Turn on raw message debugging, this will dump all low-level messages to @@ -360,7 +389,7 @@ diff -up ./man/openipmish.1.manscan ./man/openipmish.1 protocol messages are also dumped, not just IPMI messages. .TP .B \-\-dmem -@@ -34,11 +34,21 @@ Turn on memory debugging, this will caus +@@ -34,11 +34,21 @@ Turn on memory debugging, this will cause memory allocation and deallocations to be checked. When the program terminates, it will dump all memory that was not properly freed (leaked). .TP @@ -382,9 +411,10 @@ diff -up ./man/openipmish.1.manscan ./man/openipmish.1 .B \-\-snmp Enable the SNMP trap handler. .B openipmish -diff -up ./man/rmcp_ping.1.manscan ./man/rmcp_ping.1 ---- ./man/rmcp_ping.1.manscan 2013-06-05 10:52:59.704104189 +0200 -+++ ./man/rmcp_ping.1 2013-06-05 10:53:09.788107626 +0200 +diff --git a/man/rmcp_ping.1 b/man/rmcp_ping.1 +index d60019a..ce5cab0 100644 +--- a/man/rmcp_ping.1 ++++ b/man/rmcp_ping.1 @@ -38,7 +38,7 @@ starttag. This is zero by default Turns on debugging to standard output. .TP @@ -394,10 +424,11 @@ diff -up ./man/rmcp_ping.1.manscan ./man/rmcp_ping.1 .SH AUTHOR .PP -diff -up ./man/solterm.1.manscan ./man/solterm.1 ---- ./man/solterm.1.manscan 2013-06-05 10:53:46.923120093 +0200 -+++ ./man/solterm.1 2013-06-05 10:55:59.442162744 +0200 -@@ -37,9 +37,9 @@ These are all described in openipmi_conp +diff --git a/man/solterm.1 b/man/solterm.1 +index 1479a1b..ada15d8 100644 +--- a/man/solterm.1 ++++ b/man/solterm.1 +@@ -37,9 +37,9 @@ These are all described in openipmi_conparms (7) .TP .BI \-e\ escape_char The character to use to escape, or exit, the program. Entering this @@ -418,9 +449,10 @@ diff -up ./man/solterm.1.manscan ./man/solterm.1 handshake is released. .TP -diff -up ./sample/ipmicmd.c.manscan ./sample/ipmicmd.c ---- ./sample/ipmicmd.c.manscan 2013-06-05 13:55:04.191611230 +0200 -+++ ./sample/ipmicmd.c 2013-06-05 13:55:10.988610133 +0200 +diff --git a/sample/ipmicmd.c b/sample/ipmicmd.c +index 9f51273..f9a8a4a 100644 +--- a/sample/ipmicmd.c ++++ b/sample/ipmicmd.c @@ -124,6 +124,7 @@ void usage(void) printf("%s [-k ] [-v] \n", progname); printf("Where is one of:"); @@ -429,9 +461,10 @@ diff -up ./sample/ipmicmd.c.manscan ./sample/ipmicmd.c } char * -diff -up ./sample/rmcp_ping.c.manscan ./sample/rmcp_ping.c ---- ./sample/rmcp_ping.c.manscan 2013-06-05 15:17:40.073957820 +0200 -+++ ./sample/rmcp_ping.c 2013-06-05 14:21:05.778697883 +0200 +diff --git a/sample/rmcp_ping.c b/sample/rmcp_ping.c +index 7814792..5778fea 100644 +--- a/sample/rmcp_ping.c ++++ b/sample/rmcp_ping.c @@ -156,6 +156,11 @@ main(int argc, char *argv[]) if (strcmp(argv[i], "--") == 0) { i++; @@ -444,9 +477,10 @@ diff -up ./sample/rmcp_ping.c.manscan ./sample/rmcp_ping.c } else if (strcmp(argv[i], "-p") == 0) { i++; if (i >= argc) { -diff -up ./sample/solterm.c.manscan ./sample/solterm.c ---- ./sample/solterm.c.manscan 2013-06-05 15:17:55.264961190 +0200 -+++ ./sample/solterm.c 2013-06-05 15:15:14.037921308 +0200 +diff --git a/sample/solterm.c b/sample/solterm.c +index 38a3f9d..a3e52de 100644 +--- a/sample/solterm.c ++++ b/sample/solterm.c @@ -743,7 +743,12 @@ int main(int argc, char *argv[]) /* Now we make sure "lan" is the first argument so we get the @@ -461,10 +495,11 @@ diff -up ./sample/solterm.c.manscan ./sample/solterm.c fprintf(stderr, "main: %s only supports lan connections\n", progname); exit(1); -diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c ---- ./ui/basic_ui.c.manscan 2013-06-04 14:08:04.538642560 +0200 -+++ ./ui/basic_ui.c 2013-06-05 11:17:41.394541158 +0200 -@@ -225,6 +225,26 @@ snmp_init(selector_t *sel) +diff --git a/ui/basic_ui.c b/ui/basic_ui.c +index 3f0d0a1..de6c600 100644 +--- a/ui/basic_ui.c ++++ b/ui/basic_ui.c +@@ -226,6 +226,26 @@ snmp_init(selector_t *sel) } #endif /* HAVE_UCDSNMP */ @@ -491,7 +526,7 @@ diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c int main(int argc, char *argv[]) { -@@ -249,6 +269,11 @@ main(int argc, char *argv[]) +@@ -250,6 +270,11 @@ main(int argc, char *argv[]) curr_arg++; if (strcmp(arg, "--") == 0) { break; @@ -503,3 +538,6 @@ diff -up ./ui/basic_ui.c.manscan ./ui/basic_ui.c } else if (strcmp(arg, "-c") == 0) { full_screen = 0; } else if (strcmp(arg, "-dlock") == 0) { +-- +2.7.4 + diff --git a/OpenIPMI-2.0.21-nobundle.patch b/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch similarity index 59% rename from OpenIPMI-2.0.21-nobundle.patch rename to 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch index 039a2e3..1db6c6c 100644 --- a/OpenIPMI-2.0.21-nobundle.patch +++ b/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch @@ -1,39 +1,20 @@ -diff -up ./cmdlang/Makefile.am.nobundle ./cmdlang/Makefile.am ---- ./cmdlang/Makefile.am.nobundle 2013-01-21 18:24:13.000000000 +0100 -+++ ./cmdlang/Makefile.am 2014-08-12 13:35:09.836655867 +0200 -@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 - - AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ -+ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ -+ $(EDIT_CFLAGS) \ - $(TCL_CFLAGS) - - lib_LTLIBRARIES = libOpenIPMIcmdlang.la -@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la \ - $(top_builddir)/unix/libOpenIPMIposix.la \ -- $(top_builddir)/libedit/libedit.a \ -+ $(EDIT_LIBS) \ - $(TERM_LIBS) \ - $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ - $(TCL_LIB) $(TCL_LIBS) \ -diff -up ./configure.ac.nobundle ./configure.ac ---- ./configure.ac.nobundle 2014-01-28 20:35:02.000000000 +0100 -+++ ./configure.ac 2014-08-12 13:35:09.836655867 +0200 -@@ -930,7 +930,6 @@ AC_OUTPUT(Makefile - swig/perl/Makefile - swig/python/Makefile - swig/python/openipmigui/Makefile -- libedit/Makefile - cmdlang/Makefile - include/Makefile - include/OpenIPMI/Makefile -diff -up ./Makefile.am.nobundle ./Makefile.am ---- ./Makefile.am.nobundle 2012-07-22 00:01:45.000000000 +0200 -+++ ./Makefile.am 2014-08-12 13:35:09.836655867 +0200 +From db70db7ddbbf34806927e279b969b6667005cd5b Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Thu, 2 Jun 2016 12:50:03 +0200 +Subject: [PATCH] Apply 'OpenIPMI-2.0.21-nobundle.patch' + +Signed-off-by: Boris Ranto +--- + Makefile.am | 4 ++-- + cmdlang/Makefile.am | 5 +++-- + configure.ac | 1 - + sample/Makefile.am | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b1aacdf..660c693 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,10 +1,10 @@ RPM = rpmbuild RPMFLAGS = -ta @@ -47,10 +28,46 @@ diff -up ./Makefile.am.nobundle ./Makefile.am ui lanserv sample doc man swig EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ -diff -up ./sample/Makefile.am.nobundle ./sample/Makefile.am ---- ./sample/Makefile.am.nobundle 2014-08-12 13:36:19.033804459 +0200 -+++ ./sample/Makefile.am 2014-08-12 13:37:07.478907706 +0200 -@@ -53,8 +53,8 @@ solterm_LDADD = $(POPTLIBS) $(top_buildd +diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am +index e80090d..ae9c65a 100644 +--- a/cmdlang/Makefile.am ++++ b/cmdlang/Makefile.am +@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 + + AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ ++ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ ++ $(EDIT_CFLAGS) \ + $(TCL_CFLAGS) + + lib_LTLIBRARIES = libOpenIPMIcmdlang.la +@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ + $(top_builddir)/utils/libOpenIPMIutils.la \ + $(top_builddir)/lib/libOpenIPMI.la \ + $(top_builddir)/unix/libOpenIPMIposix.la \ +- $(top_builddir)/libedit/libedit.a \ ++ $(EDIT_LIBS) \ + $(TERM_LIBS) \ + $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ + $(TCL_LIB) $(TCL_LIBS) \ +diff --git a/configure.ac b/configure.ac +index 5103556..ae86ac8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -926,7 +926,6 @@ AC_OUTPUT(Makefile + swig/perl/Makefile + swig/python/Makefile + swig/python/openipmigui/Makefile +- libedit/Makefile + cmdlang/Makefile + include/Makefile + include/OpenIPMI/Makefile +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 06278bd..91d1351 100644 +--- a/sample/Makefile.am ++++ b/sample/Makefile.am +@@ -59,8 +59,8 @@ solterm_LDADD = $(POPTLIBS) $(top_builddir)/utils/libOpenIPMIutils.la \ rmcp_ping_SOURCES = rmcp_ping.c ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c @@ -61,10 +78,6 @@ diff -up ./sample/Makefile.am.nobundle ./sample/Makefile.am EXTRA_DIST = example_oem.c -@@ -65,4 +65,4 @@ install-data-local: - $(LN_S) openipmicmd $(DESTDIR)$(bindir)/ipmicmd - - uninstall-local: -- rm -f $(DESTDIR)$(bindir)/ipmicmd -\ No newline at end of file -+ rm -f $(DESTDIR)$(bindir)/ipmicmd +-- +2.7.4 + diff --git a/OpenIPMI-2.0.18-pthread-pkgconfig.patch b/OpenIPMI-2.0.18-pthread-pkgconfig.patch deleted file mode 100644 index 9a76208..0000000 --- a/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/OpenIPMI.spec b/OpenIPMI.spec index 648b966..9f7e61c 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,8 +4,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.21 -Release: 13%{?dist} +Version: 2.0.22 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -13,6 +13,9 @@ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service +Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch +Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch +Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter BuildRequires: desktop-file-utils @@ -30,10 +33,7 @@ Requires(postun): systemd-units Requires(post): systemd-sysv Requires:%{name}-libs = %{version}-%{release} -Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch -Patch2: OpenIPMI-2.0.19-man.patch # switch from libedit bundle to system libedit -Patch3: OpenIPMI-2.0.21-nobundle.patch %description The Open IPMI project aims to develop an open code base to allow access to @@ -87,9 +87,9 @@ This package contains a network IPMI listener. %prep %setup -q -%patch1 -p1 -b .pthread -%patch2 -p1 -b .manscan -%patch3 -p1 -b .nobundle +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 rm -rf ./libedit %build @@ -181,6 +181,7 @@ fi %{_bindir}/openipmish %{_bindir}/rmcp_ping %{_bindir}/solterm +%{_bindir}/openipmi_eventd %{_unitdir}/ipmi.service %{_mandir}/man1/ipmi_ui* %{_mandir}/man1/openipmicmd* @@ -189,6 +190,7 @@ fi %{_mandir}/man1/solterm* %{_mandir}/man1/ipmish* %{_mandir}/man1/ipmicmd* +%{_mandir}/man1/openipmi_eventd* %{_mandir}/man7/ipmi_cmdlang* %{_mandir}/man7/openipmi_conparms* @@ -221,6 +223,12 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jun 02 2016 Boris Ranto - 0:2.0.22-1 +- New version (0:2.0.22-1) +- Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' +- Apply './OpenIPMI-2.0.19-man.patch' +- Apply 'OpenIPMI-2.0.21-nobundle.patch' + * Tue May 17 2016 Jitka Plesnikova - 2.0.21-13 - Perl 5.24 rebuild diff --git a/sources b/sources index 9d0e4a7..dc14ac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc0b42ae40b3f1d0db2a94b75b95fae1 OpenIPMI-2.0.21.tar.gz +9a4e1f6bb073379c494839201ea10aee OpenIPMI-2.0.22.tar.gz From c2c826839a64bd67a1b772c373ec5e539e5d2d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:12:02 +0200 Subject: [PATCH 041/129] Mandatory Perl build-requires added --- OpenIPMI.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9f7e61c..ef20e08 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -17,7 +17,7 @@ Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel -BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter +BuildRequires: openssl-devel python-devel perl-devel perl-generators tcl-devel tkinter BuildRequires: desktop-file-utils BuildRequires: systemd-units BuildRequires: pkgconfig From 3d56418c61353d0fee022dc38a826649487adba1 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 15 Jul 2016 15:14:26 +0200 Subject: [PATCH 042/129] Rebuild for glibc hack --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ef20e08..89c81b2 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.22 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -223,6 +223,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Jul 15 2016 Boris Ranto - 0:2.0.22-2 +- Rebuild for glibc hack + * Thu Jun 02 2016 Boris Ranto - 0:2.0.22-1 - New version (0:2.0.22-1) - Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' From 10116e858dbd138dbf35a3cf24d1c2344b2099f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:24:07 +0000 Subject: [PATCH 043/129] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 89c81b2..2cfca72 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.22 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -223,6 +223,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.0.22-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Jul 15 2016 Boris Ranto - 0:2.0.22-2 - Rebuild for glibc hack From 8bd2e5a847686e3b681b9a71492844c998800894 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 17 Oct 2016 12:22:04 +0200 Subject: [PATCH 044/129] Resolves: #1383995 - add support for openssl-1.1.0b from upstream --- OpenIPMI-2.0.22-openssl-support.patch | 169 ++++++++++++++++++++++++++ OpenIPMI.spec | 8 +- 2 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 OpenIPMI-2.0.22-openssl-support.patch diff --git a/OpenIPMI-2.0.22-openssl-support.patch b/OpenIPMI-2.0.22-openssl-support.patch new file mode 100644 index 0000000..5dc2427 --- /dev/null +++ b/OpenIPMI-2.0.22-openssl-support.patch @@ -0,0 +1,169 @@ +diff --git a/lanserv/lanserv_ipmi.c b/lanserv/lanserv_ipmi.c +index b0a2431f1322..67bf74a5e697 100644 +--- a/lanserv/lanserv_ipmi.c ++++ b/lanserv/lanserv_ipmi.c +@@ -2217,7 +2217,7 @@ aes_cbc_encrypt(lanserv_data_t *lan, session_t *session, + unsigned char *d; + unsigned char *iv; + unsigned int i; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + int rv; + int outlen; + int tmplen; +@@ -2264,14 +2264,18 @@ aes_cbc_encrypt(lanserv_data_t *lan, session_t *session, + *data_size += 16; + + /* Ok, we're set to do the crypt operation. */ +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, a->ckey, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); +- if (!EVP_EncryptUpdate(&ctx, *pos, &outlen, d, l)) { ++ ctx = EVP_CIPHER_CTX_new(); ++ if (!ctx) { ++ rv = ENOMEM; ++ goto out_cleanup; ++ } ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, a->ckey, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); ++ if (!EVP_EncryptUpdate(ctx, *pos, &outlen, d, l)) { + rv = ENOMEM; + goto out_cleanup; + } +- if (!EVP_EncryptFinal_ex(&ctx, (*pos) + outlen, &tmplen)) { ++ if (!EVP_EncryptFinal_ex(ctx, (*pos) + outlen, &tmplen)) { + rv = ENOMEM; /* right? */ + goto out_cleanup; + } +@@ -2281,7 +2285,7 @@ aes_cbc_encrypt(lanserv_data_t *lan, session_t *session, + *data_len = outlen + 16; + + out_cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + free(d); + return rv; + } +@@ -2292,7 +2296,7 @@ aes_cbc_decrypt(lanserv_data_t *lan, session_t *session, msg_t *msg) + auth_data_t *a = &session->auth_data; + unsigned int l = msg->len; + unsigned char *d; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + int outlen; + unsigned char *pad; + int padlen; +@@ -2312,10 +2316,14 @@ aes_cbc_decrypt(lanserv_data_t *lan, session_t *session, msg_t *msg) + memcpy(d, msg->data+16, l); + + /* Ok, we're set to do the decrypt operation. */ +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, a->k2, msg->data); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); +- if (!EVP_DecryptUpdate(&ctx, msg->data+16, &outlen, d, l)) { ++ ctx = EVP_CIPHER_CTX_new(); ++ if (!ctx) { ++ rv = ENOMEM; ++ goto out_cleanup; ++ } ++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, a->k2, msg->data); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); ++ if (!EVP_DecryptUpdate(ctx, msg->data+16, &outlen, d, l)) { + rv = EINVAL; + goto out_cleanup; + } +@@ -2348,7 +2356,7 @@ aes_cbc_decrypt(lanserv_data_t *lan, session_t *session, msg_t *msg) + msg->len = outlen; + + out_cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + free(d); + return rv; + } +diff --git a/lib/aes_cbc.c b/lib/aes_cbc.c +index 483cdfbc521b..f20d69b8b1b3 100644 +--- a/lib/aes_cbc.c ++++ b/lib/aes_cbc.c +@@ -86,7 +86,7 @@ aes_cbc_encrypt(ipmi_con_t *ipmi, + unsigned int l = *payload_len; + unsigned int i; + unsigned char *d; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + int rv; + int outlen; + int tmplen; +@@ -133,15 +133,19 @@ aes_cbc_encrypt(ipmi_con_t *ipmi, + *header_len -= 16; + *max_payload_len += 16; + ++ ctx = EVP_CIPHER_CTX_new(); ++ if (!ctx) { ++ rv = ENOMEM; ++ goto out_cleanup; ++ } + /* Ok, we're set to do the crypt operation. */ +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, info->k2, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); +- if (!EVP_EncryptUpdate(&ctx, *payload, &outlen, d, l)) { ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, info->k2, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); ++ if (!EVP_EncryptUpdate(ctx, *payload, &outlen, d, l)) { + rv = ENOMEM; /* right? */ + goto out_cleanup; + } +- if (!EVP_EncryptFinal_ex(&ctx, (*payload) + outlen, &tmplen)) { ++ if (!EVP_EncryptFinal_ex(ctx, (*payload) + outlen, &tmplen)) { + rv = ENOMEM; /* right? */ + goto out_cleanup; + } +@@ -154,7 +158,7 @@ aes_cbc_encrypt(ipmi_con_t *ipmi, + *payload_len = outlen + 16; + + out_cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + ipmi_mem_free(d); + + return rv; +@@ -170,7 +174,7 @@ aes_cbc_decrypt(ipmi_con_t *ipmi, + unsigned int l = *payload_len; + unsigned char *d; + unsigned char *p; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + int outlen; + int rv = 0; + unsigned char *pad; +@@ -195,10 +199,14 @@ aes_cbc_decrypt(ipmi_con_t *ipmi, + memcpy(d, p, l); + + /* Ok, we're set to do the decrypt operation. */ +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, info->k2, *payload); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); +- if (!EVP_DecryptUpdate(&ctx, p, &outlen, d, l)) { ++ ctx = EVP_CIPHER_CTX_new(); ++ if (!ctx) { ++ rv = ENOMEM; ++ goto out_cleanup; ++ } ++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, info->k2, *payload); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); ++ if (!EVP_DecryptUpdate(ctx, p, &outlen, d, l)) { + rv = EINVAL; + goto out_cleanup; + } +@@ -231,7 +239,7 @@ aes_cbc_decrypt(ipmi_con_t *ipmi, + *payload_len = outlen; + + out_cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + ipmi_mem_free(d); + return rv; + } +-- +2.9.3 diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 2cfca72..04aade8 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.22 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -16,6 +16,8 @@ Source3: ipmi.service Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch +Patch4: OpenIPMI-2.0.22-openssl-support.patch + BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel perl-generators tcl-devel tkinter BuildRequires: desktop-file-utils @@ -90,6 +92,7 @@ This package contains a network IPMI listener. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 -b .openssl-support rm -rf ./libedit %build @@ -223,6 +226,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Oct 17 2016 Josef Ridky - 2.0.22-4 +- Add support for openssl-1.1.0 library (#1383995) + * Tue Jul 19 2016 Fedora Release Engineering - 2.0.22-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 8720bf623455b436add532fa2df4882decd02f78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:16:26 +0000 Subject: [PATCH 045/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 04aade8..36fd0fc 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.22 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -226,6 +226,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 17 2016 Josef Ridky - 2.0.22-4 - Add support for openssl-1.1.0 library (#1383995) From 2076da50baac4a848bda9454b53ef5bcfd8840ab Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 08:36:17 +0200 Subject: [PATCH 046/129] Perl 5.26 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 36fd0fc..21f9102 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.22 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -226,6 +226,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 2.0.22-6 +- Perl 5.26 rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.22-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 48a2b7264b30f2667b8817da8710547d824894d7 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 15 Jun 2017 11:35:24 +0200 Subject: [PATCH 047/129] Resolves: #1461606 - release new upstream version 2.0.23 --- .gitignore | 1 + 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch | 10 +- OpenIPMI-2.0.22-openssl-support.patch | 169 ------------------- OpenIPMI.spec | 9 +- sources | 2 +- 5 files changed, 12 insertions(+), 179 deletions(-) delete mode 100644 OpenIPMI-2.0.22-openssl-support.patch diff --git a/.gitignore b/.gitignore index 9b1e224..a28d935 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ OpenIPMI-2.0.18.tar.gz /openipmi-2.0.21.tar.gz /OpenIPMI-2.0.21.tar.gz /OpenIPMI-2.0.22.tar.gz +/OpenIPMI-2.0.23.tar.gz diff --git a/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch b/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch index 51ba9d0..da1a2fd 100644 --- a/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch +++ b/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch @@ -450,7 +450,7 @@ index 1479a1b..ada15d8 100644 .TP diff --git a/sample/ipmicmd.c b/sample/ipmicmd.c -index 9f51273..f9a8a4a 100644 +index 6cbcdc5..5f5c1ec 100644 --- a/sample/ipmicmd.c +++ b/sample/ipmicmd.c @@ -124,6 +124,7 @@ void usage(void) @@ -496,11 +496,11 @@ index 38a3f9d..a3e52de 100644 progname); exit(1); diff --git a/ui/basic_ui.c b/ui/basic_ui.c -index 3f0d0a1..de6c600 100644 +index 6993eb2..84889cb 100644 --- a/ui/basic_ui.c +++ b/ui/basic_ui.c -@@ -226,6 +226,26 @@ snmp_init(selector_t *sel) - } +@@ -306,6 +306,26 @@ snmp_init(os_handler_t *os_hnd) + static void snmp_setup_fds(os_handler_t *os_hnd) { } #endif /* HAVE_UCDSNMP */ +void help(void) @@ -526,7 +526,7 @@ index 3f0d0a1..de6c600 100644 int main(int argc, char *argv[]) { -@@ -250,6 +270,11 @@ main(int argc, char *argv[]) +@@ -327,6 +347,11 @@ main(int argc, char *argv[]) curr_arg++; if (strcmp(arg, "--") == 0) { break; diff --git a/OpenIPMI-2.0.22-openssl-support.patch b/OpenIPMI-2.0.22-openssl-support.patch deleted file mode 100644 index 5dc2427..0000000 --- a/OpenIPMI-2.0.22-openssl-support.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff --git a/lanserv/lanserv_ipmi.c b/lanserv/lanserv_ipmi.c -index b0a2431f1322..67bf74a5e697 100644 ---- a/lanserv/lanserv_ipmi.c -+++ b/lanserv/lanserv_ipmi.c -@@ -2217,7 +2217,7 @@ aes_cbc_encrypt(lanserv_data_t *lan, session_t *session, - unsigned char *d; - unsigned char *iv; - unsigned int i; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - int rv; - int outlen; - int tmplen; -@@ -2264,14 +2264,18 @@ aes_cbc_encrypt(lanserv_data_t *lan, session_t *session, - *data_size += 16; - - /* Ok, we're set to do the crypt operation. */ -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, a->ckey, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -- if (!EVP_EncryptUpdate(&ctx, *pos, &outlen, d, l)) { -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) { -+ rv = ENOMEM; -+ goto out_cleanup; -+ } -+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, a->ckey, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+ if (!EVP_EncryptUpdate(ctx, *pos, &outlen, d, l)) { - rv = ENOMEM; - goto out_cleanup; - } -- if (!EVP_EncryptFinal_ex(&ctx, (*pos) + outlen, &tmplen)) { -+ if (!EVP_EncryptFinal_ex(ctx, (*pos) + outlen, &tmplen)) { - rv = ENOMEM; /* right? */ - goto out_cleanup; - } -@@ -2281,7 +2285,7 @@ aes_cbc_encrypt(lanserv_data_t *lan, session_t *session, - *data_len = outlen + 16; - - out_cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - free(d); - return rv; - } -@@ -2292,7 +2296,7 @@ aes_cbc_decrypt(lanserv_data_t *lan, session_t *session, msg_t *msg) - auth_data_t *a = &session->auth_data; - unsigned int l = msg->len; - unsigned char *d; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - int outlen; - unsigned char *pad; - int padlen; -@@ -2312,10 +2316,14 @@ aes_cbc_decrypt(lanserv_data_t *lan, session_t *session, msg_t *msg) - memcpy(d, msg->data+16, l); - - /* Ok, we're set to do the decrypt operation. */ -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, a->k2, msg->data); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -- if (!EVP_DecryptUpdate(&ctx, msg->data+16, &outlen, d, l)) { -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) { -+ rv = ENOMEM; -+ goto out_cleanup; -+ } -+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, a->k2, msg->data); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+ if (!EVP_DecryptUpdate(ctx, msg->data+16, &outlen, d, l)) { - rv = EINVAL; - goto out_cleanup; - } -@@ -2348,7 +2356,7 @@ aes_cbc_decrypt(lanserv_data_t *lan, session_t *session, msg_t *msg) - msg->len = outlen; - - out_cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - free(d); - return rv; - } -diff --git a/lib/aes_cbc.c b/lib/aes_cbc.c -index 483cdfbc521b..f20d69b8b1b3 100644 ---- a/lib/aes_cbc.c -+++ b/lib/aes_cbc.c -@@ -86,7 +86,7 @@ aes_cbc_encrypt(ipmi_con_t *ipmi, - unsigned int l = *payload_len; - unsigned int i; - unsigned char *d; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - int rv; - int outlen; - int tmplen; -@@ -133,15 +133,19 @@ aes_cbc_encrypt(ipmi_con_t *ipmi, - *header_len -= 16; - *max_payload_len += 16; - -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) { -+ rv = ENOMEM; -+ goto out_cleanup; -+ } - /* Ok, we're set to do the crypt operation. */ -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, info->k2, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -- if (!EVP_EncryptUpdate(&ctx, *payload, &outlen, d, l)) { -+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, info->k2, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+ if (!EVP_EncryptUpdate(ctx, *payload, &outlen, d, l)) { - rv = ENOMEM; /* right? */ - goto out_cleanup; - } -- if (!EVP_EncryptFinal_ex(&ctx, (*payload) + outlen, &tmplen)) { -+ if (!EVP_EncryptFinal_ex(ctx, (*payload) + outlen, &tmplen)) { - rv = ENOMEM; /* right? */ - goto out_cleanup; - } -@@ -154,7 +158,7 @@ aes_cbc_encrypt(ipmi_con_t *ipmi, - *payload_len = outlen + 16; - - out_cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - ipmi_mem_free(d); - - return rv; -@@ -170,7 +174,7 @@ aes_cbc_decrypt(ipmi_con_t *ipmi, - unsigned int l = *payload_len; - unsigned char *d; - unsigned char *p; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - int outlen; - int rv = 0; - unsigned char *pad; -@@ -195,10 +199,14 @@ aes_cbc_decrypt(ipmi_con_t *ipmi, - memcpy(d, p, l); - - /* Ok, we're set to do the decrypt operation. */ -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, info->k2, *payload); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -- if (!EVP_DecryptUpdate(&ctx, p, &outlen, d, l)) { -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) { -+ rv = ENOMEM; -+ goto out_cleanup; -+ } -+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, info->k2, *payload); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+ if (!EVP_DecryptUpdate(ctx, p, &outlen, d, l)) { - rv = EINVAL; - goto out_cleanup; - } -@@ -231,7 +239,7 @@ aes_cbc_decrypt(ipmi_con_t *ipmi, - *payload_len = outlen; - - out_cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - ipmi_mem_free(d); - return rv; - } --- -2.9.3 diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 36fd0fc..b241e2a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,8 +4,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.22 -Release: 5%{?dist} +Version: 2.0.23 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -16,7 +16,6 @@ Source3: ipmi.service Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch -Patch4: OpenIPMI-2.0.22-openssl-support.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python-devel perl-devel perl-generators tcl-devel tkinter @@ -92,7 +91,6 @@ This package contains a network IPMI listener. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -b .openssl-support rm -rf ./libedit %build @@ -226,6 +224,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jun 15 2017 Josef Ridky - 2.0.23-1 +- New upstream release 2.0.23 (#1461606) + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.22-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index dc14ac8..d4dd8d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a4e1f6bb073379c494839201ea10aee OpenIPMI-2.0.22.tar.gz +SHA512 (OpenIPMI-2.0.23.tar.gz) = c1e9678c725dfe9aed539e8e83bbd21968917c407be6f97c2f513dbd5082a31842f756a7e581ef67deadba199231e3cf3edbc870508ed363432271a6ff255fbe From 4657652c77dab8efbb60c7ad967998d3b115ef63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:58:57 +0000 Subject: [PATCH 048/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 347b8e4..0a08e25 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.23 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -224,6 +224,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jun 15 2017 Josef Ridky - 2.0.23-1 - New upstream release 2.0.23 (#1461606) From 82c0c4d2168a87d0b5ba553b9860ea21c3f1408d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:03:48 +0000 Subject: [PATCH 049/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 0a08e25..7fa3990 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.23 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -224,6 +224,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.0.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.0.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 07864da0f5d73490001f3c54d199d714a7e3d373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:39:04 -0400 Subject: [PATCH 050/129] Python 2 binary package renamed to python2-openipmi --- OpenIPMI.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 7fa3990..5f37612 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.23 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -58,12 +58,17 @@ Requires: %{name}-libs = %{version}-%{release} %description perl The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. -%package python +%package -n python2-openipmi +%{?python_provide:%python_provide python2-openipmi} +%{?python_provide:%python_provide python2-OpenIPMI} +# Remove before F30 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Group: Development/Libraries Summary: IPMI Python language bindings Requires: %{name}-libs = %{version}-%{release} -%description python +%description -n python2-openipmi The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel @@ -199,7 +204,7 @@ fi %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm %{perl_vendorarch}/auto/OpenIPMI/ -%files python +%files -n python2-openipmi %{python_sitearch}/*OpenIPMI* %files libs @@ -224,6 +229,10 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.0.23-4 +- Python 2 binary package renamed to python2-openipmi + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Wed Aug 02 2017 Fedora Release Engineering - 2.0.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 97b4d84a2a6f24fc1750fb66b2e103ebd7b34e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Aug 2017 10:39:17 -0400 Subject: [PATCH 051/129] Add Provides for the old name without %_isa --- OpenIPMI.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 5f37612..afb66a5 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.23 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -62,6 +62,7 @@ The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. %{?python_provide:%python_provide python2-openipmi} %{?python_provide:%python_provide python2-OpenIPMI} # Remove before F30 +Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Group: Development/Libraries @@ -229,6 +230,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 2.0.23-5 +- Add Provides for the old name without %%_isa + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.0.23-4 - Python 2 binary package renamed to python2-openipmi See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 0873fda0d675445c23644494cf5f3ef58209940c Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 19 Oct 2017 09:37:36 +0200 Subject: [PATCH 052/129] Rebuilt for python package --- OpenIPMI.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index afb66a5..88ca889 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.23 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -18,7 +18,7 @@ Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel -BuildRequires: openssl-devel python-devel perl-devel perl-generators tcl-devel tkinter +BuildRequires: openssl-devel python2-devel perl-devel perl-generators tcl-devel tkinter BuildRequires: desktop-file-utils BuildRequires: systemd-units BuildRequires: pkgconfig @@ -230,6 +230,9 @@ fi %doc %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Oct 19 2017 Josef Ridky - 2.0.24-6 +- Rebuilt for python2 package + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 2.0.23-5 - Add Provides for the old name without %%_isa From 509d1d0fb9df84833235adf3a5928389d4b10c9a Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 18 Jan 2018 13:43:08 +0100 Subject: [PATCH 053/129] New upstream version 2.0.24 --- .gitignore | 1 + ...Apply-OpenIPMI-2.0.21-nobundle.patch.patch | 36 +- OpenIPMI-aarch64.patch | 1149 ----------------- OpenIPMI.spec | 153 ++- sources | 2 +- 5 files changed, 82 insertions(+), 1259 deletions(-) delete mode 100644 OpenIPMI-aarch64.patch diff --git a/.gitignore b/.gitignore index a28d935..7559be3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.21.tar.gz /OpenIPMI-2.0.22.tar.gz /OpenIPMI-2.0.23.tar.gz +/OpenIPMI-2.0.24.tar.gz diff --git a/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch b/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch index 1db6c6c..2515e0e 100644 --- a/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch +++ b/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch @@ -1,18 +1,3 @@ -From db70db7ddbbf34806927e279b969b6667005cd5b Mon Sep 17 00:00:00 2001 -From: Boris Ranto -Date: Thu, 2 Jun 2016 12:50:03 +0200 -Subject: [PATCH] Apply 'OpenIPMI-2.0.21-nobundle.patch' - -Signed-off-by: Boris Ranto ---- - Makefile.am | 4 ++-- - cmdlang/Makefile.am | 5 +++-- - configure.ac | 1 - - sample/Makefile.am | 4 ++-- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index b1aacdf..660c693 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ @@ -28,8 +13,6 @@ index b1aacdf..660c693 100644 ui lanserv sample doc man swig EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index e80090d..ae9c65a 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am @@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 @@ -51,8 +34,6 @@ index e80090d..ae9c65a 100644 $(TERM_LIBS) \ $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ $(TCL_LIB) $(TCL_LIBS) \ -diff --git a/configure.ac b/configure.ac -index 5103556..ae86ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -926,7 +926,6 @@ AC_OUTPUT(Makefile @@ -63,21 +44,16 @@ index 5103556..ae86ac8 100644 cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile -diff --git a/sample/Makefile.am b/sample/Makefile.am -index 06278bd..91d1351 100644 ---- a/sample/Makefile.am -+++ b/sample/Makefile.am -@@ -59,8 +59,8 @@ solterm_LDADD = $(POPTLIBS) $(top_builddir)/utils/libOpenIPMIutils.la \ - rmcp_ping_SOURCES = rmcp_ping.c - +--- OpenIPMI-2.0.24/sample/Makefile.am~ 2017-07-27 23:01:19.000000000 +0100 ++++ OpenIPMI-2.0.24/sample/Makefile.am 2017-12-19 07:52:45.368954855 +0000 +@@ -73,7 +73,8 @@ ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c --ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) + ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) \ + $(SOCKETLIB) -ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit -+ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) $(TERM_LIBS) ++ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) +ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS) EXTRA_DIST = example_oem.c --- -2.7.4 diff --git a/OpenIPMI-aarch64.patch b/OpenIPMI-aarch64.patch deleted file mode 100644 index f8369fc..0000000 --- a/OpenIPMI-aarch64.patch +++ /dev/null @@ -1,1149 +0,0 @@ -diff -urN OpenIPMI-2.0.19/config.guess OpenIPMI-2.0.19-aarch64/config.guess ---- OpenIPMI-2.0.19/config.guess 2010-05-09 08:32:53.000000000 -0500 -+++ OpenIPMI-2.0.19-aarch64/config.guess 2013-03-03 06:56:09.267032676 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2009-12-30' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -57,8 +55,8 @@ - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -145,7 +143,7 @@ - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -181,7 +179,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -202,6 +200,10 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -224,7 +226,7 @@ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -270,7 +272,10 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -296,12 +301,12 @@ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -395,23 +400,23 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -481,8 +486,8 @@ - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -495,7 +500,7 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -552,7 +557,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -595,52 +600,52 @@ - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -731,22 +736,22 @@ - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -770,14 +775,14 @@ - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -789,30 +794,35 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -@@ -858,6 +868,13 @@ - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -867,7 +884,7 @@ - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -@@ -879,20 +896,29 @@ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -934,7 +960,7 @@ - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -960,7 +986,7 @@ - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -968,14 +994,17 @@ - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -984,11 +1013,11 @@ - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1020,7 +1049,7 @@ - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1048,13 +1077,13 @@ - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1089,8 +1118,8 @@ - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1133,10 +1162,10 @@ - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1162,11 +1191,11 @@ - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1179,6 +1208,9 @@ - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1231,7 +1263,10 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1276,13 +1311,13 @@ - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1300,11 +1335,11 @@ - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -diff -urN OpenIPMI-2.0.19/config.sub OpenIPMI-2.0.19-aarch64/config.sub ---- OpenIPMI-2.0.19/config.sub 2010-05-09 08:32:53.000000000 -0500 -+++ OpenIPMI-2.0.19-aarch64/config.sub 2013-03-03 06:56:09.276031637 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2010-01-22' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,9 +21,7 @@ - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -76,8 +74,8 @@ - GNU config.sub ($timestamp) - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -124,13 +122,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -153,12 +156,12 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -174,10 +177,10 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -222,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -246,20 +255,25 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -282,29 +296,39 @@ - | moxie \ - | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -314,6 +338,21 @@ - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -328,25 +367,30 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -368,26 +412,29 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile-* | tilegx-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -412,7 +459,7 @@ - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -482,11 +529,20 @@ - basic_machine=powerpc-ibm - os=-cnk - ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -518,7 +574,7 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -676,7 +732,6 @@ - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -734,9 +789,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -773,10 +832,18 @@ - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -841,6 +908,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -923,9 +996,10 @@ - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -1019,6 +1093,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1075,25 +1152,8 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -- ;; -- # This must be matched before tile*. -- tilegx*) -- basic_machine=tilegx-unknown -- os=-linux-gnu -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1163,6 +1223,9 @@ - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1260,11 +1323,11 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1294,14 +1357,15 @@ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1348,7 +1412,7 @@ - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1397,7 +1461,7 @@ - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1442,8 +1506,8 @@ - -dicos*) - os=-dicos - ;; -- -nacl*) -- ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1466,10 +1530,10 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1481,8 +1545,20 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1502,14 +1578,11 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1536,7 +1609,7 @@ - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 88ca889..8e2704a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,40 +1,37 @@ %global _hardened_build 1 -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.23 -Release: 6%{?dist} -License: LGPLv2+ and GPLv2+ or BSD -Group: System Environment/Base -URL: http://sourceforge.net/projects/openipmi/ -Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz -Source1: openipmi.sysconf -Source2: openipmi-helper -Source3: ipmi.service -Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch -Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch -Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch +Version: 2.0.24 +Release: 1%{?dist} +License: LGPLv2+ and GPLv2+ or BSD +URL: http://sourceforge.net/projects/openipmi/ +Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz +Source1: openipmi.sysconf +Source2: openipmi-helper +Source3: ipmi.service +Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch +Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch +Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch -BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel -BuildRequires: openssl-devel python2-devel perl-devel perl-generators tcl-devel tkinter -BuildRequires: desktop-file-utils -BuildRequires: systemd-units -BuildRequires: pkgconfig -BuildRequires: libedit-devel -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: libtool +BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel +BuildRequires: openssl-devel python2-devel perl-devel perl-generators +BuildRequires: systemd-units +BuildRequires: pkgconfig +BuildRequires: libedit-devel +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool -Requires: libedit -Requires(post): systemd-units -Requires(preun): systemd-units +Requires: libedit +Requires(post): systemd-units +Requires(preun): systemd-units Requires(postun): systemd-units -Requires(post): systemd-sysv -Requires:%{name}-libs = %{version}-%{release} +Requires(post): systemd-sysv +Requires: %{name}-libs = %{version}-%{release} -# switch from libedit bundle to system libedit %description The Open IPMI project aims to develop an open code base to allow access to @@ -42,7 +39,6 @@ platform information using Intelligent Platform Management Interface (IPMI). This package contains the tools of the OpenIPMI project. %package libs -Group: Development/Libraries Summary: The OpenIPMI runtime libraries %description libs @@ -50,8 +46,7 @@ The OpenIPMI-libs package contains the runtime libraries for shared binaries and applications. %package perl -Group: Development/Libraries -Summary: IPMI Perl language bindings +Summary: IPMI Perl language bindings Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name}-libs = %{version}-%{release} @@ -62,19 +57,17 @@ The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. %{?python_provide:%python_provide python2-openipmi} %{?python_provide:%python_provide python2-OpenIPMI} # Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} +Provides: %{name}-python = %{version}-%{release} +Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} -Group: Development/Libraries -Summary: IPMI Python language bindings -Requires: %{name}-libs = %{version}-%{release} +Summary: IPMI Python language bindings +Requires: %{name}-libs = %{version}-%{release} %description -n python2-openipmi The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel -Group: Development/Libraries -Summary: The development environment for the OpenIPMI project +Summary: The development environment for the OpenIPMI project Requires: pkgconfig Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} @@ -84,8 +77,7 @@ The OpenIPMI-devel package contains the development libraries and header files of the OpenIPMI project. %package lanserv -Summary: Emulates an IPMI network listener -Group: Utilities +Summary: Emulates an IPMI network listener Requires: %{name} = %{version} %description lanserv @@ -93,16 +85,13 @@ This package contains a network IPMI listener. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 rm -rf ./libedit %build export EDIT_CFLAGS=`pkg-config --cflags libedit` export EDIT_LIBS=`pkg-config --libs libedit` -export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing" # generate new configure script we need this since we removed the libedit directory %{__libtoolize} --copy --force --automake @@ -113,10 +102,11 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" # libedit end %configure \ - --with-pythoninstall=%{python_sitearch} \ + LDFLAGS="%{__global_ldflags} -Wl,--as-needed" \ --disable-dependency-tracking \ - --with-tcl=no \ --disable-static \ + --with-pythoninstall=%{python2_sitearch} \ + --with-tcl=no \ --with-tkinter=no # https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Beware_of_Rpath @@ -127,27 +117,19 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make # not %{?_smp_mflags} safe %install -make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la +make install DESTDIR=%{buildroot} -install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi -install -d ${RPM_BUILD_ROOT}%{_libexecdir} -install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper -install -d ${RPM_BUILD_ROOT}%{_unitdir} -install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service -install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d +install -d %{buildroot}{%{_sysconfdir}/sysconfig,%{_unitdir},%{_libexecdir}} +install -m 644 %SOURCE1 %{buildroot}%{_sysconfdir}/sysconfig/ipmi +install -m 755 %SOURCE2 %{buildroot}%{_libexecdir}/openipmi-helper +install -m 644 %SOURCE3 %{buildroot}%{_unitdir}/ipmi.service +install -d %{buildroot}%{_sysconfdir}/modprobe.d -rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 +rm %{buildroot}/%{_mandir}/man1/openipmigui.1 %{buildroot}%{_libdir}/*.la -# add missing documentation symlinks -if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmicmd && ! test -a ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmicmd.1.gz ; then - %{__ln_s} openipmicmd.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmicmd.1.gz -fi - -if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz ; then - %{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz -fi +# add missing documentation +echo ".so man1/ipmicmd.1"» > %{buildroot}%{_mandir}/man1/ipmicmd.1 +echo ".so man1/openipmish.1"» > %{buildroot}%{_mandir}/man1/ipmish.1 %post %systemd_post ipmi.service @@ -158,11 +140,11 @@ fi %postun %systemd_postun_with_restart ipmi.service -%post libs -/sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig -%postun libs -/sbin/ldconfig +%post lanserv -p /sbin/ldconfig +%postun lanserv -p /sbin/ldconfig ### A sysv => systemd migration contains all of the same scriptlets as a ### systemd package. These are additional scriptlets @@ -178,7 +160,8 @@ fi /bin/systemctl try-restart ipmi.service >/dev/null 2>&1 || : %files -%doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ README README.Force README.MotorolaMXP +%license COPYING COPYING.BSD COPYING.LIB +%doc CONFIGURING_FOR_LAN FAQ README README.Force README.MotorolaMXP %config(noreplace) %{_sysconfdir}/sysconfig/ipmi %{_libexecdir}/openipmi-helper %{_bindir}/ipmicmd @@ -203,13 +186,13 @@ fi %files perl %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm -%{perl_vendorarch}/auto/OpenIPMI/ +%{perl_vendorarch}/auto/OpenIPMI %files -n python2-openipmi -%{python_sitearch}/*OpenIPMI* +%{python2_sitearch}/*OpenIPMI* %files libs -%{_libdir}/*.so.* +%{_libdir}/libOpenIPMI*.so.* %files devel %{_includedir}/OpenIPMI @@ -217,20 +200,32 @@ fi %{_libdir}/pkgconfig/*.pc %files lanserv -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/ipmi/ipmisim1.emu %config(noreplace) %{_sysconfdir}/ipmi/lan.conf +%dir %{_sysconfdir}/ipmi %{_bindir}/ipmilan %{_bindir}/ipmi_sim %{_bindir}/sdrcomp %{_libdir}/libIPMIlanserv.so.* -%doc %{_mandir}/man8/ipmilan.8* -%doc %{_mandir}/man1/ipmi_sim.1* -%doc %{_mandir}/man5/ipmi_lan.5* -%doc %{_mandir}/man5/ipmi_sim_cmd.5* +%{_mandir}/man8/ipmilan.8* +%{_mandir}/man1/ipmi_sim.1* +%{_mandir}/man5/ipmi_lan.5* +%{_mandir}/man5/ipmi_sim_cmd.5* %changelog -* Thu Oct 19 2017 Josef Ridky - 2.0.24-6 +* Wed Jan 17 2018 Josef Ridky - 2.0.24-1 +- New upstream release 2.0.24 +- spec update (based on Tomasz Kłoczko's pull request) +- reduce the number of SONAME dependencies by use -Wl,--as-needed in LDFLAGS +- change COPYING COPYING.BSD COPYING.LIB files as %%license +- add %%{_sysconfdir}/ipmi directory to lanserv %%files list +- execute /sbin/ldconfig in %%post and %%postun section for lanserv sub-packages +- remove desktop-file-utils and GUI related packages from BuildRequires +- use roff links instead symlinks to gzipped man pages +- use %%autosetup in %%prep +- remove Group tags + +* Thu Oct 19 2017 Josef Ridky - 2.0.23-6 - Rebuilt for python2 package * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 2.0.23-5 diff --git a/sources b/sources index d4dd8d4..1b83eda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.23.tar.gz) = c1e9678c725dfe9aed539e8e83bbd21968917c407be6f97c2f513dbd5082a31842f756a7e581ef67deadba199231e3cf3edbc870508ed363432271a6ff255fbe +SHA512 (OpenIPMI-2.0.24.tar.gz) = de1e0a46d7e25af06e07a0f5b8e23deac14d2bca854fbe09b221e776b46b5cf13b5af6b7ee1e8d0984eb792aa4bd095d66d98775674809feafe0a357ca95d677 From b987cae2d1ea95b2aff3740832bd79fd2754d6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= Date: Thu, 18 Jan 2018 14:56:21 +0000 Subject: [PATCH 054/129] - remove pkgconfig from devel Requires - remove libedit Requires (it is autogenerated as SONAME dependency) - remove main package dependecy fron devell Requires (only libs is needed --- OpenIPMI.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 8e2704a..ea8c1dc 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -25,7 +25,6 @@ BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool -Requires: libedit Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -68,9 +67,7 @@ The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel Summary: The development environment for the OpenIPMI project -Requires: pkgconfig Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} %description devel The OpenIPMI-devel package contains the development libraries and header files @@ -224,6 +221,9 @@ echo ".so man1/openipmish.1"» > %{buildroot}%{_mandir}/man1/ipmish.1 - use roff links instead symlinks to gzipped man pages - use %%autosetup in %%prep - remove Group tags +- remove pkgconfig from devel Requires +- remove libedit Requires (it is autogenerated as SONAME dependency) +- remove main package dependecy fron devell Requires (only libs is needed * Thu Oct 19 2017 Josef Ridky - 2.0.23-6 - Rebuilt for python2 package From 88944de3bb46c654cfb31174e5f45753cbb57eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= Date: Thu, 18 Jan 2018 14:56:47 +0000 Subject: [PATCH 055/129] - fixed manually c&p create roff links --- OpenIPMI.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ea8c1dc..c96bc2c 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -125,8 +125,8 @@ install -d %{buildroot}%{_sysconfdir}/modprobe.d rm %{buildroot}/%{_mandir}/man1/openipmigui.1 %{buildroot}%{_libdir}/*.la # add missing documentation -echo ".so man1/ipmicmd.1"» > %{buildroot}%{_mandir}/man1/ipmicmd.1 -echo ".so man1/openipmish.1"» > %{buildroot}%{_mandir}/man1/ipmish.1 +echo ".so man1/ipmicmd.1" > %{buildroot}%{_mandir}/man1/ipmicmd.1 +echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %post %systemd_post ipmi.service From f57a1fe65a1d8bd68fe55b6f05b588d7ce81dbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= Date: Thu, 18 Jan 2018 14:57:08 +0000 Subject: [PATCH 056/129] - move add additional flags to CFLAGS to %configure --- OpenIPMI.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index c96bc2c..9cd16d0 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -88,7 +88,6 @@ rm -rf ./libedit %build export EDIT_CFLAGS=`pkg-config --cflags libedit` export EDIT_LIBS=`pkg-config --libs libedit` -export CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing" # generate new configure script we need this since we removed the libedit directory %{__libtoolize} --copy --force --automake @@ -99,6 +98,7 @@ export CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing" # libedit end %configure \ + CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing" \ LDFLAGS="%{__global_ldflags} -Wl,--as-needed" \ --disable-dependency-tracking \ --disable-static \ From 47a54082ace1a37d3d4cd7361579bc482a097535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= Date: Thu, 18 Jan 2018 15:03:48 +0000 Subject: [PATCH 057/129] - add use %%{?_isa} macro in Requires - corrected deve Requires (it need libs subpackage) --- OpenIPMI.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9cd16d0..a6256bc 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -29,7 +29,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires(post): systemd-sysv -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -47,7 +47,7 @@ and applications. %package perl Summary: IPMI Perl language bindings Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description perl The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. @@ -60,14 +60,14 @@ Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: IPMI Python language bindings -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description -n python2-openipmi The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel Summary: The development environment for the OpenIPMI project -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The OpenIPMI-devel package contains the development libraries and header files @@ -75,7 +75,7 @@ of the OpenIPMI project. %package lanserv Summary: Emulates an IPMI network listener -Requires: %{name} = %{version} +Requires: %{name}%{?_isa} = %{version}-%{release} %description lanserv This package contains a network IPMI listener. @@ -210,6 +210,12 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jan 18 2018 Tomasz Kłoczko - 2.0.24-1 +- remove pkgconfig from devel Requires +- remove libedit Requires (it is autogenerated as SONAME dependency) +- remove main package dependecy fron devell Requires (only libs is needed +- add use %%{?_isa} macro in Requires + * Wed Jan 17 2018 Josef Ridky - 2.0.24-1 - New upstream release 2.0.24 - spec update (based on Tomasz Kłoczko's pull request) @@ -221,9 +227,6 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 - use roff links instead symlinks to gzipped man pages - use %%autosetup in %%prep - remove Group tags -- remove pkgconfig from devel Requires -- remove libedit Requires (it is autogenerated as SONAME dependency) -- remove main package dependecy fron devell Requires (only libs is needed * Thu Oct 19 2017 Josef Ridky - 2.0.23-6 - Rebuilt for python2 package From 3b58031ca1f4808244526fd072e89a57a2f174c2 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 22 Jan 2018 12:27:44 +0100 Subject: [PATCH 058/129] Spec update --- OpenIPMI.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a6256bc..e9551a4 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -25,6 +25,7 @@ BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool +Requires: libedit Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -67,6 +68,8 @@ The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel Summary: The development environment for the OpenIPMI project +Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -125,8 +128,8 @@ install -d %{buildroot}%{_sysconfdir}/modprobe.d rm %{buildroot}/%{_mandir}/man1/openipmigui.1 %{buildroot}%{_libdir}/*.la # add missing documentation -echo ".so man1/ipmicmd.1" > %{buildroot}%{_mandir}/man1/ipmicmd.1 -echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 +echo ".so man1/ipmicmd.1" > %{buildroot}%{_mandir}/man1/ipmicmd.1 +echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %post %systemd_post ipmi.service @@ -210,6 +213,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 22 2018 Josef Ridky -2.0.14-2 +- restore removed requirements + * Thu Jan 18 2018 Tomasz Kłoczko - 2.0.24-1 - remove pkgconfig from devel Requires - remove libedit Requires (it is autogenerated as SONAME dependency) From 0509c9f1915a98d42369f76b51601094d0ed4fc7 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 22 Jan 2018 12:28:48 +0100 Subject: [PATCH 059/129] Bump spec --- OpenIPMI.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index e9551a4..b3a274f 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.24 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz From 4136df6e693350dfc3f6513125e8e968560739d6 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 30 Jan 2018 08:54:50 +0100 Subject: [PATCH 060/129] Remove old systemd dependencies --- OpenIPMI.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index b3a274f..a494a32 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.24 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -18,18 +18,15 @@ Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python2-devel perl-devel perl-generators -BuildRequires: systemd-units BuildRequires: pkgconfig BuildRequires: libedit-devel BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool +%{?systemd_requires} +BuildRequires: systemd Requires: libedit -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires(post): systemd-sysv Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -213,6 +210,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 22 2018 Josef Ridky -2.0.14-3 +- remove old systemd dependencies + * Mon Jan 22 2018 Josef Ridky -2.0.14-2 - restore removed requirements From 32d12757e41ed20a976d893767e4d9d8c9fbb287 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:52:40 +0000 Subject: [PATCH 061/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a494a32..0f66312 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,7 +5,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.24 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -210,6 +210,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 22 2018 Josef Ridky -2.0.14-3 - remove old systemd dependencies From 38053e4034774e1aa4507f94a8069343ae4cb6a5 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 6 Mar 2018 14:54:45 +0100 Subject: [PATCH 062/129] Use ldconfig macros --- OpenIPMI.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 0f66312..9a30d51 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,6 +1,5 @@ %global _hardened_build 1 -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI @@ -137,11 +136,8 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %postun %systemd_postun_with_restart ipmi.service -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - -%post lanserv -p /sbin/ldconfig -%postun lanserv -p /sbin/ldconfig +%ldconfig_scriptlets libs +%ldconfig_scriptlets lanserv ### A sysv => systemd migration contains all of the same scriptlets as a ### systemd package. These are additional scriptlets @@ -210,6 +206,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Mar 06 2018 Josef Ridky - 2.0.24-5 +- use ldconfig macros + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 488f5d0be3651d2e5134aabcaf5efb7d7f804501 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 17 Apr 2018 14:27:53 +0200 Subject: [PATCH 063/129] New upstream version 2.0.25 with Python3 support --- .gitignore | 1 + ...I-2.0.19-man.patch.patch => 0001-man.patch | 0 ...obundle.patch.patch => 0002-nobundle.patch | 0 0003-Python3.patch | 167 ++++++++++++++++++ OpenIPMI.spec | 35 ++-- sources | 2 +- 6 files changed, 190 insertions(+), 15 deletions(-) rename 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch => 0001-man.patch (100%) rename 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch => 0002-nobundle.patch (100%) create mode 100644 0003-Python3.patch diff --git a/.gitignore b/.gitignore index 7559be3..06183e6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.22.tar.gz /OpenIPMI-2.0.23.tar.gz /OpenIPMI-2.0.24.tar.gz +/OpenIPMI-2.0.25.tar.gz diff --git a/0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch b/0001-man.patch similarity index 100% rename from 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch rename to 0001-man.patch diff --git a/0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch b/0002-nobundle.patch similarity index 100% rename from 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch rename to 0002-nobundle.patch diff --git a/0003-Python3.patch b/0003-Python3.patch new file mode 100644 index 0000000..7c7e9bb --- /dev/null +++ b/0003-Python3.patch @@ -0,0 +1,167 @@ +diff -urNp a/configure b/configure +--- a/configure 2018-04-17 08:47:58.528284066 +0200 ++++ b/configure 2018-04-17 10:00:24.091372864 +0200 +@@ -13406,7 +13406,7 @@ if test "x$pythoncflags" = "x" -o "x$pyt + pythonprog= + if test "x$trypython" != "xno"; then + # Extract the first word of "python", so it can be a program name with args. +-set dummy python; ac_word=$2 ++set dummy python3; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_path_pythonprog+:} false; then : +@@ -13474,7 +13474,7 @@ fi + + $as_echo "#define HAVE_PYTHON /**/" >>confdefs.h + +- PYTHON_DIR=python ++ PYTHON_DIR=python3.6 + PYTHON_CFLAGS="$pythoncflags" + PYTHON_INSTALL_DIR="$pythoninstalldir" + PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir" +@@ -13491,7 +13491,7 @@ else + + $as_echo "#define HAVE_PYTHON /**/" >>confdefs.h + +- PYTHON_DIR=python ++ PYTHON_DIR=python3.6 + PYTHON_CFLAGS="$pythoncflags" + PYTHON_INSTALL_DIR="$pythoninstalldir" + PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir" +@@ -13500,12 +13500,12 @@ if test "x$pythonprog" != "x"; then + if test "x$pythonusepthreads" = "x"; then + cat - <<_ACEOF >conftest.py + try: +- import thread ++ import threading + print('yes') + except: + print('no') + _ACEOF +- pythonusepthreads=`python conftest.py` ++ pythonusepthreads=`python3 conftest.py` + rm -f conftest.py + fi + echo "checking for python threads... $pythonusepthreads" +@@ -13537,7 +13537,7 @@ try: + except: + print('no') + _ACEOF +- tkinter=`python conftest.py` ++ tkinter=`python3 conftest.py` + rm -f conftest.py + fi + fi +diff -urNp a/configure.ac b/configure.ac +--- a/configure.ac 2018-04-17 08:47:58.529284062 +0200 ++++ b/configure.ac 2018-04-17 10:01:02.115576922 +0200 +@@ -526,7 +526,7 @@ AC_SUBST(PERL_POSIX_SO) + if test "x$pythoncflags" = "x" -o "x$pythoninstalldir" = "x"; then + pythonprog= + if test "x$trypython" != "xno"; then +- AC_PATH_PROG(pythonprog, python) ++ AC_PATH_PROG(pythonprog, python3) + fi + if test "x$pythonprog" != "x"; then + # Now find a proper installation location. +@@ -578,12 +578,12 @@ if test "x$pythonprog" != "x"; then + if test "x$pythonusepthreads" = "x"; then + cat - <<_ACEOF >conftest.py + try: +- import thread ++ import threading + print('yes') + except: + print('no') + _ACEOF +- pythonusepthreads=`python conftest.py` ++ pythonusepthreads=`python3 conftest.py` + rm -f conftest.py + fi + echo "checking for python threads... $pythonusepthreads" +@@ -615,7 +615,7 @@ try: + except: + print('no') + _ACEOF +- tkinter=`python conftest.py` ++ tkinter=`python3 conftest.py` + rm -f conftest.py + fi + fi +diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am +--- a/swig/python/Makefile.am 2018-04-17 08:47:58.547283986 +0200 ++++ b/swig/python/Makefile.am 2018-04-17 13:08:09.752299116 +0200 +@@ -22,19 +22,14 @@ EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h + OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la + -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' + +-OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la +- -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' +- + OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i + $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< + +-CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc ++CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py + +-install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo ++install-exec-local: _OpenIPMI.la OpenIPMI.py + $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) + $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)" +- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)" +- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)" + if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \ + $(INSTALL) -d $(DESTDIR)$(bindir); \ + $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\ +@@ -43,8 +38,6 @@ install-exec-local: _OpenIPMI.la OpenIPM + uninstall-local: + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/_OpenIPMI.so" + rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.py" +- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyc" +- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo" + rm -f "$(DESTDIR)$(bindir)/openipmigui" + + rungui: +diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in +--- a/swig/python/Makefile.in 2018-04-17 08:47:58.547283986 +0200 ++++ b/swig/python/Makefile.in 2018-04-17 13:08:50.130269660 +0200 +@@ -443,7 +443,7 @@ nodist__OpenIPMI_la_SOURCES = OpenIPMI_w + _OpenIPMI_la_LDFLAGS = -module -avoid-version + _OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) $(PYTHON_POSIX_LIB) + EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py sample.py sample2.py +-CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc ++CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py + all: all-recursive + + .SUFFIXES: +@@ -837,20 +837,12 @@ uninstall-am: uninstall-local uninstall- + .PRECIOUS: Makefile + + +-OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la +- -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' +- +-OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la +- -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' +- + OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i + $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< + +-install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo ++install-exec-local: _OpenIPMI.la OpenIPMI.py + $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) + $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)" +- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)" +- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)" + if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \ + $(INSTALL) -d $(DESTDIR)$(bindir); \ + $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\ +@@ -859,8 +851,6 @@ install-exec-local: _OpenIPMI.la OpenIPM + uninstall-local: + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/_OpenIPMI.so" + rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.py" +- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyc" +- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo" + rm -f "$(DESTDIR)$(bindir)/openipmigui" + + rungui: diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9a30d51..67659e7 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,20 +3,20 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.24 -Release: 4%{?dist} +Version: 2.0.25 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service -Patch1: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch -Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch -Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch +Patch1: 0001-man.patch +Patch2: 0002-nobundle.patch +Patch3: 0003-Python3.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel -BuildRequires: openssl-devel python2-devel perl-devel perl-generators +BuildRequires: openssl-devel python3-devel perl-devel perl-generators BuildRequires: pkgconfig BuildRequires: libedit-devel BuildRequires: automake @@ -49,17 +49,17 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description perl The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. -%package -n python2-openipmi -%{?python_provide:%python_provide python2-openipmi} -%{?python_provide:%python_provide python2-OpenIPMI} +%package -n python3-openipmi +%{?python_provide:%python_provide python3-openipmi} +%{?python_provide:%python_provide python3-OpenIPMI} # Remove before F30 Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} +Obsoletes: %{name}-python2 < %{version}-%{release} Summary: IPMI Python language bindings Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description -n python2-openipmi +%description -n python3-openipmi The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel @@ -101,7 +101,7 @@ export EDIT_LIBS=`pkg-config --libs libedit` LDFLAGS="%{__global_ldflags} -Wl,--as-needed" \ --disable-dependency-tracking \ --disable-static \ - --with-pythoninstall=%{python2_sitearch} \ + --with-pythoninstall=%{python3_sitearch} \ --with-tcl=no \ --with-tkinter=no @@ -181,8 +181,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm %{perl_vendorarch}/auto/OpenIPMI -%files -n python2-openipmi -%{python2_sitearch}/*OpenIPMI* +%files -n python3-openipmi +%{python3_sitearch}/*OpenIPMI* +%{python3_sitearch}/__pycache__/OpenIPMI.*.pyc %files libs %{_libdir}/libOpenIPMI*.so.* @@ -206,6 +207,12 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Apr 17 2018 Josef Ridky - 2.0.25-1 +- New upstream release 2.0.25 (#1568194) +- Replace Python2 with Python3 +- Drop OpenIPMI-python2 and set it as Obsolete +- Introduce new OpenIPMI-python3 package + * Tue Mar 06 2018 Josef Ridky - 2.0.24-5 - use ldconfig macros diff --git a/sources b/sources index 1b83eda..26a13b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.24.tar.gz) = de1e0a46d7e25af06e07a0f5b8e23deac14d2bca854fbe09b221e776b46b5cf13b5af6b7ee1e8d0984eb792aa4bd095d66d98775674809feafe0a357ca95d677 +SHA512 (OpenIPMI-2.0.25.tar.gz) = 5d89deb5d0d0ff44d6f62a9759577dba92aa58c208477e317aecbd01e71ccf7ba0dab138a1d8feff22d523c85d6ceaee9e478e26834ffcd91949b81d2d9c1f86 From 90129e622b34869d9b99e15036a30ca3015b08ac Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 17 Apr 2018 14:50:25 +0200 Subject: [PATCH 064/129] Add python3 option to swig --- 0003-Python3.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/0003-Python3.patch b/0003-Python3.patch index 7c7e9bb..7651762 100644 --- a/0003-Python3.patch +++ b/0003-Python3.patch @@ -90,7 +90,7 @@ diff -urNp a/configure.ac b/configure.ac fi diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am --- a/swig/python/Makefile.am 2018-04-17 08:47:58.547283986 +0200 -+++ b/swig/python/Makefile.am 2018-04-17 13:08:09.752299116 +0200 ++++ b/swig/python/Makefile.am 2018-04-17 14:43:01.703963727 +0200 @@ -22,19 +22,14 @@ EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' @@ -99,7 +99,8 @@ diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am - -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i - $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< +- $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< ++ $(SWIG) $(DEFS) -python -py3 -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< -CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc +CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py @@ -124,7 +125,7 @@ diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am rungui: diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in --- a/swig/python/Makefile.in 2018-04-17 08:47:58.547283986 +0200 -+++ b/swig/python/Makefile.in 2018-04-17 13:08:50.130269660 +0200 ++++ b/swig/python/Makefile.in 2018-04-17 14:43:28.969899859 +0200 @@ -443,7 +443,7 @@ nodist__OpenIPMI_la_SOURCES = OpenIPMI_w _OpenIPMI_la_LDFLAGS = -module -avoid-version _OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) $(PYTHON_POSIX_LIB) @@ -145,7 +146,8 @@ diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in - -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i - $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< +- $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< ++ $(SWIG) $(DEFS) -python -py3 -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< -install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo +install-exec-local: _OpenIPMI.la OpenIPMI.py From ea41ad6fa5204ae2bfa255d6ff33bd154f03e1bf Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 18 Apr 2018 09:00:24 +0200 Subject: [PATCH 065/129] Python3 update --- 0003-Python3.patch | 24 ++---------------------- OpenIPMI.spec | 5 ++++- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/0003-Python3.patch b/0003-Python3.patch index 7651762..702d976 100644 --- a/0003-Python3.patch +++ b/0003-Python3.patch @@ -10,24 +10,6 @@ diff -urNp a/configure b/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_pythonprog+:} false; then : -@@ -13474,7 +13474,7 @@ fi - - $as_echo "#define HAVE_PYTHON /**/" >>confdefs.h - -- PYTHON_DIR=python -+ PYTHON_DIR=python3.6 - PYTHON_CFLAGS="$pythoncflags" - PYTHON_INSTALL_DIR="$pythoninstalldir" - PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir" -@@ -13491,7 +13491,7 @@ else - - $as_echo "#define HAVE_PYTHON /**/" >>confdefs.h - -- PYTHON_DIR=python -+ PYTHON_DIR=python3.6 - PYTHON_CFLAGS="$pythoncflags" - PYTHON_INSTALL_DIR="$pythoninstalldir" - PYTHON_INSTALL_LIB_DIR="$pythoninstalllibdir" @@ -13500,12 +13500,12 @@ if test "x$pythonprog" != "x"; then if test "x$pythonusepthreads" = "x"; then cat - <<_ACEOF >conftest.py @@ -99,8 +81,7 @@ diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am - -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i -- $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< -+ $(SWIG) $(DEFS) -python -py3 -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< + $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< -CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc +CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py @@ -146,8 +127,7 @@ diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in - -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i -- $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< -+ $(SWIG) $(DEFS) -python -py3 -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< + $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< -install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo +install-exec-local: _OpenIPMI.la OpenIPMI.py diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 67659e7..e355f1e 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -207,6 +207,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Apr 18 2018 Josef Ridky - 2.0.25-2 +- Python3 update + * Tue Apr 17 2018 Josef Ridky - 2.0.25-1 - New upstream release 2.0.25 (#1568194) - Replace Python2 with Python3 From 187d1283cf07972b8973497a2b3cf9490cc54da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:39:00 +0200 Subject: [PATCH 066/129] Rebuilt for Python 3.7 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index e355f1e..139c555 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -207,6 +207,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jun 19 2018 Miro Hrončok - 2.0.25-3 +- Rebuilt for Python 3.7 + * Wed Apr 18 2018 Josef Ridky - 2.0.25-2 - Python3 update From 4accb5b172ab2b6d51ec963b3b5354562bf589db Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 29 Jun 2018 22:10:23 +0200 Subject: [PATCH 067/129] Perl 5.28 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 139c555..3dfae8a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -207,6 +207,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Jun 29 2018 Jitka Plesnikova - 2.0.25-4 +- Perl 5.28 rebuild + * Tue Jun 19 2018 Miro Hrončok - 2.0.25-3 - Rebuilt for Python 3.7 From 8d0f91894de91afaafd1b93cb3c527108b1150ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 3 Jul 2018 12:35:57 +0200 Subject: [PATCH 068/129] Perl 5.28 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 3dfae8a..88636b4 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -207,6 +207,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jul 03 2018 Petr Pisar - 2.0.25-5 +- Perl 5.28 rebuild + * Fri Jun 29 2018 Jitka Plesnikova - 2.0.25-4 - Perl 5.28 rebuild From 619a4c309b9ad8412b7fc98460fe25f106bd7eb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:10:33 +0000 Subject: [PATCH 069/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 88636b4..39ede48 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -207,6 +207,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 03 2018 Petr Pisar - 2.0.25-5 - Perl 5.28 rebuild From 3cabf8d444a2613bf6e7778dac93a2bc1340db82 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 24 Jul 2018 14:15:54 -0700 Subject: [PATCH 070/129] Rebuild for new net-snmp --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 39ede48..9feda48 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -207,6 +207,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jul 24 2018 Adam Williamson - 2.0.25-7 +- Rebuild for new net-snmp + * Thu Jul 12 2018 Fedora Release Engineering - 2.0.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 81ff12a0f9e85bf511633efbc6ec98bb27e8f6b7 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 5 Sep 2018 11:11:22 +0200 Subject: [PATCH 071/129] Resolves: 1612159 - fix self referencing error --- OpenIPMI.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9feda48..9bfbc91 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -124,7 +124,8 @@ install -d %{buildroot}%{_sysconfdir}/modprobe.d rm %{buildroot}/%{_mandir}/man1/openipmigui.1 %{buildroot}%{_libdir}/*.la # add missing documentation -echo ".so man1/ipmicmd.1" > %{buildroot}%{_mandir}/man1/ipmicmd.1 +echo ".so man1/openipmicmd.1" > %{buildroot}%{_mandir}/man1/ipmicmd.1 + echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %post @@ -207,6 +208,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Sep 05 2018 Josef Ridky - 2.0.25-8 +- Fix man page self referencing error (#1612159) + * Tue Jul 24 2018 Adam Williamson - 2.0.25-7 - Rebuild for new net-snmp From 7f5559911baccd121a77c50111aeda190e71f374 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:45:39 +0000 Subject: [PATCH 072/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 9bfbc91..49ba66e 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -208,6 +208,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.25-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Sep 05 2018 Josef Ridky - 2.0.25-8 - Fix man page self referencing error (#1612159) From ba598c7e552b4e5c47ef480d0fafff948d93d7a4 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 31 May 2019 06:47:12 +0200 Subject: [PATCH 073/129] Perl 5.30 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 49ba66e..ead97e8 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.25 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -208,6 +208,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri May 31 2019 Jitka Plesnikova - 2.0.25-10 +- Perl 5.30 rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.0.25-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3212f5b44add34d9bb3316718e43e2502063eb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 19 Jun 2019 09:57:50 +0200 Subject: [PATCH 074/129] Drop use of __* macros that were removed in rpm-4.15 --- OpenIPMI.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ead97e8..70ce04a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -89,11 +89,11 @@ export EDIT_CFLAGS=`pkg-config --cflags libedit` export EDIT_LIBS=`pkg-config --libs libedit` # generate new configure script we need this since we removed the libedit directory -%{__libtoolize} --copy --force --automake -%{__aclocal} -%{__autoheader} -%{__automake} --add-missing --copy --foreign --force-missing -%{__autoconf} +libtoolize --copy --force --automake +aclocal +autoheader +automake --add-missing --copy --foreign --force-missing +autoconf # libedit end %configure \ From 18a10dc445673cb7a3674cb8022d91ff3abfc665 Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Wed, 26 Jun 2019 14:00:38 +0200 Subject: [PATCH 075/129] New upstream release 2.0.27 - readline replaced bundled libedit in upstream --- .gitignore | 1 + ...nIPMI-2.0.18-pthread-pkgconfig.patch.patch | 26 --- 0002-nobundle.patch | 59 ------- 0002-readline-includes.patch | 30 ++++ 0003-Python3.patch | 149 ------------------ OpenIPMI.spec | 27 ++-- sources | 2 +- 7 files changed, 41 insertions(+), 253 deletions(-) delete mode 100644 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch delete mode 100644 0002-nobundle.patch create mode 100644 0002-readline-includes.patch delete mode 100644 0003-Python3.patch diff --git a/.gitignore b/.gitignore index 06183e6..60a5886 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.23.tar.gz /OpenIPMI-2.0.24.tar.gz /OpenIPMI-2.0.25.tar.gz +/OpenIPMI-2.0.27.tar.gz diff --git a/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch b/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch deleted file mode 100644 index 5c92eb9..0000000 --- a/0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d058bc9be5ef521882e3226a27e81cca8aded5ce Mon Sep 17 00:00:00 2001 -From: Boris Ranto -Date: Thu, 2 Jun 2016 12:46:39 +0200 -Subject: [PATCH] Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' - -Signed-off-by: Boris Ranto ---- - OpenIPMIpthread.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/OpenIPMIpthread.pc.in b/OpenIPMIpthread.pc.in -index 59b52e5..fffa0d0 100644 ---- a/OpenIPMIpthread.pc.in -+++ b/OpenIPMIpthread.pc.in -@@ -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 --- -2.7.4 - diff --git a/0002-nobundle.patch b/0002-nobundle.patch deleted file mode 100644 index 2515e0e..0000000 --- a/0002-nobundle.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,10 +1,10 @@ - RPM = rpmbuild - RPMFLAGS = -ta - --SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \ -+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \ - ui lanserv sample doc man $(SWIG_DIR) - --DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \ -+DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \ - ui lanserv sample doc man swig - - EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 - - AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ -+ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ -+ $(EDIT_CFLAGS) \ - $(TCL_CFLAGS) - - lib_LTLIBRARIES = libOpenIPMIcmdlang.la -@@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la \ - $(top_builddir)/unix/libOpenIPMIposix.la \ -- $(top_builddir)/libedit/libedit.a \ -+ $(EDIT_LIBS) \ - $(TERM_LIBS) \ - $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ - $(TCL_LIB) $(TCL_LIBS) \ ---- a/configure.ac -+++ b/configure.ac -@@ -926,7 +926,6 @@ AC_OUTPUT(Makefile - swig/perl/Makefile - swig/python/Makefile - swig/python/openipmigui/Makefile -- libedit/Makefile - cmdlang/Makefile - include/Makefile - include/OpenIPMI/Makefile ---- OpenIPMI-2.0.24/sample/Makefile.am~ 2017-07-27 23:01:19.000000000 +0100 -+++ OpenIPMI-2.0.24/sample/Makefile.am 2017-12-19 07:52:45.368954855 +0000 -@@ -73,7 +73,8 @@ - ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c - ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) \ - $(SOCKETLIB) --ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit -+ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) -+ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS) - - EXTRA_DIST = example_oem.c - - diff --git a/0002-readline-includes.patch b/0002-readline-includes.patch new file mode 100644 index 0000000..84c6770 --- /dev/null +++ b/0002-readline-includes.patch @@ -0,0 +1,30 @@ +Fix including readline and readline history headers in OpenIPMI 2.0.27 + +It will probably be fixed in next release + +diff --git a/cmdlang/ipmish.c b/cmdlang/ipmish.c +index 139da67b..a4b8f0ba 100644 +--- a/cmdlang/ipmish.c ++++ b/cmdlang/ipmish.c +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_GLIB + #include +diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c +index e0ae0197..184745ef 100644 +--- a/sample/ipmi_serial_bmc_emu.c ++++ b/sample/ipmi_serial_bmc_emu.c +@@ -42,7 +42,8 @@ + #include + #include + #include +-#include ++#include ++#include + + #define _GNU_SOURCE + #include diff --git a/0003-Python3.patch b/0003-Python3.patch deleted file mode 100644 index 702d976..0000000 --- a/0003-Python3.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -urNp a/configure b/configure ---- a/configure 2018-04-17 08:47:58.528284066 +0200 -+++ b/configure 2018-04-17 10:00:24.091372864 +0200 -@@ -13406,7 +13406,7 @@ if test "x$pythoncflags" = "x" -o "x$pyt - pythonprog= - if test "x$trypython" != "xno"; then - # Extract the first word of "python", so it can be a program name with args. --set dummy python; ac_word=$2 -+set dummy python3; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_path_pythonprog+:} false; then : -@@ -13500,12 +13500,12 @@ if test "x$pythonprog" != "x"; then - if test "x$pythonusepthreads" = "x"; then - cat - <<_ACEOF >conftest.py - try: -- import thread -+ import threading - print('yes') - except: - print('no') - _ACEOF -- pythonusepthreads=`python conftest.py` -+ pythonusepthreads=`python3 conftest.py` - rm -f conftest.py - fi - echo "checking for python threads... $pythonusepthreads" -@@ -13537,7 +13537,7 @@ try: - except: - print('no') - _ACEOF -- tkinter=`python conftest.py` -+ tkinter=`python3 conftest.py` - rm -f conftest.py - fi - fi -diff -urNp a/configure.ac b/configure.ac ---- a/configure.ac 2018-04-17 08:47:58.529284062 +0200 -+++ b/configure.ac 2018-04-17 10:01:02.115576922 +0200 -@@ -526,7 +526,7 @@ AC_SUBST(PERL_POSIX_SO) - if test "x$pythoncflags" = "x" -o "x$pythoninstalldir" = "x"; then - pythonprog= - if test "x$trypython" != "xno"; then -- AC_PATH_PROG(pythonprog, python) -+ AC_PATH_PROG(pythonprog, python3) - fi - if test "x$pythonprog" != "x"; then - # Now find a proper installation location. -@@ -578,12 +578,12 @@ if test "x$pythonprog" != "x"; then - if test "x$pythonusepthreads" = "x"; then - cat - <<_ACEOF >conftest.py - try: -- import thread -+ import threading - print('yes') - except: - print('no') - _ACEOF -- pythonusepthreads=`python conftest.py` -+ pythonusepthreads=`python3 conftest.py` - rm -f conftest.py - fi - echo "checking for python threads... $pythonusepthreads" -@@ -615,7 +615,7 @@ try: - except: - print('no') - _ACEOF -- tkinter=`python conftest.py` -+ tkinter=`python3 conftest.py` - rm -f conftest.py - fi - fi -diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am ---- a/swig/python/Makefile.am 2018-04-17 08:47:58.547283986 +0200 -+++ b/swig/python/Makefile.am 2018-04-17 14:43:01.703963727 +0200 -@@ -22,19 +22,14 @@ EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h - OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la - -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' - --OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la -- -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' -- - OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i - $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< - --CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc -+CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py - --install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo -+install-exec-local: _OpenIPMI.la OpenIPMI.py - $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) - $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)" - if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \ - $(INSTALL) -d $(DESTDIR)$(bindir); \ - $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\ -@@ -43,8 +38,6 @@ install-exec-local: _OpenIPMI.la OpenIPM - uninstall-local: - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/_OpenIPMI.so" - rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.py" -- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyc" -- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo" - rm -f "$(DESTDIR)$(bindir)/openipmigui" - - rungui: -diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in ---- a/swig/python/Makefile.in 2018-04-17 08:47:58.547283986 +0200 -+++ b/swig/python/Makefile.in 2018-04-17 14:43:28.969899859 +0200 -@@ -443,7 +443,7 @@ nodist__OpenIPMI_la_SOURCES = OpenIPMI_w - _OpenIPMI_la_LDFLAGS = -module -avoid-version - _OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) $(PYTHON_POSIX_LIB) - EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py sample.py sample2.py --CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc -+CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py - all: all-recursive - - .SUFFIXES: -@@ -837,20 +837,12 @@ uninstall-am: uninstall-local uninstall- - .PRECIOUS: Makefile - - --OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la -- -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' -- --OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la -- -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' -- - OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i - $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< - --install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo -+install-exec-local: _OpenIPMI.la OpenIPMI.py - $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) - $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)" - if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \ - $(INSTALL) -d $(DESTDIR)$(bindir); \ - $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\ -@@ -859,8 +851,6 @@ install-exec-local: _OpenIPMI.la OpenIPM - uninstall-local: - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/_OpenIPMI.so" - rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.py" -- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyc" -- rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo" - rm -f "$(DESTDIR)$(bindir)/openipmigui" - - rungui: diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 70ce04a..54eb530 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,8 +3,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.25 -Release: 10%{?dist} +Version: 2.0.27 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -12,20 +12,18 @@ Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service Patch1: 0001-man.patch -Patch2: 0002-nobundle.patch -Patch3: 0003-Python3.patch +Patch2: 0002-readline-includes.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python3-devel perl-devel perl-generators BuildRequires: pkgconfig -BuildRequires: libedit-devel +BuildRequires: readline-devel BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool %{?systemd_requires} BuildRequires: systemd -Requires: libedit Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -82,19 +80,8 @@ This package contains a network IPMI listener. %prep %autosetup -p1 -rm -rf ./libedit %build -export EDIT_CFLAGS=`pkg-config --cflags libedit` -export EDIT_LIBS=`pkg-config --libs libedit` - -# generate new configure script we need this since we removed the libedit directory -libtoolize --copy --force --automake -aclocal -autoheader -automake --add-missing --copy --foreign --force-missing -autoconf -# libedit end %configure \ CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing" \ @@ -102,6 +89,7 @@ autoconf --disable-dependency-tracking \ --disable-static \ --with-pythoninstall=%{python3_sitearch} \ + --with-python=%{__python3} \ --with-tcl=no \ --with-tkinter=no @@ -110,7 +98,7 @@ autoconf 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=%{buildroot} @@ -208,6 +196,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jun 26 2019 Vaclav Dolezal - 2.0.27-1 +- New upstream release 2.0.27 + * Fri May 31 2019 Jitka Plesnikova - 2.0.25-10 - Perl 5.30 rebuild diff --git a/sources b/sources index 26a13b2..253db02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.25.tar.gz) = 5d89deb5d0d0ff44d6f62a9759577dba92aa58c208477e317aecbd01e71ccf7ba0dab138a1d8feff22d523c85d6ceaee9e478e26834ffcd91949b81d2d9c1f86 +SHA512 (OpenIPMI-2.0.27.tar.gz) = 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3 From 3c63b526a44c27cf32240109e6d94d5e969f776d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 16:02:48 +0000 Subject: [PATCH 076/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 54eb530..0a816b9 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.27 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -196,6 +196,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 26 2019 Vaclav Dolezal - 2.0.27-1 - New upstream release 2.0.27 From 6fcbd97ea05901f8aaf3fba751fe2cf5e74f1846 Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Thu, 1 Aug 2019 09:47:26 +0200 Subject: [PATCH 077/129] Prevent bogus Provides of libOpenIPMI.so.0 Resolves: #1734407 --- OpenIPMI.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 0a816b9..30c55c2 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.27 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -26,6 +26,8 @@ BuildRequires: systemd Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# Prevent bogus provides of private libs from perl +%global __provides_exclude_from %{?__provides_exclude_from:%{__provides_exclude_from}|}^%{perl_vendorarch}/auto/.*\\.so$ %description The Open IPMI project aims to develop an open code base to allow access to @@ -196,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Aug 01 2019 Vaclav Dolezal - 2.0.27-3 +- Prevent bogus Provides of libOpenIPMI.so.0 by OpenIPMI-perl (#1734407) + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 765db84b19c90c27dfbd91aaa31cd523f35d501f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:00:19 +0200 Subject: [PATCH 078/129] Rebuilt for Python 3.8 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 30c55c2..cd53af2 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.27 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.0.27-4 +- Rebuilt for Python 3.8 + * Thu Aug 01 2019 Vaclav Dolezal - 2.0.27-3 - Prevent bogus Provides of libOpenIPMI.so.0 by OpenIPMI-perl (#1734407) From 849c0b43fa43c315350f8fa3ef9aaa23d93f9393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:49:37 +0200 Subject: [PATCH 079/129] Rebuilt for Python 3.8.0rc1 (#1748018) --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index cd53af2..d243c78 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.27 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.0.27-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 2.0.27-4 - Rebuilt for Python 3.8 From d4e1908b4326035d50ce035988d88d29ac75b0a6 Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Mon, 16 Dec 2019 11:49:30 +0100 Subject: [PATCH 080/129] New upstream release 2.0.28 --- .gitignore | 1 + 0002-readline-includes.patch | 14 ++++---------- OpenIPMI.spec | 7 +++++-- sources | 1 + 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 60a5886..f4ebde5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.24.tar.gz /OpenIPMI-2.0.25.tar.gz /OpenIPMI-2.0.27.tar.gz +/OpenIPMI-2.0.28.tar.gz diff --git a/0002-readline-includes.patch b/0002-readline-includes.patch index 84c6770..b4927b4 100644 --- a/0002-readline-includes.patch +++ b/0002-readline-includes.patch @@ -1,9 +1,5 @@ -Fix including readline and readline history headers in OpenIPMI 2.0.27 - -It will probably be fixed in next release - diff --git a/cmdlang/ipmish.c b/cmdlang/ipmish.c -index 139da67b..a4b8f0ba 100644 +index 139da67..a4b8f0b 100644 --- a/cmdlang/ipmish.c +++ b/cmdlang/ipmish.c @@ -51,6 +51,7 @@ @@ -15,15 +11,13 @@ index 139da67b..a4b8f0ba 100644 #ifdef HAVE_GLIB #include diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index e0ae0197..184745ef 100644 +index 1b8bb9a..184745e 100644 --- a/sample/ipmi_serial_bmc_emu.c +++ b/sample/ipmi_serial_bmc_emu.c -@@ -42,7 +42,8 @@ - #include +@@ -43,6 +43,7 @@ #include #include --#include -+#include + #include +#include #define _GNU_SOURCE diff --git a/OpenIPMI.spec b/OpenIPMI.spec index d243c78..ff88526 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,8 +3,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.27 -Release: 5%{?dist} +Version: 2.0.28 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Dec 16 2019 Vaclav Dolezal - 2.0.28-1 +- New upstream release 2.0.28 + * Thu Oct 03 2019 Miro Hrončok - 2.0.27-5 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 253db02..bdf74ce 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (OpenIPMI-2.0.27.tar.gz) = 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3 +SHA512 (OpenIPMI-2.0.28.tar.gz) = faaca335f7ff582f396d588c6b3736b4e2756a9914becba75550878a10d7acce55e85912bcf5cd9e482c3e646eb472a8a055c520f2dcba7a874f0c0f120502da From 5d7705c6c376452fe692042098781153f059886b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:37:22 +0000 Subject: [PATCH 081/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ff88526..c54982d 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.28 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 16 2019 Vaclav Dolezal - 2.0.28-1 - New upstream release 2.0.28 From 89be3f89ee81e350c41153f1b85e28b20856b3f9 Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Thu, 9 Jan 2020 11:46:33 +0100 Subject: [PATCH 082/129] Cleanup of openipmi-helper script Removed some legacy stuff including branches handling systems with no udev. Resolves: #1579773 --- OpenIPMI.spec | 5 ++++- openipmi-helper | 57 +++++++------------------------------------------ 2 files changed, 12 insertions(+), 50 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index c54982d..99bb2a9 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.28 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Feb 03 2020 Vaclav Dolezal - 2.0.28-3 +- Cleanup of openipmi-helper script; removed no-udev branch (#1579773) + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/openipmi-helper b/openipmi-helper index 4cebfb9..4f3d3d9 100644 --- a/openipmi-helper +++ b/openipmi-helper @@ -4,6 +4,7 @@ # ipmi: OpenIPMI Driver helper script # # Authors: Jan Safranek +# Václav Doležal # # Based on IPMI init script by: # Matt Domsch @@ -30,11 +31,6 @@ INTF_NUM=0 IPMI_SMB_MODULE_NAME="ipmi_smb" IPMI_SI_MODULE_NAME="ipmi_si" -kernel=`uname -r | cut -d. -f1-2` -if [ "${kernel}" == "2.4" ]; then - IPMI_SMB_MODULE_NAME="ipmi_smb_intf" - IPMI_SI_MODULE_NAME="ipmi_si_drv" -fi MODULES_INTERFACES="" [ "${DEV_IPMI}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_devintf" @@ -55,17 +51,6 @@ RETVAL=0 LOCKFILE=/var/lock/subsys/ipmi DEV_IPMI_TIMEOUT=150 -UDEV_EXISTS=0 -if [ -e /sbin/udev -o -e /sbin/udevd ]; then - UDEV_EXISTS=1 -fi - -############################################################################# -# NOTES: -# * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload, -# because SLES9 and RHEL4 kernels don't send a message for udev to delete -# it for us. -# ############################################################################# modules_loaded_verbose() @@ -73,7 +58,7 @@ modules_loaded_verbose() OnePlusLoaded=0 OnePlusUnloaded=0 for m in $@; do - if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then + if /sbin/lsmod | grep -q $m ; then echo "$m module loaded." OnePlusLoaded=1 else @@ -88,7 +73,7 @@ modules_loaded() OnePlusLoaded=0 OnePlusUnloaded=0 for m in $@; do - if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then + if /sbin/lsmod | grep -q $m ; then OnePlusLoaded=1 else OnePlusUnloaded=1 @@ -154,13 +139,6 @@ start_watchdog_common() RETVAL=$((RETVAL | 2)) && echo "Watchdog startup failed: cannot load ipmi_watchdog module" && return - if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then - mknod -m 0600 /dev/watchdog c 10 130 - [ $? -ne 0 ] && - RETVAL=$((RETVAL | 8)) && - echo "Watchdog startup failed: cannot create /dev/watchdog" && - return - fi } start_watchdog_quiet() @@ -186,10 +164,6 @@ stop_watchdog() if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) echo "Watchog shutdown failed: cannot unload ipmi_watchdog module" - else - if [ "${IPMI_WATCHDOG}" = "yes" ]; then - [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog - fi fi } @@ -199,10 +173,6 @@ stop_watchdog_quiet() modules_loaded ipmi_watchdog if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) - else - if [ "${IPMI_WATCHDOG}" = "yes" ]; then - [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog - fi fi } @@ -211,9 +181,9 @@ start_powercontrol_common() local poweroff_opts="" load_hw_modules if [ "${IPMI_POWERCYCLE}" == "yes" ]; then - modinfo ipmi_poweroff 2>/dev/null | grep poweroff_control > /dev/null 2>&1 && \ + modinfo ipmi_poweroff 2>/dev/null | grep -q poweroff_control && \ poweroff_opts="poweroff_control=2" - modinfo ipmi_poweroff 2>/dev/null | grep poweroff_powercycle > /dev/null 2>&1 && \ + modinfo ipmi_poweroff 2>/dev/null | grep -q poweroff_powercycle && \ poweroff_opts="poweroff_powercycle=1" fi modprobe ipmi_poweroff "${poweroff_opts}" > /dev/null 2>&1 @@ -265,9 +235,6 @@ unload_all_ipmi_modules() for m in ${MODULES}; do modprobe -q -r ${m} > /dev/null 2>&1 done - # delete interface node ONLY if ipmi_devintf is unloaded - [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] && - rm -f "/dev/ipmi${INTF_NUM}" } unload_ipmi_modules_leave_features() @@ -275,10 +242,7 @@ unload_ipmi_modules_leave_features() for m in ${MODULES_INTERFACES}; do modprobe -q -r ${m} > /dev/null 2>&1 done - # delete interface node ONLY if ipmi_devintf is unloaded - [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] && - rm -f "/dev/ipmi${INTF_NUM}" - lsmod | egrep -q "ipmi_(poweroff|watchdog)" > /dev/null 2>&1 + lsmod | grep -Eq "ipmi_(poweroff|watchdog)" if [ "$?" -ne "0" ]; then stop_watchdog_quiet stop_powercontrol_quiet @@ -302,14 +266,7 @@ load_ipmi_modules () modprobe ipmi_devintf > /dev/null 2>&1 modules_loaded ipmi_devintf RETVAL=$((RETVAL & ~2)) - [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) if [ ${OnePlusLoaded} -eq 1 ]; then - if [ ${UDEV_EXISTS} -eq 0 ]; then - DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'` - rm -f /dev/ipmi${INTF_NUM} - mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4)) - fi - # udev can take several seconds to create /dev/ipmi0, # but it happens asynchronously, so delay here locdelay=${DEV_IPMI_TIMEOUT} @@ -317,6 +274,8 @@ load_ipmi_modules () locdelay=$((locdelay - 1)) sleep 0.1 done + else + RETVAL=$((RETVAL | 2)) fi fi From 7c1c3da08499a687d27f117b1d16a4f270d24f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:39:26 +0200 Subject: [PATCH 083/129] Rebuilt for Python 3.9 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 99bb2a9..81d8a03 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.28 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue May 26 2020 Miro Hrončok - 2.0.28-4 +- Rebuilt for Python 3.9 + * Mon Feb 03 2020 Vaclav Dolezal - 2.0.28-3 - Cleanup of openipmi-helper script; removed no-udev branch (#1579773) From a2551c9ef0caa6604fc7734c50f976c869eeff24 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 23 Jun 2020 11:03:49 +0200 Subject: [PATCH 084/129] Perl 5.32 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 81d8a03..300ded7 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.28 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jun 23 2020 Jitka Plesnikova - 2.0.28-5 +- Perl 5.32 rebuild + * Tue May 26 2020 Miro Hrončok - 2.0.28-4 - Rebuilt for Python 3.9 From 03895d321f86e662079480ede7833c35c0a0f2b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:32:23 +0000 Subject: [PATCH 085/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 300ded7..ebb46e4 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.28 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.28-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 23 2020 Jitka Plesnikova - 2.0.28-5 - Perl 5.32 rebuild From 4d5c157bc8392251a8c85c9db97c79f7573ff114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Thu, 27 Aug 2020 14:13:47 +0200 Subject: [PATCH 086/129] Rebuilt for new net-snmp release --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ebb46e4..fe311d1 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.28 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Aug 27 2020 Josef Řídký - 2.0.28-7 +- Rebuilt for new net-snmp release + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.28-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 083420d40250989c07e6b4836900c3580af2b841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Thu, 17 Sep 2020 09:52:40 +0200 Subject: [PATCH 087/129] Resolves: #1846675 - new upstream release 2.0.29 --- .gitignore | 1 + 0002-readline-includes.patch | 24 ------------------------ OpenIPMI.spec | 8 +++++--- sources | 3 +-- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 0002-readline-includes.patch diff --git a/.gitignore b/.gitignore index f4ebde5..51bd777 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.25.tar.gz /OpenIPMI-2.0.27.tar.gz /OpenIPMI-2.0.28.tar.gz +/OpenIPMI-2.0.29.tar.gz diff --git a/0002-readline-includes.patch b/0002-readline-includes.patch deleted file mode 100644 index b4927b4..0000000 --- a/0002-readline-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cmdlang/ipmish.c b/cmdlang/ipmish.c -index 139da67..a4b8f0b 100644 ---- a/cmdlang/ipmish.c -+++ b/cmdlang/ipmish.c -@@ -51,6 +51,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_GLIB - #include -diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c -index 1b8bb9a..184745e 100644 ---- a/sample/ipmi_serial_bmc_emu.c -+++ b/sample/ipmi_serial_bmc_emu.c -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - #define _GNU_SOURCE - #include diff --git a/OpenIPMI.spec b/OpenIPMI.spec index fe311d1..49ef4b7 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,8 +3,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.28 -Release: 7%{?dist} +Version: 2.0.29 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -12,7 +12,6 @@ Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service Patch1: 0001-man.patch -Patch2: 0002-readline-includes.patch BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python3-devel perl-devel perl-generators @@ -198,6 +197,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Sep 17 2020 Josef Řídký - 2.0.29-1 +- New upstream release 2.0.29 (#1846675) + * Thu Aug 27 2020 Josef Řídký - 2.0.28-7 - Rebuilt for new net-snmp release diff --git a/sources b/sources index bdf74ce..ba5326e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (OpenIPMI-2.0.27.tar.gz) = 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3 -SHA512 (OpenIPMI-2.0.28.tar.gz) = faaca335f7ff582f396d588c6b3736b4e2756a9914becba75550878a10d7acce55e85912bcf5cd9e482c3e646eb472a8a055c520f2dcba7a874f0c0f120502da +SHA512 (OpenIPMI-2.0.29.tar.gz) = ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10 From 0aa5ab4378723ec776a4da90624f371af28b586d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:33:02 +0000 Subject: [PATCH 088/129] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- OpenIPMI.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 49ef4b7..32148bf 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -13,6 +13,7 @@ Source2: openipmi-helper Source3: ipmi.service Patch1: 0001-man.patch +BuildRequires: make BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel BuildRequires: openssl-devel python3-devel perl-devel perl-generators BuildRequires: pkgconfig From f33012cb54aa7437da5a2f6a6e84f1879b9a5821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 25 Jan 2021 10:24:37 +0100 Subject: [PATCH 089/129] Resolves: #1905768 - new upstream release 2.0.31 --- .gitignore | 1 + OpenIPMI.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 51bd777..cac54fc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.27.tar.gz /OpenIPMI-2.0.28.tar.gz /OpenIPMI-2.0.29.tar.gz +/OpenIPMI-2.0.31.tar.gz diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 49ef4b7..79729da 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,7 +3,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.29 +Version: 2.0.31 Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ @@ -197,6 +197,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 25 2021 Josef Ridky - 2.0.31-1 +- New upstream release 2.0.31 (#1905768) + * Thu Sep 17 2020 Josef Řídký - 2.0.29-1 - New upstream release 2.0.29 (#1846675) diff --git a/sources b/sources index ba5326e..f58fa1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.29.tar.gz) = ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10 +SHA512 (OpenIPMI-2.0.31.tar.gz) = de1b364315e97daffb4c601bcf3bf33591795449d71690496ae368bd0730a117c1716508ecaddef5d55498f56e73481a32f509791185e80e2475667d7abd73e7 From 6f4a94c4f2e5dc5ae79d0640cfaa4e92b1ceaf67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:34:24 +0000 Subject: [PATCH 090/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 99e2e98..eaf8eeb 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.31 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 25 2021 Josef Ridky - 2.0.31-1 - New upstream release 2.0.31 (#1905768) From ce8bd9d67bfcb12ffc96b47d87e8e64945924cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:09 +0100 Subject: [PATCH 091/129] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- OpenIPMI.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index eaf8eeb..2ad9c37 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.31 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,10 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.31-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Jan 25 2021 Fedora Release Engineering - 2.0.31-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 27cbe4b8d6903b7fea35e6067cd68e3c5a3dac70 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 22:41:29 +0200 Subject: [PATCH 092/129] Perl 5.34 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 2ad9c37..8a08231 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.31 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri May 21 2021 Jitka Plesnikova - 2.0.31-4 +- Perl 5.34 rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.31-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 5101433ed83d310d0bac540c59638133f84e3662 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:13:55 +0200 Subject: [PATCH 093/129] Rebuilt for Python 3.10 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 8a08231..5e5c1f5 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.31 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Jun 04 2021 Python Maint - 2.0.31-5 +- Rebuilt for Python 3.10 + * Fri May 21 2021 Jitka Plesnikova - 2.0.31-4 - Perl 5.34 rebuild From d67acfa593486a914e617334deadb5ae6908c2d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 11:03:25 +0000 Subject: [PATCH 094/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 6ae83e6e9bddb502c975bf1675bd9b0c7de409d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:57:54 +0000 Subject: [PATCH 095/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 5e5c1f5..e842177 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.31 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -198,6 +198,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2.0.31-5 - Rebuilt for Python 3.10 From 4a7c04fd6983eedda56c52550e3241160b08e017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 2 Aug 2021 15:36:38 +0200 Subject: [PATCH 096/129] Resolves: #1948437 - fix FTBFS due of distutils issue --- OpenIPMI-ax-python.patch | 12 ++ OpenIPMI-sysconfig.patch | 239 +++++++++++++++++++++++++++++++++++++++ OpenIPMI.spec | 7 +- 3 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 OpenIPMI-ax-python.patch create mode 100644 OpenIPMI-sysconfig.patch diff --git a/OpenIPMI-ax-python.patch b/OpenIPMI-ax-python.patch new file mode 100644 index 0000000..9c74546 --- /dev/null +++ b/OpenIPMI-ax-python.patch @@ -0,0 +1,12 @@ +diff -urNp a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +--- a/m4/ax_python_devel.m4 2021-08-02 13:15:04.122972905 +0200 ++++ b/m4/ax_python_devel.m4 2021-08-02 13:16:17.407749535 +0200 +@@ -143,7 +143,7 @@ variable to configure. See ``configure - + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) diff --git a/OpenIPMI-sysconfig.patch b/OpenIPMI-sysconfig.patch new file mode 100644 index 0000000..bfd56d3 --- /dev/null +++ b/OpenIPMI-sysconfig.patch @@ -0,0 +1,239 @@ +diff -urNp a/configure b/configure +--- a/configure 2021-08-02 13:38:21.012807239 +0200 ++++ b/configure 2021-08-02 14:32:29.884167376 +0200 +@@ -13535,20 +13535,20 @@ variable to configure. See \`\`configure + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have sysconfig, else fail + # +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 +-$as_echo_n "checking for the distutils Python package... " >&6; } +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the sysconfig Python package" >&5 ++$as_echo_n "checking for the sysconfig Python package... " >&6; } ++ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` ++ if test -z "$ac_sysconfig_result"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- as_fn_error $? "cannot import Python module \"distutils\". ++ as_fn_error $? "cannot import Python module \"sysconfig\". + Please check your Python installation. The error was: +-$ac_distutils_result" "$LINENO" 5 ++$ac_sysconfig_result" "$LINENO" 5 + PYTHON_VERSION="" + fi + +@@ -13558,10 +13558,10 @@ $ac_distutils_result" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 + $as_echo_n "checking for Python include path... " >&6; } + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc ());"` +- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` ++ python_path=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_path('include'));"` ++ plat_python_path=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" +@@ -13587,7 +13587,7 @@ $as_echo_n "checking for Python library + + # join all versioning strings, on some systems + # major/minor numbers could be in different list elements +-from distutils.sysconfig import * ++from sysconfig import * + e = get_config_var('VERSION') + if e is not None: + print(e) +@@ -13613,8 +13613,8 @@ _ACEOF + ac_python_libdir=`cat<&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5 + $as_echo_n "checking for Python site-packages path... " >&6; } + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_lib(0,0));"` ++ PYTHON_SITE_PKG=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_path('platlib'));"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5 + $as_echo "$PYTHON_SITE_PKG" >&6; } +@@ -13678,8 +13678,8 @@ $as_echo "$PYTHON_SITE_PKG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5 + $as_echo_n "checking python extra libraries... " >&6; } + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sysconfig; \ ++ conf = sysconfig.get_config_var; \ + print (conf('LIBS') + ' ' + conf('SYSLIBS'))"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 +@@ -13692,8 +13692,8 @@ $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 + $as_echo_n "checking python extra linking flags... " >&6; } + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sysconfig; \ ++ conf = sysconfig.get_config_var; \ + print (conf('LINKFORSHARED'))"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 +diff -urNp a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +--- a/m4/ax_python_devel.m4 2021-08-02 13:38:21.025807373 +0200 ++++ b/m4/ax_python_devel.m4 2021-08-02 14:36:33.262720424 +0200 +@@ -139,17 +139,17 @@ variable to configure. See ``configure - + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have sysconfig, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` ++ AC_MSG_CHECKING([for the sysconfig Python package]) ++ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` + if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ AC_MSG_ERROR([cannot import Python module "sysconfig". + Please check your Python installation. The error was: +-$ac_distutils_result]) ++$ac_sysconfig_result]) + PYTHON_VERSION="" + fi + +@@ -158,10 +158,10 @@ $ac_distutils_result]) + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc ());"` +- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` ++ python_path=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_path('include'));"` ++ plat_python_path=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" +@@ -185,7 +185,7 @@ $ac_distutils_result]) + + # join all versioning strings, on some systems + # major/minor numbers could be in different list elements +-from distutils.sysconfig import * ++from sysconfig import * + e = get_config_var('VERSION') + if e is not None: + print(e) +@@ -208,8 +208,8 @@ EOD` + ac_python_libdir=`cat< %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Aug 02 2021 Josef Ridky - 2.0.31-7 +- replace distutils and fix FTBFS (#1948437) + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.31-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 11093c905cb23c382428933303586a5b07606c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 2 Aug 2021 15:51:32 +0200 Subject: [PATCH 097/129] Resolves: #1927022 - fix collectd-ipmi crash --- OpenIPMI-collectd.patch | 12 ++++++++++++ OpenIPMI.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 OpenIPMI-collectd.patch diff --git a/OpenIPMI-collectd.patch b/OpenIPMI-collectd.patch new file mode 100644 index 0000000..0ddfaf8 --- /dev/null +++ b/OpenIPMI-collectd.patch @@ -0,0 +1,12 @@ +diff -urNp a/unix/posix_thread_os_hnd.c b/unix/posix_thread_os_hnd.c +--- a/unix/posix_thread_os_hnd.c 2021-08-02 15:36:49.536860558 +0200 ++++ b/unix/posix_thread_os_hnd.c 2021-08-02 15:38:48.990041616 +0200 +@@ -140,8 +140,6 @@ add_fd(os_handler_t *handler, + fd_data->data_ready = data_ready; + fd_data->handler = handler; + fd_data->freed = freed; +- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); +- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); + rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL, + free_fd_data); + if (rv) { diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 40578f6..ecb223a 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -14,6 +14,7 @@ Source3: ipmi.service Patch1: 0001-man.patch Patch2: OpenIPMI-ax-python.patch Patch3: OpenIPMI-sysconfig.patch +Patch4: OpenIPMI-collectd.patch BuildRequires: make BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel @@ -202,6 +203,7 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %changelog * Mon Aug 02 2021 Josef Ridky - 2.0.31-7 - replace distutils and fix FTBFS (#1948437) +- fix collectd-ipmi crash (#1927022) * Wed Jul 21 2021 Fedora Release Engineering - 2.0.31-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a23218efd41563b7775d0f9717d4abb95091b441 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:09:50 +0200 Subject: [PATCH 098/129] Rebuilt with OpenSSL 3.0.0 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ecb223a..08af653 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.31 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -201,6 +201,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.0.31-8 +- Rebuilt with OpenSSL 3.0.0 + * Mon Aug 02 2021 Josef Ridky - 2.0.31-7 - replace distutils and fix FTBFS (#1948437) - fix collectd-ipmi crash (#1927022) From e6099d1eb8f22750aaf6bd1c50aaa07b3ff0db28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 10 Jan 2022 09:14:19 +0100 Subject: [PATCH 099/129] Resolves: #2020717 - new upstream release 2.0.32 --- .gitignore | 1 + OpenIPMI-collectd.patch | 12 ------------ OpenIPMI.spec | 10 ++++++---- sources | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 OpenIPMI-collectd.patch diff --git a/.gitignore b/.gitignore index cac54fc..d61324c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.28.tar.gz /OpenIPMI-2.0.29.tar.gz /OpenIPMI-2.0.31.tar.gz +/OpenIPMI-2.0.32.tar.gz diff --git a/OpenIPMI-collectd.patch b/OpenIPMI-collectd.patch deleted file mode 100644 index 0ddfaf8..0000000 --- a/OpenIPMI-collectd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp a/unix/posix_thread_os_hnd.c b/unix/posix_thread_os_hnd.c ---- a/unix/posix_thread_os_hnd.c 2021-08-02 15:36:49.536860558 +0200 -+++ b/unix/posix_thread_os_hnd.c 2021-08-02 15:38:48.990041616 +0200 -@@ -140,8 +140,6 @@ add_fd(os_handler_t *handler, - fd_data->data_ready = data_ready; - fd_data->handler = handler; - fd_data->freed = freed; -- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); -- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); - rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL, - free_fd_data); - if (rv) { diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ecb223a..98d7f18 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,8 +3,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.31 -Release: 7%{?dist} +Version: 2.0.32 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -14,7 +14,6 @@ Source3: ipmi.service Patch1: 0001-man.patch Patch2: OpenIPMI-ax-python.patch Patch3: OpenIPMI-sysconfig.patch -Patch4: OpenIPMI-collectd.patch BuildRequires: make BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel @@ -201,7 +200,10 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog -* Mon Aug 02 2021 Josef Ridky - 2.0.31-7 +* Mon Jan 10 2022 Josef Ridky - 2.0.32-1 +- new upstream release 2.0.32 (#2020717) + +* Mon Aug 02 2021 Josef Ridky - 2.0.31-7 - replace distutils and fix FTBFS (#1948437) - fix collectd-ipmi crash (#1927022) diff --git a/sources b/sources index f58fa1e..ec51f6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.31.tar.gz) = de1b364315e97daffb4c601bcf3bf33591795449d71690496ae368bd0730a117c1716508ecaddef5d55498f56e73481a32f509791185e80e2475667d7abd73e7 +SHA512 (OpenIPMI-2.0.32.tar.gz) = e409f32e6bbf26756338ada386fa394d48d734b4d6ba4beca700ce60bc3af3d0f41e972a328c4e076ae014f4fbd8598d05d3f879f9c6d76198e6ae1a2ba03e95 From cf82f72dc52b704e656b164251f47d8546a01290 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:33:05 +0000 Subject: [PATCH 100/129] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 3e43b6f..ab90d99 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -200,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 10 2022 Josef Ridky - 2.0.32-1 - new upstream release 2.0.32 (#2020717) From 3cc1d3c09ecbd5733cae04663a56b1b188ad7def Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 31 May 2022 09:07:31 +0200 Subject: [PATCH 101/129] Perl 5.36 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ab90d99..3f03fe3 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -200,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue May 31 2022 Jitka Plesnikova - 2.0.32-3 +- Perl 5.36 rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ae314e06e91d19da845d1d124d2ed9b8406148d9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:12:15 +0200 Subject: [PATCH 102/129] Rebuilt for Python 3.11 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 3f03fe3..291331f 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -200,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jun 13 2022 Python Maint - 2.0.32-4 +- Rebuilt for Python 3.11 + * Tue May 31 2022 Jitka Plesnikova - 2.0.32-3 - Perl 5.36 rebuild From c829d162033fff21f215a4cc161ccbadba71247e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:53:01 +0000 Subject: [PATCH 103/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 291331f..d30230b 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -200,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.32-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 2.0.32-4 - Rebuilt for Python 3.11 From c9e3c09f14db22c982e15c6a97e6c369f5f60e91 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 09:52:42 +0100 Subject: [PATCH 104/129] Remove perl(MODULE_COMPAT), it will be replaced by generators --- OpenIPMI.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index d30230b..70ac6ab 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -45,7 +45,6 @@ and applications. %package perl Summary: IPMI Perl language bindings -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description perl From 03040baf1129459531b2ebe07b6d64f62c8a0ae1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 19:58:44 +0000 Subject: [PATCH 105/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 70ac6ab..6a39cf9 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -199,6 +199,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.32-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 2.0.32-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From eef65171de36076490d9bb5c1d1ab2fe3ae01694 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:46:20 +0200 Subject: [PATCH 106/129] Rebuilt for Python 3.12 --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 6a39cf9..934eb0b 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -199,6 +199,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jun 13 2023 Python Maint - 2.0.32-7 +- Rebuilt for Python 3.12 + * Wed Jan 18 2023 Fedora Release Engineering - 2.0.32-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8baac995e5326d11d817b63d58b6eca0408c355b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 16:15:47 +0200 Subject: [PATCH 107/129] Perl 5.38 rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 934eb0b..88415e4 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ and GPLv2+ or BSD URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -199,6 +199,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 2.0.32-8 +- Perl 5.38 rebuild + * Tue Jun 13 2023 Python Maint - 2.0.32-7 - Rebuilt for Python 3.12 From 6d1c795f87d438b882efe57965a397f06b8c8963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Tue, 18 Jul 2023 09:54:36 +0200 Subject: [PATCH 108/129] Migrate to the SPDX license format --- OpenIPMI.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 88415e4..ed498c3 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,8 +4,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 8%{?dist} -License: LGPLv2+ and GPLv2+ or BSD +Release: 9%{?dist} +License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf @@ -199,6 +199,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue Jul 18 2023 Josef Ridky - 2.0.32-9 +- Migrate to SPDX license format + * Tue Jul 11 2023 Jitka Plesnikova - 2.0.32-8 - Perl 5.38 rebuild From 630761c4fea19a60589395016c29c546bb41abd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 11:20:03 +0000 Subject: [PATCH 109/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ed498c3..e77e46b 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -199,6 +199,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.32-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 18 2023 Josef Ridky - 2.0.32-9 - Migrate to SPDX license format From 2a28c71178662b3f4a674599dd48ef45e36fcb2d Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 8 Jan 2024 16:10:31 +0100 Subject: [PATCH 110/129] Fix C compatibility issues Related to: --- OpenIPMI-c99.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++ OpenIPMI.spec | 6 ++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 OpenIPMI-c99.patch diff --git a/OpenIPMI-c99.patch b/OpenIPMI-c99.patch new file mode 100644 index 0000000..40cb5c4 --- /dev/null +++ b/OpenIPMI-c99.patch @@ -0,0 +1,60 @@ +C type errors in the SWIG-generated Perl bindings + +The first change fixes an error with newer compilers: + +OpenIPMI_wrap.c: In function ‘_wrap_strconstarray_val_set’: +OpenIPMI_wrap.c:10491:27: error: assignment to ‘const char **’ from incompatible pointer type ‘char **’ +10491 | if (arg1) (arg1)->val = arg2; + | ^ + +The second change is also about a compiler error: + +In file included from /usr/lib64/perl5/CORE/perl.h:4530, + from OpenIPMI_wrap.c:751: +OpenIPMI_wrap.c: In function ‘_wrap_ipmi_sol_conn_t_write’: +/usr/lib64/perl5/CORE/sv.h:1952:31: error: passing argument 3 of ‘Perl_SvPV_helper’ from incompatible pointer type + 1952 | Perl_SvPV_helper(aTHX_ sv, &len, flags, SvPVnormal_type_, \ +/usr/lib64/perl5/CORE/sv.h:1972:37: note: in expansion of macro ‘SvPV_flags’ + 1972 | #define SvPV(sv, len) SvPV_flags(sv, len, SV_GMAGIC) + | ^~~~~~~~~~ +OpenIPMI_wrap.c:27664:24: note: in expansion of macro ‘SvPV’ +27664 | (&arg2)->val = SvPV(tempsv, (&arg2)->len); + | ^~~~ +In file included from /usr/lib64/perl5/CORE/perl.h:7812: +/usr/lib64/perl5/CORE/sv_inline.h:908:33: note: expected ‘STRLEN * const’ {aka ‘long unsigned int * const’} but argument is of type ‘int *’ + 908 | STRLEN * const lp, + | ~~~~~~~~~~~~~~~^~ + +But the existing code looks broken on big-endian 64-bit architectures, +too. + +Submitted upstream: + +diff --git a/swig/OpenIPMI.i b/swig/OpenIPMI.i +index 8e674a94e6f85f62..db2aa1b5292a276f 100644 +--- a/swig/OpenIPMI.i ++++ b/swig/OpenIPMI.i +@@ -359,7 +359,7 @@ typedef struct iargarray + %} + typedef struct strconstarray + { +- char **val; ++ const char **val; + int len; + } strconstarray; + typedef struct argarray +diff --git a/swig/perl/OpenIPMI_lang.i b/swig/perl/OpenIPMI_lang.i +index d13b62f09e69e02a..d7482d1135cdc3e4 100644 +--- a/swig/perl/OpenIPMI_lang.i ++++ b/swig/perl/OpenIPMI_lang.i +@@ -292,7 +292,9 @@ + $1.val = NULL; + $1.len = 0; + } else { +- $1.val = SvPV(tempsv, $1.len); ++ STRLEN len; ++ $1.val = SvPV(tempsv, len); ++ $1.len = len; + } + } + diff --git a/OpenIPMI.spec b/OpenIPMI.spec index e77e46b..83755ff 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -14,6 +14,7 @@ Source3: ipmi.service Patch1: 0001-man.patch Patch2: OpenIPMI-ax-python.patch Patch3: OpenIPMI-sysconfig.patch +Patch4: OpenIPMI-c99.patch BuildRequires: make BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel @@ -199,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 08 2024 Florian Weimer - 2.0.32-11 +- Fix C compatibility issues + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.32-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From cf38984dec9371cb73a3e34910607e2d607e648c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 10:08:58 +0000 Subject: [PATCH 111/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 83755ff..2cd4e02 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -200,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.32-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 08 2024 Florian Weimer - 2.0.32-11 - Fix C compatibility issues From 2a25afb580af39b041a849ba901b6c7e0e018205 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 21:08:40 +0000 Subject: [PATCH 112/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 2cd4e02..8edb0de 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.32 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -200,6 +200,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.32-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.32-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cfc50baa6a7d8d77f10843f8c4ae5716e229be16 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Sun, 11 Feb 2024 20:29:10 +0100 Subject: [PATCH 113/129] Resolve one Python 3.13 compatibility issue Include in SWIG code to prevent errors about implicit declaration of function 'isspace' & 'isxdigit'. bz#2245793 --- OpenIPMI-py313compat.patch | 12 ++++++++++++ OpenIPMI.spec | 1 + 2 files changed, 13 insertions(+) create mode 100644 OpenIPMI-py313compat.patch diff --git a/OpenIPMI-py313compat.patch b/OpenIPMI-py313compat.patch new file mode 100644 index 0000000..60845b4 --- /dev/null +++ b/OpenIPMI-py313compat.patch @@ -0,0 +1,12 @@ +diff -ur OpenIPMI-2.0.34/swig/OpenIPMI.i OpenIPMI-2.0.34-python/swig/OpenIPMI.i +--- OpenIPMI-2.0.34/swig/OpenIPMI.i 2024-02-11 19:52:41.555777279 +0100 ++++ OpenIPMI-2.0.34-python/swig/OpenIPMI.i 2024-02-11 20:11:59.061132776 +0100 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_GETADDRINFO + #include +Only in OpenIPMI-2.0.34-python/swig: OpenIPMI.i~ diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 8edb0de..1aedd17 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -15,6 +15,7 @@ Patch1: 0001-man.patch Patch2: OpenIPMI-ax-python.patch Patch3: OpenIPMI-sysconfig.patch Patch4: OpenIPMI-c99.patch +Patch5: OpenIPMI-py313compat.patch BuildRequires: make BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel From 595d9c22313a17c22638fea070f482055daa90f6 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Sun, 11 Feb 2024 20:46:55 +0100 Subject: [PATCH 114/129] Update to 2.0.34 and drop unneeded patches --- .gitignore | 1 + OpenIPMI-ax-python.patch | 12 -- OpenIPMI-sysconfig.patch | 239 --------------------------------------- OpenIPMI.spec | 11 +- sources | 2 +- 5 files changed, 8 insertions(+), 257 deletions(-) delete mode 100644 OpenIPMI-ax-python.patch delete mode 100644 OpenIPMI-sysconfig.patch diff --git a/.gitignore b/.gitignore index d61324c..60c81c3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.29.tar.gz /OpenIPMI-2.0.31.tar.gz /OpenIPMI-2.0.32.tar.gz +/OpenIPMI-2.0.34.tar.gz diff --git a/OpenIPMI-ax-python.patch b/OpenIPMI-ax-python.patch deleted file mode 100644 index 9c74546..0000000 --- a/OpenIPMI-ax-python.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 ---- a/m4/ax_python_devel.m4 2021-08-02 13:15:04.122972905 +0200 -+++ b/m4/ax_python_devel.m4 2021-08-02 13:16:17.407749535 +0200 -@@ -143,7 +143,7 @@ variable to configure. See ``configure - - # - AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) diff --git a/OpenIPMI-sysconfig.patch b/OpenIPMI-sysconfig.patch deleted file mode 100644 index bfd56d3..0000000 --- a/OpenIPMI-sysconfig.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -urNp a/configure b/configure ---- a/configure 2021-08-02 13:38:21.012807239 +0200 -+++ b/configure 2021-08-02 14:32:29.884167376 +0200 -@@ -13535,20 +13535,20 @@ variable to configure. See \`\`configure - fi - - # -- # Check if you have distutils, else fail -+ # Check if you have sysconfig, else fail - # -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 --$as_echo_n "checking for the distutils Python package... " >&6; } -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the sysconfig Python package" >&5 -+$as_echo_n "checking for the sysconfig Python package... " >&6; } -+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` -+ if test -z "$ac_sysconfig_result"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- as_fn_error $? "cannot import Python module \"distutils\". -+ as_fn_error $? "cannot import Python module \"sysconfig\". - Please check your Python installation. The error was: --$ac_distutils_result" "$LINENO" 5 -+$ac_sysconfig_result" "$LINENO" 5 - PYTHON_VERSION="" - fi - -@@ -13558,10 +13558,10 @@ $ac_distutils_result" "$LINENO" 5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 - $as_echo_n "checking for Python include path... " >&6; } - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` -+ python_path=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_path('include'));"` -+ plat_python_path=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_path('include'));"` - if test -n "${python_path}"; then - if test "${plat_python_path}" != "${python_path}"; then - python_path="-I$python_path -I$plat_python_path" -@@ -13587,7 +13587,7 @@ $as_echo_n "checking for Python library - - # join all versioning strings, on some systems - # major/minor numbers could be in different list elements --from distutils.sysconfig import * -+from sysconfig import * - e = get_config_var('VERSION') - if e is not None: - print(e) -@@ -13613,8 +13613,8 @@ _ACEOF - ac_python_libdir=`cat<&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5 - $as_echo_n "checking for Python site-packages path... " >&6; } - if test -z "$PYTHON_SITE_PKG"; then -- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_lib(0,0));"` -+ PYTHON_SITE_PKG=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_path('platlib'));"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5 - $as_echo "$PYTHON_SITE_PKG" >&6; } -@@ -13678,8 +13678,8 @@ $as_echo "$PYTHON_SITE_PKG" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5 - $as_echo_n "checking python extra libraries... " >&6; } - if test -z "$PYTHON_EXTRA_LDFLAGS"; then -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ -- conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sysconfig; \ -+ conf = sysconfig.get_config_var; \ - print (conf('LIBS') + ' ' + conf('SYSLIBS'))"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 -@@ -13692,8 +13692,8 @@ $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 - $as_echo_n "checking python extra linking flags... " >&6; } - if test -z "$PYTHON_EXTRA_LIBS"; then -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ -- conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sysconfig; \ -+ conf = sysconfig.get_config_var; \ - print (conf('LINKFORSHARED'))"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 -diff -urNp a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 ---- a/m4/ax_python_devel.m4 2021-08-02 13:38:21.025807373 +0200 -+++ b/m4/ax_python_devel.m4 2021-08-02 14:36:33.262720424 +0200 -@@ -139,17 +139,17 @@ variable to configure. See ``configure - - fi - - # -- # Check if you have distutils, else fail -+ # Check if you have sysconfig, else fail - # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -+ AC_MSG_CHECKING([for the sysconfig Python package]) -+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` - if test $? -eq 0; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ AC_MSG_ERROR([cannot import Python module "sysconfig". - Please check your Python installation. The error was: --$ac_distutils_result]) -+$ac_sysconfig_result]) - PYTHON_VERSION="" - fi - -@@ -158,10 +158,10 @@ $ac_distutils_result]) - # - AC_MSG_CHECKING([for Python include path]) - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` -+ python_path=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_path('include'));"` -+ plat_python_path=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_path('include'));"` - if test -n "${python_path}"; then - if test "${plat_python_path}" != "${python_path}"; then - python_path="-I$python_path -I$plat_python_path" -@@ -185,7 +185,7 @@ $ac_distutils_result]) - - # join all versioning strings, on some systems - # major/minor numbers could be in different list elements --from distutils.sysconfig import * -+from sysconfig import * - e = get_config_var('VERSION') - if e is not None: - print(e) -@@ -208,8 +208,8 @@ EOD` - ac_python_libdir=`cat< %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Sun Feb 11 2024 Fedora Release Monitoring - 2.0.34-1 +- Update to 2.0.34 (rhbz#2105023) + * Mon Jan 22 2024 Fedora Release Engineering - 2.0.32-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index ec51f6c..bf85804 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.32.tar.gz) = e409f32e6bbf26756338ada386fa394d48d734b4d6ba4beca700ce60bc3af3d0f41e972a328c4e076ae014f4fbd8598d05d3f879f9c6d76198e6ae1a2ba03e95 +SHA512 (OpenIPMI-2.0.34.tar.gz) = 25402019a4ee243effca30b7e0bfd4934f2e505a25009ea6330c4c9317299fde937ab3640f2dcb48aaabc9919d3a8f064807c368c0c0e6bca341e3c19ec82edd From e144f3ad661277522887f609defeb8d7123505d1 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Sun, 11 Feb 2024 21:10:57 +0100 Subject: [PATCH 115/129] Add a patch from C9S Include config.h in cmdlang to avoid gethostbyname cmdlang.c uses a configure macro to determine getaddrinfo support. Without the macro defined, it uses gethostbyname instead of getaddrinfo. This was actually happening erroneously, because the code did not include config.h. Fix that. Avoids one rpminspect/rpmdiff warning. --- OpenIPMI.spec | 1 + include-config-h-cmdlang.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 include-config-h-cmdlang.patch diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a41c95e..8843778 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -12,6 +12,7 @@ Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service Patch1: 0001-man.patch +Patch2: include-config-h-cmdlang.patch Patch4: OpenIPMI-c99.patch Patch5: OpenIPMI-py313compat.patch diff --git a/include-config-h-cmdlang.patch b/include-config-h-cmdlang.patch new file mode 100644 index 0000000..4f9fcab --- /dev/null +++ b/include-config-h-cmdlang.patch @@ -0,0 +1,12 @@ +diff -up OpenIPMI-2.0.32/cmdlang/cmdlang.c~ OpenIPMI-2.0.32/cmdlang/cmdlang.c +--- OpenIPMI-2.0.32/cmdlang/cmdlang.c~ 2021-01-22 19:51:28.000000000 +0100 ++++ OpenIPMI-2.0.32/cmdlang/cmdlang.c 2022-01-28 11:55:42.375470392 +0100 +@@ -32,6 +32,8 @@ + */ + + ++#include ++ + #include + #include + #include From c88325940a8a630c5685004734478a3e5fa4eeb3 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 12 Feb 2024 09:14:48 +0100 Subject: [PATCH 116/129] Resolve a minor issue found by rpmdiff (from C9S) "Subpackage OpenIPMI-lanserv on aarch64 x86_64 ppc64le s390x consumes libraries libOpenIPMIposix.so.0()(64bit) libOpenIPMIutils.so.0()(64bit) from subpackage OpenIPMI-libs but does not have explicit package version requirement. Please add Requires: OpenIPMI-libs = %{version}-%{release} to OpenIPMI-lanserv in the specfile to avoid the need to test interoperability between the various combinations of old and new subpackages." "Subpackage OpenIPMI-devel on aarch64 x86_64 ppc64le s390x consumes library libIPMIlanserv.so.0()(64bit) from subpackage OpenIPMI-lanserv but does not have explicit package version requirement. Please add Requires: OpenIPMI-lanserv = %{version}-%{release} to OpenIPMI-devel in the specfile to avoid the need to test interoperability between the various combinations of old and new subpackages." --- OpenIPMI.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 8843778..ebdc868 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -69,6 +69,7 @@ Summary: The development environment for the OpenIPMI project Requires: pkgconfig Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-lanserv%{?_isa} = %{version}-%{release} %description devel The OpenIPMI-devel package contains the development libraries and header files @@ -77,6 +78,7 @@ of the OpenIPMI project. %package lanserv Summary: Emulates an IPMI network listener Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description lanserv This package contains a network IPMI listener. From a2170f0b388e47de9b2ec998d0f166c9c89c0c10 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 12 Feb 2024 11:23:56 +0100 Subject: [PATCH 117/129] Conditional Perl & Python module build By default disabled - seem to be unused. Debian has them disabled too. Related: rhbz#2245793 --- OpenIPMI.spec | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ebdc868..ea82550 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,5 +1,8 @@ %global _hardened_build 1 +%bcond_with python +%bcond_with perl + Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI @@ -17,8 +20,17 @@ Patch4: OpenIPMI-c99.patch Patch5: OpenIPMI-py313compat.patch BuildRequires: make -BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel -BuildRequires: openssl-devel python3-devel perl-devel perl-generators +BuildRequires: gdbm-devel glib2-devel net-snmp-devel ncurses-devel +%if %{with python} || %{with perl} +BuildRequires: swig +%endif +BuildRequires: openssl-devel +%if %{with python} +BuildRequires: python3-devel +%endif +%if %{with perl} +BuildRequires: perl-devel perl-generators +%endif BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: automake @@ -44,13 +56,16 @@ Summary: The OpenIPMI runtime libraries The OpenIPMI-libs package contains the runtime libraries for shared binaries and applications. +%if %{with perl} %package perl Summary: IPMI Perl language bindings Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description perl The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI. +%endif +%if %{with python} %package -n python3-openipmi %{?python_provide:%python_provide python3-openipmi} %{?python_provide:%python_provide python3-OpenIPMI} @@ -63,6 +78,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description -n python3-openipmi The OpenIPMI-python package contains the Python language bindings for OpenIPMI. +%endif %package devel Summary: The development environment for the OpenIPMI project @@ -94,8 +110,15 @@ This package contains a network IPMI listener. LDFLAGS="%{__global_ldflags} -Wl,--as-needed" \ --disable-dependency-tracking \ --disable-static \ +%if %{with python} --with-pythoninstall=%{python3_sitearch} \ --with-python=%{__python3} \ +%else + --with-python=no \ +%endif +%if %{without perl} + --with-perl=no \ +%endif --with-tcl=no \ --with-tkinter=no @@ -172,13 +195,17 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man7/ipmi_cmdlang* %{_mandir}/man7/openipmi_conparms* +%if %{with perl} %files perl %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm %{perl_vendorarch}/auto/OpenIPMI +%endif +%if %{with python} %files -n python3-openipmi %{python3_sitearch}/*OpenIPMI* %{python3_sitearch}/__pycache__/OpenIPMI.*.pyc +%endif %files libs %{_libdir}/libOpenIPMI*.so.* From d6d15f112717645a2af45657bd0cf5ca83764afb Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 12 Feb 2024 09:20:58 +0100 Subject: [PATCH 118/129] Update %changelog --- OpenIPMI.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ea82550..fa57e01 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -229,8 +229,14 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog -* Sun Feb 11 2024 Fedora Release Monitoring - 2.0.34-1 +* Sun Feb 11 2024 Pavel Cahyna - 2.0.34-1 - Update to 2.0.34 (rhbz#2105023) +- Resolve issues found by rpmdiff + - add a patch to fix getaddrinfo detection to avoid using gethostbyname + - add explicit Requires: on subpackages to avoid the need to test + interoperability between the various combinations of old and new + subpackages +- Conditional Perl & Python module build, by default disabled * Mon Jan 22 2024 Fedora Release Engineering - 2.0.32-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3a18f154a6a471bd47848ce39531f3b04ab0abf0 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 7 May 2024 12:21:35 +0200 Subject: [PATCH 119/129] Remove patch integrated upstream Related: bz2278007 --- OpenIPMI-c99.patch | 60 ---------------------------------------------- OpenIPMI.spec | 1 - 2 files changed, 61 deletions(-) delete mode 100644 OpenIPMI-c99.patch diff --git a/OpenIPMI-c99.patch b/OpenIPMI-c99.patch deleted file mode 100644 index 40cb5c4..0000000 --- a/OpenIPMI-c99.patch +++ /dev/null @@ -1,60 +0,0 @@ -C type errors in the SWIG-generated Perl bindings - -The first change fixes an error with newer compilers: - -OpenIPMI_wrap.c: In function ‘_wrap_strconstarray_val_set’: -OpenIPMI_wrap.c:10491:27: error: assignment to ‘const char **’ from incompatible pointer type ‘char **’ -10491 | if (arg1) (arg1)->val = arg2; - | ^ - -The second change is also about a compiler error: - -In file included from /usr/lib64/perl5/CORE/perl.h:4530, - from OpenIPMI_wrap.c:751: -OpenIPMI_wrap.c: In function ‘_wrap_ipmi_sol_conn_t_write’: -/usr/lib64/perl5/CORE/sv.h:1952:31: error: passing argument 3 of ‘Perl_SvPV_helper’ from incompatible pointer type - 1952 | Perl_SvPV_helper(aTHX_ sv, &len, flags, SvPVnormal_type_, \ -/usr/lib64/perl5/CORE/sv.h:1972:37: note: in expansion of macro ‘SvPV_flags’ - 1972 | #define SvPV(sv, len) SvPV_flags(sv, len, SV_GMAGIC) - | ^~~~~~~~~~ -OpenIPMI_wrap.c:27664:24: note: in expansion of macro ‘SvPV’ -27664 | (&arg2)->val = SvPV(tempsv, (&arg2)->len); - | ^~~~ -In file included from /usr/lib64/perl5/CORE/perl.h:7812: -/usr/lib64/perl5/CORE/sv_inline.h:908:33: note: expected ‘STRLEN * const’ {aka ‘long unsigned int * const’} but argument is of type ‘int *’ - 908 | STRLEN * const lp, - | ~~~~~~~~~~~~~~~^~ - -But the existing code looks broken on big-endian 64-bit architectures, -too. - -Submitted upstream: - -diff --git a/swig/OpenIPMI.i b/swig/OpenIPMI.i -index 8e674a94e6f85f62..db2aa1b5292a276f 100644 ---- a/swig/OpenIPMI.i -+++ b/swig/OpenIPMI.i -@@ -359,7 +359,7 @@ typedef struct iargarray - %} - typedef struct strconstarray - { -- char **val; -+ const char **val; - int len; - } strconstarray; - typedef struct argarray -diff --git a/swig/perl/OpenIPMI_lang.i b/swig/perl/OpenIPMI_lang.i -index d13b62f09e69e02a..d7482d1135cdc3e4 100644 ---- a/swig/perl/OpenIPMI_lang.i -+++ b/swig/perl/OpenIPMI_lang.i -@@ -292,7 +292,9 @@ - $1.val = NULL; - $1.len = 0; - } else { -- $1.val = SvPV(tempsv, $1.len); -+ STRLEN len; -+ $1.val = SvPV(tempsv, len); -+ $1.len = len; - } - } - diff --git a/OpenIPMI.spec b/OpenIPMI.spec index fa57e01..e0d1030 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -16,7 +16,6 @@ Source2: openipmi-helper Source3: ipmi.service Patch1: 0001-man.patch Patch2: include-config-h-cmdlang.patch -Patch4: OpenIPMI-c99.patch Patch5: OpenIPMI-py313compat.patch BuildRequires: make From a31e92343fea7cca2c96a9d03c73c170ebe1594c Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 7 May 2024 14:45:00 +0200 Subject: [PATCH 120/129] Update to 2.0.35 (#2278007) --- .gitignore | 1 + OpenIPMI.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 60c81c3..74b8b02 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.31.tar.gz /OpenIPMI-2.0.32.tar.gz /OpenIPMI-2.0.34.tar.gz +/OpenIPMI-2.0.35.tar.gz diff --git a/OpenIPMI.spec b/OpenIPMI.spec index e0d1030..a3c74c7 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -6,7 +6,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.34 +Version: 2.0.35 Release: 1%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: http://sourceforge.net/projects/openipmi/ diff --git a/sources b/sources index bf85804..8bbc09d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.34.tar.gz) = 25402019a4ee243effca30b7e0bfd4934f2e505a25009ea6330c4c9317299fde937ab3640f2dcb48aaabc9919d3a8f064807c368c0c0e6bca341e3c19ec82edd +SHA512 (OpenIPMI-2.0.35.tar.gz) = 95a662fbdc5f799b37ce2987cad9305160032f566164032de0495fd9bafe80a423d18b4dcf91937155f853fece1d71fcc3f7eef52f6c48d2eceb68d020ca79f2 From 9a0ad87fac1d30c42f187bd790ca7cb3bacf5160 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 7 May 2024 14:41:18 +0200 Subject: [PATCH 121/129] Switch to https --- OpenIPMI.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a3c74c7..39e7873 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -9,8 +9,8 @@ Name: OpenIPMI Version: 2.0.35 Release: 1%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause -URL: http://sourceforge.net/projects/openipmi/ -Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz +URL: https://sourceforge.net/projects/openipmi/ +Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi-helper Source3: ipmi.service From 88ae7665857c17ac5f00a3f892291e7a5ae6c532 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 7 May 2024 14:45:25 +0200 Subject: [PATCH 122/129] Update changelog --- OpenIPMI.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 39e7873..8cc47c3 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -228,6 +228,11 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Tue May 7 2024 Pavel Cahyna - 2.0.35-1 +- Switch to https +- Update to 2.0.35 (rhbz#2278007) + drop patch integrated upstream + * Sun Feb 11 2024 Pavel Cahyna - 2.0.34-1 - Update to 2.0.34 (rhbz#2105023) - Resolve issues found by rpmdiff From 664ac6d0ffced21d9ca31f2359ce0ba6032ea57d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 15:04:33 +0000 Subject: [PATCH 123/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 8cc47c3..55bc6b0 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.35 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: https://sourceforge.net/projects/openipmi/ Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -228,6 +228,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 7 2024 Pavel Cahyna - 2.0.35-1 - Switch to https - Update to 2.0.35 (rhbz#2278007) From 45b2ff20f8166ec829ba1555440d95d9f21ae0f2 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Thu, 22 Aug 2024 21:55:17 +0200 Subject: [PATCH 124/129] Update to 2.0.36 (#2302353) Resolves CVE-2024-42934 --- .gitignore | 1 + OpenIPMI.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 74b8b02..18dbbc6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ OpenIPMI-2.0.18.tar.gz /OpenIPMI-2.0.32.tar.gz /OpenIPMI-2.0.34.tar.gz /OpenIPMI-2.0.35.tar.gz +/OpenIPMI-2.0.36.tar.gz diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 55bc6b0..fb04edb 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -6,8 +6,8 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.35 -Release: 2%{?dist} +Version: 2.0.36 +Release: 1%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: https://sourceforge.net/projects/openipmi/ Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -228,6 +228,10 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Aug 22 2024 Fedora Release Monitoring - 2.0.36-1 +- Update to 2.0.36 (#2302353) +- Resolves CVE-2024-42934 + * Wed Jul 17 2024 Fedora Release Engineering - 2.0.35-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 8bbc09d..1870111 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenIPMI-2.0.35.tar.gz) = 95a662fbdc5f799b37ce2987cad9305160032f566164032de0495fd9bafe80a423d18b4dcf91937155f853fece1d71fcc3f7eef52f6c48d2eceb68d020ca79f2 +SHA512 (OpenIPMI-2.0.36.tar.gz) = a47725308336f200e88a1eb8641ed5ef03fc8bb43ee47f7a99e39df68640ff912b6842c1710d7e767aeb724fc41fa4ed3b244685812ee985e5200003a45f4015 From dccfce06e679e26fd2c4d69cd2f7cb6c094338d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Feb 2024 19:23:44 +0100 Subject: [PATCH 125/129] Update the Python 3.13 compatibility patch - the ctypes.h changes in not necessary any more (still valuable upstream) - the PyEval_InitThreads() function was removed and does nothing since 3.7 (upstream might need a more complex patch to support Python 3.6 etc.) Fixes https://bugzilla.redhat.com/2245793 --- OpenIPMI-py313compat.patch | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/OpenIPMI-py313compat.patch b/OpenIPMI-py313compat.patch index 60845b4..fccde75 100644 --- a/OpenIPMI-py313compat.patch +++ b/OpenIPMI-py313compat.patch @@ -1,12 +1,13 @@ -diff -ur OpenIPMI-2.0.34/swig/OpenIPMI.i OpenIPMI-2.0.34-python/swig/OpenIPMI.i ---- OpenIPMI-2.0.34/swig/OpenIPMI.i 2024-02-11 19:52:41.555777279 +0100 -+++ OpenIPMI-2.0.34-python/swig/OpenIPMI.i 2024-02-11 20:11:59.061132776 +0100 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_GETADDRINFO - #include -Only in OpenIPMI-2.0.34-python/swig: OpenIPMI.i~ +diff --git a/swig/python/OpenIPMI_lang.i b/swig/python/OpenIPMI_lang.i +index 67221fd..d150d81 100644 +--- a/swig/python/OpenIPMI_lang.i ++++ b/swig/python/OpenIPMI_lang.i +@@ -541,7 +541,7 @@ static void OI_put_py_state(int current) + #else + static void init_lang(void) + { +- PyEval_InitThreads(); ++ /* nothing */ + } + #define OI_PY_STATE PyGILState_STATE + #define OI_PY_STATE_GET() PyGILState_Ensure() From eab46d052724d69ae5e5a364f1eaedd673fa7641 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:49:45 +0000 Subject: [PATCH 126/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index fb04edb..a4016f2 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.36 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: https://sourceforge.net/projects/openipmi/ Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -228,6 +228,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Aug 22 2024 Fedora Release Monitoring - 2.0.36-1 - Update to 2.0.36 (#2302353) - Resolves CVE-2024-42934 From e81dec8ae9526bdd4b23c5ff739edb5b037891cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:54:03 +0000 Subject: [PATCH 127/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index a4016f2..6c5caf9 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.36 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: https://sourceforge.net/projects/openipmi/ Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -228,6 +228,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.36-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.0.36-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2edc97063dc61b500d01430ef454c5b9cde006e5 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 12 Jan 2026 18:33:24 +0100 Subject: [PATCH 128/129] Rebuild for new net-snmp release Signed-off-by: Josef Ridky --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 6c5caf9..eb73792 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.36 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: https://sourceforge.net/projects/openipmi/ Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -228,6 +228,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Mon Jan 12 2026 Josef Ridky - 2.0.36-4 +- rebuild for new net-snmp release + * Wed Jul 23 2025 Fedora Release Engineering - 2.0.36-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 32e6b7566bdcf7cdc0f26c522377ee214c8f2644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 02:39:45 +0000 Subject: [PATCH 129/129] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- OpenIPMI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index eb73792..7016dc2 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -7,7 +7,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.36 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.1-or-later and GPL-2.0-or-later or BSD-3-Clause URL: https://sourceforge.net/projects/openipmi/ Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz @@ -228,6 +228,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1 %{_mandir}/man5/ipmi_sim_cmd.5* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.36-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Jan 12 2026 Josef Ridky - 2.0.36-4 - rebuild for new net-snmp release