Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package OpenIPMI for openSUSE:Factory 
checked in at 2021-10-04 18:38:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenIPMI (Old)
 and      /work/SRC/openSUSE:Factory/.OpenIPMI.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "OpenIPMI"

Mon Oct  4 18:38:56 2021 rev:51 rq:921957 version:2.0.31

Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenIPMI/OpenIPMI.changes        2021-07-02 
13:26:52.589035535 +0200
+++ /work/SRC/openSUSE:Factory/.OpenIPMI.new.2443/OpenIPMI.changes      
2021-10-04 18:38:59.561962761 +0200
@@ -1,0 +2,19 @@
+Tue Sep 28 08:30:14 UTC 2021 - Thomas Renninger <tr...@suse.de>
+
+- Add latest mainline fixes:
+A    
lanserv-Add-the-judgment-on-the-validity-of-length-in-emu_cmd.c-and-session-in-lanserv_ipmi.c.patch
+A    unix_thread-Remove-the-fd-handler-sets-before-it-s-set-up.patch 
+
+-------------------------------------------------------------------
+Fri Jul  9 08:15:37 UTC 2021 - Thomas Renninger <tr...@suse.de>
+
+- Update to version 2.0.31
+  Adopted patches to latest sources:
+M    OpenIMPI-add-libncurses.patch
+M    OpenIPMI-no-return-in-nonvoid-function.patch
+M    OpenIPMI-prefer_perl_vendor.patch
+M    fix_dia_version_detection.patch
+M    openipmi-tinfo.patch
+
+
+-------------------------------------------------------------------
@@ -4 +23 @@
-- Use Python3 instead of Python2.
+- Use Python3 instead of Python2 (bsc#1190999).

Old:
----
  OpenIPMI-2.0.29.tar.gz

New:
----
  OpenIPMI-2.0.31.tar.gz
  
lanserv-Add-the-judgment-on-the-validity-of-length-in-emu_cmd.c-and-session-in-lanserv_ipmi.c.patch
  unix_thread-Remove-the-fd-handler-sets-before-it-s-set-up.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ OpenIPMI.spec ++++++
--- /var/tmp/diff_new_pack.eOgRg0/_old  2021-10-04 18:39:00.517964315 +0200
+++ /var/tmp/diff_new_pack.eOgRg0/_new  2021-10-04 18:39:00.525964327 +0200
@@ -31,7 +31,7 @@
 %endif
 
 Name:           OpenIPMI
-Version:        2.0.29
+Version:        2.0.31
 Release:        0
 Summary:        Service processor access via IPMI
 License:        LGPL-2.1-or-later
@@ -56,6 +56,8 @@
 Patch6:         OpenIPMI-no-return-in-nonvoid-function.patch
 Patch7:         fix_dia_version_detection.patch
 Patch8:         use_python3_shebang
+Patch9:         
lanserv-Add-the-judgment-on-the-validity-of-length-in-emu_cmd.c-and-session-in-lanserv_ipmi.c.patch
+Patch10:        unix_thread-Remove-the-fd-handler-sets-before-it-s-set-up.patch
 
 BuildRequires:  autoconf-archive
 BuildRequires:  gd-devel

++++++ OpenIMPI-add-libncurses.patch ++++++
--- /var/tmp/diff_new_pack.eOgRg0/_old  2021-10-04 18:39:00.577964412 +0200
+++ /var/tmp/diff_new_pack.eOgRg0/_new  2021-10-04 18:39:00.577964412 +0200
@@ -1,10 +1,12 @@
-Index: OpenIPMI-2.0.24/ui/Makefile.am
+Index: OpenIPMI-2.0.31/ui/Makefile.am
 ===================================================================
---- OpenIPMI-2.0.24.orig/ui/Makefile.am
-+++ OpenIPMI-2.0.24/ui/Makefile.am
-@@ -18,4 +18,4 @@ libOpenIPMIui_la_LIBADD =
- libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION)
+--- OpenIPMI-2.0.31.orig/ui/Makefile.am
++++ OpenIPMI-2.0.31/ui/Makefile.am
+@@ -18,6 +18,6 @@ libOpenIPMIui_la_LIBADD = $(top_builddir
+ libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION) -no-undefined
  
  ipmi_ui_SOURCES = basic_ui.c
 -ipmi_ui_LDADD = libOpenIPMIui.la $(top_builddir)/utils/libOpenIPMIutils.la 
