Bump with a patch that allows bmc-watchdog to behave and the init script to work correctly in Gentoo for the first time.

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

7 files changed, 124 insertions, 85 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 3573cfa3374f..578badee9fe4 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.36 2011/09/03 02:06:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.37 2011/09/07 06:20:45 flameeyes Exp $
+
+*freeipmi-1.0.6-r1 (07 Sep 2011)
+
+  07 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> -freeipmi-1.0.5.ebuild,
+  -freeipmi-1.0.6.ebuild, +freeipmi-1.0.6-r1.ebuild,
+  +files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch,
+  +files/bmc-watchdog.initd.2, +files/ipmidetectd.initd.2:
+  Bump with a patch that allows bmc-watchdog to behave and the init script to
+  work correctly in Gentoo for the first time.
 
 *freeipmi-1.0.6 (03 Sep 2011)
 
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 3a328b9377f3..a60984a96422 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -3,20 +3,21 @@ Hash: SHA1
 
 AUX bmc-watchdog.confd 1495 RMD160 c7335f914d4a5904a358a5140a3427a43cd75988 SHA1 8faba92b3ec4ed072b85e41e9bb9f82f867aa8fd SHA256 0f9cbe8090523e3fd4df35fb049d38ee696292892542ff6ffe3139e39fb1795e
 AUX bmc-watchdog.initd 824 RMD160 05a18c843c92de4fa79938aaef882b43dfd23274 SHA1 b487327b4219ba948f322a1159677298368719c4 SHA256 02995b82bfaeafb11c9f067dce5bbd23d2adc87e4acf38b41e01f74aee9a6617
+AUX bmc-watchdog.initd.2 634 RMD160 92eff3c52a8dda2f0f73e554d473442dde2f8f6f SHA1 791cac85dd2d0e1e52a939589f0e9c5636c2163c SHA256 457dff904ae1241365ba467aeb35dabf10da68d5cf98bc55cca014cd18150a0e
 AUX freeipmi-1.0.5-strictaliasing.patch 549 RMD160 d9d1d1eba6b3448dafc0b00e1be1d4be449a53d8 SHA1 f1c7e6a68154fe118327b0efe4de299b23223b82 SHA256 5f90b1f6f8db5bb662e54b00ab4377b057cd71982af26d066636e7503cd723bc
+AUX freeipmi-1.0.6-bmc-watchdog-pidfile.patch 1365 RMD160 bb768139e4041922480d9d7879300821b1451cb0 SHA1 a83874dbc3db78d35718152bb0a8e8422847c1ba SHA256 49bb25fb11c25a1da8f5ac26ac78f4ad0609861c49368843a6abb64a8f6d56d5
 AUX ipmidetectd.initd 800 RMD160 91f992208e621b2ef47f4b2c5c70a658b6ddc12d SHA1 b9a4bbacd1ab4ec661ff7817b567d37d720f4c8a SHA256 9b142aff8690a97686df5d7ddf6888cd4d68142dba60632345a0decf5ba0aa77
+AUX ipmidetectd.initd.2 570 RMD160 1f1ee23ea0f797ceb27e7afa956a9ab756a78254 SHA1 817413f2a4e09ca285c8316c08e2073e6d698443 SHA256 b15694805ee196f6d47866ec415e6f631ae0839efb1dd181eab3f4fca18eb23d
 DIST freeipmi-0.8.9.tar.gz 2775329 RMD160 01c9441596502f60b0c3336dae9db9ff3774a132 SHA1 d80fac5de458363f32c589baef12315a9a471b06 SHA256 8c1c18d83b74e2f657b7c6ccbc6be8eb2c0270d7c0424105bee34fdebe794ea0
-DIST freeipmi-1.0.5.tar.gz 3171009 RMD160 c7cb848289981e13c8194d27708a6cb53db85d47 SHA1 a9dee6f91913a3fa69beae628001a28ce8c5dfbe SHA256 3db85e1f100d1cac1470585b36de428ac84ceec75f048dbef25172300a34b873
 DIST freeipmi-1.0.6.tar.gz 3172169 RMD160 7105276e68921831e6d6bd2a3dc513f9f4a134ff SHA1 f008eb53d19f734e91f636c3dbdc1c12a4b8c71e SHA256 662d96010cefcd0b93b2cb9ca2ab62371a5d8f05f33feacabae5853e71f020a5
 EBUILD freeipmi-0.8.9.ebuild 2044 RMD160 c562216c8361aebe7a7ebcde4ac9c1ca82c0fcbf SHA1 5ff432b878f3258e3ccadf25d12b3d9245b48eca SHA256 54bf27c829e21b61bdc3ae7c000b9799c9a53399ac0ed60e8ccf7113a488c210
