Remove old file; bump to latest version (2.3.7) closing bug #264331; add patch to build with glibc 2.10 closing bug #270541.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 73 insertions, 54 deletions

diff --git a/sys-apps/ipmiutil/ChangeLog b/sys-apps/ipmiutil/ChangeLog
index e771f6bf98a5..c3de4fe326e2 100644
--- a/sys-apps/ipmiutil/ChangeLog
+++ b/sys-apps/ipmiutil/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/ipmiutil
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.7 2008/08/07 21:57:46 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.8 2009/05/22 16:28:57 flameeyes Exp $
+
+*ipmiutil-2.3.7 (22 May 2009)
+
+  22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ipmiutil-1.6.0-link-external-freeipmi.diff, +ipmiutil-2.3.7.ebuild,
+  +files/ipmiutil-2.3.7+glibc-2.10.patch:
+  Remove old file; bump to latest version (2.3.7) closing bug #264331; add
+  patch to build with glibc 2.10 closing bug #270541.
 
   07 Aug 2008; Markus Meier <maekke@gentoo.org> ipmiutil-2.1.1.ebuild:
   amd64/x86 stable, bug #233569
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 76aaab10d906..7665e678b0e8 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ipmiutil-1.6.0-link-external-freeipmi.diff 1904 RMD160 eecb33839cac88a97a9060cab55a40c36d81f10e SHA1 71248d2e7b88b376440fd73c5aba0981fb49ea1d SHA256 5bd0cf9b0503431654cc878482e3746a695adee646f52a47ad54323c8bc53b71
+AUX ipmiutil-2.3.7+glibc-2.10.patch 701 RMD160 595f39b4e7c625537d69ed4971478c0132a53a84 SHA1 4e2f7637679a424cb66f82e6fa15c91517d2d575 SHA256 60076d447b51f954edcef4a4e90fe50bae78953f9006534937266534da987bdf
 DIST ipmiutil-2.1.1.tar.gz 1226477 RMD160 a83f37abe0288a52601f3078590f47cf746bfa2b SHA1 8102ab072dc0abcc5f11911165a4a31eeda5cb8b SHA256 bd0196f7e6341fad258008bad0ae854feb53cfbb8466e04cce05dcdc8bf21c1f
 DIST ipmiutil-2.1.2.tar.gz 1453588 RMD160 ab0fbf63209921720d859275832c6a13021bdb31 SHA1 621b1c94f183083723031f8989bbe25b5ad1926f SHA256 1f77f653d62a8aa9834363ada7234d8f4727ac41bd4895b63dd4b4c8f179042e
+DIST ipmiutil-2.3.7.tar.gz 1292496 RMD160 8527ca9b999808e8618d8be6f762d01d85c91953 SHA1 1ee95691ad15206b4b26075009dbb169f54713ec SHA256 58ec6596ae8e3a51bc8eb630f19c348d79b9f116d78d73662a8a3dd9229645a5
 EBUILD ipmiutil-2.1.1.ebuild 956 RMD160 5b41ea0902b937dd99a0fe73c3449adfeefed835 SHA1 5985dedcae58e9334df9db1c801f8cf5680c730a SHA256 25f681f57899be6e04387d89992afff6fbae0ea24f847cf11733f6aa242d1fa8
 EBUILD ipmiutil-2.1.2.ebuild 960 RMD160 1eaef6f36fa4ad9897ce498483a528a0b027c6b8 SHA1 7d7e1558c7ce1191e4956f91196f429c2765fbe9 SHA256 fb6c27d9dcf0eefa8d6bd4218a175c0b4cbf51ce548de595f92a865a74ceebca
-MISC ChangeLog 1387 RMD160 6072cb54984e41bf2facddff5f342d7bab3e3dba SHA1 a44417df4ed176dcbaa1ed1b1449e89a1127d84b SHA256 e2c340c1a84176919c94c8e8c5bb921dba388c457ea41c4c17152afff5b7cd95
+EBUILD ipmiutil-2.3.7.ebuild 766 RMD160 be7dda3acf9da8e57647e03602e68a904ae5e438 SHA1 db5b76c0252379af6f02f133e32ad38284511dd3 SHA256 dd17f43b08e3c285af224671694e13c4323e1fd61f56ded589b5b3c628b2cef5
+MISC ChangeLog 1726 RMD160 4354626f2eb2d6ec34ec18ec536caaa9bf208b97 SHA1 d1cba1850b78f9bbb8c5e90e22ac44238ced09a4 SHA256 699d5e9a709c3aa3a1e23cc60a0c527b3f94ef8b8e1ccde0ff63875c76cfe855
 MISC metadata.xml 161 RMD160 036f72a3fa0f193b1ed10f46bea0df0a2bf7e07f SHA1 00f2ba2d18e3c9d0ba2305497408776582e87666 SHA256 4447fa40fb360e4e153d4fc115728bf9db74e1aa3536c77de0594dc487ca5cea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkibcCgACgkQkKaRLQcq0GItbQCcDg6VG7xx1dcR/lTDLN7WnPJy