$(top_builddir)/lib/libOpenIPMI.la $(top_builddir)/unix/libOpenIPMIposix.la 
$(TERM_LIBS) $(SNMPLIBS) $(OPENSSLLIBS) $(GDBM_LIB)
 +ipmi_ui_LDADD = libOpenIPMIui.la $(top_builddir)/utils/libOpenIPMIutils.la 
$(top_builddir)/lib/libOpenIPMI.la $(top_builddir)/unix/libOpenIPMIposix.la 
$(TERM_LIBS) $(SNMPLIBS) $(OPENSSLLIBS) $(GDBM_LIB) -lncurses
+ ipmi_ui_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
+       -I$(top_srcdir)/include -DIPMI_CHECK_LOCKS

++++++ OpenIPMI-2.0.29.tar.gz -> OpenIPMI-2.0.31.tar.gz ++++++
++++ 27383 lines of diff (skipped)

++++++ OpenIPMI-no-return-in-nonvoid-function.patch ++++++
--- /var/tmp/diff_new_pack.eOgRg0/_old  2021-10-04 18:39:00.877964899 +0200
+++ /var/tmp/diff_new_pack.eOgRg0/_new  2021-10-04 18:39:00.877964899 +0200
@@ -1,7 +1,7 @@
-Index: OpenIPMI-2.0.28/swig/OpenIPMI.i
+Index: OpenIPMI-2.0.31/swig/OpenIPMI.i
 ===================================================================
---- OpenIPMI-2.0.28.orig/swig/OpenIPMI.i
-+++ OpenIPMI-2.0.28/swig/OpenIPMI.i
+--- OpenIPMI-2.0.31.orig/swig/OpenIPMI.i
++++ OpenIPMI-2.0.31/swig/OpenIPMI.i
 @@ -3123,6 +3123,7 @@ init_glib(void)
      init_lang();
  #endif

++++++ OpenIPMI-prefer_perl_vendor.patch ++++++
--- /var/tmp/diff_new_pack.eOgRg0/_old  2021-10-04 18:39:00.893964925 +0200
+++ /var/tmp/diff_new_pack.eOgRg0/_new  2021-10-04 18:39:00.897964931 +0200
@@ -1,8 +1,8 @@
-Index: OpenIPMI-2.0.28/configure.ac
+Index: OpenIPMI-2.0.31/configure.ac
 ===================================================================
---- OpenIPMI-2.0.28.orig/configure.ac
-+++ OpenIPMI-2.0.28/configure.ac
-@@ -450,10 +450,10 @@ if test "x$perlcflags" = "x" -o "x$perli
+--- OpenIPMI-2.0.31.orig/configure.ac
++++ OpenIPMI-2.0.31/configure.ac
+@@ -455,10 +455,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

++++++ fix_dia_version_detection.patch ++++++
--- /var/tmp/diff_new_pack.eOgRg0/_old  2021-10-04 18:39:00.937964997 +0200
+++ /var/tmp/diff_new_pack.eOgRg0/_new  2021-10-04 18:39:00.937964997 +0200
@@ -1,8 +1,8 @@
-Index: OpenIPMI-2.0.28/configure.ac
+Index: OpenIPMI-2.0.31/configure.ac
 ===================================================================
---- OpenIPMI-2.0.28.orig/configure.ac
-+++ OpenIPMI-2.0.28/configure.ac
-@@ -715,11 +715,14 @@ AC_HAVE_FUNCS(syslog)
+--- OpenIPMI-2.0.31.orig/configure.ac
++++ OpenIPMI-2.0.31/configure.ac
+@@ -720,11 +720,14 @@ AC_HAVE_FUNCS(syslog)
  DIA=
  AC_PATH_PROG(diaprog, dia)
  if test "x$diaprog" != "x"; then

