[openhpi] - update to 3.2.1
Dan Horák
sharkcz at fedoraproject.org
Fri Jul 19 09:24:14 UTC 2013
commit b5cfdd85ce17c842c6b23c8c28f60b1a001a114d
Author: Dan Horák <dan at danny.cz>
Date: Fri Jul 19 11:24:00 2013 +0200
- update to 3.2.1
.gitignore | 1 +
openhpi-3.2.0-systemd.patch | 183 ------------------------
openhpi-3.2.1-systemd.patch | 328 +++++++++++++++++++++++++++++++++++++++++++
openhpi.spec | 9 +-
sources | 2 +-
5 files changed, 336 insertions(+), 187 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba2c804..16ebb87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ openhpi-2.14.1.tar.gz
/openhpi-2.17.0.tar.gz
/openhpi-3.0.0.tar.gz
/openhpi-3.2.0.tar.gz
+/openhpi-3.2.1.tar.gz
diff --git a/openhpi-3.2.1-systemd.patch b/openhpi-3.2.1-systemd.patch
new file mode 100644
index 0000000..a32ab7f
--- /dev/null
+++ b/openhpi-3.2.1-systemd.patch
@@ -0,0 +1,328 @@
+diff -up openhpi-3.2.1/configure.ac.systemd openhpi-3.2.1/configure.ac
+--- openhpi-3.2.1/configure.ac.systemd 2012-08-27 20:08:58.000000000 +0200
++++ openhpi-3.2.1/configure.ac 2013-07-18 17:48:09.000000000 +0200
+@@ -670,6 +670,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
+@@ -712,6 +723,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 -up openhpi-3.2.1/configure.systemd openhpi-3.2.1/configure
+--- openhpi-3.2.1/configure.systemd 2013-07-18 00:38:41.000000000 +0200
++++ openhpi-3.2.1/configure 2013-07-18 17:48:09.000000000 +0200
+@@ -787,6 +787,9 @@ ac_includes_default="\
+ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
++unitdir
++ENABLE_SYSTEMD_FALSE
++ENABLE_SYSTEMD_TRUE
+ MAN
+ found_pod2man
+ OPENHPI_INCLUDES
+@@ -993,6 +996,7 @@ enable_debuggable
+ enable_debug_msgs
+ enable_werror
+ enable_man
++with_systemdsystemunitdir
+ '
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1677,6 +1681,8 @@ Optional Packages:
+ --with-net-snmp-config=SCRIPT run SCRIPT as net-snmp-config
+ --with-varpath=PATH use directory PATH to store openhpi specific data [default=$prefix/var/lib/openhpi]
+ --with-pluginpath=PATH use directory PATH to locate plugin libraries [default=LIBDIR/openhpi]
++ --with-systemdsystemunitdir[=DIR]
++ systemd system unit files location
+
+ Some influential environment variables:
+ CC C compiler command
+@@ -4649,13 +4655,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:4652: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4658: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:4655: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4661: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:4658: output\"" >&5)
++ (eval echo "\"\$as_me:4664: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -5861,7 +5867,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5864 "configure"' > conftest.$ac_ext
++ echo '#line 5870 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7712,11 +7718,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:7715: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7721: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7719: \$? = $ac_status" >&5
++ echo "$as_me:7725: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8051,11 +8057,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8054: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8060: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8058: \$? = $ac_status" >&5
++ echo "$as_me:8064: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8156,11 +8162,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8159: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8165: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8163: \$? = $ac_status" >&5
++ echo "$as_me:8169: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -8211,11 +8217,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8214: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8220: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8218: \$? = $ac_status" >&5
++ echo "$as_me:8224: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11014,7 +11020,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11017 "configure"
++#line 11023 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11110,7 +11116,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11113 "configure"
++#line 11119 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14397,11 +14403,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14400: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14406: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14404: \$? = $ac_status" >&5
++ echo "$as_me:14410: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -14496,11 +14502,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14499: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14505: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14503: \$? = $ac_status" >&5
++ echo "$as_me:14509: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -14548,11 +14554,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14551: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14557: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14555: \$? = $ac_status" >&5
++ echo "$as_me:14561: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18999,7 +19005,27 @@ else
+ fi
+
+
+-ac_config_files="$ac_config_files openhpi.spec openhpi.pc rt-env.sh Makefile utils/openhpiutils.pc utils/Makefile utils/t/Makefile utils/t/epath/Makefile utils/t/rpt/Makefile utils/t/sahpi/Makefile utils/t/el/Makefile utils/t/uid/Makefile utils/t/ann/Makefile transport/Makefile marshal/Makefile marshal/t/Makefile plugins/Makefile plugins/watchdog/Makefile plugins/ipmi/Makefile plugins/ipmi/t/Makefile plugins/snmp_bc/Makefile plugins/snmp_bc/t/Makefile plugins/sysfs/Makefile plugins/ipmidirect/Makefile plugins/ipmidirect/t/Makefile plugins/simulator/Makefile plugins/simulator/t/Makefile plugins/dynamic_simulator/Makefile plugins/rtas/Makefile plugins/ilo2_ribcl/Makefile plugins/oa_soap/Makefile plugins/slave/Makefile plugins/test_agent/Makefile scripts/Makefile scripts/test/Makefile snmp/Makefile ssl/Makefile baselib/Makefile docs/Makefile docs/man/Makefile openhpid/Makefile openhpid/openhpid.sh openhpid/t/Makefile openhpid/t/ohpi/Makefile hpi_shell/Makefile cpp/Makefile cpp
/t/Makefile clients/Makefile clients/hpixml/Makefile baselibs/Makefile"
++
++# Check whether --with-systemdsystemunitdir was given.
++if test "${with_systemdsystemunitdir+set}" = set; then
++ withval=$with_systemdsystemunitdir; enable_systemd=yes
++else
++ enable_systemd=no
++fi
++
++
++ if test "x$enable_systemd" = "xyes"; then
++ ENABLE_SYSTEMD_TRUE=
++ ENABLE_SYSTEMD_FALSE='#'
++else
++ ENABLE_SYSTEMD_TRUE='#'
++ ENABLE_SYSTEMD_FALSE=
++fi
++
++unitdir=$with_systemdsystemunitdir
++
++
++ac_config_files="$ac_config_files openhpi.spec openhpi.pc rt-env.sh Makefile utils/openhpiutils.pc utils/Makefile utils/t/Makefile utils/t/epath/Makefile utils/t/rpt/Makefile utils/t/sahpi/Makefile utils/t/el/Makefile utils/t/uid/Makefile utils/t/ann/Makefile transport/Makefile marshal/Makefile marshal/t/Makefile plugins/Makefile plugins/watchdog/Makefile plugins/ipmi/Makefile plugins/ipmi/t/Makefile plugins/snmp_bc/Makefile plugins/snmp_bc/t/Makefile plugins/sysfs/Makefile plugins/ipmidirect/Makefile plugins/ipmidirect/t/Makefile plugins/simulator/Makefile plugins/simulator/t/Makefile plugins/dynamic_simulator/Makefile plugins/rtas/Makefile plugins/ilo2_ribcl/Makefile plugins/oa_soap/Makefile plugins/slave/Makefile plugins/test_agent/Makefile scripts/Makefile scripts/test/Makefile snmp/Makefile ssl/Makefile baselib/Makefile docs/Makefile docs/man/Makefile openhpid/Makefile openhpid/openhpid.sh openhpid/openhpid.service openhpid/t/Makefile openhpid/t/ohpi/Makefile hpi_shell
/Makefile cpp/Makefile cpp/t/Makefile clients/Makefile clients/hpixml/Makefile baselibs/Makefile"
+
+
+ cat >confcache <<\_ACEOF
+@@ -19163,6 +19189,13 @@ $as_echo "$as_me: error: conditional \"H
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${ENABLE_SYSTEMD_TRUE}" && test -z "${ENABLE_SYSTEMD_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SYSTEMD\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"ENABLE_SYSTEMD\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+
+ : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+@@ -20067,6 +20100,7 @@ do
+ "docs/man/Makefile") CONFIG_FILES="$CONFIG_FILES docs/man/Makefile" ;;
+ "openhpid/Makefile") CONFIG_FILES="$CONFIG_FILES openhpid/Makefile" ;;
+ "openhpid/openhpid.sh") CONFIG_FILES="$CONFIG_FILES openhpid/openhpid.sh" ;;
++ "openhpid/openhpid.service") CONFIG_FILES="$CONFIG_FILES openhpid/openhpid.service" ;;
+ "openhpid/t/Makefile") CONFIG_FILES="$CONFIG_FILES openhpid/t/Makefile" ;;
+ "openhpid/t/ohpi/Makefile") CONFIG_FILES="$CONFIG_FILES openhpid/t/ohpi/Makefile" ;;
+ "hpi_shell/Makefile") CONFIG_FILES="$CONFIG_FILES hpi_shell/Makefile" ;;
+diff -up openhpi-3.2.1/openhpid/Makefile.am.systemd openhpi-3.2.1/openhpid/Makefile.am
+--- openhpi-3.2.1/openhpid/Makefile.am.systemd 2011-05-08 19:32:36.000000000 +0200
++++ openhpi-3.2.1/openhpid/Makefile.am 2013-07-18 17:48:09.000000000 +0200
+@@ -27,6 +27,7 @@ DIST_SUBDIRS = t
+
+ EXTRA_DIST = \
+ openhpid.sh.in \
++ openhpid.service.in \
+ Makefile.mingw32 \
+ openhpid-win32.cpp \
+ version.rc
+@@ -82,11 +83,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 -up openhpi-3.2.1/openhpid/Makefile.in.systemd openhpi-3.2.1/openhpid/Makefile.in
+--- openhpi-3.2.1/openhpid/Makefile.in.systemd 2013-07-18 00:38:36.000000000 +0200
++++ openhpi-3.2.1/openhpid/Makefile.in 2013-07-18 17:48:09.000000000 +0200
+@@ -321,6 +321,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++unitdir = @unitdir@
+ MAINTAINERCLEANFILES = Makefile.in *~
+ AM_CPPFLAGS = -DG_LOG_DOMAIN=\"openhpid\"
+ INCLUDES = \
+@@ -330,6 +331,7 @@ SUBDIRS = t
+ DIST_SUBDIRS = t
+ EXTRA_DIST = \
+ openhpid.sh.in \
++ openhpid.service.in \
+ Makefile.mingw32 \
+ openhpid-win32.cpp \
+ version.rc
+@@ -851,8 +853,10 @@ uninstall-am: uninstall-local uninstall-
+ .NOTPARALLEL:
+
+ install-data-local:
+- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
+- $(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
++ at ENABLE_SYSTEMD_TRUE@ $(mkinstalldirs) $(DESTDIR)$(unitdir)
++ at ENABLE_SYSTEMD_TRUE@ $(INSTALL) -m 0644 openhpid.service $(DESTDIR)$(unitdir)
++ at ENABLE_SYSTEMD_FALSE@ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
++ at ENABLE_SYSTEMD_FALSE@ $(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
+
+ uninstall-local:
+ rm -f $(DESTDIR)$(sysconfdir)/init.d/openhpid
+diff -up openhpi-3.2.1/openhpid/openhpid.service.in.systemd openhpi-3.2.1/openhpid/openhpid.service.in
+--- openhpi-3.2.1/openhpid/openhpid.service.in.systemd 2013-07-18 17:48:09.000000000 +0200
++++ openhpi-3.2.1/openhpid/openhpid.service.in 2013-07-18 17:48:09.000000000 +0200
+@@ -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
diff --git a/openhpi.spec b/openhpi.spec
index 67d6c5a..252594b 100644
--- a/openhpi.spec
+++ b/openhpi.spec
@@ -2,14 +2,14 @@
Summary: Hardware Platform Interface library and tools
Name: openhpi
-Version: 3.2.0
-Release: 2%{?dist}
+Version: 3.2.1
+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.0-systemd.patch
+Patch0: %{name}-3.2.1-systemd.patch
BuildRequires: libsysfs-devel
BuildRequires: net-snmp-devel
BuildRequires: OpenIPMI-devel
@@ -147,6 +147,9 @@ fi
%changelog
+* Thu Jul 18 2013 Dan Horák <dan[at]danny.cz> - 3.2.1-1
+- update to 3.2.1
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index b1b834c..3181328 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a36a076741d830abf6276fc1a3f1aeb openhpi-3.2.0.tar.gz
+115bd1c8f3443c6fa3bf893d73f37dca openhpi-3.2.1.tar.gz
More information about the scm-commits
mailing list