9
0
forked from pool/OpenIPMI
Files
OpenIPMI/fix_dia_version_detection.patch
Thomas Renninger 9ac78ca4ae Accepting request 979226 from home:trenn:branches:systemsmanagement
- Update to version 2.0.32.3+git.05faa36e:
  * entity: Handle NULL entity in internal_fru_fetch_done()
  * entity: Keep the entity around duringa FRU fetch
  * Move to version 2.0.32
  * Fix readline and python support
  * sol: Fix multiple flush queuing issue
- Patches that are mainline:
D    fix-conversions.patch
D    unix_thread-Remove-the-fd-handler-sets-before-it-s-set-up.patch
D    lanserv-Add-the-judgment-on-the-validity-of-length-in-emu_cmd.c-and-session-in-lanserv_ipmi.c.patch
- Refreshed patches not yet mainline:
M    openipmi-tinfo.patch
M    fix_dia_version_detection.patch

OBS-URL: https://build.opensuse.org/request/show/979226
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/OpenIPMI?expand=0&rev=71
2022-05-25 15:35:44 +00:00

22 lines
1.0 KiB
Diff

Index: openipmi-2.0.32.3+git.05faa36e/configure.ac
===================================================================
--- openipmi-2.0.32.3+git.05faa36e.orig/configure.ac
+++ openipmi-2.0.32.3+git.05faa36e/configure.ac
@@ -729,11 +729,14 @@ AC_HAVE_FUNCS(syslog)
DIA=
AC_PATH_PROG(diaprog, dia)
if test "x$diaprog" != "x"; then
- diaver=`$diaprog --version 2>&1 | grep 'Dia version' | sed 's/Dia version \([[^,]]*\), .*$/\1/' | sed 's/^\([[0-9.]]\+\)+.*$/\1/'`
+ diaver=`$diaprog --version 2>&1 | grep 'Dia version' | sed 's/Dia version \([^,]*\), .*$/\1/' | sed 's/^\([[0-9.]]\+\)+.*$/\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"
exit 1
else
DIA="$diaprog"