Version bump, the bmc-watchdog patch is properly upstreamed.

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

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 5408c3b13422e9e8043725a5d9398b7f5cba9da0..924e12fadeb8f55fc46afeaf238ee31b392028bd 100644 (file)
--- 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/Manifest b/sys-libs/freeipmi/Manifest
index a5d8c9f58aef23491cf962dfc497bb66516551b0..d6a220d7c39b8858a2c19cd1221e97d5796d6917 100644 (file)
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -5,19 +5,18 @@ AUX bmc-watchdog.confd 1495 RMD160 c7335f914d4a5904a358a5140a3427a43cd75988 SHA1
 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.6.tar.gz 3172169 RMD160 7105276e68921831e6d6bd2a3dc513f9f4a134ff SHA1 f008eb53d19f734e91f636c3dbdc1c12a4b8c71e SHA256 662d96010cefcd0b93b2cb9ca2ab62371a5d8f05f33feacabae5853e71f020a5
+DIST freeipmi-1.0.7.tar.gz 3188884 RMD160 78b3d3cc3bbf599ae9ea79a25bf2015a9d49ddee SHA1 ecdc56a947640a57667bc76370ee7a4ad9a473db SHA256 244129a0b4030c70ea56bd43269d95c8135976ecb779313183417ae5ca8d784c
 EBUILD freeipmi-0.8.9.ebuild 2044 RMD160 c562216c8361aebe7a7ebcde4ac9c1ca82c0fcbf SHA1 5ff432b878f3258e3ccadf25d12b3d9245b48eca SHA256 54bf27c829e21b61bdc3ae7c000b9799c9a53399ac0ed60e8ccf7113a488c210
-EBUILD freeipmi-1.0.6-r2.ebuild 2252 RMD160 5a58f654d9ff39201bc1278cf60f8236065fa39b SHA1 862d4193653264ac876955171d71a21232e88c1c SHA256 cc0bb78e20a704963e87fa85a2484ad741dc94c5382377d627dba8fad9554e7f
-MISC ChangeLog 7025 RMD160 939e2f8c1aa0967e80f7e44fc0d456075cb18be4 SHA1 701bd51964eec7aa860086c68b4fc146e3f7d63d SHA256 47bb2b32a1eee378987c77b198ec5975e65656373a32c2e89285c601dc663a7c
+EBUILD freeipmi-1.0.7.ebuild 1963 RMD160 62e71da92291bc64f037f4f7a8655d244b3be0a7 SHA1 ca1f0b442d97c3bc9d6562d70be57e69bc79f113 SHA256 6c25fb7c67c885c1d1b9f7ad8af4a7bc99c9253d16e1c49f7385982e26cbe21b
+MISC ChangeLog 7281 RMD160 e5bf6ea5ad39ad063d69f750e7ec03d9ef0dab08 SHA1 6a41321362b06a98f5571f757b43ad84f941fbd4 SHA256 14442638966593fa3d6ade9b8f14472412d6c484dd70b5cc7f39f5d8d9cd7102
 MISC metadata.xml 234 RMD160 6498603a1fe3a96823743847afc906df194bb430 SHA1 5ec768281f5435ff5173031bd715fa65ddd274e3 SHA256 73ec73ca73cd98df81c2bbb3e76a83751a3c95802ac103ef21368201d871a9d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6AW0QACgkQAiZjviIA2Xi4gACg2CGxS3vLvHrvOuj+B1EySGiB
-DuAAoJEp+QUci9bGw6OGcrsW+fss38M2
-=rcXq
+iEYEARECAAYFAk6DkRkACgkQAiZjviIA2XgQ6wCgv/CSPXJX1W+ajaNFmyvRAHEF
+wg4AoMUDQyzN5dRa6qzLE1uEAgVM4Krd
+=zDl1
 -----END PGP SIGNATURE-----

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 (file)
index f5b0b6f..0000000
--- 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
similarity index 84%
rename from sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild
rename to sys-libs/freeipmi/freeipmi-1.0.7.ebuild
index 02f8d4196510c80f95825478fab43323a297c0a4..c5a6bf83d33ad313ca529e8b38c4da3960f7d732 100644 (file)
--- 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
 }