Version bump to version 0.6.10, closes bug #245113 by Badalian Slava, and add a patch to build with glibc 2.8, closes bug #241422.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 257 insertions, 2 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 79a96c28acdc..4fb1e7e07b20 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/freeipmi
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.12 2008/11/03 06:38:31 flameeyes Exp $
+
+*freeipmi-0.6.10 (03 Nov 2008)
+
+  03 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freeipmi-0.6.10+glibc-2.8.patch, +freeipmi-0.6.10.ebuild:
+  Version bump to version 0.6.10, closes bug #245113 by Badalian Slava, and
+  add a patch to build with glibc 2.8, closes bug #241422.
 
 *freeipmi-0.5.6 (22 Apr 2008)
 
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index e8b8a4b27fc7..e959179b229b 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -1,11 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bmc-watchdog.confd 1495 RMD160 c7335f914d4a5904a358a5140a3427a43cd75988 SHA1 8faba92b3ec4ed072b85e41e9bb9f82f867aa8fd SHA256 0f9cbe8090523e3fd4df35fb049d38ee696292892542ff6ffe3139e39fb1795e
 AUX bmc-watchdog.initd 823 RMD160 4a502b4c6e64013eda736268e473860b050d3db1 SHA1 62c762acac01619b15044be0fe036d146e814217 SHA256 d443511ef57abdab74eb6e8b2c889285ec408b9d583dc25fe2c581ca65b0ee60
 AUX freeipmi-0.5.6-as_needed.patch 554 RMD160 ec46ade1c84fa80c1bf1fd73463ccf5970c47d82 SHA1 b1a9f458c9778c5d91021e9903be2b0b19723e9b SHA256 0d48d15a1fa53c452064b2034bb1e1723b519f2baa02ef6eb47b0ef2f095dc43
 AUX freeipmi-0.5.6-missing_syslog_include.patch 312 RMD160 a04770e6063348e47e2827c44c6db5e1c764e5f7 SHA1 822ad573a7ea06d9ff06d2eb95819a95a2c0b21d SHA256 4bcf53a89160fa4239a358cc5a90f5f65d5dffa04f471055b9ac95feaca2c6db
+AUX freeipmi-0.6.10+glibc-2.8.patch 5362 RMD160 914711231432f91fc03ad229ea8afcd8fb2a9651 SHA1 65f023ed3ded23996b90bd9c6e52ab6772ac6b27 SHA256 d9bc35866e5b48d25261e51c81a1db08044c552b6a2ea8537fbce9ab4b97ebaf
 AUX ipmidetectd.initd 799 RMD160 03e54b6b3d6e56ee3533096c3c2cca35d7537eb9 SHA1 7de96a810c7ca14e880320df0074cb5d6eb084a3 SHA256 7137eaf90c64f03d9eb1423336becbd02e1172bbef11139cfe6b9b1dbe60ea44
 DIST freeipmi-0.4.4.tar.gz 1476079 RMD160 3a1dd7380734b2ec561ed011dcdd92b05ed0ff74 SHA1 cf95a97c9c03dc24553b34de866914144c7613c7 SHA256 988c4645a4bdad6396c36bd9f92fa5a86b5eaccf1030ac940379562fc092498d
 DIST freeipmi-0.5.6.tar.gz 1540543 RMD160 a8795c876e371f30c7db086ea5f9b926303e919e SHA1 10a131b2a98ee42d2a34a952de55792c9a91976d SHA256 a800fe05a945186ca3eb99bb2df61cab0905d98a9ef44ba526ab620a7ba6f9ed
+DIST freeipmi-0.6.10.tar.gz 1669900 RMD160 073790a58d1589c1a07dcf73baa6601f4cb1d36f SHA1 1718ae26ec0b5dc093e82ff264b4f97fb753fbb9 SHA256 33c22e46feabe027913b40fd9ff5a8a745ac9b6cf27a6010f0fa801b2a966cdd
 EBUILD freeipmi-0.4.4.ebuild 1492 RMD160 4104eb8d1c56744e4492d44784d75d042d694809 SHA1 1a454b492df2d10b3b78ce841edcebc5c60cd59e SHA256 6f872f605957478459fbc109a9cbc80435428cd302cb6d0a8e473b7c27775277
 EBUILD freeipmi-0.5.6.ebuild 1560 RMD160 e2756cbcefdd7f6b86d4d036bbc7b78cd415b716 SHA1 1fb62df5ff3d793721f8636c995ba1fdf7f68dee SHA256 a2829df20198643cc42b314b1c5c76bc46b8cdb4002450e0a85a820bac856c05
