packages: ipmiutil/ipmiutil-make-jN.patch, ipmiutil/ipmiutil.spec, ipmiutil...

qboosh qboosh at pld-linux.org
Sat Nov 13 21:38:40 CET 2010 

Author: qboosh                       Date: Sat Nov 13 20:38:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.7.2
- updated am,make-jN patches, removed obsolete am2 patch

---- Files affected:
packages/ipmiutil:
   ipmiutil-make-jN.patch (1.7 -> 1.8) , ipmiutil.spec (1.24 -> 1.25) , ipmiutil-am2.patch (1.6 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ipmiutil/ipmiutil-make-jN.patch
diff -u packages/ipmiutil/ipmiutil-make-jN.patch:1.7 packages/ipmiutil/ipmiutil-make-jN.patch:1.8
--- packages/ipmiutil/ipmiutil-make-jN.patch:1.7	Tue Jan  5 16:24:06 2010
+++ packages/ipmiutil/ipmiutil-make-jN.patch	Sat Nov 13 21:38:34 2010
@@ -1,62 +1,101 @@
---- ipmiutil-2.2.0/util/Makefile.am.orig	2008-08-25 22:08:37.000000000 +0200
-+++ ipmiutil-2.2.0/util/Makefile.am	2008-08-28 00:43:08.614118386 +0200
-@@ -54,52 +54,23 @@
- LDADD += -lpthread
- 	
+--- ipmiutil-2.7.2/util/Makefile.am.orig	2010-11-02 21:25:41.000000000 +0100
++++ ipmiutil-2.7.2/util/Makefile.am	2010-11-13 07:24:02.003101613 +0100
+@@ -63,75 +63,50 @@
+ # EXTRA_PROGRAMS are built by default but not included in the install package
+ # TESTPROGS are not built by default.  To build, do 'make ifruset', for example.
  sbin_PROGRAMS = ipmiutil idiscover ipmi_port ievents
--EXTRA_PROGRAMS = libipmiutil.a libimbapi.a ipmi_sample
-+EXTRA_PROGRAMS = 
+-EXTRA_PROGRAMS = libipmiutil.a ipmi_sample
++EXTRA_PROGRAMS =
 +noinst_LTLIBRARIES = libipmiutil.la libimbapi.la
- TESTPROGS = bmcconfig xmlconfig ipmimv 
+ TESTPROGS = libimbapi.a iconfig ipmimv ifruset
+ # OLDPROGS are old/previous binaries that may exist and need to be deleted.
  OLDPROGS = alarms bmchealth fruconfig getevent hwreset icmd isolconsole pefconfig sensor showsel tmconfig wdt
- # xmlconfig dropped
  
  # To build an imb api library (libimbapi.a):
 -libimbapi.a:	imbapi.c
--	$(CC) -I. -I.. @OS_CFLAGS@ -fPIC $(CFLAGS) -c imbapi.c
--	$(AR) cru libimbapi.a imbapi.o
+-	$(CC) -I. -I.. @OS_CFLAGS@ -fPIC $(CFLAGS) -o $(tmpdir)/imbapi.o -c imbapi.c
+-	$(AR) cru libimbapi.a $(tmpdir)/imbapi.o
 -	$(RANLIB) libimbapi.a
--	rm -f imbapi.o
+-	rm -f $(tmpdir)/imbapi.o
 +libimbapi_la_SOURCES = imbapi.c
-+libimbapi_la_CFLAGS = -I. -I.. @OS_CFLAGS@ -fPIC -c
++libimbapi_la_CFLAGS = -I -I.. @OS_CFLAGS@ -fPIC
   
  # To build a lib to support all of the IPMI drivers (libipmiutil.a)
 -libipmiutil.a:	$(CMDMOD:.c=.o) @LANPLUS_LIB@
 -	if [ -f "@LANPLUS_LIB@" ]; then \
 -	    $(CC) $(CFLAGS_SAM) -c ipmilanplus.c; \
+-	    $(CC) $(CFLAGS_SAM) -c ipmilan.c; \
 -	    ar x @LANPLUS_LIB@ ; fi
--	$(AR) cru libipmiutil.a $(CMDMOD:.c=.o) $(LANPLUS_OBJ)
+-	$(AR) cru libipmiutil.a $(CMDMOD:.c=.o) $(LANPLUS_OBJ) 
 -	$(RANLIB) libipmiutil.a
 -	if [ -f "@LANPLUS_LIB@" ]; then \
--	    rm -f $(LANPLUS_OBJ) ipmilanplus.o; fi 
-+libipmiutil_la_SOURCES = $(CMDMOD)
-+libipmiutil_la_LIBADD = @LANPLUS_LIB@
-+libipmiutil_la_CFLAGS = $(AM_CFLAGS)
- 
- # To build ipmiutil, need to use METACFLAGS for each .c/.o
- 
+-	    rm -f $(LANPLUS_OBJ) ipmilan.o ipmilanplus.o; fi 
+-
+-# To build ipmiutil, need to use METACFLAGS for each .c/.o
+-
 -idiscover:	idiscover.c
--	$(CC) @OS_CFLAGS@ $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c
+-	$(CC) @OS_CFLAGS@ $(CFLAGS) $(LDFLAGS) $(OS_LF) -o idiscover idiscover.c
 -
 -ipmimv: 	ipmimv.c
 -	$(CC) @OS_CFLAGS@ $(CFLAGS) $(LDFLAGS) -DTEST_BIN -o ipmimv ipmimv.c
 -
 -ievents:         ievents.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o ievents ievents.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -DALONE -o ievents ievents.c
 -
 -ipmi_sample:	libipmiutil.a ipmi_sample.c
 -	$(CC) $(CFLAGS_SAM) -c ipmi_sample.c
 -	$(CC)  -g -O2 -o ipmi_sample  ipmi_sample.o libipmiutil.a $(LDFLAGS) $(LDADD)
 -
+-ifruset:	libipmiutil.a ifruset.c ifru_picmg.c
+-	$(CC) $(CFLAGS_SAM) -c ifruset.c
+-	$(CC) $(CFLAGS_SAM) -c ifru_picmg.c
+-	$(CC)  -g -O2 -o ifruset ifruset.o ifru_picmg.o libipmiutil.a $(LDFLAGS) $(LDADD)
+-
 -ipmi_port:      ipmi_port.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c 
 -
--xmlconfig:      xmlconfig.c libipmiutil.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o xmlconfig xmlconfig.c libipmiutil.a @LANPLUS_CRYPTO@
--
--bmcconfig:      bmcconfig.c libipmiutil.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o bmcconfig bmcconfig.c libipmiutil.a @LANPLUS_CRYPTO@
+-#xmlconfig:      xmlconfig.c libipmiutil.a
+-#	$(CC) $(CFLAGS) $(LDFLAGS) -o xmlconfig xmlconfig.c libipmiutil.a @LANPLUS_CRYPTO@
 -
+-iconfig:      iconfig.c libipmiutil.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o iconfig iconfig.c libipmiutil.a @LANPLUS_CRYPTO@
++libipmiutil_la_SOURCES = $(CMDMOD) isol.c
++libipmiutil_la_LIBADD = @LANPLUS_LIB@ -lcrypto
++libipmiutil_la_CFLAGS = $(AM_CFLAGS)
+ 
  ipmiutil_SOURCES  = $(METASOURCE) 
  # ipmiutil:	$(METASOURCE:.c=.o) 
  #	$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o)
+ 
+-ievents_SOURCES    = ievents.c
++ievents_SOURCES    = ievents.c
++ievents_CPPFLAGS = $(AM_CPPFLAGS) -UMETACOMMAND -DALONE
+ 
+ idiscover_SOURCES = idiscover.c 
++idiscover_CPPFLAGS = $(AM_CPPFLAGS) -UMETACOMMAND @OS_CFLAGS@
++
++ipmimv_SOURCES = ipmimv.c
++ipmimv_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_BIN
++
++ifruset_SOURCES = ifruset.c ifru_picmg.c
++ifruset_LDADD = libipmiutil.la
++
++ipmi_sample_SOURCES = ipmi_sample.c
++ipmi_sample_LDADD = libipmiutil.la
+ 
+ ipmi_port_SOURCES = ipmi_port.c 
+ 
+ # xmlconfig_SOURCES = xmlconfig.c $(CMDMOD) 
+ 
+-EXTRA_DIST = imb_api.h ipmicmd.h ipmi_ioctls.h ipmidir.h ipmilan.h ipmilanplus.h ipmiutil.h
++iconfig_SOURCES = iconfig.c
++iconfig_LDADD = libipmiutil.la @LANPLUS_CRYPTO@
+ 
+-all-am: Makefile $(sbin_PROGRAMS) $(EXTRA_PROGRAMS)
++EXTRA_DIST = imb_api.h ipmicmd.h ipmi_ioctls.h ipmidir.h ipmilan.h ipmilanplus.h ipmiutil.h
+ 
+-install-data-am:  $(EXTRA_PROGRAMS)
++install-data-am:
+ 	mkdir -p $(DESTDIR)$(extradir)
+ 
+ clean-generic:   

================================================================
Index: packages/ipmiutil/ipmiutil.spec
diff -u packages/ipmiutil/ipmiutil.spec:1.24 packages/ipmiutil/ipmiutil.spec:1.25
--- packages/ipmiutil/ipmiutil.spec:1.24	Mon Apr 12 21:25:48 2010
+++ packages/ipmiutil/ipmiutil.spec	Sat Nov 13 21:38:34 2010
@@ -1,32 +1,23 @@
 # $Revision$, $Date$
-# TODO
-# - unpackaged:
-#   /etc/cron.daily/checksel
-#   /etc/rc.d/init.d/ipmi_port
-#   /etc/rc.d/init.d/ipmiutil_asy
-#   /etc/rc.d/init.d/ipmiutil_wdt
-#   /usr/share/ipmiutil/COPYING
-#   /usr/share/ipmiutil/README
-#   /usr/share/ipmiutil/UserGuide
-#   /usr/share/ipmiutil/evt.sh
-#   /usr/share/ipmiutil/ipmi_if.sh
-%bcond_without	gpl
+#
+# Conditonal build:
+%bcond_without	gpl	# build with GPL code (md2.h, ipmi_ioctls.h)
+#
 Summary:	IPMI Management Utilities
 Summary(pl.UTF-8):	Narzędzia zarządzające IPMI
 Name:		ipmiutil
-Version:	2.5.2
-Release:	5
+Version:	2.7.2
+Release:	1
 %if %{with gpl}
-License:	GPL
+License:	GPL v2+
 %else
 License:	BSD
 %endif
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
-# Source0-md5:	1423145340b6ef832ab38fc2920121b1
+Source0:	http://downloads.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
+# Source0-md5:	07fd1ab25472c1f3371da2e0d07dfda2
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-make-jN.patch
-Patch2:		%{name}-am2.patch
 URL:		http://ipmiutil.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -79,9 +70,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-rm lib/lib*.a*
+%{__rm} lib/lib*.a*
 
 %build
 %{__libtoolize}
@@ -101,7 +91,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_mandir}/man8,%{mibsdir}}
+install -d $RPM_BUILD_ROOT%{mibsdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -117,43 +107,59 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO doc/{UserGuide,checksel,*.sh,ipmiutil_asy,ipmiutil_wdt}
-%attr(755,root,root) %{_sbindir}/alarms
-%attr(755,root,root) %{_sbindir}/bmcconfig
-%attr(755,root,root) %{_sbindir}/bmchealth
-%attr(755,root,root) %{_sbindir}/fruconfig
-%attr(755,root,root) %{_sbindir}/getevent
-%attr(755,root,root) %{_sbindir}/hwreset
+%attr(755,root,root) %{_sbindir}/ialarms
 %attr(755,root,root) %{_sbindir}/icmd
+%attr(755,root,root) %{_sbindir}/iconfig
 %attr(755,root,root) %{_sbindir}/idiscover
 %attr(755,root,root) %{_sbindir}/ievents
+%attr(755,root,root) %{_sbindir}/ifirewall
+%attr(755,root,root) %{_sbindir}/ifru
+%attr(755,root,root) %{_sbindir}/ifwum
+%attr(755,root,root) %{_sbindir}/igetevent
+%attr(755,root,root) %{_sbindir}/ihealth
+%attr(755,root,root) %{_sbindir}/ihpm
+%attr(755,root,root) %{_sbindir}/ilan
+%attr(755,root,root) %{_sbindir}/ipicmg
 %attr(755,root,root) %{_sbindir}/ipmi_port
 %attr(755,root,root) %{_sbindir}/ipmiutil
-%attr(755,root,root) %{_sbindir}/isolconsole
-%attr(755,root,root) %{_sbindir}/pefconfig
-%attr(755,root,root) %{_sbindir}/sensor
-%attr(755,root,root) %{_sbindir}/showsel
-%attr(755,root,root) %{_sbindir}/tmconfig
-%attr(755,root,root) %{_sbindir}/wdt
-%{_mandir}/man8/alarms.8*
-%{_mandir}/man8/bmcconfig.8*
-%{_mandir}/man8/bmchealth.8*
-%{_mandir}/man8/fruconfig.8*
-%{_mandir}/man8/getevent.8*
-%{_mandir}/man8/hwreset.8*
+%attr(755,root,root) %{_sbindir}/ireset
+%attr(755,root,root) %{_sbindir}/isel
+%attr(755,root,root) %{_sbindir}/isensor
+%attr(755,root,root) %{_sbindir}/iserial
+%attr(755,root,root) %{_sbindir}/isol
+%attr(755,root,root) %{_sbindir}/iwdt
+%attr(754,root,root) /etc/cron.daily/checksel
+%attr(754,root,root) /etc/rc.d/init.d/ipmi_port
+%attr(754,root,root) /etc/rc.d/init.d/ipmiutil_asy
+%attr(754,root,root) /etc/rc.d/init.d/ipmiutil_evt
+%attr(754,root,root) /etc/rc.d/init.d/ipmiutil_wdt
+%{_datadir}/%{name}
+%{_mandir}/man8/ialarms.8*
 %{_mandir}/man8/icmd.8*
+%{_mandir}/man8/iconfig.8*
 %{_mandir}/man8/idiscover.8*
+%{_mandir}/man8/iekanalyzer.8*
 %{_mandir}/man8/ievents.8*
+%{_mandir}/man8/ifirewall.8*
+%{_mandir}/man8/ifru.8*
+%{_mandir}/man8/ifwum.8*
+%{_mandir}/man8/igetevent.8*
+%{_mandir}/man8/ihealth.8*
+%{_mandir}/man8/ihpm.8*
+%{_mandir}/man8/ilan.8*
+%{_mandir}/man8/ipicmg.8*
+%{_mandir}/man8/ipmi_port.8*
 %{_mandir}/man8/ipmiutil.8*
-%{_mandir}/man8/isolconsole.8*
-%{_mandir}/man8/pefconfig.8*
-%{_mandir}/man8/sensor.8*
-%{_mandir}/man8/showsel.8*
-%{_mandir}/man8/tmconfig.8*
-%{_mandir}/man8/wdt.8*
+%{_mandir}/man8/ireset.8*
+%{_mandir}/man8/isel.8*
+%{_mandir}/man8/isensor.8*
+%{_mandir}/man8/iserial.8*
+%{_mandir}/man8/isol.8*
+%{_mandir}/man8/isunoem.8*
+%{_mandir}/man8/iwdt.8*
 
 %files -n mibs-%{name}
 %defattr(644,root,root,755)
-%{mibsdir}/bmclanaol.mib
 %{mibsdir}/bmclanpet.mib
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -162,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/11/13 20:38:34  qboosh
+- updated to 2.7.2
+- updated am,make-jN patches, removed obsolete am2 patch
+
 Revision 1.24  2010/04/12 19:25:48  arekm
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil-make-jN.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil.spec?r1=1.24&r2=1.25&f=u

More information about the pld-cvs-commit mailing list