Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
9d874e82
Commit
9d874e82
authored
Apr 11, 2015
by
Axel Auweter
Browse files
MacOS compile fixes for OpenIPMI.
parent
4c91cfd1
Changes
1
Hide whitespace changes
Inline
Side-by-side
patches/OpenIPMI-2.0.21.patch
View file @
9d874e82
diff -ru OpenIPMI-2.0.21/Makefile.am OpenIPMI-2.0.21-patched/Makefile.am
--- OpenIPMI-2.0.21/Makefile.am 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/Makefile.am 2015-04-11 19:34:12.000000000 +0200
@@ -1,18 +1,18 @@
RPM = rpmbuild
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
- OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
+ OpenIPMIpthread.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
ACLOCAL_AMFLAGS = -I m4
@@ -34,6 +34,6 @@
rungui:
LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py
-DISTCLEANFILES=OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+DISTCLEANFILES=OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
diff -ru OpenIPMI-2.0.21/Makefile.in OpenIPMI-2.0.21-patched/Makefile.in
--- OpenIPMI-2.0.21/Makefile.in 2014-01-28 20:35:10.000000000 +0100
+++ OpenIPMI-2.0.21-patched/Makefile.in 2015-04-11 19:34:12.000000000 +0200
@@ -86,8 +86,8 @@
$(srcdir)/OpenIPMIutils.pc.in $(srcdir)/OpenIPMI.pc.in \
$(srcdir)/OpenIPMIpthread.pc.in $(srcdir)/OpenIPMIposix.pc.in \
$(srcdir)/OpenIPMIglib.pc.in $(srcdir)/OpenIPMIglib12.pc.in \
- $(srcdir)/OpenIPMItcl.pc.in $(srcdir)/OpenIPMIcmdlang.pc.in \
- $(srcdir)/OpenIPMIui.pc.in COPYING COPYING.LIB TODO ar-lib \
+ $(srcdir)/OpenIPMItcl.pc.in \
+ COPYING COPYING.LIB TODO ar-lib \
compile config.guess config.sub depcomp install-sh missing \
ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -103,8 +103,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc \
OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc \
- OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc \
- OpenIPMIui.pc
+ OpenIPMIglib12.pc OpenIPMItcl.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -390,24 +389,24 @@
top_srcdir = @top_srcdir@
RPM = rpmbuild
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
- OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
+ OpenIPMIpthread.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
ACLOCAL_AMFLAGS = -I m4
PYPATH = $(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
-DISTCLEANFILES = OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+DISTCLEANFILES = OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
all: config.h
@@ -479,10 +478,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMItcl.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMItcl.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-OpenIPMIcmdlang.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIcmdlang.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-OpenIPMIui.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIui.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
diff -ru OpenIPMI-2.0.21/OpenIPMI.spec OpenIPMI-2.0.21-patched/OpenIPMI.spec
--- OpenIPMI-2.0.21/OpenIPMI.spec 2014-01-28 20:35:18.000000000 +0100
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec 2015-04-11 19:34:12.000000000 +0200
@@ -64,14 +64,6 @@
%description ui
This package contains a user interface
-%package lanserv
-Summary: Emulates an IPMI network listener
-Group: Utilities
-Requires: OpenIPMI = %{version}
-
-%description lanserv
-This package contains a network IPMI listener.
-
###################################################
%prep
###################################################
@@ -120,7 +112,6 @@
%files
###################################################
%defattr(-,root,root)
-%{_libdir}/libOpenIPMIcmdlang.so.*
%{_libdir}/libOpenIPMIglib.so.*
# USERFIX: You might need to modify the following if glib12 is not
# handled properly by the autodetection
@@ -175,21 +166,14 @@
%files ui
###################################################
%defattr(-,root,root)
-%{_bindir}/ipmi_ui
%{_bindir}/ipmicmd
%{_bindir}/openipmicmd
-%{_bindir}/ipmish
-%{_bindir}/openipmish
%{_bindir}/solterm
%{_bindir}/rmcp_ping
-%{_libdir}/libOpenIPMIui.so.*
-%doc %{_mandir}/man1/ipmi_ui.1*
%doc %{_mandir}/man1/openipmicmd.1*
-%doc %{_mandir}/man1/openipmish.1*
%doc %{_mandir}/man1/openipmigui.1*
%doc %{_mandir}/man1/solterm.1*
%doc %{_mandir}/man1/rmcp_ping.1*
-%doc %{_mandir}/man7/ipmi_cmdlang.7*
%doc %{_mandir}/man7/openipmi_conparms.7*
###################################################
diff -ru OpenIPMI-2.0.21/OpenIPMI.spec.in OpenIPMI-2.0.21-patched/OpenIPMI.spec.in
--- OpenIPMI-2.0.21/OpenIPMI.spec.in 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec.in 2015-04-11 19:34:12.000000000 +0200
@@ -64,14 +64,6 @@
%description ui
This package contains a user interface
-%package lanserv
-Summary: Emulates an IPMI network listener
-Group: Utilities
-Requires: OpenIPMI = %{version}
-
-%description lanserv
-This package contains a network IPMI listener.
-
###################################################
%prep
###################################################
@@ -120,7 +112,6 @@
%files
###################################################
%defattr(-,root,root)
-%{_libdir}/libOpenIPMIcmdlang.so.*
%{_libdir}/libOpenIPMIglib.so.*
# USERFIX: You might need to modify the following if glib12 is not
# handled properly by the autodetection
@@ -175,21 +166,14 @@
%files ui
###################################################
%defattr(-,root,root)
-%{_bindir}/ipmi_ui
%{_bindir}/ipmicmd
%{_bindir}/openipmicmd
-%{_bindir}/ipmish
-%{_bindir}/openipmish
%{_bindir}/solterm
%{_bindir}/rmcp_ping
-%{_libdir}/libOpenIPMIui.so.*
-%doc %{_mandir}/man1/ipmi_ui.1*
%doc %{_mandir}/man1/openipmicmd.1*
-%doc %{_mandir}/man1/openipmish.1*
%doc %{_mandir}/man1/openipmigui.1*
%doc %{_mandir}/man1/solterm.1*
%doc %{_mandir}/man1/rmcp_ping.1*
-%doc %{_mandir}/man7/ipmi_cmdlang.7*
%doc %{_mandir}/man7/openipmi_conparms.7*
###################################################
diff -ru OpenIPMI-2.0.21/configure OpenIPMI-2.0.21-patched/configure
--- OpenIPMI-2.0.21/configure 2014-01-28 20:35:11.000000000 +0100
+++ OpenIPMI-2.0.21-patched/configure 2015-04-
08 11:37:34.225967045
+0200
+++ OpenIPMI-2.0.21-patched/configure 2015-04-
11 19:34:12.000000000
+0200
@@ -825,8 +825,6 @@
with_ucdsnmp
with_snmpflags
...
...
@@ -1486,7 +1687,7 @@ diff -ru OpenIPMI-2.0.21/configure OpenIPMI-2.0.21-patched/configure
esac
diff -ru OpenIPMI-2.0.21/configure.ac OpenIPMI-2.0.21-patched/configure.ac
--- OpenIPMI-2.0.21/configure.ac 2014-01-28 20:35:02.000000000 +0100
+++ OpenIPMI-2.0.21-patched/configure.ac 2015-04-
08 11:17:17.04
1934
428
+0200
+++ OpenIPMI-2.0.21-patched/configure.ac 2015-04-
11
19
:
34
:12.000000000
+0200
@@ -52,18 +52,6 @@
SNMPLIBS="$withval"
)
...
...
@@ -1627,204 +1828,62 @@ diff -ru OpenIPMI-2.0.21/configure.ac OpenIPMI-2.0.21-patched/configure.ac
- OpenIPMIcmdlang.pc
- OpenIPMIui.pc)
+ OpenIPMItcl.pc)
diff -ru OpenIPMI-2.0.21/Makefile.am OpenIPMI-2.0.21-patched/Makefile.am
--- OpenIPMI-2.0.21/Makefile.am 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/Makefile.am 2015-04-08 11:37:48.261875696 +0200
@@ -1,18 +1,18 @@
RPM = rpmbuild
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
- OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
+ OpenIPMIpthread.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
ACLOCAL_AMFLAGS = -I m4
@@ -34,6 +34,6 @@
rungui:
LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py
-DISTCLEANFILES=OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+DISTCLEANFILES=OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
diff -ru OpenIPMI-2.0.21/Makefile.in OpenIPMI-2.0.21-patched/Makefile.in
--- OpenIPMI-2.0.21/Makefile.in 2014-01-28 20:35:10.000000000 +0100
+++ OpenIPMI-2.0.21-patched/Makefile.in 2015-04-08 11:37:59.157798813 +0200
@@ -86,8 +86,8 @@
$(srcdir)/OpenIPMIutils.pc.in $(srcdir)/OpenIPMI.pc.in \
$(srcdir)/OpenIPMIpthread.pc.in $(srcdir)/OpenIPMIposix.pc.in \
$(srcdir)/OpenIPMIglib.pc.in $(srcdir)/OpenIPMIglib12.pc.in \
- $(srcdir)/OpenIPMItcl.pc.in $(srcdir)/OpenIPMIcmdlang.pc.in \
- $(srcdir)/OpenIPMIui.pc.in COPYING COPYING.LIB TODO ar-lib \
+ $(srcdir)/OpenIPMItcl.pc.in \
+ COPYING COPYING.LIB TODO ar-lib \
compile config.guess config.sub depcomp install-sh missing \
ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -103,8 +103,7 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc \
OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc \
- OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc \
- OpenIPMIui.pc
+ OpenIPMIglib12.pc OpenIPMItcl.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -390,24 +389,24 @@
top_srcdir = @top_srcdir@
RPM = rpmbuild
RPMFLAGS = -ta
-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
- ui lanserv sample doc man $(SWIG_DIR)
+SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) \
+ doc man $(SWIG_DIR)
diff -ru OpenIPMI-2.0.21/include/OpenIPMI/ipmi_posix.h OpenIPMI-2.0.21-patched/include/OpenIPMI/ipmi_posix.h
--- OpenIPMI-2.0.21/include/OpenIPMI/ipmi_posix.h 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/include/OpenIPMI/ipmi_posix.h 2015-04-11 19:34:12.000000000 +0200
@@ -41,6 +41,26 @@
extern "C" {
#endif
-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
- ui lanserv sample doc man swig
+DIST_SUBDIRS = include utils lib unix glib tcl \
+ doc man swig
+/* Fix for missing CLOCK_MONOTONIC / CLOCK_REALTIME on MacOS */
+#ifdef __MACH__
+#include <mach/mach_time.h>
+#define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 0
+#define clock_gettime clock_gettime_mach
+static int clock_gettime(int clk_id, struct timespec *t){
+ mach_timebase_info_data_t timebase;
+ mach_timebase_info(&timebase);
+ uint64_t time;
+ time = mach_absolute_time();
+ double nseconds = ((double)time * (double)timebase.numer)/((double)timebase.denom);
+ double seconds = ((double)time * (double)timebase.numer)/((double)timebase.denom * 1e9);
+ t->tv_sec = seconds;
+ t->tv_nsec = nseconds;
+ return 0;
+}
+typedef int clockid_t;
+#endif
+
/* These are the defined OS handlers for POSIX with and without
threading. If you use these (and thus link with the OpenIPMIposix
or OpenIPMIpthread libraries) you must provide posix_vlog(). It is
diff -ru OpenIPMI-2.0.21/lib/rakp.c OpenIPMI-2.0.21-patched/lib/rakp.c
--- OpenIPMI-2.0.21/lib/rakp.c 2013-09-25 17:24:21.000000000 +0200
+++ OpenIPMI-2.0.21-patched/lib/rakp.c 2015-04-11 19:34:50.000000000 +0200
@@ -482,7 +482,11 @@
return EINVAL;
HMAC(rinfo->evp_md, p, rinfo->key_len, idata, 58+idata[57], integ_data, &ilen);
if (memcmp(data+40, integ_data, rinfo->key_len) != 0)
+#ifdef __MACH__
+ return EINVAL;
+#else
return EKEYREJECTED;
+#endif
EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
CONFIGURING_FOR_LAN
-PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIui.pc OpenIPMIposix.pc \
- OpenIPMIpthread.pc OpenIPMIcmdlang.pc $(GLIB_PKGCONF) \
+PKGCONFIGS = OpenIPMIutils.pc OpenIPMI.pc OpenIPMIposix.pc \
+ OpenIPMIpthread.pc $(GLIB_PKGCONF) \
$(GLIB12_PKGCONF) $(TCL_PKGCONF)
ACLOCAL_AMFLAGS = -I m4
PYPATH = $(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
-DISTCLEANFILES = OpenIPMI.spec OpenIPMIcmdlang.pc OpenIPMI.pc OpenIPMItcl.pc \
- OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIui.pc OpenIPMIglib.pc \
+DISTCLEANFILES = OpenIPMI.spec OpenIPMI.pc OpenIPMItcl.pc \
+ OpenIPMIglib12.pc OpenIPMIposix.pc OpenIPMIglib.pc \
OpenIPMIpthread.pc OpenIPMIutils.pc
/* Now generate the SIK */
p = ipmi_rmcpp_auth_get_my_rand(info->ainfo, &plen);
diff -ru OpenIPMI-2.0.21/unix/selector.c OpenIPMI-2.0.21-patched/unix/selector.c
--- OpenIPMI-2.0.21/unix/selector.c 2013-10-10 21:04:27.000000000 +0200
+++ OpenIPMI-2.0.21-patched/unix/selector.c 2015-04-11 19:34:12.000000000 +0200
@@ -51,6 +51,10 @@
#include <signal.h>
#include <string.h>
all: config.h
@@ -479,10 +478,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
OpenIPMItcl.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMItcl.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-OpenIPMIcmdlang.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIcmdlang.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-OpenIPMIui.pc: $(top_builddir)/config.status $(srcdir)/OpenIPMIui.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
diff -ru OpenIPMI-2.0.21/OpenIPMI.spec OpenIPMI-2.0.21-patched/OpenIPMI.spec
--- OpenIPMI-2.0.21/OpenIPMI.spec 2014-01-28 20:35:18.000000000 +0100
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec 2015-04-08 11:18:33.332342003 +0200
@@ -64,14 +64,6 @@
%description ui
This package contains a user interface
-%package lanserv
-Summary: Emulates an IPMI network listener
-Group: Utilities
-Requires: OpenIPMI = %{version}
-
-%description lanserv
-This package contains a network IPMI listener.
-
###################################################
%prep
###################################################
@@ -120,7 +112,6 @@
%files
###################################################
%defattr(-,root,root)
-%{_libdir}/libOpenIPMIcmdlang.so.*
%{_libdir}/libOpenIPMIglib.so.*
# USERFIX: You might need to modify the following if glib12 is not
# handled properly by the autodetection
@@ -175,21 +166,14 @@
%files ui
###################################################
%defattr(-,root,root)
-%{_bindir}/ipmi_ui
%{_bindir}/ipmicmd
%{_bindir}/openipmicmd
-%{_bindir}/ipmish
-%{_bindir}/openipmish
%{_bindir}/solterm
%{_bindir}/rmcp_ping
-%{_libdir}/libOpenIPMIui.so.*
-%doc %{_mandir}/man1/ipmi_ui.1*
%doc %{_mandir}/man1/openipmicmd.1*
-%doc %{_mandir}/man1/openipmish.1*
%doc %{_mandir}/man1/openipmigui.1*
%doc %{_mandir}/man1/solterm.1*
%doc %{_mandir}/man1/rmcp_ping.1*
-%doc %{_mandir}/man7/ipmi_cmdlang.7*
%doc %{_mandir}/man7/openipmi_conparms.7*
###################################################
diff -ru OpenIPMI-2.0.21/OpenIPMI.spec.in OpenIPMI-2.0.21-patched/OpenIPMI.spec.in
--- OpenIPMI-2.0.21/OpenIPMI.spec.in 2012-07-22 00:01:45.000000000 +0200
+++ OpenIPMI-2.0.21-patched/OpenIPMI.spec.in 2015-04-08 11:18:40.004196315 +0200
@@ -64,14 +64,6 @@
%description ui
This package contains a user interface
-%package lanserv
-Summary: Emulates an IPMI network listener
-Group: Utilities
-Requires: OpenIPMI = %{version}
-
-%description lanserv
-This package contains a network IPMI listener.
-
###################################################
%prep
###################################################
@@ -120,7 +112,6 @@
%files
###################################################
%defattr(-,root,root)
-%{_libdir}/libOpenIPMIcmdlang.so.*
%{_libdir}/libOpenIPMIglib.so.*
# USERFIX: You might need to modify the following if glib12 is not
# handled properly by the autodetection
@@ -175,21 +166,14 @@
%files ui
###################################################
%defattr(-,root,root)
-%{_bindir}/ipmi_ui
%{_bindir}/ipmicmd
%{_bindir}/openipmicmd
-%{_bindir}/ipmish
-%{_bindir}/openipmish
%{_bindir}/solterm
%{_bindir}/rmcp_ping
-%{_libdir}/libOpenIPMIui.so.*
-%doc %{_mandir}/man1/ipmi_ui.1*
%doc %{_mandir}/man1/openipmicmd.1*
-%doc %{_mandir}/man1/openipmish.1*
%doc %{_mandir}/man1/openipmigui.1*
%doc %{_mandir}/man1/solterm.1*
%doc %{_mandir}/man1/rmcp_ping.1*
-%doc %{_mandir}/man7/ipmi_cmdlang.7*
%doc %{_mandir}/man7/openipmi_conparms.7*
###################################################
+#ifdef __MACH__
+#define CLOCK_MONOTONIC 0
+#endif
+
typedef struct fd_state_s
{
int deleted;
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