-EBUILD freeipmi-1.0.5.ebuild 2083 RMD160 674cb58bc72d68fcf3ca4a5c1e748706ad64de82 SHA1 e7694bf9d23909a0ff174beca797a99ca729f58a SHA256 309eb3c83c68e2e1f54058be13ab9de06cbdc834bb0264b72195a082fdb2b6bc
-EBUILD freeipmi-1.0.6.ebuild 2090 RMD160 aaa6e93bffeac92e88331a15754f69ca40eb83c0 SHA1 70d10e30108509824fb7290aeac5ef4d36bad64c SHA256 8d2226e258bd6d886b038c2d94e3857bceddd1895cdc741e66d6a8a57a146727
-MISC ChangeLog 6420 RMD160 58e015f5031719de82c632a370908ba3c7ad0546 SHA1 edfd89f434c29694bd5a72ce7e0e370c2dab713f SHA256 a34894c1532cdb1e4b69ffa286747f72cf062fd7a5e56f7f0af11bec3f6f9b9b
+EBUILD freeipmi-1.0.6-r1.ebuild 2152 RMD160 d15023765228d977792dc5b6a284fb2d9fe6a627 SHA1 221368aff2e40001b59f0ae1944124933d5bb7f2 SHA256 36e2bb6156c9ebb42163c80af10682c1adb6aefd4727af0f5c510df9a3202a1a
+MISC ChangeLog 6824 RMD160 8cd28e62609e7433ec73c11a33f8b62f0f465ece SHA1 a66b7d007c369afb639d25c1db0c409608618ad1 SHA256 323363282569050cb2a1300ccdd997efebceb2670ddb2da1026187fa89ff3602
 MISC metadata.xml 234 RMD160 6498603a1fe3a96823743847afc906df194bb430 SHA1 5ec768281f5435ff5173031bd715fa65ddd274e3 SHA256 73ec73ca73cd98df81c2bbb3e76a83751a3c95802ac103ef21368201d871a9d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5hi48ACgkQAiZjviIA2Xi3ygCeL+YqvFxNADPI5qvGAhZqQcGF