-MISC ChangeLog 1857 RMD160 be4124fd446898b8f34429928c042205f34415ad SHA1 090deb600e86e26a9eeb3ff82d0c37ce825781cd SHA256 98099bb4c94b660e56b92de4ddd59d84b339f1e5ca95e8d17f7efd4f24120a09
+EBUILD freeipmi-0.6.10.ebuild 1451 RMD160 18f6d89445167dd0fac827c4bf330a3f4cbf51e8 SHA1 96ca5a70307fd55c431c7279cfa16a63e5880eb1 SHA256 e78816b0fc9a583e73912f9865654c35982a5004bb68f5119106427e5deac4de
+MISC ChangeLog 2146 RMD160 3eb470819860bde989149436c86c45bb60b45206 SHA1 d5365b494eb398db0fbaf481e92ed48241b3e739 SHA256 7fe8dfcc21bb5d8baf66accb678b9b53d3a04e020fb0b30d3c3cc66515a37a42
 MISC metadata.xml 161 RMD160 036f72a3fa0f193b1ed10f46bea0df0a2bf7e07f SHA1 00f2ba2d18e3c9d0ba2305497408776582e87666 SHA256 4447fa40fb360e4e153d4fc115728bf9db74e1aa3536c77de0594dc487ca5cea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkOqlwACgkQAiZjviIA2XgalACfbjcOPQhBGXQ2ul19AChy86QA
