diff options
Diffstat (limited to 'sys-libs/freeipmi')
| -rw-r--r-- | sys-libs/freeipmi/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-libs/freeipmi/files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch | 44 | ||||
| -rw-r--r-- | sys-libs/freeipmi/freeipmi-1.0.7.ebuild (renamed from sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild) | 10 |
3 files changed, 9 insertions, 54 deletions
diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog index 5408c3b13422..924e12fadeb8 100644 --- a/sys-libs/freeipmi/ChangeLog +++ b/sys-libs/freeipmi/ChangeLog @@ -1,6 +1,13 @@ # 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.38 2011/09/26 11:00:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.39 2011/09/28 21:27:03 flameeyes Exp $ + +*freeipmi-1.0.7 (28 Sep 2011) + + 28 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> + -freeipmi-1.0.6-r2.ebuild, -files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch, + +freeipmi-1.0.7.ebuild: + Version bump, the bmc-watchdog patch is properly upstreamed. *freeipmi-1.0.6-r2 (26 Sep 2011) 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 deleted file mode 100644 index f5b0b6f1bc8b..000000000000 --- a/sys-libs/freeipmi/files/freeipmi-1.0.6-bmc-watchdog-pidfile.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/freeipmi-1.0.6-r2.ebuild b/sys-libs/freeipmi/freeipmi-1.0.7.ebuild index 02f8d4196510..c5a6bf83d33a 100644 --- a/sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild +++ b/sys-libs/freeipmi/freeipmi-1.0.7.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-r2.ebuild,v 1.1 2011/09/26 11:00:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.7.ebuild,v 1.1 2011/09/28 21:27:03 flameeyes Exp $ EAPI=4 @@ -20,15 +20,7 @@ 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}"/${PN}-1.0.5-strictaliasing.patch - epatch "${FILESDIR}"/${P}-bmc-watchdog-pidfile.patch - - # bug #383793 - sed -i -e 's:/usr/local/:/usr/:' \ - "${S}"/ipmi-sensors/src/ipmimonitoring || die AT_M4DIR="config" eautoreconf } |