-XM8AoLWIp1XsQEXJRdrImK3KLx6HJna8
-=53NC
+iEYEARECAAYFAkoW0tEACgkQAiZjviIA2Xh3HQCgo6tOEypo5JzY//tcd3fg3ze4
+HrwAn0kWJF4kDPuqlHFTuWOvp/L4/nTr
+=7qG/
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ipmiutil/files/ipmiutil-1.6.0-link-external-freeipmi.diff b/sys-apps/ipmiutil/files/ipmiutil-1.6.0-link-external-freeipmi.diff
deleted file mode 100644
index 6ae4aa09abbc..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-1.6.0-link-external-freeipmi.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nuar ipmiutil-1.6.0.orig/Makefile.am ipmiutil-1.6.0/Makefile.am
---- ipmiutil-1.6.0.orig/Makefile.am	2005-02-10 07:29:37.000000000 -0800
-+++ ipmiutil-1.6.0/Makefile.am	2005-03-25 01:40:42.817933112 -0800
-@@ -1,5 +1,5 @@
- 
--SUBDIRS = doc freeipmi util
-+SUBDIRS = doc util
- PKGDIR = /usr/src/redhat
- SOURCEDIR = $(PKGDIR)/SOURCES
- BUILDDIR = $(PKGDIR)/BUILD
-diff -Nuar ipmiutil-1.6.0.orig/Makefile.in ipmiutil-1.6.0/Makefile.in
---- ipmiutil-1.6.0.orig/Makefile.in	2005-03-07 12:25:58.000000000 -0800
-+++ ipmiutil-1.6.0/Makefile.in	2005-03-25 01:40:53.444317656 -0800
-@@ -63,7 +63,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
--SUBDIRS = doc freeipmi util
-+SUBDIRS = doc util
- PKGDIR = /usr/src/redhat
- SOURCEDIR = $(PKGDIR)/SOURCES
- BUILDDIR = $(PKGDIR)/BUILD
-diff -Nuar ipmiutil-1.6.0.orig/util/Makefile.am ipmiutil-1.6.0/util/Makefile.am
---- ipmiutil-1.6.0.orig/util/Makefile.am	2005-03-07 12:14:03.000000000 -0800
-+++ ipmiutil-1.6.0/util/Makefile.am	2005-03-25 01:41:27.013214408 -0800
-@@ -3,7 +3,7 @@
- AM_CPPFLAGS = -DLINUX -DLOCALEDIR=\"$(localedir)\"
- INCLUDES = -I..
- CMDMOD = ipmicmd.c imbapi.c ipmimv.c ipmignu.c ipmild.c 
--LDFLAGS = -lfreeipmi -L../freeipmi 
-+LDFLAGS = -lfreeipmi
- # To build without gnu freeipmi, uncomment the following two lines.
- # LDFLAGS = 
- # CMDMOD = ipmicmd.c imbapi.c ipmimv.c ipmignustub.c
-diff -Nuar ipmiutil-1.6.0.orig/util/Makefile.in ipmiutil-1.6.0/util/Makefile.in
---- ipmiutil-1.6.0.orig/util/Makefile.in	2005-03-07 12:26:04.000000000 -0800
-+++ ipmiutil-1.6.0/util/Makefile.in	2005-03-25 01:41:28.650965432 -0800
-@@ -67,7 +67,7 @@
- AM_CPPFLAGS = -DLINUX -DLOCALEDIR=\"$(localedir)\"
- INCLUDES = -I..
- CMDMOD = ipmicmd.c imbapi.c ipmimv.c ipmignu.c ipmild.c 
--LDFLAGS = -lfreeipmi -L../freeipmi 
-+LDFLAGS = -lfreeipmi
- # To build without gnu freeipmi, uncomment the following two lines.
- # LDFLAGS = 
- # CMDMOD = ipmicmd.c imbapi.c ipmimv.c ipmignustub.c
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.3.7+glibc-2.10.patch b/sys-apps/ipmiutil/files/ipmiutil-2.3.7+glibc-2.10.patch
new file mode 100644
index 000000000000..18efa2ca291e
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-2.3.7+glibc-2.10.patch
@@ -0,0 +1,22 @@
+Index: ipmiutil-2.3.7/util/ipmicmd.c
+===================================================================
+--- ipmiutil-2.3.7.orig/util/ipmicmd.c
++++ ipmiutil-2.3.7/util/ipmicmd.c
+@@ -1116,7 +1116,7 @@ void tty_setnormal(int mode)
+ }
+ #endif
+ 
+-static char *getline(char *prompt, char fwipe)
++static char *ipmi_getline(char *prompt, char fwipe)
+ {
+    /* getline is the same format as readline, but much simpler, and portable. */
+    static char linebuf[128];
+@@ -1144,7 +1144,7 @@ static char *getline(char *prompt, char 
+ 
+ static char *getline_wipe(char *prompt)
+ {
+-   return(getline(prompt,1));
++   return(ipmi_getline(prompt,1));
+ }
+ 
+ void parse_lan_options(char c, char *optarg, char fdebugcmd)
diff --git a/sys-apps/ipmiutil/ipmiutil-2.3.7.ebuild b/sys-apps/ipmiutil/ipmiutil-2.3.7.ebuild
new file mode 100644
index 000000000000..664daa53c933
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-2.3.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.3.7.ebuild,v 1.1 2009/05/22 16:28:57 flameeyes Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
+
+	sed -i -e '/strip/d' util/Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+}