+llAAoK47QCLxBSlsYz4l2HmkGBdjJsix
+=9hru
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/freeipmi/files/freeipmi-0.6.10+glibc-2.8.patch b/sys-libs/freeipmi/files/freeipmi-0.6.10+glibc-2.8.patch
new file mode 100644
index 000000000000..57ec5df7bc4c
--- /dev/null
+++ b/sys-libs/freeipmi/files/freeipmi-0.6.10+glibc-2.8.patch
@@ -0,0 +1,179 @@
+Index: freeipmi-0.6.10/ipmi-oem/src/ipmi-oem-argp.c
+===================================================================
+--- freeipmi-0.6.10.orig/ipmi-oem/src/ipmi-oem-argp.c
++++ freeipmi-0.6.10/ipmi-oem/src/ipmi-oem-argp.c
+@@ -93,6 +93,7 @@ parse_opt (int key, char *arg, struct ar
+           }
+         else 
+           {
++#if 0
+             if (cmd_args->oem_options_count < ARG_MAX)
+               {
+                 if (!(cmd_args->oem_options[cmd_args->oem_options_count] = strdup(arg)))
+@@ -103,6 +104,7 @@ parse_opt (int key, char *arg, struct ar
+                 cmd_args->oem_options_count++;
+                 break;
+               }
++#endif
+           }
+ 	break;
+       }
+@@ -126,7 +128,9 @@ ipmi_oem_argp_parse (int argc, char **ar
+ 
+   cmd_args->oem_id = NULL;
+   cmd_args->oem_command = NULL;
++#if 0
+   memset (cmd_args->oem_options, 0, sizeof(cmd_args->oem_options));
++#endif
+   cmd_args->oem_options_count = 0;
+ 
+   argp_parse (&argp, argc, argv, ARGP_IN_ORDER, NULL, cmd_args);
+Index: freeipmi-0.6.10/ipmi-oem/src/ipmi-oem.h
+===================================================================
+--- freeipmi-0.6.10.orig/ipmi-oem/src/ipmi-oem.h
++++ freeipmi-0.6.10/ipmi-oem/src/ipmi-oem.h
+@@ -20,7 +20,6 @@
+ #define _IPMI_OEM_H
+ 
+ #include <freeipmi/freeipmi.h>
+-#include <limits.h>	/* ARG_MAX */
+ 
+ #include "tool-cmdline-common.h"
+ #include "pstdout.h"
+@@ -31,7 +30,9 @@ struct ipmi_oem_arguments
+   struct hostrange_cmd_args hostrange;
+   char *oem_id;
+   char *oem_command;
++#if 0
+   char *oem_options[ARG_MAX];
++#endif
+   unsigned int oem_options_count;
+ };
+ 
+Index: freeipmi-0.6.10/ipmipower/src/Makefile.am
+===================================================================
+--- freeipmi-0.6.10.orig/ipmipower/src/Makefile.am
++++ freeipmi-0.6.10/ipmipower/src/Makefile.am
+@@ -32,7 +32,8 @@ ipmipower_CPPFLAGS = \
+ 	-I$(srcdir)/../../ipmidetect/src/libipmidetect \
+ 	-I$(srcdir)/../../libfreeipmi/include \
+ 	-DWITH_LSD_FATAL_ERROR_FUNC=1 \
+-	-DWITH_LSD_NOMEM_ERROR_FUNC=1	
++	-DWITH_LSD_NOMEM_ERROR_FUNC=1 \
++        -D_GNU_SOURCE
+ 
+ noinst_HEADERS= \
+ 	argv.h \
+Index: freeipmi-0.6.10/ipmi-raw/src/ipmi-raw-argp.c
+===================================================================
+--- freeipmi-0.6.10.orig/ipmi-raw/src/ipmi-raw-argp.c
++++ freeipmi-0.6.10/ipmi-raw/src/ipmi-raw-argp.c
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #if STDC_HEADERS
+ #include <string.h>
++#include <unistd.h>
+ #endif /* STDC_HEADERS */
+ #include <argp.h>
+ 
+@@ -139,7 +140,7 @@ ipmi_raw_argp_parse (int argc, char **ar
+   init_hostrange_cmd_args (&(cmd_args->hostrange));
+ 
+   cmd_args->cmd_file = NULL;
+-  memset (cmd_args->cmd, 0, sizeof(cmd_args->cmd));
++  cmd_args->cmd = calloc(sysconf(_SC_ARG_MAX), sizeof(uint8_t));
+   cmd_args->cmd_length = 0;
+ 
+   argp_parse (&argp, argc, argv, ARGP_IN_ORDER, NULL, cmd_args);
+Index: freeipmi-0.6.10/ipmi-raw/src/ipmi-raw.c
+===================================================================
+--- freeipmi-0.6.10.orig/ipmi-raw/src/ipmi-raw.c
++++ freeipmi-0.6.10/ipmi-raw/src/ipmi-raw.c
+@@ -24,9 +24,9 @@
+ #include <stdlib.h>
+ #if STDC_HEADERS
+ #include <string.h>
++#include <unistd.h>
+ #endif /* STDC_HEADERS */
+ #include <argp.h>
+-#include <limits.h>
+ #include <assert.h>
+ 
+ #include <freeipmi/freeipmi.h>
+@@ -46,13 +46,17 @@ ipmi_raw_cmdline (ipmi_raw_state_data_t 
+   uint8_t *bytes_rq = NULL;
+   int send_len;
+   int i;
+-  uint8_t bytes_rs[ARG_MAX];
++  uint8_t *bytes_rs;
++  long arg_max;
+   int32_t rs_len;
+ 
+   assert(state_data);
+   assert(state_data->prog_data->args->cmd);
+   assert(state_data->prog_data->args->cmd_length);
+ 
++  arg_max = sysconf(_SC_ARG_MAX);
++  bytes_rs = calloc(arg_max, sizeof(uint8_t));
++
+   args = state_data->prog_data->args;
+ 
+   bytes_rq = args->cmd;
+@@ -72,7 +76,7 @@ ipmi_raw_cmdline (ipmi_raw_state_data_t 
+                               &bytes_rq[2],
+                               send_len - 2, 
+                               bytes_rs, 
+-                              ARG_MAX)) >= 0)
++                              arg_max)) >= 0)
+     {
+       pstdout_printf (state_data->pstate, "rcvd: ");
+       for (i = 0; i < rs_len; i++)
+@@ -210,13 +214,17 @@ ipmi_raw_stream (ipmi_raw_state_data_t *
+   size_t n = 0;
+   uint8_t *bytes_rq = NULL;
+   int send_len;
+-  uint8_t bytes_rs[ARG_MAX];
++  uint8_t *bytes_rs;
++  long arg_max;
+   int32_t rs_len;
+   int i, rv = -1;
+ 
+   assert(state_data);
+   assert(stream);
+ 
++  arg_max = sysconf(_SC_ARG_MAX);
++  bytes_rs = calloc(arg_max, sizeof(uint8_t));
++
+   args = state_data->prog_data->args;
+ 
+   while (1)
+@@ -246,7 +254,7 @@ ipmi_raw_stream (ipmi_raw_state_data_t *
+ 				  &bytes_rq[2], 
+ 				  send_len - 2, 
+ 				  bytes_rs, 
+-				  ARG_MAX)) < 0)
++				  arg_max)) < 0)
+         {
+           pstdout_fprintf(state_data->pstate,
+                           stderr,
+Index: freeipmi-0.6.10/ipmi-raw/src/ipmi-raw.h
+===================================================================
+--- freeipmi-0.6.10.orig/ipmi-raw/src/ipmi-raw.h
++++ freeipmi-0.6.10/ipmi-raw/src/ipmi-raw.h
+@@ -20,7 +20,6 @@
+ #define _IPMI_RAW_H
+ 
+ #include <freeipmi/freeipmi.h>
+-#include <limits.h>	/* ARG_MAX */
+ 
+ #include "tool-cmdline-common.h"
+ #include "pstdout.h"
+@@ -35,7 +34,7 @@ struct ipmi_raw_arguments
+   struct common_cmd_args common;
+   struct hostrange_cmd_args hostrange;
+   char *cmd_file;
+-  uint8_t cmd[ARG_MAX];
++  uint8_t *cmd;
+   int cmd_length;
+ };
+ 
diff --git a/sys-libs/freeipmi/freeipmi-0.6.10.ebuild b/sys-libs/freeipmi/freeipmi-0.6.10.ebuild
new file mode 100644
index 000000000000..718f0c8fc42e
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-0.6.10.ebuild
@@ -0,0 +1,56 @@
+# 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.6.10.ebuild,v 1.1 2008/11/03 06:38:31 flameeyes 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}+glibc-2.8.patch"
+	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
+
+	rm /usr/share/doc/${PF}/COPYING* /usr/share/doc/${PF}/INSTALL
+
+	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
+}