++++++ 
lanserv-Add-the-judgment-on-the-validity-of-length-in-emu_cmd.c-and-session-in-lanserv_ipmi.c.patch
 ++++++
From: zhangqiumiao <zhangqiumi...@huawei.com>
Subject: lanserv: Add the judgment on the validity of length in emu_cmd.c and 
session in lanserv_ipmi.c
References: 
Patch-Mainline: 
Git-commit: 35525f7903bdbfe98c1b101f2c30afd78fbdda98
Git-repo: https://git.code.sf.net/p/openipmi/code.git



Signed-off-by:  <tr...@suse.com>
diff --git a/lanserv/emu_cmd.c b/lanserv/emu_cmd.c
index ea3f8685..727bb0c8 100644
--- a/lanserv/emu_cmd.c
+++ b/lanserv/emu_cmd.c
@@ -913,6 +913,9 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t 
*mc, char **toks)
     if (rv)
        return rv;
 
+    if (length > MAX_FRU_SIZE)
+       return EINVAL;
+
     tok = mystrtok(NULL, " \t\n", toks);
     if (!tok) {
        out->eprintf(out, "**No FRU data type given");
diff --git a/lanserv/lanserv_ipmi.c b/lanserv/lanserv_ipmi.c
index 4005bcba..ccd60015 100644
--- a/lanserv/lanserv_ipmi.c
+++ b/lanserv/lanserv_ipmi.c
@@ -3143,7 +3143,7 @@ get_associated_mc(channel_t *chan, uint32_t session_id, 
unsigned int payload)
     lanserv_data_t *lan = chan->chan_info;
     session_t *session = sid_to_session(lan, session_id);
 
-    if (payload >= LANSERV_NUM_CLOSERS)
+    if (payload >= LANSERV_NUM_CLOSERS || session == NULL)
        return NULL;
 
     return session->closers[payload].mc;
++++++ openipmi-tinfo.patch ++++++
--- /var/tmp/diff_new_pack.eOgRg0/_old  2021-10-04 18:39:00.989965081 +0200
+++ /var/tmp/diff_new_pack.eOgRg0/_new  2021-10-04 18:39:00.989965081 +0200
@@ -1,8 +1,8 @@
-Index: OpenIPMI-2.0.28/configure.ac
+Index: OpenIPMI-2.0.31/configure.ac
 ===================================================================
---- OpenIPMI-2.0.28.orig/configure.ac
-+++ OpenIPMI-2.0.28/configure.ac
-@@ -763,10 +763,12 @@ AX_CONFIG_FEATURE(
+--- OpenIPMI-2.0.31.orig/configure.ac
++++ OpenIPMI-2.0.31/configure.ac
+@@ -768,10 +768,12 @@ AX_CONFIG_FEATURE(
     [epoll_pwait], [This platform supports epoll(7) with epoll_pwait(2)],
     [HAVE_EPOLL_PWAIT], [This platform supports epoll(7) with epoll_pwait(2).])
  

++++++ unix_thread-Remove-the-fd-handler-sets-before-it-s-set-up.patch ++++++
From: Corey Minyard <cminy...@mvista.com>
Subject: unix_thread: Remove the fd handler sets before it's set up
References: 
Patch-Mainline: 
Git-commit: d613d279dbce2d5e4594f6fed39653d83af0d99b
Git-repo: https://git.code.sf.net/p/openipmi/code.git

There were a couple of fd handler set before the fd was actually
configured.  With recent changes in the selector code that would result
in an assert.  The calls were unnecessary, so remove them.

Signed-off-by: Corey Minyard <cminy...@mvista.com>


Signed-off-by:  <tr...@suse.com>
diff --git a/unix/posix_thread_os_hnd.c b/unix/posix_thread_os_hnd.c
index 28c66898..cb315c5e 100644
--- a/unix/posix_thread_os_hnd.c
+++ b/unix/posix_thread_os_hnd.c
@@ -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) {

Reply via email to