-SHAAn1k9czOERdaUPsDU25/lo2M5XrmX
-=118/
+iEYEARECAAYFAk5nDUsACgkQAiZjviIA2XhW/QCeKQMZuSoJ9hqSAwL1PQfM6ydw
+t2cAn3n63FYdBC6Y1Fg87PviwTJSn+fB
+=0YVq
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/freeipmi/files/bmc-watchdog.initd.2 b/sys-libs/freeipmi/files/bmc-watchdog.initd.2
new file mode 100644
index 000000000000..45bc01d43189
--- /dev/null
+++ b/sys-libs/freeipmi/files/bmc-watchdog.initd.2
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.2,v 1.1 2011/09/07 06:20:45 flameeyes Exp $
+
+extra_commands="condrestart"
+
+PIDFILE=/var/run/$SVCNAME.pid
+
+start() {
+	rm -f $PIDFILE
+
+	ebegin "Starting $SVCNAME"
+	start-stop-daemon \
+		--start --exec /usr/sbin/$SVCNAME \
+		--pidfile $PIDFILE -- ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $SVCNAME"
+	start-stop-daemon \
+		--stop \
+		--pidfile $PIDFILE
+	eend $?
+	rm -f $PIDFILE
+}
+
+condrestart() {
+	service_started && restart
+}
diff --git a/sys-libs/freeipmi/files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch b/sys-libs/freeipmi/files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch
new file mode 100644
index 000000000000..f5b0b6f1bc8b
--- /dev/null
+++ b/sys-libs/freeipmi/files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch
@@ -0,0 +1,44 @@
+diff --git a/bmc-watchdog/src/Makefile.am b/bmc-watchdog/src/Makefile.am
+index 04c01e2..38d2f7f 100644
+--- a/bmc-watchdog/src/Makefile.am
++++ b/bmc-watchdog/src/Makefile.am
+@@ -10,7 +10,8 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/common/src/portability \
+ 	-I$(top_srcdir)/libfreeipmi/include \
+ 	-D_GNU_SOURCE \
+-	-D_REENTRANT
++	-D_REENTRANT \
++	-DLOCALSTATEDIR='"$(localstatedir)"'
+ 
+ sbin_PROGRAMS = bmc-watchdog
+ 
+diff --git a/bmc-watchdog/src/bmc-watchdog.c b/bmc-watchdog/src/bmc-watchdog.c
+index 566ee65..403bc0a 100644
+--- a/bmc-watchdog/src/bmc-watchdog.c
++++ b/bmc-watchdog/src/bmc-watchdog.c
+@@ -1677,6 +1677,10 @@ _daemon_init ()
+     {
+       unsigned int i;
+       pid_t pid;
++      FILE *pidfile;
++
++      if ( (pidfile = fopen(LOCALSTATEDIR "/run/bmc-watchdog.pid", "w")) == NULL )
++        _err_exit ("fopen: %s", strerror (errno));
+ 
+       if ((pid = fork ()) < 0)
+         _err_exit ("fork: %s", strerror (errno));
+@@ -1690,8 +1694,13 @@ _daemon_init ()
+ 
+       if ((pid = fork ()) < 0)
+         _err_exit ("fork: %s", strerror (errno));
+-      if (pid)
++      if (pid) {
++        /* write the 2nd child PID to the pidfile */
++        fprintf(pidfile, "%u\n", pid);
++        fclose(pidfile);
++
+         exit (0);                   /* 1st child terminates */
++      }
+ 
+       if (chdir ("/") < 0)
+         _err_exit ("chdir: %s", strerror (errno));
diff --git a/sys-libs/freeipmi/files/ipmidetectd.initd.2 b/sys-libs/freeipmi/files/ipmidetectd.initd.2
new file mode 100644
index 000000000000..154d30281a2e
--- /dev/null
+++ b/sys-libs/freeipmi/files/ipmidetectd.initd.2
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/ipmidetectd.initd.2,v 1.1 2011/09/07 06:20:45 flameeyes Exp $
+
+PIDFILE=/var/run/$SVCNAME.pid
+
+start() {
+	rm -f $PIDFILE
+
+	ebegin "Starting $SVCNAME"
+	start-stop-daemon --background --make-pidfile \
+		--start --exec /usr/sbin/$SVCNAME \
+		--pidfile $PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $SVCNAME"
+	start-stop-daemon \
+		--stop \
+		--pidfile $PIDFILE
+	eend $?
+	rm -f $PIDFILE
+}
diff --git a/sys-libs/freeipmi/freeipmi-1.0.5.ebuild b/sys-libs/freeipmi/freeipmi-1.0.5.ebuild
deleted file mode 100644
index 188e1f9f6032..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.0.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.5.ebuild,v 1.1 2011/07/01 07:31:26 flameeyes Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="http://www.gnu.org/software/freeipmi/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	http://ftp.gluster.com/pub/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-
-src_prepare() {
-	# Fix build mistake, only causes warnings but at least stop it.
-	sed -i -e '/-module/d' "${S}"/libfreeipmi/src/Makefile.am || die
-
-	epatch "${FILESDIR}"/${P}-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
-		--enable-logrotate-config \
-		--localstatedir=/var
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "emake install failed"
-	find "${D}" -name '*.la' -delete
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO 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/freeipmi-1.0.6.ebuild b/sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild
index d5beb83d441b..6867480c375d 100644
--- a/sys-libs/freeipmi/freeipmi-1.0.6.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.6.ebuild,v 1.1 2011/09/03 02:06:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild,v 1.1 2011/09/07 06:20:45 flameeyes Exp $
 
 EAPI=4
 
@@ -24,6 +24,7 @@ src_prepare() {
 	sed -i -e '/-module/d' "${S}"/libfreeipmi/src/Makefile.am || die
 
 	epatch "${FILESDIR}"/${PN}-1.0.5-strictaliasing.patch
+	epatch "${FILESDIR}"/${P}-bmc-watchdog-pidfile.patch
 
 	AT_M4DIR="config" eautoreconf
 }
@@ -67,7 +68,8 @@ src_install() {
 		/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
+	newinitd "${FILESDIR}"/ipmidetectd.initd.2 ipmidetectd
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.2 bmc-watchdog
+	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
 }