Version bump, remove old version and patch. Thanks to Christian (idl0r) in bug #353327.

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

5 files changed, 88 insertions, 245 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 3960e31a4aba..8c8bbeb740e8 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/freeipmi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.29 2010/10/05 19:52:13 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.30 2011/01/31 17:46:49 flameeyes Exp $
+
+*freeipmi-1.0.1 (31 Jan 2011)
+
+  31 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -freeipmi-0.6.10.ebuild, -files/freeipmi-0.6.10+glibc-2.8.patch,
+  +freeipmi-1.0.1.ebuild:
+  Version bump, remove old version and patch. Thanks to Christian (idl0r) in
+  bug #353327.
 
   05 Oct 2010; Markus Meier <maekke@gentoo.org> freeipmi-0.8.9.ebuild:
   x86 stable, bug #339140
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 139d72a0afe0..a66717b3b9d3 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -3,20 +3,19 @@ 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 freeipmi-0.6.10+glibc-2.8.patch 5362 RMD160 914711231432f91fc03ad229ea8afcd8fb2a9651 SHA1 65f023ed3ded23996b90bd9c6e52ab6772ac6b27 SHA256 d9bc35866e5b48d25261e51c81a1db08044c552b6a2ea8537fbce9ab4b97ebaf
 AUX ipmidetectd.initd 800 RMD160 91f992208e621b2ef47f4b2c5c70a658b6ddc12d SHA1 b9a4bbacd1ab4ec661ff7817b567d37d720f4c8a SHA256 9b142aff8690a97686df5d7ddf6888cd4d68142dba60632345a0decf5ba0aa77
-DIST freeipmi-0.6.10.tar.gz 1669900 RMD160 073790a58d1589c1a07dcf73baa6601f4cb1d36f SHA1 1718ae26ec0b5dc093e82ff264b4f97fb753fbb9 SHA256 33c22e46feabe027913b40fd9ff5a8a745ac9b6cf27a6010f0fa801b2a966cdd
 DIST freeipmi-0.8.10.tar.gz 2815418 RMD160 d4b9a3cd8759564620a22f1b05bc32718e600c8a SHA1 773446a45405cfd13ec0791daad78a70f07669ec SHA256 6fea041746728403cb21d8649aa9bd77e6482da50a2c8c5f9cef9b25f0497862
 DIST freeipmi-0.8.9.tar.gz 2775329 RMD160 01c9441596502f60b0c3336dae9db9ff3774a132 SHA1 d80fac5de458363f32c589baef12315a9a471b06 SHA256 8c1c18d83b74e2f657b7c6ccbc6be8eb2c0270d7c0424105bee34fdebe794ea0
-EBUILD freeipmi-0.6.10.ebuild 1461 RMD160 f50e8c49c54863f2ed17b92de203669b67106feb SHA1 671eefae36da7f910b95b74575746e57a3e0629e SHA256 4f0d3ed12af58b46420883bda04182b4a5c0801835aaed1cf68b9ba54ac15c7e
+DIST freeipmi-1.0.1.tar.gz 3053737 RMD160 4667dcd760079cc898673bb1dcdebaa411ae6b7f SHA1 22f5034b633337fc17006f3f348a9faaf1dd123f SHA256 ba022ada0a6c8e307018c6b4c8d46c92be723e7c893c275842f2ef9ed5964086
 EBUILD freeipmi-0.8.10.ebuild 2050 RMD160 6ece587e95c263c00ae2ebd0ace4e95e33784298 SHA1 a0b82261ac54a4544353ceeaa70fab8a568be3a5 SHA256 f1632a1040725e4618fb62a4b4e2a7ef5199364c3fd96526d664d706cc78b29d
 EBUILD freeipmi-0.8.9.ebuild 2044 RMD160 c562216c8361aebe7a7ebcde4ac9c1ca82c0fcbf SHA1 5ff432b878f3258e3ccadf25d12b3d9245b48eca SHA256 54bf27c829e21b61bdc3ae7c000b9799c9a53399ac0ed60e8ccf7113a488c210
-MISC ChangeLog 4998 RMD160 cf682267a5af48a5781eeb90c8d00baf2f2f39c1 SHA1 7c025ad410e2f4839728f5b6b795f5db3863960d SHA256 5288a204ed9e7c30670a697756e198d85898e361827a7891dad04470ab4d7558
+EBUILD freeipmi-1.0.1.ebuild 2034 RMD160 9d3ed95196a37f2be227e411eec1aa1e9ba87d76 SHA1 9ffae50b402f3dbd5a70bf9e46cee91bb7a5184d SHA256 bef109c64dd0986c7bf593efb5bbfc4b5bae7bfacdd5eb6e0eb59ddb29dc283c
+MISC ChangeLog 5274 RMD160 d07a08ed6bbcf280a28dc6b20bd9faee5bbdfce2 SHA1 78ec65a668d41d02eb4d4a2718b342221ed089b8 SHA256 c75cd8b23a40d49df6755131d199fb1c663775cea473b23648dc33f3bf20f614
 MISC metadata.xml 234 RMD160 6498603a1fe3a96823743847afc906df194bb430 SHA1 5ec768281f5435ff5173031bd715fa65ddd274e3 SHA256 73ec73ca73cd98df81c2bbb3e76a83751a3c95802ac103ef21368201d871a9d3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyrgaUACgkQkKaRLQcq0GIfcACgsJbO7OrtI1BJaL6sYWelx1Zd
-7BwAn0MGsgHNm8c2wP6CJCLD8pLx/ly/
-=9c8f
+iEYEARECAAYFAk1G9ZQACgkQAiZjviIA2XhMQACgwrdT65Nvp5HleMqrXUSWKXi+
+xQ8An3DerayFNx5epYIO6VKteYi5/djP
+=OQDt
 -----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
deleted file mode 100644
index 57ec5df7bc4c..000000000000
--- a/sys-libs/freeipmi/files/freeipmi-0.6.10+glibc-2.8.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-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
deleted file mode 100644
index 9875a01a1c63..000000000000
--- a/sys-libs/freeipmi/freeipmi-0.6.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 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.3 2009/10/01 09:44:50 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 "${D}"/usr/share/doc/${PF}/COPYING* "${D}"/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
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.0.1.ebuild b/sys-libs/freeipmi/freeipmi-1.0.1.ebuild
new file mode 100644
index 000000000000..6cfdfa1a5606
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-1.0.1.ebuild
@@ -0,0 +1,71 @@
+# 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.1.ebuild,v 1.1 2011/01/31 17:46:49 flameeyes Exp $
+
+EAPI=2
+
+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="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
+
+	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 || die
+
+	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
+}