Version bump (bug #199989). Fixed various compile issues (upstream bug #1948890).

Package-Manager: portage-2.1.5_rc4

5 files changed, 207 insertions, 8 deletions

diff --git a/sys-apps/ipmiutil/ChangeLog b/sys-apps/ipmiutil/ChangeLog
index c6f662ef82ee..2b596c31319b 100644
--- a/sys-apps/ipmiutil/ChangeLog
+++ b/sys-apps/ipmiutil/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/ipmiutil
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.2 2007/02/09 08:28:30 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.3 2008/04/22 14:51:06 dev-zero Exp $
+
+*ipmiutil-2.1.0 (22 Apr 2008)
+
+  22 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/2.1.0-various_compile_issues.patch, metadata.xml,
+  +ipmiutil-2.1.0.ebuild:
+  Version bump (bug #199989). Fixed various compile issues (upstream bug
+  #1948890).
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index d9543e3180e8..b1268f4c1719 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,5 +1,8 @@
+AUX 2.1.0-various_compile_issues.patch 5362 RMD160 d976917cbf3d460efa6c86c6edacab383fc50c4b SHA1 fc18019cb9ad73663cdfd144b37264566688ae43 SHA256 0e026dc1c3474b97764ae81db536a7216818f832745b74696358d39bd475cae6
 AUX ipmiutil-1.6.0-link-external-freeipmi.diff 1904 RMD160 eecb33839cac88a97a9060cab55a40c36d81f10e SHA1 71248d2e7b88b376440fd73c5aba0981fb49ea1d SHA256 5bd0cf9b0503431654cc878482e3746a695adee646f52a47ad54323c8bc53b71
 DIST ipmiutil-1.6.0.tar.gz 1151460 RMD160 b8564b4c9504d8681e5b410bc87f420a0b840411 SHA1 64a70a7a0bf5bc98b5ff64e7a9f2bc82fcad30f6 SHA256 f7929ae1d26c8fbbd512946d152b80a276b87cf1f2e28025f72d092583679817
+DIST ipmiutil-2.1.0.tar.gz 1225330 RMD160 ba1d58b5f02e0d21e87ed6003702435fa44f7ca7 SHA1 744dd2cecef0567b17905b22c40973e2e53745b3 SHA256 fae10b04a288180a4ec8212c2198ee8aa4df7ef3ec720e4794cd4be13fd7b302
 EBUILD ipmiutil-1.6.0.ebuild 1176 RMD160 03fb8162e42491d9fd1c50bc3f995de462aac330 SHA1 415ea603e09c9bea298cf51ce65c8fc306c99ec8 SHA256 16cef9c8319e61fa62d10340e1e70eec7bc71a5e842c93221d2be8ed598c2979
-MISC ChangeLog 545 RMD160 3f28211fbb2f777d6f6900d8c3b7d658a2d9be50 SHA1 89125f7dab2771fcc6d31d386bdefd1396cfb8c7 SHA256 738c9a5e04f1df5a08b365153b99fdb7122cba6f86f3e14fe422f4cf6360f498
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
+EBUILD ipmiutil-2.1.0.ebuild 1018 RMD160 dbb55f7e138b891e98a917f4676dac6dc462edbd SHA1 5fc552873a3cb52cd9b2762a791fd36a88643be8 SHA256 7a2163258d0dc4858818df8f0a9e0978ae703a3c05d3619f57cc3142863e97c4
+MISC ChangeLog 800 RMD160 031599cd6e86011d28f600c82ece196dd053de34 SHA1 0f57777db5436dd423e447954bb994d0073ee856 SHA256 151f8c5f483fb1955001a4c9c5a91e91ffb1d0f8a821a79ca94f29fd6a049f77
+MISC metadata.xml 161 RMD160 036f72a3fa0f193b1ed10f46bea0df0a2bf7e07f SHA1 00f2ba2d18e3c9d0ba2305497408776582e87666 SHA256 4447fa40fb360e4e153d4fc115728bf9db74e1aa3536c77de0594dc487ca5cea
diff --git a/sys-apps/ipmiutil/files/2.1.0-various_compile_issues.patch b/sys-apps/ipmiutil/files/2.1.0-various_compile_issues.patch
new file mode 100644
index 000000000000..ed2c6285def7
--- /dev/null
+++ b/sys-apps/ipmiutil/files/2.1.0-various_compile_issues.patch
@@ -0,0 +1,148 @@
+diff -Naur ipmiutil-2.1.0.orig/lib/lanplus/Makefile.am ipmiutil-2.1.0/lib/lanplus/Makefile.am
+--- ipmiutil-2.1.0.orig/lib/lanplus/Makefile.am	2008-04-22 16:24:25.000000000 +0200
++++ ipmiutil-2.1.0/lib/lanplus/Makefile.am	2008-04-22 16:38:40.000000000 +0200
+@@ -1,7 +1,7 @@
+ #  Makefile.am for libipmi_lanplus.so and libipmi_lanplus.a
+ 
+ ODIR 	= obj
+-CFLAGS_STATIC  = -DHAVE_CONFIG_H -g -O2 -fno-strict-aliasing -fPIC
++CFLAGS_STATIC  = -DHAVE_CONFIG_H -fno-strict-aliasing -fPIC $(CFLAGS)
+ 
+ MAINTAINERCLEANFILES    = Makefile.in
+  
+@@ -32,12 +32,12 @@
+ 	rm -rf $(ODIR)
+ 
+ $(lanplus_liba):	$(am_libipmi_lanplus_a_OBJECTS)
+-	ar cru $(lanplus_liba) $(am_libipmi_lanplus_a_OBJECTS)
+-	ranlib $(lanplus_liba)
++	$(AR) cru $(lanplus_liba) $(am_libipmi_lanplus_a_OBJECTS)
++	$(RANLIB) $(lanplus_liba)
+ 		
+ $(ODIR):
+ 	mkdir -p $(ODIR)
+ 
+ $(ODIR)/%.o:    %.c $(ODIR)
+-	gcc -c $(CFLAGS_STATIC) $(INCLUDES) -o $@ $<
++	$(CC) -c $(CFLAGS_STATIC) $(INCLUDES) -o $@ $<
+ 
+diff -Naur ipmiutil-2.1.0.orig/util/ipmilanplus.c ipmiutil-2.1.0/util/ipmilanplus.c
+--- ipmiutil-2.1.0.orig/util/ipmilanplus.c	2008-04-22 16:24:25.000000000 +0200
++++ ipmiutil-2.1.0/util/ipmilanplus.c	2008-04-22 16:25:15.000000000 +0200
+@@ -8,6 +8,7 @@
+  */
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <string.h>
+ 
+ // #define DEBUG  1
+ #ifndef HAVE_LANPLUS
+diff -Naur ipmiutil-2.1.0.orig/util/ipmi_port.c ipmiutil-2.1.0/util/ipmi_port.c
+--- ipmiutil-2.1.0.orig/util/ipmi_port.c	2008-04-22 16:24:25.000000000 +0200
++++ ipmiutil-2.1.0/util/ipmi_port.c	2008-04-22 16:26:05.000000000 +0200
+@@ -12,6 +12,7 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <netinet/in.h>
+diff -Naur ipmiutil-2.1.0.orig/util/Makefile.am ipmiutil-2.1.0/util/Makefile.am
+--- ipmiutil-2.1.0.orig/util/Makefile.am	2008-04-22 16:24:25.000000000 +0200
++++ ipmiutil-2.1.0/util/Makefile.am	2008-04-22 16:35:55.000000000 +0200
+@@ -54,26 +54,26 @@
+ 
+ # To build an imb api library (libimbapi.a):
+ libimbapi.a:	imbapi.c
+-	gcc -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC -g -O2 -c imbapi.c
+-	ar cru libimbapi.a imbapi.o
+-	ranlib libimbapi.a
++	$(CC) -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c
++	$(AR) cru libimbapi.a imbapi.o
++	$(RANLIB) libimbapi.a
+ 	rm -f imbapi.o
+  
+ # To build a lib to support all of the IPMI drivers (libipmiutil.a)
+ libipmiutil.a:	$(CMDMOD:.c=.o) @LANPLUS_LIB@
+-	ar cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@
+-	ranlib libipmiutil.a
++	$(AR) cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@
++	$(RANLIB) libipmiutil.a
+ 
+ # To build ipmiutil, need to use METACFLAGS for each .c/.o
+ 
+ idiscover:	idiscover.c
+-	gcc $(CFLAGS) -o idiscover idiscover.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c
+ 
+ events:         events.c
+-	gcc $(CFLAGS) -DTEST -o events events.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o events events.c
+ 
+ ipmi_port:      ipmi_port.c
+-	gcc $(CFLAGS) -o ipmi_port ipmi_port.c 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c 
+ 
+ ipmiutil_SOURCES  = $(METASOURCE) 
+ 
+diff -Naur ipmiutil-2.1.0.orig/util/Makefile.am-all ipmiutil-2.1.0/util/Makefile.am-all
+--- ipmiutil-2.1.0.orig/util/Makefile.am-all	2008-04-22 16:24:25.000000000 +0200
++++ ipmiutil-2.1.0/util/Makefile.am-all	2008-04-22 16:39:04.000000000 +0200
+@@ -42,7 +42,7 @@
+ AM_CPPFLAGS += @LANPLUS_CFLAGS@ 
+ LDADD += @LANPLUS_LDADD@ 
+ 
+-METACFLAGS = -I. -I.. -DMETACOMMAND $(AM_CPPFLAGS)
++METACFLAGS = -I. -I.. -DMETACOMMAND $(AM_CPPFLAGS) $(CFLAGS)
+ METASOURCE = ipmiutil.c alarms.c bmchealth.c events.c fruconfig.c getevent.c hwreset.c icmd.c pefconfig.c sensor.c showsel.c tmconfig.c wdt.c isolconsole.c idiscover.c $(CMDMOD) 
+ METALD = @LANDESK_LDADD@ @LANPLUS_LIB@ @LANPLUS_CRYPTO@ -lpthread
+ LDADD += -lpthread
+@@ -52,35 +52,35 @@
+ 
+ # To build an imb api library (libimbapi.a):
+ libimbapi.a:	imbapi.c
+-	gcc -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC -g -O2 -c imbapi.c
+-	ar cru libimbapi.a imbapi.o
+-	ranlib libimbapi.a
++	$(CC) -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c
++	$(AR) cru libimbapi.a imbapi.o
++	$(RANLIB) libimbapi.a
+ 	rm -f imbapi.o
+  
+ # To build a lib to support all of the IPMI drivers (libipmiutil.a)
+ libipmiutil.a:	$(CMDMOD:.c=.o) @LANPLUS_LIB@
+-	ar cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@
+-	ranlib libipmiutil.a
++	$(AR) cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@
++	$(RANLIB) libipmiutil.a
+ 
+ # To build ipmiutil, need to use METACFLAGS for each .c/.o
+ ipmiutil:	$(METASOURCE) 
+ 	@for f in $(METASOURCE); do \
+-	    echo "gcc $(METACFLAGS) -c $$f"; \
+-	    gcc $(METACFLAGS) -c $$f; done
++	    echo "$(CC) $(METACFLAGS) -c $$f"; \
++	    $(CC) $(METACFLAGS) -c $$f; done
+ 	@METAOBJ=`echo $(METASOURCE) | sed -e 's/ipmilan2.c//' | \
+ 			sed -e 's/.c$$/.o/g' -e 's/.c /.o /g'`; \
+-	echo "gcc -g -O2 -o ipmiutil $$METAOBJ $(METALD)"; \
+-	gcc -g -O2 -o ipmiutil $$METAOBJ $(METALD); \
++	echo "$(CC) -o ipmiutil $$METAOBJ $(METALD)"; \
++	$(CC) -o ipmiutil $$METAOBJ $(METALD); \
+ 	rm -f $$METAOBJ 
+ 
+ idiscover:	idiscover.c
+-	gcc $(CFLAGS) -o idiscover idiscover.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c
+ 
+ events:         events.c
+-	gcc $(CFLAGS) -DTEST -o events events.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o events events.c
+ 
+ ipmi_port:      ipmi_port.c
+-	gcc $(CFLAGS) -o ipmi_port ipmi_port.c 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c 
+ 
+ ipmiutil_SOURCES  = 
+ 
diff --git a/sys-apps/ipmiutil/ipmiutil-2.1.0.ebuild b/sys-apps/ipmiutil/ipmiutil-2.1.0.ebuild
new file mode 100644
index 000000000000..3408cfbd37b7
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.1.0.ebuild,v 1.1 2008/04/22 14:51:06 dev-zero Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_unpack() {
+	unpack ${A}
+	# The following upstream directories are unneeded/obsolete:
+	# hpiutil kern test
+	# we remove them for safety:
+	cd "${S}"
+	rm -rf hpiutil kern test
+
+	# They get misplaced
+	sed -i \
+		-e '/COPYING/d' \
+		-e '/README/d' \
+		-e '/UserGuide/d' \
+		"${S}/doc/Makefile" || die "sed failed"
+
+	epatch "${FILESDIR}/${PV}-various_compile_issues.patch"
+
+	# Upstream requests this
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+}
diff --git a/sys-apps/ipmiutil/metadata.xml b/sys-apps/ipmiutil/metadata.xml
index 5d9f5be9d49d..068c4a987bc2 100644
--- a/sys-apps/ipmiutil/metadata.xml
+++ b/sys-apps/ipmiutil/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+<herd>sysadmin</herd>
 </pkgmetadata>