Version bump (bug #199284), reassigned package to 'sysadmin' herd.

(Portage version: 2.1.5_rc4)

10 files changed, 195 insertions, 97 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 50d33ac93461..79a96c28acdc 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-libs/freeipmi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.10 2007/09/23 05:38:24 robbat2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.11 2008/04/22 09:44:38 dev-zero Exp $
+
+*freeipmi-0.5.6 (22 Apr 2008)
+
+  22 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/freeipmi-0.5.6-as_needed.patch,
+  +files/freeipmi-0.5.6-missing_syslog_include.patch,
+  +files/bmc-watchdog.confd, +files/bmc-watchdog.initd,
+  +files/ipmidetectd.initd, metadata.xml, -freeipmi-0.1.3.ebuild,
+  -freeipmi-0.2.3.ebuild, +freeipmi-0.5.6.ebuild:
+  Version bump (bug #199284), reassigned package to 'sysadmin' herd.
 
 *freeipmi-0.4.4 (23 Sep 2007)
 
diff --git a/sys-libs/freeipmi/files/bmc-watchdog.confd b/sys-libs/freeipmi/files/bmc-watchdog.confd
new file mode 100644
index 000000000000..4d39cf4d8b7d
--- /dev/null
+++ b/sys-libs/freeipmi/files/bmc-watchdog.confd
@@ -0,0 +1,44 @@
+# 
+# This configuration file controls the behaviour of the bmc-watchdog daemon
+# from FreeIPMI.
+#
+#       -u INT, --timer-use=INT
+#              Set timer use.  The timer use value can be set  to  one  of  the
+#              following:  1  =  BIOS FRB2, 2 = BIOS POST, 3 = OS_LOAD, 4 = SMS
+#              OS, 5 = OEM.
+#
+#       -p INT, --pre-timeout-interrupt=INT
+#              Set pre-timeout interrupt.  The pre timeout interrupt can be set
+#              to one of the following: 0 = None, 1 = SMI, 2 = NMI, 3 = Messag-
+#              ing Interrupt.
+#
+#       -a INT, --timeout-action=INT
+#              Set timeout action.  The timeout action can be set to one of the
+#              following: 0 = No action, 1 = Hard Reset, 2 = Power  Down,  3  =
+#              Power Cycle.
+#
+#       -F, --clear-bios-frb2
+#              Clear  BIOS FRB2 Timer Use Flag.
+#
+#       -P, --clear-bios-post
+#              Clear BIOS POST Timer Use Flag.
+#
+#       -L, --clear-os-load
+#              Clear OS Load Timer Use Flag.
+#
+#       -S, --clear-sms-os
+#              Clear SMS/OS Timer Use Flag.
+#
+#       -O, --clear-oem
+#              Clear OEM Timer Use Flag.
+#
+#       -i SECS, --initial-countdown=SECS
+#              Set initial countdown in seconds.
+#
+#       -e, --reset-period
+#              Time interval to wait before resetting timer.  The default is 60
+#              seconds.
+#
+# For the remaining options, consult man bmc-watchdog
+#
+OPTIONS="-d -u 4 -p 0 -a 1 -F -P -L -S -O -i 900 -e 60"
diff --git a/sys-libs/freeipmi/files/bmc-watchdog.initd b/sys-libs/freeipmi/files/bmc-watchdog.initd
new file mode 100644
index 000000000000..51010dad52a7
--- /dev/null
+++ b/sys-libs/freeipmi/files/bmc-watchdog.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/bmc-watchdog.initd,v 1.1 2008/04/22 09:44:39 dev-zero Exp $
+
+start() {
+	ebegin "Starting bmc-watchdog"
+	if [ -f /var/run/bmc-watchdog.pid ] ; then
+		ewarn "/var/run/bmc-watchdog.pid already exists,"
+		ewarn "removing it but you might want to find out"
+		ewarn "why this happened."
+		rm /var/run/bmc-watchdog.pid
+	fi
+	start-stop-daemon --background --make-pidfile \
+		--start --quiet --exec /usr/sbin/bmc-watchdog \
+		--pidfile /var/run/bmc-watchdog.pid -- ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bmc-watchdog"
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile /var/run/bmc-watchdog.pid
+	eend $?
+	rm /var/run/bmc-watchdog.pid
+}
diff --git a/sys-libs/freeipmi/files/freeipmi-0.5.6-as_needed.patch b/sys-libs/freeipmi/files/freeipmi-0.5.6-as_needed.patch
new file mode 100644
index 000000000000..3de9fe2b336e
--- /dev/null
+++ b/sys-libs/freeipmi/files/freeipmi-0.5.6-as_needed.patch
@@ -0,0 +1,12 @@
+--- ipmimonitoring/src/ipmimonitoring/Makefile.am.orig	2008-04-02 16:54:29.000000000 +0200
++++ ipmimonitoring/src/ipmimonitoring/Makefile.am	2008-04-02 16:55:00.000000000 +0200
+@@ -23,8 +23,8 @@
+ 	../../../common/src/libllnlcommon.la \
+ 	../libipmimonitoring/libipmimonitoring.la \
+ 	../../../common/src/libpstdout.la \
+-	../../../ipmidetect/src/libipmidetect/libipmidetect.la \
+ 	../../../common/src/libhostrange.la \
++	../../../ipmidetect/src/libipmidetect/libipmidetect.la \
+ 	../../../common/src/libtoolcommon.la \
+ 	../../../common/src/libcbuf.la
+ 
diff --git a/sys-libs/freeipmi/files/freeipmi-0.5.6-missing_syslog_include.patch b/sys-libs/freeipmi/files/freeipmi-0.5.6-missing_syslog_include.patch
new file mode 100644
index 000000000000..4e2a1db93ddd
--- /dev/null
+++ b/sys-libs/freeipmi/files/freeipmi-0.5.6-missing_syslog_include.patch
@@ -0,0 +1,10 @@
+--- common/src/ipmi-sdr-cache.c.orig	2008-04-02 15:03:01.000000000 +0200
++++ common/src/ipmi-sdr-cache.c	2008-04-02 15:03:46.000000000 +0200
+@@ -27,6 +27,7 @@
+ #if STDC_HEADERS
+ #include <string.h>
+ #endif /* STDC_HEADERS */
++#include <syslog.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #if HAVE_UNISTD_H
diff --git a/sys-libs/freeipmi/files/ipmidetectd.initd b/sys-libs/freeipmi/files/ipmidetectd.initd
new file mode 100644
index 000000000000..883c1a9fc87d
--- /dev/null
+++ b/sys-libs/freeipmi/files/ipmidetectd.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/ipmidetectd.initd,v 1.1 2008/04/22 09:44:39 dev-zero Exp $
+
+start() {
+	ebegin "Starting ipmidetectd"
+	if [ -f /var/run/ipmidetectd.pid ] ; then
+		ewarn "/var/run/ipmidetectd.pid already exists,"
+		ewarn "removing it but you might want to find out"
+		ewarn "why this happened."
+		rm /var/run/ipmidetectd.pid
+	fi
+	start-stop-daemon --background --make-pidfile \
+		--start --quiet --exec /usr/sbin/ipmidetectd \
+		--pidfile /var/run/ipmidetectd.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ipmidetectd"
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile /var/run/ipmidetectd.pid
+	eend $?
+	rm /var/run/ipmidetectd.pid
+}
diff --git a/sys-libs/freeipmi/freeipmi-0.1.3.ebuild b/sys-libs/freeipmi/freeipmi-0.1.3.ebuild
deleted file mode 100644
index 7c4422fbf329..000000000000
--- a/sys-libs/freeipmi/freeipmi-0.1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.1.3.ebuild,v 1.8 2007/01/10 17:42:07 hkbst Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="FreeIPMI provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="http://www.gnu.org/software/freeipmi/"
-SRC_URI="ftp://ftp.californiadigital.com/pub/freeipmi/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RDEPEND="virtual/libc
-		dev-scheme/guile"
-DEPEND="${RDEPEND}
-		virtual/os-headers
-		sys-apps/sed
-		doc? ( virtual/tetex )"
-
-src_unpack() {
-	unpack ${A}
-	sed 's,auth_type_t,output_type_t,' -i.orig \
-		"${S}/ipmipower/src/ipmipower_output.c"
-	# avoid conflict with lm_sensors
-	sed -i.orig \
-		-e '/dist_man_MANS/s,sensors.1,sensors-fish.1,' \
-		${S}/fish/Makefile.in
-		mv ${S}/fish/sensors.1 ${S}/fish/sensors-fish.1
-}
-
-src_compile() {
-	# this is to make things compile
-	append-flags "-DHAVE_VPRINTF=1"
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "emake install failed"
-	dodoc AUTHORS COPYING* ChangeLog DISCLAIMER* NEWS README TODO doc/BUGS
-	# this is a redhat-style init script
-	# I still need to write a Gentoo init script later on
-	rm -f ${D}/etc/init.d/bmc-watchdog
-	newdoc ${S}/bmc-watchdog/bmc-watchdog redhat_init-bmc-watchdog
-}
diff --git a/sys-libs/freeipmi/freeipmi-0.2.3.ebuild b/sys-libs/freeipmi/freeipmi-0.2.3.ebuild
deleted file mode 100644
index a69051aa4080..000000000000
--- a/sys-libs/freeipmi/freeipmi-0.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.2.3.ebuild,v 1.2 2007/01/10 17:42:29 hkbst Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="FreeIPMI provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="http://www.gnu.org/software/freeipmi/"
-SRC_URI="ftp://ftp.zresearch.com/pub/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RDEPEND="virtual/libc
-		dev-scheme/guile"
-DEPEND="${RDEPEND}
-		virtual/os-headers
-		sys-apps/sed
-		doc? ( virtual/tetex )"
-
-src_unpack() {
-	unpack ${A}
-	sed 's,auth_type_t,output_type_t,' -i.orig \
-		${S}/ipmipower/src/ipmipower_output.c \
-		|| die "Failed to fix ipmipower"
-}
-
-src_compile() {
-	# this is to make things compile
-	append-flags "-DHAVE_VPRINTF=1"
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/examples
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "emake install failed"
-	dodoc AUTHORS COPYING* ChangeLog DISCLAIMER* NEWS README TODO doc/BUGS
-	# this is a redhat-style init script
-	# I still need to write a Gentoo init script later on
-	rm -f ${D}/etc/init.d/bmc-watchdog
-	newdoc ${S}/bmc-watchdog/bmc-watchdog redhat_init-bmc-watchdog
-}
diff --git a/sys-libs/freeipmi/freeipmi-0.5.6.ebuild b/sys-libs/freeipmi/freeipmi-0.5.6.ebuild
new file mode 100644
index 000000000000..adaf3c4f69e9
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-0.5.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.5.6.ebuild,v 1.1 2008/04/22 09:44:38 dev-zero Exp $
+
+WANT_AUTOMAKE=1.9
+
+inherit autotools
+
+DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
+HOMEPAGE="http://www.gnu.org/software/freeipmi/"
+SRC_URI="ftp://ftp.zresearch.com/pub/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug syslog"
+
+RDEPEND="dev-libs/libgcrypt"
+DEPEND="${RDEPEND}
+		virtual/os-headers"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-missing_syslog_include.patch" \
+		"${FILESDIR}/${P}-as_needed.patch"
+
+	# Don't install any licenses (or else) files
+	sed -i \
+		-e 's/^EXTRA/FOO/' \
+		"${S}/Makefile.am" || die "sed failed"
+
+	AT_M4DIR="config" eautomake
+
+}
+
+src_compile() {
+	econf \
+		--disable-init-scripts \
+		$(use_enable debug) \
+		--enable-logrotate-config \
+		$(use_enable syslog) \
+		--localstatedir=/var \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO
+	dodoc doc/*.txt
+
+	keepdir \
+		/var/cache/ipmimonitoringsdrcache \
+		/var/lib/freeipmi \
+		/var/log/{freeipmi,ipmiconsole}
+
+	newinitd "${FILESDIR}/ipmidetectd.initd" ipmidetectd
+	newinitd "${FILESDIR}/bmc-watchdog.initd" bmc-watchdog
+	newconfd "${FILESDIR}/bmc-watchdog.confd" bmc-watchdog
+}
diff --git a/sys-libs/freeipmi/metadata.xml b/sys-libs/freeipmi/metadata.xml
index 5d9f5be9d49d..068c4a987bc2 100644
--- a/sys-libs/freeipmi/metadata.xml
+++ b/sys-libs/freeipmi/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+<herd>sysadmin</herd>
 </pkgmetadata>