Package: openipmi
Version: 2.0.7-1
Severity: normal
A new upstream version is availablem, which fixes a minor bug. While
packageing it for myself, I also fixed/improved some other things.
Please feel free to integrate them into your package and/or send them
upstream.
1. Manual page updates: 1st patched file is Debian only, rest applies to
upstream, too.
--- openipmi-2.0.8.orig/debian/openipmi.links
+++ openipmi-2.0.8/debian/openipmi.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/openipmicmd.1 usr/share/man/man1/ipmicmd.1
+usr/share/man/man1/openipmish.1 usr/share/man/man1/ipmish.1
--- openipmi-2.0.8.orig/man/openipmish.1
+++ openipmi-2.0.8/man/openipmish.1
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.B openipmish
-[\fIoption\fR]
+.RI [ option ]
.SH DESCRIPTION
The
@@ -21,42 +21,42 @@
.SH OPTIONS
.TP
-.B "\--dmsg"
+.B \-\-dmsg
Turn on message debugging, this will dump all messages to debug log output.
.TP
-.B "\--drawmsg"
+.B \-\-drawmsg
Turn on raw message debugging, this will dump all low-level messages to
debug log output. This differes from normal message debugging in that all
protocol messages are also dumped, not just IPMI messages.
.TP
-.B "\--dmem"
+.B \-\-dmem
Turn on memory debugging, this will cause memory allocation and
deallocations to be checked. When the program terminates, it will
dump all memory that was not properly freed (leaked).
.TP
-.B "\--dlock"
+.B \-\-dlock
Turn on lock debugging, this will check lock operations to make sure
that locks are help in all the proper places and make sure that locks
are properly nested.
.TP
-.B "\--snmp"
+.B \-\-snmp
Enable the SNMP trap handler.
.B openipmish
must be compiled with SNMP code enabled for this option to be available.
.TP
-.B "\--help"
+.B \-\-help
Help output
.SH COMMANDS
.B openipmish
follows the standard command syntax defined in
-.BR ipmi_cmdlang(7).
+.BR ipmi_cmdlang (7).
See that for the details on most commands. The IPMI manual that comes
with OpenIPMI will also be quite handy.
.B openipmish
-defines two commands that are not in the standard command language.
+defines some commands that are not in the standard command language.
These are:
.TP
@@ -68,14 +68,14 @@
Quit
.TP
-.B redisp_cmd on|off
+.BR redisp_cmd\ on | off
Normally, openipmish redisplays the command line when an event comes in. This
is nice for interactive use, but bad for scripting. This lets you turn
that function on and off.
-.B openipmish
.SH "SEE ALSO"
-ipmi_cmdlang(7), ipmi_ui(1)
+.BR ipmi_cmdlang (7),
+.BR ipmi_ui (1)
.SH "KNOWN PROBLEMS"
None
--- openipmi-2.0.8.orig/man/ipmi_cmdlang.7
+++ openipmi-2.0.8/man/ipmi_cmdlang.7
@@ -2531,7 +2531,7 @@
.SH "SEE ALSO"
-ipmish(1)
+.BR ipmish (1)
.SH "KNOWN PROBLEMS"
None
--- openipmi-2.0.8.orig/man/openipmigui.1
+++ openipmi-2.0.8/man/openipmigui.1
@@ -5,14 +5,14 @@
.SH SYNOPSIS
.B openipmigui
-.RB [--dmsg]
-.RB [--drawmsg]
-.RB [--glib12]
-.RB [--trace]
-.RB [--logstderr]
-.RB [-n]
-.RB [-p
-.IR preffile]
+.RB [ \-\-dmsg ]
+.RB [ \-\-drawmsg ]
+.RB [ \-\-glib12 ]
+.RB [ \-\-trace ]
+.RB [ \-\-logstderr ]
+.RB [ \-n ]
+.RB [ \-p
+.IR preffile ]
.SH DESCRIPTION
.B openipmigui
@@ -33,33 +33,33 @@
.SH OPTIONS
.TP
-.B "\--dmsg"
+.B \-\-dmsg
Turn on message debugging, this will dump all messages to debug log output.
.TP
-.B "\--drawmsg"
+.B \-\-drawmsg
Turn on raw message debugging, this will dump all low-level messages to
debug log output. This differes from normal message debugging in that all
protocol messages are also dumped, not just IPMI messages.
.TP
-.B "\--dmem"
+.B \-\-dmem
Turn on memory debugging, this will cause memory allocation and
deallocations to be checked. When the program terminates, it will
dump all memory that was not properly freed (leaked), and overruns,
writing of freed memory, or other types of memory errors.
.TP
-.B "\--logstderr"
+.B \-\-logstderr
Send all logs to standard error output as well as the GUI console.
.TP
-.B "\--trace"
+.B \-\-trace
Turn on python tracing so that all python procedure calls entered and
exited will be printed out.
.TP
-.B "\-n"
+.B \-n
Turn off reading of the preferences file at startup.
.TP
-.BI \-p\ preffile
-Use preffile as the name of the preferences file instead of
-$HOME/.openipmigui.startup
+.BI \-p\ preffile
+Use \fIpreffile\fP as the name of the preferences file instead of
+\fB$HOME/.openipmigui.startup\fP.
.SH MENU BAR
@@ -271,76 +271,77 @@
remote side of the connection. These are:
.TP
-Accept Input
+.B Accept Input
If disabled, this will cause data from the BMC to be refused,
effectively flow-controlling the data (assuming that the BMC actually
supports this properly, some don't)
.TP
-Use Encryption
+.B Use Encryption
Encrypt the data on the LAN using RMCP+ encryption negotiated for the
connection. Only available when the connection is closed, this cannot
be changed dynamically.
.TP
-Use Authentication
+.B Use Authentication
Authenticate the data on the LAN using RMCP+ authentication negotiated
for the connection. Only available when the connection is closed,
this cannot be changed dynamically.
.TP
-Deassert CTS/DCD/DSR on connect
+.B Deassert CTS/DCD/DSR on connect
Don't raise the lines when a connection is made; this allows things
like baud rate to be set before the device on the far end of the
serial port knows there is a connection.
.TP
-CTS Assertable
+.B CTS Assertable
If set, the BMC has control over the CTS line. Otherwise, the CTS
line is deasserted.
.TP
-DCD/DSR Asserted
+.B DCD/DSR Asserted
Set the DCD and DSR lines.
.TP
-RI Asserted
+.B RI Asserted
Assert the Ring Indicator line, can be used for remote wakeup on some
systems (though, with IPMI, you have to wonder why you wouldn't use
IPMI for this).
.TP
-Set Ack Timeout
+.B Set Ack Timeout
Sets the timeout waiting for an ACK from the BMC.
.TP
-Set Ack Retries
+.B Set Ack Retries
Sets the number of times a packet is retried before the connection is
closed.
.TP
-Send Break
+.B Send Break
Send a 300ms break signal to the remote serial port.
.TP
-Serial Rate
+.B Serial Rate
Sets the bitrate on the serial port. Not all systems support this.
Some, in fact, completely ignore this setting and use 19.2K. Note
that this is only the volatile rate. The non-volatile rate setting is
done with SOLPARM.
.TP
-Serial Alert Behavior
+.B Serial Alert Behavior
This sets what to do when an IPMI alert occurs and is going out the
serial port somehow. If set to "succeed", the SoL session will be
disconnected when an alert comes out.
.TP
-Queue Flush
+.B Queue Flush
Allows various queues to be flushed.
.SH "SEE ALSO"
-ipmish(1), IPMI document from OpenIPMI
+.BR ipmish (1),
+IPMI document from OpenIPMI
.SH "KNOWN PROBLEMS"
Some of missing functionality. See the list in the
--- openipmi-2.0.8.orig/man/openipmi_conparms.7
+++ openipmi-2.0.8/man/openipmi_conparms.7
@@ -42,115 +42,121 @@
.SH OPTIONS
.TP
-.BI smi-num
+.I smi-num
The SMI interface for the local connection. There may be more than
one BMC connection on a system and they are generally numbered, like
-/dev/ipmi0, /dev/ipmi1. etc.
+\fB/dev/ipmi0\fP, \fB/dev/ipmi1\fP, etc.
.TP
-.BI \-U\ username
-Use the given username for the LAN connection. If none is given, then
+.BI \-U\ username
+Use the given \fIusername\fP for the LAN connection. If none is given, then
no username is used.
.TP
-.BI \-P\ password
-The password to use for the connection. If none is given, the user is
+.BI \-P\ password
+The \fIpassword\fP to use for the connection. If none is given, the user is
assumed to have an empty password
.TP
-.BI \-p[2]\ port
-The UCP port to connect to. This defaults to the standard 623 port,
+\fB\-p\fP[\fB2\fP] \fIport\fP
+The UCP \fIport\fP to connect to. This defaults to the standard 623 port,
so it is not necessary unless a special port is required. Note that
since you can have two connections (hosts),
-.BI \-p
+.B \-p
is for the first host and
-.BI \-p2
+.B \-p2
is for the second host.
.TP
-.BI \-A\ authtype
-The authentication type to use, one of rmcp+, md5, md2, straight, or
-none. If you don't supply this, the most secure one available is
+.BI \-A\ authtype
+The \fIauthentication type\fP to use, one of \fBrmcp+\fP, \fBmd5\fP,
\fBmd2\fP, \fBstraight\fP, or
+\fBnone\fP. If you don't supply this, the most secure one available is
chosen, in the order given in the previous list.
.TP
-.BI \-L\ privilege
-The privilege to use for the connection. Lower privileges cannot
-execute some commands. Privileges are: callback, user, operator,
-admin, and oem. The default is admin.
+.BI \-L\ privilege
+The \fIprivilege\fP to use for the connection. Lower privileges cannot
+execute some commands. Privileges are: \fBcallback\fP, \fBuser\fP,
\fBoperator\fP,
+\fBadmin\fP, and \fBoem\fP. The default is \fBadmin\fP.
.TP
-.BI \-Ra\ authentication\ algorithm
-Set the RMCP+ authentication algorithm to use. Options are: bmcpick,
-rakp_none, rakp_hmac_sha1, and rakp_hmac_md5. The bmcpick option is
+.BI \-Ra\ authentication\ algorithm
+Set the \fIRMCP+ authentication algorithm\fP to use. Options are:
\fBbmcpick\fP,
+\fBrakp_none\fP, \fBrakp_hmac_sha1\fP, and \fBrakp_hmac_md5\fP. The
\fBbmcpick\fP option is
used by default, which means the BMC picks the algorithm it wants to
use.
.TP
-.BI \-Ri\ integrity\ algorithm
-The RMCP+ integrity algorithm to use. This ensures that the data has
+.BI \-Ri\ integrity\ algorithm
+The \fIRMCP+ integrity algorithm\fP to use. This ensures that the data has
not be altered between the sender and receiver. Valid options are:
-bmcpick, none, hmac_sha1, hmac_md5, and md5. The bmcpick option is
+\fBbmcpick\fP, \fBnone\fP, \fBhmac_sha1\fP, \fBhmac_md5\fP, and \fBmd5\fP.
The \fBbmcpick\fP option is
used by default, which means the BMC picks the algorithm it wants to
use.
.TP
-.BI \-Rc\ confidentiality\ algorithm
-The RMCP+ confidentiality (encryption) algorithm to use. This keeps
-evesdroppers from seeing the data. Valid values are: bmcpick,
-aes_cbc_128, xrc4_128, and xrc_40. The bmcpick option is used by
+.BI \-Rc\ confidentiality\ algorithm
+The \fIRMCP+ confidentiality (encryption) algorithm\fP to use. This keeps
+evesdroppers from seeing the data. Valid values are: \fBbmcpick\fP,
+\fBaes_cbc_128\fP, \fBxrc4_128\fP, and \fBxrc_40\fP. The \fBbmcpick\fP option
is used by
default, which means the BMC picks the algorithm it wants to use.
.TP
-.BI \-Rl
+.B \-Rl
If this is specified, the username is looked up using the privilege
level along with the username. This allows the same name to have
different passwords with different privilege levels.
.TP
-.BI \-Rk\ BMC\ Key
-If the system requires two-key lookups, this specifies the second key
+.BI \-Rk\ BMC\ Key
+If the system requires two-key lookups, this specifies the \fIsecond key\fP
(the BMC key) to use. This is ignored if two-key lookups are not
enabled by the BMC.
.TP
-.BI \-H\ hackname
+.BI \-H\ hackname
Well, it always happens. Things in the field don't work quite like
they are supposed to. There was some vagueness in the first IPMI
specs and different vendors interpreted RMCP+ in different ways. This
allows different options to be supported. Try different hacks if your
RMCP+ systems don't authenticate properly. These are:
-.IP rakp3_wrong_rolem - Some systems use the incorrect Role(m) field
+.RS
+.TP
+.B rakp3_wrong_rolem
+Some systems use the incorrect Role(m) field
in a specific authentication message (the RAKP3 message). This is a
common problem.
-.IP rmcpp_integ_sik - The original IPMI 2.0 spec specified the
+.TP
+.B rmcpp_integ_sik
+The original IPMI 2.0 spec specified the
incorrect key to use for the integrity key. This forces use of the
Session Initiation Key. The default is to use K(1)
+.RE
.TP
-.BI \-s
+.B \-s
Make two connections to the BMC. This means the BMC has two different
IP addresses/ports that are equivalent. If this is specified, a
second host must be supplied. This is not the same as two connections
to two different BMCs. This must be a connection to the same BMC.
.TP
-.BI host
+.I host
The IP address (either by name lookup or specified directly) to
connect to. If the
-.BI \-s
+.B \-s
is specified, two hosts must be supplied.
.P
The
-.BI \-Ra,
-.BI \-Ri,
-.BI \-Rc,
-.BI \-Rk
+.BR \-Ra ,
+.BR \-Ri ,
+.BR \-Rc ,
+.BR \-Rk
and
-.BI \-Rl
+.B \-Rl
options only apply to RMCP+ connections and will be ignored if the
connection does not support RMCP+ or if a non-RMCP+ authentication
type is specified.
@@ -159,7 +165,7 @@
.SH "SEE ALSO"
.BR ipmish (8),
.BR openipmicmd (8),
-.BR solterm(1)
+.BR solterm (1)
.SH "KNOWN PROBLEMS"
This is excessively complicated, but the defaults should be good.
--- openipmi-2.0.8.orig/man/rmcp_ping.1
+++ openipmi-2.0.8/man/rmcp_ping.1
@@ -4,7 +4,7 @@
rmcp_ping \- IPMI RMCP Ping program
.SH SYNOPSIS
-.B ipmilan
+.B rmcp_ping
.RB [ \-p
.IR port ]
.RB [ \-t
@@ -12,6 +12,7 @@
.RB [ \-s
.IR starttag ]
.RB [ \-d ]
+.I destination
.SH DESCRIPTION
The
@@ -21,20 +22,23 @@
.SH OPTIONS
.TP
-.BI \-p\ port
-Set the destination port. This is the standard RMCP port by default,
+.BI \-p\ port
+Set the destination \fIport\fP. This is the standard RMCP port by default,
623.
.TP
-.BI \-t\ waittime
+.BI \-t\ waittime
Sets the number of seconds to wait for a response. Ten by default.
.TP
-.BI \-s\ starttag
+.BI \-s\ starttag
There is an 8-bit tag value in every ping packet (0-254, 255 is
reserved), this program will cycle through the values starting at
starttag. This is zero by default
.TP
.B \-d
Turns on debugging to standard output.
+.TP
+.I destination
+The target address, default is the boradcast address (default 255.255.255.255)
.SH AUTHOR
.PP
2. rpath is not allowed in Debian. Rewrite part of Autoconf and Automake
stuff to not use rpath. Please check on other architectures, before
applying upstream.
--- openipmi-2.0.8.orig/configure.in
+++ openipmi-2.0.8/configure.in
@@ -348,11 +348,9 @@
AC_DEFINE([HAVE_GLIB], [], [Have GLIB libraries])
GLIB_LIB='$(top_builddir)/glib/libOpenIPMIglib.la'
GLIB_PKGCONF=OpenIPMIglib.pc
- GLIB_TARGET=libOpenIPMIglib.la
else
GLIB_LIB=
GLIB_PKGCONF=
- GLIB_TARGET=
fi
AC_SUBST(GLIB_VERSION)
AC_SUBST(GLIB_CFLAGS)
@@ -360,7 +358,7 @@
AC_SUBST(GLIB_LIB)
AC_SUBST(GLIB_PKGCONF)
-AC_SUBST(GLIB_TARGET)
+AM_CONDITIONAL(WANT_GLIB, test "x$haveglib" = "xyes")
# We allow a glib 1.2 specific library, too.
@@ -391,18 +389,16 @@
AC_DEFINE([HAVE_GLIB12], [], [Have the GLIB 1.2 libraries])
GLIB12_LIB='$(top_builddir)/glib/libOpenIPMIglib12.la'
GLIB12_PKGCONF=OpenIPMIglib12.pc
- GLIB12_TARGET=libOpenIPMIglib12.la
else
GLIB12_LIB=
GLIB12_PKGCONF=
- GLIB12_TARGET=
fi
AC_SUBST(GLIB12_CFLAGS)
AC_SUBST(GLIB12_LIBS)
AC_SUBST(GLIB12_LIB)
AC_SUBST(GLIB12_PKGCONF)
-AC_SUBST(GLIB12_TARGET)
+AM_CONDITIONAL(WANT_GLIB12, test "x$haveglib12" = "xyes")
if test "x$haveglib12" = "xyes" -o "x$haveglib" = "xyes"; then
@@ -466,12 +462,10 @@
AC_DEFINE([HAVE_TCL], [], [Have TCL libraries])
TCL_LIB='$(top_builddir)/tcl/libOpenIPMItcl.la'
TCL_PKGCONF=OpenIPMItcl.pc
- TCL_TARGET=libOpenIPMItcl.la
TCL_DIR=tcl
else
TCL_LIB=
TCL_PKGCONF=
- TCL_TARGET=
TCL_DIR=
fi
AC_SUBST(TCL_CFLAGS)
@@ -479,8 +473,8 @@
AC_SUBST(TCL_LIB)
AC_SUBST(TCL_PKGCONF)
-AC_SUBST(TCL_TARGET)
AC_SUBST(TCL_DIR)
+AM_CONDITIONAL(WANT_TCL, test "x$havetcl" = "xyes")
# Handle PERL support
if test "x$perlcflags" = "x" -o "x$perlinstalldir" = "x"; then
--- openipmi-2.0.8.orig/lib/Makefile.am
+++ openipmi-2.0.8/lib/Makefile.am
@@ -27,6 +27,6 @@
libOpenIPMI_la_LIBADD = -lm $(top_builddir)/utils/libOpenIPMIutils.la \
$(OPENSSLLIBS)
libOpenIPMI_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- -Wl,-Map -Wl,libOpenIPMI.map -L$(DESTDIR)$(libdir) -R$(libdir)
+ -Wl,-Map -Wl,libOpenIPMI.map -L$(DESTDIR)$(libdir)
CLEANFILES = libOpenIPMI.map
--- openipmi-2.0.8.orig/unix/Makefile.am
+++ openipmi-2.0.8/unix/Makefile.am
@@ -24,7 +24,7 @@
libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
$(GDBM_LIB)
libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(DESTDIR)$(libdir) -R$(libdir)
+ -Wl,-Map -Wl,libOpenIPMIposix.map -L$(DESTDIR)$(libdir)
noinst_HEADERS = heap.h
--- openipmi-2.0.8.orig/glib/Makefile.am
+++ openipmi-2.0.8/glib/Makefile.am
@@ -12,21 +12,26 @@
AM_CFLAGS = -Wall -Wsign-compare -I$(top_srcdir)/include
-lib_LTLIBRARIES = @GLIB_TARGET@ @GLIB12_TARGET@
-EXTRA_LTLIBRARIES = libOpenIPMIglib.la libOpenIPMIglib12.la
+lib_LTLIBRARIES =
+if WANT_GLIB
+lib_LTLIBRARIES += libOpenIPMIglib.la
+endif
+if WANT_GLIB12
+lib_LTLIBRARIES += libOpenIPMIglib12.la
+endif
libOpenIPMIglib_la_SOURCES = glib_os_hnd.c
libOpenIPMIglib_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
libOpenIPMIglib_la_LIBADD = $(GDBM_LIB)
libOpenIPMIglib_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- -rpath $(libdir) -L$(DESTDIR)$(libdir) -R$(libdir) \
+ -L$(DESTDIR)$(libdir) \
-Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS)
libOpenIPMIglib12_la_SOURCES = glib_os_hnd.c
libOpenIPMIglib12_la_CFLAGS = $(GLIB12_CFLAGS) $(AM_CFLAGS)
libOpenIPMIglib12_la_LIBADD = $(GDBM_LIB)
libOpenIPMIglib12_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- -rpath $(libdir) -L$(DESTDIR)$(libdir) -R$(libdir) \
+ -L$(DESTDIR)$(libdir) \
-Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS)
CLEANFILES = libOpenIPMIglib.map libOpenIPMIglib12.map glib12_os_hnd.c
--- openipmi-2.0.8.orig/tcl/Makefile.am
+++ openipmi-2.0.8/tcl/Makefile.am
@@ -12,14 +12,16 @@
AM_CFLAGS = -Wall -Wsign-compare -I$(top_srcdir)/include
-lib_LTLIBRARIES = @TCL_TARGET@
-EXTRA_LTLIBRARIES = libOpenIPMItcl.la
+lib_LTLIBRARIES =
+if WANT_TCL
+lib_LTLIBRARIES += libOpenIPMItcl.la
+endif
libOpenIPMItcl_la_SOURCES = tcl_os_hnd.c
libOpenIPMItcl_la_CFLAGS = $(TCL_CFLAGS) $(AM_CFLAGS)
libOpenIPMItcl_la_LIBADD = $(GDBM_LIB)
libOpenIPMItcl_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- -rpath $(libdir) -L$(DESTDIR)$(libdir) -R$(libdir) \
+ -L$(DESTDIR)$(libdir) \
-Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS)
noinst_PROGRAMS = test_handlers
--- openipmi-2.0.8.orig/cmdlang/Makefile.am
+++ openipmi-2.0.8/cmdlang/Makefile.am
@@ -23,7 +23,7 @@
$(top_builddir)/utils/libOpenIPMIutils.la \
$(top_builddir)/lib/libOpenIPMI.la
libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(DESTDIR)$(libdir) -R$(libdir)
+ -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(DESTDIR)$(libdir)
bin_PROGRAMS = openipmish
--- openipmi-2.0.8.orig/ui/Makefile.am
+++ openipmi-2.0.8/ui/Makefile.am
@@ -24,7 +24,7 @@
libOpenIPMIui_la_SOURCES = ui.c ui_os.c ui_keypad.c ui_command.c
libOpenIPMIui_la_LIBADD =
libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION) \
- -Wl,-Map -Wl,libOpenIPMIui.map -L$(DESTDIR)$(libdir) -R$(libdir)
+ -Wl,-Map -Wl,libOpenIPMIui.map -L$(DESTDIR)$(libdir)
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
-lncurses $(SNMPLIBS) $(OPENSSLLIBS)
--- openipmi-2.0.8.orig/lanserv/Makefile.am
+++ openipmi-2.0.8/lanserv/Makefile.am
@@ -27,7 +27,7 @@
libIPMIlanserv_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
$(OPENSSLLIBS)
libIPMIlanserv_la_LDFLAGS = -version-info $(LD_VERSION) \
- -Wl,-Map -Wl,libIPMIlanserv.map -L$(DESTDIR)$(libdir) -R$(libdir)
+ -Wl,-Map -Wl,libIPMIlanserv.map -L$(DESTDIR)$(libdir)
ipmi_checksum_SOURCES = ipmi_checksum.c
--- openipmi-2.0.8.orig/swig/perl/Makefile.am
+++ openipmi-2.0.8/swig/perl/Makefile.am
@@ -25,8 +25,7 @@
$(GLIB_SINGLE_LIB) $(TCL_LIB)
OpenIPMI.so: $(OpenIPMI_OBJ)
- $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OpenIPMI_LIB) \
- -R/$(libdir)
+ $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OpenIPMI_LIB)
rm OpenIPMI.so
mv .libs/OpenIPMI.so .
rm -rf .libs
--- openipmi-2.0.8.orig/swig/python/Makefile.am
+++ openipmi-2.0.8/swig/python/Makefile.am
@@ -27,8 +27,7 @@
EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py
_OpenIPMI.so: $(OpenIPMI_OBJ)
- $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OpenIPMI_LIB) \
- -R/$(libdir)
+ $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OpenIPMI_LIB)
rm _OpenIPMI.so
mv .libs/_OpenIPMI.so .
rm -rf .libs
@@ -51,9 +50,9 @@
install-exec-local: _OpenIPMI.so OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
$(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) _OpenIPMI.so
"$(DESTDIR)$(PYTHON_INSTALL_DIR)"
- $(INSTALL_PROGRAM) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
- $(INSTALL_PROGRAM) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
- $(INSTALL_PROGRAM) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
+ $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
+ $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
+ $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \
$(INSTALL) -d $(DESTDIR)$(bindir); \
$(INSTALL_PROGRAM) openipmigui.py
"$(DESTDIR)$(bindir)/openipmigui";\
--- openipmi-2.0.8.orig/swig/python/openipmigui/Makefile.am
+++ openipmi-2.0.8/swig/python/openipmigui/Makefile.am
@@ -22,9 +22,9 @@
all-local: $(PYC_FILES) $(PYO_FILES)
-install-exec-local: $(EXTRA_DIST) $(PYC_FILES) $(PYO_FILES)
+install-data-local: $(EXTRA_DIST) $(PYC_FILES) $(PYO_FILES)
$(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
- $(INSTALL_PROGRAM) $^ $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
+ $(INSTALL_DATA) $^ $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui
uninstall-local:
(for i in $(EXTRA_DIST) $(PYC_FILES) $(PYO_FILES); do \
This is relevant to DEBIAN only:
3. Add Python package. Since enableling that also enables TCL and Perl,
you might want to split the TCL-parm from libopenipmi0 to reduce
dependencies. The Perl-part is not packaged, since it's anly two files.
Since perl is essential in Debian, include it into libopenipmi0?
Since the Python-part depends on libOpenIPMIcmdlang.so.0, which was not
part of previous libopenipmi0-packages, also add a
debian/libopenipmi0.shlibs file.
--- openipmi-2.0.8.orig/debian/changelog
+++ openipmi-2.0.8/debian/changelog
@@ -1,3 +1,16 @@
+openipmi (2.0.8-0.pmhahn0) unstable; urgency=low
+
+ * NMU.
+ * New upstream version.
+ * Update manual pages.
+ * Symlink {open,}ipmi{cmd,sh}.1 manual pages.
+ * Enable Python GUI.
+ * Fix rpath issues:
+ + configure.in
+ + {glib,tcl}/Makefile.am, swig/{perl,python}/Makefile.am
+
+ -- Philipp Matthias Hahn <[EMAIL PROTECTED]> Fri, 13 Oct 2006 14:17:46 +0200
+
openipmi (2.0.7-1) unstable; urgency=low
* new upstream release from 2006-06-08
--- openipmi-2.0.8.orig/debian/control
+++ openipmi-2.0.8/debian/control
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Noèl Köthe <[EMAIL PROTECTED]>
-Build-Depends: debhelper, dpatch, cdbs, libsnmp9-dev, libpopt-dev,
libncurses5-dev
+Build-Depends: debhelper (>= 4), dpatch, cdbs, libsnmp9-dev, libpopt-dev,
libncurses5-dev, swig (>= 1.3.21), python2.3-dev, python-tk, tix8.1, tcl8.4-dev
Standards-Version: 3.7.2
Package: openipmi
@@ -30,9 +30,22 @@
Package: libopenipmi-dev
Section: libdevel
Architecture: any
-Depends: libopenipmi0 (= ${Source-Version}), ${shlibs:Depends}, libgdbm-dev
+Depends: libopenipmi0 (= ${Source-Version}), libgdbm-dev
Description: Intelligent Platform Management Interface - development
IPMI allows remote monitoring and remote management of devices.
.
This package contains the development headers needed for compiling
programs against libopenipmi.
+
+Package: openipmi-python
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tk, tix8.1
+Description: Intelligent Platform Management Interface Python GUI
+ IPMI allows remote monitoring and remote management of devices.
+ .
+ This package contains the Python-Tk-GUI names openipmigui and the
+ Python bindings.
+ .
+ http://openipmi.sourceforge.net/
+ https://sourceforge.net/projects/openipmi
--- openipmi-2.0.8.orig/debian/rules
+++ openipmi-2.0.8/debian/rules
@@ -37,6 +37,9 @@
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--without-openssl \
+ --with-tclcflags="-I
/usr/include/tcl8.4" \
+ --with-tcllibs=-ltcl8.4 \
+ --with-python=yes --with-swig=yes \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
@@ -109,7 +112,7 @@
dh_compress
dh_fixperms
# dh_perl
-# dh_python
+ dh_python -popenipmi-python
dh_makeshlibs
dh_installdeb
dh_shlibdeps
--- openipmi-2.0.8.orig/debian/openipmi-python.files
+++ openipmi-2.0.8/debian/openipmi-python.files
@@ -0,0 +1,5 @@
+usr/lib/python2.3/site-packages/_OpenIPMI.so
+usr/lib/python2.3/site-packages/OpenIPMI.py
+usr/lib/python2.3/site-packages/openipmigui/*.py
+usr/bin/openipmigui
+usr/share/man/man1/openipmigui.1
--- openipmi-2.0.8.orig/debian/libopenipmi0.shlibs
+++ openipmi-2.0.8/debian/libopenipmi0.shlibs
@@ -0,0 +1,10 @@
+libOpenIPMIutils 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMI 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMIpthread 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMIposix 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMIglib 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMIcmdlang 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMIglib12 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMIui 1 libopenipmi0 (>= 2.0.8)
+libIPMIlanserv 0 libopenipmi0 (>= 2.0.8)
+libOpenIPMItcl 0 libopenipmi0 (>= 2.0.8)
-- System Information:
Debian Release: 3.1
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.18-station
Locale: LANG=de_DE.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages openipmi depends on:
ii libc6 2.3.2.ds1-22sarge4 GNU C Library: Shared libraries an
ii libglib2.0-0 2.6.4-1 The GLib library of C routines
ii libncurses5 5.4-4 Shared libraries for terminal hand
ii libopenipmi0 2.0.8-0.pmhahn0 Intelligent Platform Management In
ii libpopt0 1.7-5 lib for parsing cmdline parameters
ii libsnmp5 5.1.2-6.2 NET SNMP (Simple Network Managemen
ii tcl8.4 8.4.9-1 Tcl (the Tool Command Language) v8
-- no debconf information
