[openhpi] - update to 3.4.0
Dan Horák
sharkcz at fedoraproject.org
Mon Aug 25 09:10:08 UTC 2014
commit 804f62291018e97fa2e81e46ca4fcea7ecf94fcb
Author: Dan Horák <dan at danny.cz>
Date: Mon Aug 25 11:10:04 2014 +0200
- update to 3.4.0
.gitignore | 1 +
openhpi-3.2.1-docs.patch | 126 -----------
openhpi-3.2.1-ipv6.patch | 519 -------------------------------------------
openhpi-3.2.1-systemd.patch | 328 ---------------------------
openhpi-3.4.0-docs.patch | 13 +
openhpi-3.4.0-man.patch | 203 +++++++++++++++++
openhpi-3.4.0-systemd.patch | 94 ++++++++
openhpi.spec | 23 +-
sources | 2 +-
9 files changed, 324 insertions(+), 985 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16ebb87..2aa1d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ openhpi-2.14.1.tar.gz
/openhpi-3.0.0.tar.gz
/openhpi-3.2.0.tar.gz
/openhpi-3.2.1.tar.gz
+/openhpi-3.4.0.tar.gz
diff --git a/openhpi-3.4.0-docs.patch b/openhpi-3.4.0-docs.patch
new file mode 100644
index 0000000..72a5a01
--- /dev/null
+++ b/openhpi-3.4.0-docs.patch
@@ -0,0 +1,13 @@
+diff -up openhpi-3.2.1/Makefile.am.docs openhpi-3.2.1/Makefile.am
+--- openhpi-3.2.1/Makefile.am.docs 2013-08-20 18:20:30.498731238 +0200
++++ openhpi-3.2.1/Makefile.am 2013-08-20 18:20:43.124971660 +0200
+@@ -116,8 +116,7 @@ include_HEADERS = $(top_srcdir)/include/
+ $(top_srcdir)/utils/event_utils.h \
+ $(top_srcdir)/clients/oh_clients.h
+
+-docsdir=$(datadir)/doc/$(PACKAGE_NAME)-$(VERSION)
+-docs_DATA = README README.daemon COPYING
++doc_DATA = README README.daemon COPYING
+
+ $(top_srcdir)/utils/sahpi_enum_utils.h:
+ make -C $(top_builddir)/utils sahpi_enum_utils.h
diff --git a/openhpi-3.4.0-man.patch b/openhpi-3.4.0-man.patch
new file mode 100644
index 0000000..ed01584
--- /dev/null
+++ b/openhpi-3.4.0-man.patch
@@ -0,0 +1,203 @@
+From a870faf95052553be84cdc4a2a0d320a1e2025a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Mon, 25 Aug 2014 10:09:40 +0200
+Subject: [PATCH] man page fixes
+
+sync man pages with the output of --help (rhbz#948461)
+---
+ docs/man/hpiel.1.pod | 6 +++---
+ docs/man/hpitree.1.pod | 2 +-
+ docs/man/hpiwdt.1.pod | 4 ++--
+ docs/man/ohdomainlist.1.pod | 16 ++++++++++++++
+ docs/man/ohhandler.1.pod | 14 ++++++------
+ docs/man/openhpid.8.pod | 52 ++++++++++++++++++++++++++++++++-------------
+ 6 files changed, 66 insertions(+), 28 deletions(-)
+
+diff --git a/docs/man/hpiel.1.pod b/docs/man/hpiel.1.pod
+index 7ac4a6b..39c56f4 100644
+--- a/docs/man/hpiel.1.pod
++++ b/docs/man/hpiel.1.pod
+@@ -4,9 +4,9 @@ hpiel - An openhpi sample application that displays HPI event log entries.
+
+ =head1 SYNOPSIS
+
+- hpiel [-D nn] [-N host[:port]] [-C <cfgfile>] [-d] [-e entitypath] [-c -p -r -X -h ]
+- hpiel [--Domain=nn] [--host=host[:port]] [--cfgfile=file]
+- [--del] [--entitypath="entitypath"] [--clear --resource --rdr --xml --debug --help]
++ hpiel [-D nn] [-N host[:port]] [-C <cfgfile>] [-d] [-E entity-path] [-c -p -r -X -h ]
++ hpiel [--domain=nn] [--host=host[:port]] [--cfgfile=file]
++ [--del] [--entity-path="entitypath"] [--clear --resource --rdr --debug --help]
+
+ =head1 DESCRIPTION
+
+diff --git a/docs/man/hpitree.1.pod b/docs/man/hpitree.1.pod
+index f677931..ba7210f 100644
+--- a/docs/man/hpitree.1.pod
++++ b/docs/man/hpitree.1.pod
+@@ -5,7 +5,7 @@ and resources' manamegement instruments (rdr's) data structures of the managed o
+
+ =head1 SYNOPSIS
+
+- hpitree [-D nn] [-N host[:port]] [-C <cfgfile>] [-acdiorsw ] [-n nn] [-x] [-h]
++ hpitree [-D nn] [-N host[:port]] [-C <cfgfile>] [-acdiorsw ] [-n nn] [-X] [-h]
+ hpitree [--domain=nn] [--host=host[:port]] [--cfgfile=file] [--all] [--controls] [--rdrs] [--inventories] [--rpts]
+ [--sensors] [--watchdogs] [--overview] [--resource=nn] [--debug] [--help]
+
+diff --git a/docs/man/hpiwdt.1.pod b/docs/man/hpiwdt.1.pod
+index b876d9b..6cf4e45 100644
+--- a/docs/man/hpiwdt.1.pod
++++ b/docs/man/hpiwdt.1.pod
+@@ -4,9 +4,9 @@ hpiwdt - This sample openhpi application reads and enables the watchdog timer.
+
+ =head1 SYNOPSIS
+
+- hpiwdt [-D nn] [-N host[:port]] [-C <cfgfile>] [-der -t sec] [-X] [-h]
++ hpiwdt [-D nn] [-N host[:port]] [-C <cfgfile>] [-t sec] [-X] [-h]
+ hpiwdt [--domain=nn] [--host=host[:port]] [--cfgfile=file]
+- [--disable][--enable][--reset][--timout n] [--debug] [--help]
++ [--disable][--enable][--reset][--timeout n] [--debug] [--help]
+
+ =head1 DESCRIPTION
+
+diff --git a/docs/man/ohdomainlist.1.pod b/docs/man/ohdomainlist.1.pod
+index c0088df..2631989 100644
+--- a/docs/man/ohdomainlist.1.pod
++++ b/docs/man/ohdomainlist.1.pod
+@@ -38,6 +38,10 @@ Show help options
+
+ =over 2
+
++=item B<-D>, B<--domain>=I<nn>
++
++Select domain id nn
++
+ =item B<-X>, B<--debug>
+
+ Display debug messages
+@@ -46,6 +50,18 @@ Display debug messages
+
+ Verbose mode
+
++=item B<-N>, B<--host>=I<"host[:port]">
++
++Open session to the domain served by the daemon
++at the specified URL (host:port).
++This option overrides the OPENHPI_DAEMON_HOST and
++OPENHPI_DAEMON_PORT environment variables.
++
++=item B<-C>, B<--cfgfile>=I<"file">
++
++Use passed file as client configuration file.
++This option overrides the OPENHPICLIENT_CONf environment variable.
++
+ =back
+
+ =head1 SEE ALSO
+diff --git a/docs/man/ohhandler.1.pod b/docs/man/ohhandler.1.pod
+index 9e11bba..c093027 100644
+--- a/docs/man/ohhandler.1.pod
++++ b/docs/man/ohhandler.1.pod
+@@ -7,13 +7,13 @@ ohhandler - An openhpi sample application that uses the openhpi additional inter
+ ohhandler [-D nn] [-N host[:port]] [-C <cfgfile>] [-X] command <specific arguments>
+ ohhandler [--domain nn] [--host=host[:port]] [--cfgfile=file] [--debug] command <specific arguments>
+
+- ohhandler [-D nn] [-x] list
+- ohhandler [-D nn] [-x] info <handler-id>
+- ohhandler [-D nn] [-x] destroy <handler-id>
+- ohhandler [-D nn] [-x] getnext <handler-id>
+- ohhandler [-D nn] [-x] find <resource-id>
+- ohhandler [-D nn] [-x] retry <handler-id>
+- ohhandler [-D nn] [-x] create plugin <plugin-name> <configuration-parameters>
++ ohhandler [-D nn] [-X] list
++ ohhandler [-D nn] [-X] info <handler-id>
++ ohhandler [-D nn] [-X] destroy <handler-id>
++ ohhandler [-D nn] [-X] getnext <handler-id>
++ ohhandler [-D nn] [-X] find <resource-id>
++ ohhandler [-D nn] [-X] retry <handler-id>
++ ohhandler [-D nn] [-X] create plugin <plugin-name> <configuration-parameters>
+
+ =head1 DESCRIPTION
+
+diff --git a/docs/man/openhpid.8.pod b/docs/man/openhpid.8.pod
+index 9ae13b7..8973793 100644
+--- a/docs/man/openhpid.8.pod
++++ b/docs/man/openhpid.8.pod
+@@ -38,38 +38,60 @@ The client and daemon currently cannot resolve differences between 32-bit and
+
+ =over 4
+
+-=item B<-f> I<pidfile>
++=item B<-c>, B<--cfg>=I<conf_file>
+
+-This overrides the default location of the pidfile.
++Sets path/name of the configuration file.
++This option is required unless the environment
++variable OPENHPI_CONF has been set to a valid configuration file.
+
+-=item B<-n>
++=item B<-v>, B<--verbose>
+
+-This forces the daemon to run in the foreground.
++This option causes the daemon to display verbose
++messages. This option is optional.
+
+-=item B<-p> I<port>
++=item B<-b>, B<--bind>=I<bind_address>
+
+-This is used to override the port to listen on by the daemon.
++Bind address for the daemon socket.
++Also bind address can be specified with
++OPENHPI_DAEMON_BIND_ADDRESS environment variable.
++No bind address is used by default.
+
+-=item B<-s> I<seconds>
++=item B<-p>, B<--port>=I<port>
+
+-Read timeout used by the daemon sockets. Default is unlimited.
++Overrides the default listening port (4743) of the daemon.
++The option is optional.
+
+-=item B<-t> I<threads>
++=item B<-f>, B<--pidfile>=I<pidfile>
+
+-Sets the maximum number of connection threads. Default is unlimited.
++Overrides the default path/name for the daemon pid file.
++The option is optional.
+
+-=item B<-v>
++=item B<-s>, B<--timeout>=I<seconds>
+
+-Display verbose messages
++Overrides the default socket read timeout of 30 minutes.
++The option is optional.
+
+-=item B<-4>
++=item B<-t>, B<--threads>=I<threads>
+
+-The daemon will try to bind IPv4 socket.
++Sets the maximum number of connection threads.
++The default is umlimited.
++The option is optional.
+
+-=item B<-6>
++=item B<-n>, B<--nondaemon>
++
++Forces the code to run as a foreground process and NOT as a daemon.
++The default is to run as a daemon.
++The option is optional.
++
++=item B<-6>, B<--ipv6>
+
+ The daemon will try to bind IPv6 socket.
+
++=item B<-4>, B<--ipv4>
++
++The daemon will try to bind IPv4 socket (default).
++IPv6 option takes precedence over IPv6 option.
++
+ =item B<-4 -6>
+
+ The daemon will try to bind IPv4 or IPv6 socket.
+--
+1.9.3
+
diff --git a/openhpi-3.4.0-systemd.patch b/openhpi-3.4.0-systemd.patch
new file mode 100644
index 0000000..028d985
--- /dev/null
+++ b/openhpi-3.4.0-systemd.patch
@@ -0,0 +1,94 @@
+From d82555d0f32fc341d8f3e58a08f63894a3eb7ce0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Tue, 6 Mar 2012 11:23:01 +0100
+Subject: [PATCH] add support for systemd
+
+New configure parameter is introduced (--with-systemdsystemunitdir) and when set
+it means that systemd service file will be installed instead of the classis initscript.
+---
+ configure.ac | 12 ++++++++++++
+ openhpid/Makefile.am | 7 +++++++
+ openhpid/openhpid.service.in | 11 +++++++++++
+ 3 files changed, 30 insertions(+)
+ create mode 100644 openhpid/openhpid.service.in
+
+diff --git a/configure.ac b/configure.ac
+index e538fb4..80157af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -709,6 +709,17 @@ AC_ARG_ENABLE([man],
+ AC_SUBST(MAN,"")
+ fi])
+
++dnl systemd system unit files location
++AC_ARG_WITH([systemdsystemunitdir],
++ AS_HELP_STRING([--with-systemdsystemunitdir@<:@=DIR@:>@],[systemd system unit files location]),
++ [enable_systemd=yes],
++ [enable_systemd=no])
++
++dnl enable systemd and set unit dir
++AM_CONDITIONAL([ENABLE_SYSTEMD], [test "x$enable_systemd" = "xyes"])
++unitdir=$with_systemdsystemunitdir
++AC_SUBST(unitdir)
++
+ AC_CONFIG_FILES([openhpi.spec
+ openhpi.pc
+ rt-env.sh
+@@ -751,6 +762,7 @@ AC_CONFIG_FILES([openhpi.spec
+ docs/man/Makefile
+ openhpid/Makefile
+ openhpid/openhpid.sh
++ openhpid/openhpid.service
+ openhpid/t/Makefile
+ openhpid/t/ohpi/Makefile
+ hpi_shell/Makefile
+diff --git a/openhpid/Makefile.am b/openhpid/Makefile.am
+index bccbce5..bfc6e73 100644
+--- a/openhpid/Makefile.am
++++ b/openhpid/Makefile.am
+@@ -28,6 +28,7 @@ DIST_SUBDIRS = t
+
+ EXTRA_DIST = \
+ openhpid.sh.in \
++ openhpid.service.in \
+ Makefile.mingw32 \
+ openhpid-win32.cpp \
+ version.rc
+@@ -83,11 +84,17 @@ endif
+
+
+ install-data-local:
++if ENABLE_SYSTEMD
++ $(mkinstalldirs) $(DESTDIR)$(unitdir)
++ $(INSTALL) -m 0644 openhpid.service $(DESTDIR)$(unitdir)
++else
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
+ $(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
++endif
+
+ uninstall-local:
+ rm -f $(DESTDIR)$(sysconfdir)/init.d/openhpid
++ rm -f $(DESTDIR)$(unitdir)/openhpid.service
+
+ clean-local:
+ rm -f *~ core core.*
+diff --git a/openhpid/openhpid.service.in b/openhpid/openhpid.service.in
+new file mode 100644
+index 0000000..69b1348
+--- /dev/null
++++ b/openhpid/openhpid.service.in
+@@ -0,0 +1,11 @@
++[Unit]
++Description=Daemon providing access to the SAF Hardware Platform Interface
++After=syslog.target
++
++[Service]
++Type=forking
++PIDFile=/var/run/openhpid.pid
++ExecStart=@sbindir@/openhpid -c @sysconfdir@/openhpi/openhpi.conf
++
++[Install]
++WantedBy=multi-user.target
+--
+1.9.3
+
diff --git a/openhpi.spec b/openhpi.spec
index fc1dee4..f1f1b9a 100644
--- a/openhpi.spec
+++ b/openhpi.spec
@@ -2,18 +2,18 @@
Summary: Hardware Platform Interface library and tools
Name: openhpi
-Version: 3.2.1
-Release: 6%{?dist}
+Version: 3.4.0
+Release: 1%{?dist}
License: BSD
Group: System Environment/Base
URL: http://www.openhpi.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# convert from initscript to systemd unit
-Patch0: %{name}-3.2.1-systemd.patch
+Patch0: %{name}-3.4.0-systemd.patch
# https://sourceforge.net/p/openhpi/bugs/1807/
-Patch1: %{name}-3.2.1-docs.patch
-# https://sourceforge.net/p/openhpi/bugs/1808/
-Patch2: %{name}-3.2.1-ipv6.patch
+Patch1: %{name}-3.4.0-docs.patch
+# https://sourceforge.net/p/openhpi/bugs/1850/
+Patch2: %{name}-3.4.0-man.patch
BuildRequires: libsysfs-devel
BuildRequires: net-snmp-devel
BuildRequires: OpenIPMI-devel
@@ -68,11 +68,9 @@ The development libraries and header files for the OpenHPI project.
%setup -q
%patch0 -p1 -b .systemd
%patch1 -p1 -b .docs
-%patch2 -p1 -b .ipv6
-# workaround dependecies between manually modified autotooled files
-touch aclocal.m4
-touch config.h.in
-touch configure
+%patch2 -p1 -b .man
+
+autoreconf -vif
# fix permissions
chmod a-x plugins/simulator/*.[ch]
@@ -144,6 +142,9 @@ make check
%changelog
+* Mon Aug 25 2014 Dan Horák <dan[at]danny.cz> - 3.4.0-1
+- update to 3.4.0
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 3181328..d4c6035 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-115bd1c8f3443c6fa3bf893d73f37dca openhpi-3.2.1.tar.gz
+6b21173f167494c8d2369e7e1d04dc9d openhpi-3.4.0.tar.gz
More information about the scm-commits
mailing list