Hello community,
here is the log from the commit of package OpenIPMI for openSUSE:Factory checked in at 2018-09-18 11:39:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenIPMI (Old)
and /work/SRC/openSUSE:Factory/.OpenIPMI.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenIPMI"
Tue Sep 18 11:39:19 2018 rev:45 rq:635292 version:2.0.25
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenIPMI/OpenIPMI.changes 2018-07-31 15:52:49.434879488 +0200
+++ /work/SRC/openSUSE:Factory/.OpenIPMI.new/OpenIPMI.changes 2018-09-18 11:39:30.536157827 +0200
@@ -1,0 +2,42 @@
+Tue Sep 11 15:34:15 UTC 2018 - Jan Engelhardt
+
+- Use noun phrase in summary. Ensure neutrality of description.
+- Update unspecific summaries of subpackages.
+- Drop --with-pic which is only relevant for static libs.
+- Speedier /usr/bin/find call.
+
+-------------------------------------------------------------------
+Fri Sep 7 13:56:06 UTC 2018 - trenn@suse.de
+
+- Update to latest version 2.0.25 plus latest fixes (fate#326195):
+
+- A OpenIPMI-2.0.25..HEAD_git.diff
+Patch to latest git commit:
+commit 4ac55d7dc7016c9e5f0c474f69f4e64e7aacac42
+Date: Wed Jul 18 13:59:29 2018 -0500
+ unix: Add a way to clear fd handlers with no callbacks
+
+I had to manually edit git diff v2.0.25.. and remove .gitignore deletion
+to patch succesfully. Build service wants to have the original
+.tar.gz tarball from sourceforge.
+
+I also had to add the bootstrap file which seem to exist in git sources
+but not in the exported tarball, even it is not listed in .gitignore:
+A bootstrap
+
+OAD
+0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch
+
+- Adjusted patches:
+M 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch
+M fix-conversions.patch
+M OpenIPMI-prefer_perl_vendor.patch
+M openipmi-tinfo.patch
+
+- Fix build service error (use /usr/bin/python3 in shebang instead of env
+A use_python3_shebang
+- Build documentation (IPMI.pdf) ourselves as IPMI.pdf vanished from sources
+ For this quite some build requires had to be added as well
+A fix_dia_version_detection.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch
OpenIPMI-2.0.24.tar.gz
New:
----
OpenIPMI-2.0.25..HEAD_git.diff
OpenIPMI-2.0.25.tar.gz
bootstrap
fix_dia_version_detection.patch
use_python3_shebang
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenIPMI.spec ++++++
--- /var/tmp/diff_new_pack.a4TNgJ/_old 2018-09-18 11:39:32.336155929 +0200
+++ /var/tmp/diff_new_pack.a4TNgJ/_new 2018-09-18 11:39:32.336155929 +0200
@@ -20,23 +20,32 @@
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
+
+# IPMI.pdf build for devel package
+# It is not worth to build, but as I got it running I add it
+# how it worked for me in Tumbleweed, Leap 42.2 and 42.3 and SLE 15
+# latex packages where not avail for SLE 12 flavors
+%define doc_build 0
+%if 0%{?suse_version} < 1500
+%define doc_build 0
+%endif
+
Name: OpenIPMI
-Version: 2.0.24
+Version: 2.0.25
Release: 0
Summary: Provides access to service processors via IPMI
License: LGPL-2.1-or-later
Group: System/Monitoring
-URL: http://openipmi.sourceforge.net
+Url: http://openipmi.sourceforge.net
Source0: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
Source1: sysconfig.ipmi
Source2: ipmi.service
Source3: openipmi-helper
+Source4: bootstrap
Source99: OpenIPMI-rpmlintrc
-Patch0: OpenIPMI-prefer_perl_vendor.patch
-Patch1: fix-conversions.patch
-# PATCH-FIX-UPSTREAM patche taken from Fedora fixing pthread.pc search that is
-# not present on distribution
-Patch2: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch
+Patch0: OpenIPMI-2.0.25..HEAD_git.diff
+Patch1: OpenIPMI-prefer_perl_vendor.patch
+Patch2: fix-conversions.patch
# PATCH-FIX-UPSTREAM do not use bundled libedit
Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch
# PATCH-FIX-UPSTREAM detect tinfo from ncurses properly
@@ -45,6 +54,10 @@
Patch5: OpenIMPI-add-libncurses.patch
# some int functions do not return a value
Patch6: OpenIPMI-no-return-in-nonvoid-function.patch
+Patch7: fix_dia_version_detection.patch
+Patch8: use_python3_shebang
+
+BuildRequires: autoconf-archive
BuildRequires: gd-devel
BuildRequires: gdbm-devel
BuildRequires: glib2-devel
@@ -66,6 +79,16 @@
BuildRequires: systemd-rpm-macros
BuildRequires: tcl-devel
BuildRequires: tix
+%if 0%{?doc_build}
+BuildRequires: dia
+BuildRequires: ghostscript
+BuildRequires: texlive-acronym
+BuildRequires: texlive-bibtex
+BuildRequires: texlive-dvips-bin
+BuildRequires: texlive-latex
+BuildRequires: texlive-moreverb
+%endif
+
Requires(post): %fillup_prereq
Provides: ipmi_ui
Provides: ipmicmd
@@ -74,20 +97,18 @@
%{?perl_requires}
%description
-OpenIPMI is an effort to create a full-function IPMI system to allow
-full access to all IPMI information on a server and to abstract it to a
-level that makes it easy to use.
+OpenIPMI allows access to IPMI information on a server and to abstract it.
OpenIPMI consists of two main parts: a device driver that is included
-in the Linux kernel and a user-level library that provides a
+in the Linux kernel, and a user-level library that provides a
higher-level abstraction of IPMI and generic services that can be used
on any operation system. This package contains the user-level library
part. This OpenIPMI library also includes the ipmicmd program, a small
-program that lets you inject and receive messages.
+program that can inject and receive messages.
%package devel
Summary: OpenIPMI - Development libraries
-Group: Development/Libraries/Other
+Group: Development/Libraries/C and C++
Requires: OpenIPMI = %{version}
Requires: glibc-devel
Provides: libIPMIlanserv
@@ -99,7 +120,7 @@
functions.
%package python
-Summary: OpenIPMI
+Summary: Python module and GUI for OpenIPMI
Group: System/Monitoring
Requires: OpenIPMI
Requires: python-tk
@@ -107,8 +128,8 @@
Provides: openipmigui
%description python
-The python parts provide a OpenIPMI python library and a GUI, openipmigui
-making use of it.
+The Python parts provide an OpenIPMI Python library and a GUI, openipmigui,
+that makes use of it.
%prep
%setup -q
@@ -120,13 +141,19 @@
export EDIT_CFLAGS=`pkg-config --cflags libedit`
export EDIT_LIBS=`pkg-config --libs libedit`
export CFLAGS="-fPIC %{optflags} -fno-strict-aliasing"
-autoreconf -fvi
-%configure --disable-static --with-pic \
+chmod 755 %{SOURCE4}
+%{SOURCE4}
+%configure --disable-static \
--with-openssl=yes \
--with-pythoninstall=%{python_sitearch} \
--with-tcl=yes \
- --with-tcllibs=-ltcl%{tcl_version}
-make -j1
+ --with-tcllibs=-ltcl%{tcl_version} \
+ --with-tkinter=yes
+make %{?_smp_mflags}
+%if 0%{?doc_build}
+cd doc
+make IPMI.pdf
+%endif
%install
%make_install
@@ -151,7 +178,7 @@
# rebuild python files to fix timestamps:
for d in "%{python_sitelib}" "%{python_sitearch}"; do
[ -d "%{buildroot}$d" ] || continue
- find "%{buildroot}$d/" -type f \( -name '*.pyc' -o -name '*.pyo' \) -exec rm {} \;
+ find "%{buildroot}$d/" -type f \( -name '*.pyc' -o -name '*.pyo' \) -delete
python -c 'import compileall; compileall.compile_dir("%{buildroot}'"$d"'",ddir="'"$d"'",force=1)'
done
@@ -220,7 +247,9 @@
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
+%if 0%{?doc_build}
%doc doc/IPMI.pdf
+%endif
###################################################
%files python
++++++ 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch ++++++
--- /var/tmp/diff_new_pack.a4TNgJ/_old 2018-09-18 11:39:32.356155908 +0200
+++ /var/tmp/diff_new_pack.a4TNgJ/_new 2018-09-18 11:39:32.356155908 +0200
@@ -1,48 +1,8 @@
-Index: OpenIPMI-2.0.24/Makefile.am
+Index: OpenIPMI-2.0.25/configure.ac
===================================================================
---- OpenIPMI-2.0.24.orig/Makefile.am
-+++ OpenIPMI-2.0.24/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 \
-Index: OpenIPMI-2.0.24/cmdlang/Makefile.am
-===================================================================
---- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am
-+++ OpenIPMI-2.0.24/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.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) \
-Index: OpenIPMI-2.0.24/configure.ac
-===================================================================
---- OpenIPMI-2.0.24.orig/configure.ac
-+++ OpenIPMI-2.0.24/configure.ac
-@@ -878,7 +878,6 @@ AC_OUTPUT(Makefile
+--- OpenIPMI-2.0.25.orig/configure.ac 2018-08-28 16:21:06.379098464 +0200
++++ OpenIPMI-2.0.25/configure.ac 2018-08-28 16:21:12.511447871 +0200
+@@ -841,7 +841,6 @@ AC_OUTPUT(Makefile
swig/perl/Makefile
swig/python/Makefile
swig/python/openipmigui/Makefile
@@ -50,10 +10,10 @@
cmdlang/Makefile
include/Makefile
include/OpenIPMI/Makefile
-Index: OpenIPMI-2.0.24/sample/Makefile.am
+Index: OpenIPMI-2.0.25/sample/Makefile.am
===================================================================
---- OpenIPMI-2.0.24.orig/sample/Makefile.am
-+++ OpenIPMI-2.0.24/sample/Makefile.am
+--- OpenIPMI-2.0.25.orig/sample/Makefile.am 2018-08-28 16:21:06.379098464 +0200
++++ OpenIPMI-2.0.25/sample/Makefile.am 2018-08-28 16:21:12.511447871 +0200
@@ -71,9 +71,9 @@ rmcp_ping_SOURCES = rmcp_ping.c
rmcp_ping_LDADD = $(SOCKETLIB)
++++++ OpenIPMI-2.0.25..HEAD_git.diff ++++++
++++ 22786 lines (skipped)
++++++ OpenIPMI-2.0.24.tar.gz -> OpenIPMI-2.0.25.tar.gz ++++++
++++ 14831 lines of diff (skipped)
++++++ OpenIPMI-prefer_perl_vendor.patch ++++++
--- /var/tmp/diff_new_pack.a4TNgJ/_old 2018-09-18 11:39:32.832155406 +0200
+++ /var/tmp/diff_new_pack.a4TNgJ/_new 2018-09-18 11:39:32.832155406 +0200
@@ -1,7 +1,8 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-OpenIPMI-2.0.21/configure.ac ./configure.ac
---- ../orig-OpenIPMI-2.0.21/configure.ac 2014-01-28 20:35:02.000000000 +0100
-+++ ./configure.ac 2014-02-13 10:11:41.060321295 +0100
-@@ -541,10 +541,10 @@
+Index: OpenIPMI-2.0.25/configure.ac
+===================================================================
+--- OpenIPMI-2.0.25.orig/configure.ac 2018-06-20 15:53:54.000000000 +0200
++++ OpenIPMI-2.0.25/configure.ac 2018-08-27 16:31:51.144399542 +0200
+@@ -451,10 +451,10 @@ if test "x$perlcflags" = "x" -o "x$perli
if test "x$perlinstalldir" = "x"; then
perlinstalldir=`(eval \`perl -V:installvendorarch\`; echo $installvendorarch)`
if test "x$perlinstalldir" = "x" -o ! -d "$perlinstalldir"; then
++++++ bootstrap ++++++
#! /bin/sh -x
#
# Copyright (c) 2003, Intel Corporation
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
# conditions are met:
#
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the distribution.
#
# Neither the name of Intel Corporation nor the names
# of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
libtoolize --copy --force --automake
aclocal
autoheader
automake --add-missing --copy --foreign
autoconf
++++++ fix-conversions.patch ++++++
--- /var/tmp/diff_new_pack.a4TNgJ/_old 2018-09-18 11:39:32.856155381 +0200
+++ /var/tmp/diff_new_pack.a4TNgJ/_new 2018-09-18 11:39:32.856155381 +0200
@@ -1,10 +1,11 @@
Not sure for what exactly this could be
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-OpenIPMI-2.0.20-rc3/swig/OpenIPMI.i ./swig/OpenIPMI.i
---- ../orig-OpenIPMI-2.0.20-rc3/swig/OpenIPMI.i 2013-08-28 17:02:23.000000000 +0200
-+++ ./swig/OpenIPMI.i 2013-10-04 09:50:14.951385925 +0200
-@@ -2666,7 +2666,7 @@
+Index: OpenIPMI-2.0.25/swig/OpenIPMI.i
+===================================================================
+--- OpenIPMI-2.0.25.orig/swig/OpenIPMI.i 2018-06-20 15:53:54.000000000 +0200
++++ OpenIPMI-2.0.25/swig/OpenIPMI.i 2018-08-27 16:31:55.632653896 +0200
+@@ -2704,7 +2704,7 @@ sol_data_received_cb(ipmi_sol_conn_t *co
int rv = 0;
conn_ref = swig_make_ref(conn, ipmi_sol_conn_t);
++++++ fix_dia_version_detection.patch ++++++
Index: OpenIPMI-2.0.25/configure.ac
===================================================================
--- OpenIPMI-2.0.25.orig/configure.ac 2018-09-07 14:00:41.233081707 +0200
+++ OpenIPMI-2.0.25/configure.ac 2018-09-07 14:07:26.444083374 +0200
@@ -716,11 +716,14 @@ AC_HAVE_FUNCS(syslog)
DIA=
AC_PATH_PROG(diaprog, dia)
if test "x$diaprog" != "x"; then
- diaver=`$diaprog --version 2>&1 | sed 's/Dia version \([[^,]]*\), .*$/\1/'`
+ diaver=`$diaprog --version 2>&1 | sed 's/Dia version \([^,]]*\), .*$/\1/'`
tmp=`echo $diaver | sed 's/^[[0-9.]]\+$//'`
if test "x$diaver" = "x" -o "x$tmp" != 'x'; then
- # Couldn't get the dia version, give up.
+ # Couldn't get the dia version, guess we have a latest one.
echo "Couldn't determine the dia version from '$diaver'"
+ echo "Assuming Dia version 0.94 or newer"
+ DIA_FILTER_NAME=--filter
+ DIA="$diaprog"
else
DIA="$diaprog"
diaver_major=`echo $diaver | sed 's/\.[[0-9.]]\+$//'`
++++++ openipmi-tinfo.patch ++++++
--- /var/tmp/diff_new_pack.a4TNgJ/_old 2018-09-18 11:39:32.888155347 +0200
+++ /var/tmp/diff_new_pack.a4TNgJ/_new 2018-09-18 11:39:32.892155343 +0200
@@ -1,7 +1,8 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2014-01-28 20:35:02.000000000 +0100
-+++ b/configure.ac 2015-09-23 17:05:03.526010122 +0200
-@@ -861,10 +861,12 @@
+Index: OpenIPMI-2.0.25/configure.ac
+===================================================================
+--- OpenIPMI-2.0.25.orig/configure.ac 2018-08-28 16:18:57.427750765 +0200
++++ OpenIPMI-2.0.25/configure.ac 2018-08-28 16:19:00.039899606 +0200
+@@ -770,10 +770,12 @@ case $host in
*-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
esac
++++++ use_python3_shebang ++++++
Index: OpenIPMI-2.0.25/swig/python/openipmigui.py
===================================================================
--- OpenIPMI-2.0.25.orig/swig/python/openipmigui.py 2018-06-20 15:53:54.000000000 +0200
+++ OpenIPMI-2.0.25/swig/python/openipmigui.py 2018-09-07 15:55:13.970977102 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# openipmigui.py
#