Hello community, here is the log from the commit of package OpenIPMI for openSUSE:Factory checked in at 2013-10-11 12:53:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenIPMI (Old) and /work/SRC/openSUSE:Factory/.OpenIPMI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenIPMI" Changes: -------- --- /work/SRC/openSUSE:Factory/OpenIPMI/OpenIPMI.changes 2012-11-22 16:50:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.OpenIPMI.new/OpenIPMI.changes 2013-10-11 12:53:58.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 4 08:31:43 UTC 2013 - [email protected] + +- Fix SLE 11 build + +------------------------------------------------------------------- @@ -9,0 +15,2 @@ + +- Suffix all patches with .patch Old: ---- OpenIPMI-2.0.16-larger-ipmibuf OpenIPMI-2.0.20-rc1.tar.bz2 do-fclose fix-conversions fix-devel-deps New: ---- OpenIPMI-2.0.16-larger-ipmibuf.patch OpenIPMI-2.0.20-rc3.tar.bz2 do-fclose.patch fix-conversions.patch fix-devel-deps.patch tcl-includes-moved.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenIPMI.spec ++++++ --- /var/tmp/diff_new_pack.fKoebj/_old 2013-10-11 12:53:59.000000000 +0200 +++ /var/tmp/diff_new_pack.fKoebj/_new 2013-10-11 12:53:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package OpenIPMI # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,9 @@ BuildRequires: ncurses-devel BuildRequires: net-snmp-devel BuildRequires: openssl-devel +%if 0%{?suse_version} > 1200 BuildRequires: perl-macros +%endif BuildRequires: pkg-config BuildRequires: popt-devel BuildRequires: python-devel @@ -40,7 +42,7 @@ BuildRequires: tix Version: 2.0.20rc1 Release: 0 -%define pkgversion 2.0.20-rc1 +%define pkgversion 2.0.20-rc3 # http://prdownloads.sourceforge.net/openipmi/OpenIPMI-%{version}.tar.gz Source0: %{name}-%{pkgversion}.tar.bz2 Source1: sysconfig.ipmi @@ -49,11 +51,13 @@ Patch2: new-names-for-new-variables Patch3: OpenIPMI-libtool.patch Patch4: OpenIPMI-popt.patch -Patch5: OpenIPMI-2.0.16-larger-ipmibuf -Patch6: fix-devel-deps +Patch5: OpenIPMI-2.0.16-larger-ipmibuf.patch +Patch6: fix-devel-deps.patch # upstream ID 3587484 -Patch7: do-fclose -Patch8: fix-conversions +Patch7: do-fclose.patch +Patch8: fix-conversions.patch +# location of tcl.h moved from include/tcl to include, [email protected] +Patch9: tcl-includes-moved.patch Source99: OpenIPMI-rpmlintrc Url: http://openipmi.sourceforge.net Provides: ipmi_ui @@ -66,7 +70,17 @@ License: LGPL-2.1+ Group: System/Monitoring PreReq: %install_info_prereq %insserv_prereq %fillup_prereq +%if 0%{?suse_version} > 1200 %{perl_requires} +%else +%define perl_version %(eval "`%{__perl} -V:version`"; echo $version) +%if 0%{?fedora} +%define perl_requires perl(:MODULE_COMPAT_%{perl_version}) +Requires: %{perl_version} +%else +Requires: perl = %{perl_version} +%endif +%endif # Perl is sometimes installed in /usr/lib, not /usr/lib64 on 64-bit platforms. # %define perl_libdir %{_exec_prefix}/lib @@ -105,6 +119,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build autoreconf --install --force @@ -181,6 +196,7 @@ %{_bindir}/openipmicmd %{_bindir}/ipmish %{_bindir}/openipmish +%{_bindir}/sdrcomp %{_bindir}/solterm %{_bindir}/rmcp_ping %doc %{_mandir}/man1/ipmi_ui.1* ++++++ OpenIPMI-2.0.16-larger-ipmibuf.patch ++++++ 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/include/linux/ipmi_msgdefs.h ./include/linux/ipmi_msgdefs.h --- ../orig-OpenIPMI-2.0.20-rc3/include/linux/ipmi_msgdefs.h 2012-07-22 00:01:45.000000000 +0200 +++ ./include/linux/ipmi_msgdefs.h 2013-10-04 09:41:31.801884531 +0200 @@ -53,6 +53,6 @@ #define IPMI_GET_BMC_GLOBAL_ENABLES_CMD 0x2f #define IPMI_READ_EVENT_MSG_BUFFER_CMD 0x35 -#define IPMI_MAX_MSG_LENGTH 80 +#define IPMI_MAX_MSG_LENGTH 256 #endif /* __LINUX_IPMI_MSGDEFS_H */ 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/include/OpenIPMI/ipmi_types.h ./include/OpenIPMI/ipmi_types.h --- ../orig-OpenIPMI-2.0.20-rc3/include/OpenIPMI/ipmi_types.h 2013-01-21 18:24:13.000000000 +0100 +++ ./include/OpenIPMI/ipmi_types.h 2013-10-04 09:41:31.801884531 +0200 @@ -124,7 +124,7 @@ #ifndef __LINUX_IPMI_H /* Don't include this is we are including the kernel */ -#define IPMI_MAX_MSG_LENGTH 80 +#define IPMI_MAX_MSG_LENGTH 256 /* A raw IPMI message without any addressing. This covers both commands and responses. The completion code is always the first ++++++ OpenIPMI-2.0.20-rc1.tar.bz2 -> OpenIPMI-2.0.20-rc3.tar.bz2 ++++++ ++++ 59315 lines of diff (skipped) ++++++ OpenIPMI-popt.patch ++++++ --- /var/tmp/diff_new_pack.fKoebj/_old 2013-10-11 12:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fKoebj/_new 2013-10-11 12:54:01.000000000 +0200 @@ -1,6 +1,7 @@ ---- configure.in -+++ configure.in -@@ -289,7 +289,7 @@ if test "x$FOUND_POPT_HEADER" != "xyes"; +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/configure.in ./configure.in +--- ../orig-OpenIPMI-2.0.20-rc3/configure.in 2013-10-04 09:38:40.754850007 +0200 ++++ ./configure.in 2013-10-04 09:40:32.959464727 +0200 +@@ -297,7 +297,7 @@ fi if test "x$POPTLIBS" = "x"; then ++++++ OpenIPMI-prefer_perl_vendor.patch ++++++ --- /var/tmp/diff_new_pack.fKoebj/_old 2013-10-11 12:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fKoebj/_new 2013-10-11 12:54:01.000000000 +0200 @@ -1,6 +1,7 @@ ---- OpenIPMI-2.0.13/configure.in.orig 2007-10-16 17:23:26.000000000 +0200 -+++ OpenIPMI-2.0.13/configure.in 2008-01-16 14:26:00.000000000 +0100 -@@ -532,10 +532,10 @@ if test "x$perlcflags" = "x" -o "x$perli +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/configure.in ./configure.in +--- ../orig-OpenIPMI-2.0.20-rc3/configure.in 2013-08-30 19:38:17.000000000 +0200 ++++ ./configure.in 2013-10-04 09:38:05.649406069 +0200 +@@ -540,10 +540,10 @@ if test "x$perlinstalldir" = "x"; then perlinstalldir=`(eval \`perl -V:installvendorarch\`; echo $installvendorarch)` if test "x$perlinstalldir" = "x" -o ! -d "$perlinstalldir"; then ++++++ do-fclose.patch ++++++ 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/lanserv/config.c ./lanserv/config.c --- ../orig-OpenIPMI-2.0.20-rc3/lanserv/config.c 2013-01-21 18:24:13.000000000 +0100 +++ ./lanserv/config.c 2013-10-04 09:46:41.322610344 +0200 @@ -816,8 +816,6 @@ } if (!err) { err = lanserv_read_config(sys, f, &line, val); - if (err) - return err; } } else if (strcmp(tok, "user") == 0) { err = get_user(&tokptr, sys, &errstr); @@ -874,7 +872,7 @@ next: if (err) { fprintf(stderr, "Error on line %d: %s\n", line, errstr); - return err; + break; } } @@ -883,5 +881,5 @@ if (print_version) load_dynamic_libs(sys, print_version); - return 0; + return err; } 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/lanserv/emu_cmd.c ./lanserv/emu_cmd.c --- ../orig-OpenIPMI-2.0.20-rc3/lanserv/emu_cmd.c 2013-08-29 03:30:25.000000000 +0200 +++ ./lanserv/emu_cmd.c 2013-10-04 09:47:58.429779879 +0200 @@ -235,7 +235,7 @@ rv = ipmi_emu_cmd(out, emu, buffer); if (rv) - return rv; + break; pos = 0; } out: ++++++ fix-conversions.patch ++++++ 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 @@ int rv = 0; conn_ref = swig_make_ref(conn, ipmi_sol_conn_t); - swig_call_cb_rv('i', &rv, cb, "sol_data_received", "%p%*b", + swig_call_cb_rv('i', &rv, cb, "sol_data_received", "%p%*s", &conn_ref, count, buf); swig_free_ref_check(conn_ref, ipmi_sol_conn_t); return rv; ++++++ fix-devel-deps.patch ++++++ --- OpenIPMI-2.0.16/OpenIPMIpthread.pc.in.orig 2005-08-17 05:56:02.000000000 +0200 +++ OpenIPMI-2.0.16/OpenIPMIpthread.pc.in 2010-03-11 15:44:39.560785000 +0100 @@ -6,6 +6,6 @@ Name: OpenIPMIpthread Description: Pthread OS handler for OpenIPMI Version: @VERSION@ -Requires: OpenIPMI pthread +Requires: OpenIPMI Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread Cflags: -I${includedir} ++++++ new-names-for-new-variables ++++++ --- /var/tmp/diff_new_pack.fKoebj/_old 2013-10-11 12:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fKoebj/_new 2013-10-11 12:54:01.000000000 +0200 @@ -1,6 +1,7 @@ ---- OpenIPMI-2.0.7/lib/ipmi_lan.c.orig 2006-10-25 10:32:44.000000000 +0200 -+++ OpenIPMI-2.0.7/lib/ipmi_lan.c 2007-02-05 12:23:43.000000000 +0100 -@@ -1833,12 +1833,12 @@ +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/lib/ipmi_lan.c ./lib/ipmi_lan.c +--- ../orig-OpenIPMI-2.0.20-rc3/lib/ipmi_lan.c 2013-08-28 14:57:28.000000000 +0200 ++++ ./lib/ipmi_lan.c 2013-10-04 09:38:55.847470769 +0200 +@@ -1842,12 +1842,12 @@ if ((payload_type == IPMI_RMCPP_PAYLOAD_TYPE_OEM_EXPLICIT) || ((payload_type >= 0x20) && (payload_type <= 0x27))) { ++++++ tcl-includes-moved.patch ++++++ 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/tcl/test_handlers.c ./tcl/test_handlers.c --- ../orig-OpenIPMI-2.0.20-rc3/tcl/test_handlers.c 2013-08-28 15:27:30.000000000 +0200 +++ ./tcl/test_handlers.c 2013-10-04 09:53:03.734310452 +0200 @@ -59,7 +59,7 @@ #include <errno.h> #include <signal.h> #include <OpenIPMI/ipmi_tcl.h> -#include <tcl/tcl.h> +#include <tcl.h> os_handler_t *test_os_hnd; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
