[packages/ipmiutil] - up to 2.9.7

adwol adwol at pld-linux.org
Sun Nov 29 03:20:08 CET 2015 

commit ac6503dfc772cc22ff0a44a9afd70cdd412f483d
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Sun Nov 29 03:19:53 2015 +0100

    - up to 2.9.7

 ipmiutil-am.patch                                  | 17 ++---
 ...idiscover-ifaces_with_dot_in_name_support.patch | 12 ++++
 ipmiutil-libcrypto.patch                           | 17 +++++
 ipmiutil-symlink.patch                             | 12 ++++
 ipmiutil.spec                                      | 75 ++++++++++++++++++++--
 5 files changed, 118 insertions(+), 15 deletions(-)
---
diff --git a/ipmiutil.spec b/ipmiutil.spec
index 0f04421..bdd3d1e 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -6,7 +6,7 @@
 Summary:	IPMI Management Utilities
 Summary(pl.UTF-8):	Narzędzia zarządzające IPMI
 Name:		ipmiutil
-Version:	2.8.8
+Version:	2.9.7
 Release:	1
 %if %{with gpl}
 License:	GPL v2+
@@ -15,8 +15,11 @@ License:	BSD
 %endif
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
-# Source0-md5:	a7178c63856ee62aa0b1b81860d5355b
+# Source0-md5:	b5b60a2f913a21dd04b86ce2a3900928
 Patch0:		%{name}-am.patch
+Patch1:		%{name}-idiscover-ifaces_with_dot_in_name_support.patch
+Patch2:		%{name}-libcrypto.patch
+Patch3:		%{name}-symlink.patch
 URL:		http://ipmiutil.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -47,6 +50,44 @@ Critical Stop (pefconfig). Wymaga pakietu ze sterownikiem IPMI
 Sterownik IPMI może być dostarczony przez sterownik Intel IPMI
 (/dev/imb), albo przez sterownik valinux IPMI (/dev/ipmikcs).
 
+%package libs
+Summary:	ipmiutil library
+Summary(pl.UTF-8):	Biblioteka ipmiutil
+Group:		Libraries
+
+%description libs
+This package contains libipmiutil library.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera bibliotekę libipmiutil.
+
+%package devel
+Summary:	Header files and examples for ipmiutil library
+Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do biblioteki ipmiutil
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+This package contains header files and examples for developing
+own programs which use libipmiutil.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe i przykłady umożliwiające
+tworzenie własnych programów wykorzystujących bibliotekę
+ipmiutil.
+
+%package static
+Summary:	Static ipmiutil library
+Summary(pl.UTF-8):	Statyczna biblioteka ipmiutil
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+This package contains static libipmiutil library.
+
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczną bibliotekę libipmiutil.
+
 %package -n mibs-%{name}
 Summary:	MIB database from IPMI Management Utilities
 Summary(pl.UTF-8):	Baza danych MIB z narzędzi zarządzających IPMI
@@ -66,6 +107,9 @@ Ten pakiet zawiera plik MIB od Intela:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %{__rm} lib/lib*.a*
 
@@ -80,8 +124,6 @@ Ten pakiet zawiera plik MIB od Intela:
 	--enable-shared \
 	--enable-static
 
-%{__make} -C lib \
-	CC="%{__cc}"
 %{__make} \
 	CC="%{__cc}"
 
@@ -95,9 +137,12 @@ install -d $RPM_BUILD_ROOT%{mibsdir}
 	sysdto=$RPM_BUILD_ROOT%{systemdunitdir}
 
 mv $RPM_BUILD_ROOT%{_datadir}/ipmiutil/*.mib $RPM_BUILD_ROOT%{mibsdir}
-# devel not packaged
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libipmiutil.a \
-	$RPM_BUILD_ROOT%{_includedir}/ipmicmd.h
+
+install -d $RPM_BUILD_ROOT%{_includedir}
+install util/ipmicmd.h $RPM_BUILD_ROOT%{_includedir}
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install util/{ipmi_sample.c,ipmi_sample_evt.c,isensor.c,ievents.c,isensor.h,ievents.h,Makefile} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/ipmi_port
 %attr(755,root,root) %{_sbindir}/ireset
 %attr(755,root,root) %{_sbindir}/isel
+%attr(755,root,root) %{_sbindir}/iseltime
 %attr(755,root,root) %{_sbindir}/isensor
 %attr(755,root,root) %{_sbindir}/iserial
 %attr(755,root,root) %{_sbindir}/isol
@@ -158,11 +204,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/isel.8*
 %{_mandir}/man8/isensor.8*
 %{_mandir}/man8/iserial.8*
+%{_mandir}/man8/ismcoem.8*
 %{_mandir}/man8/isol.8*
 %{_mandir}/man8/isunoem.8*
 %{_mandir}/man8/itsol.8*
 %{_mandir}/man8/iwdt.8*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libipmiutil.so.*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libipmiutil.so
+%{_includedir}/ipmicmd.h
+%{_examplesdir}/%{name}-%{version}
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libipmiutil.a
+
 %files -n mibs-%{name}
 %defattr(644,root,root,755)
 %{mibsdir}/bmclanpet.mib
diff --git a/ipmiutil-am.patch b/ipmiutil-am.patch
index c88569e..7436725 100644
--- a/ipmiutil-am.patch
+++ b/ipmiutil-am.patch
@@ -1,11 +1,12 @@
---- ipmiutil-2.8.8/configure.in.orig	2013-02-06 16:16:23.000000000 +0100
-+++ ipmiutil-2.8.8/configure.in	2013-02-24 15:13:44.926428809 +0100
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(util/ipmiutil.c)
- AM_INIT_AUTOMAKE(ipmiutil,2.8.8)
+diff -ruN ipmiutil-2.9.7.orig/configure.ac ipmiutil-2.9.7/configure.ac
+--- ipmiutil-2.9.7.orig/configure.ac	2015-10-12 19:13:02.000000000 +0200
++++ ipmiutil-2.9.7/configure.ac	2015-11-29 01:21:44.570406534 +0100
+@@ -2,7 +2,7 @@
+ AC_INIT(ipmiutil,2.9.7)
+ AC_CONFIG_SRCDIR(util/ipmiutil.c)
+ echo "ipmiutil version ${PACKAGE_VERSION}"
 -AM_CONFIG_HEADER(config.h)
 +AC_CONFIG_HEADERS(config.h)
- 
- AC_PREFIX_DEFAULT(/usr) 
+ AC_PREFIX_DEFAULT(/usr)
+ AM_INIT_AUTOMAKE()
  
diff --git a/ipmiutil-idiscover-ifaces_with_dot_in_name_support.patch b/ipmiutil-idiscover-ifaces_with_dot_in_name_support.patch
new file mode 100644
index 0000000..a20cb01
--- /dev/null
+++ b/ipmiutil-idiscover-ifaces_with_dot_in_name_support.patch
@@ -0,0 +1,12 @@
+diff -ruNp ipmiutil-2.9.7.orig/util/idiscover.c ipmiutil-2.9.7/util/idiscover.c
+--- ipmiutil-2.9.7.orig/util/idiscover.c	2015-10-12 19:13:02.000000000 +0200
++++ ipmiutil-2.9.7/util/idiscover.c	2015-11-29 01:24:27.639654074 +0100
+@@ -525,7 +525,7 @@ int sock_init( char *_interface, char *_
+       }
+       if (n < 0) rv = LAN_ERR_OTHER; /*-13*/
+    } else { /* valid _interface string */
+-      if (strchr(_interface, '.') != NULL)
++      if (0)
+         {   /* assume it is an IP address*/
+           if ((rv = inet_pton(AF_INET, _interface, &_srcaddr.sin_addr)) < 0)
+             printerr("inet_pton: %s\n", showlasterr());
diff --git a/ipmiutil-libcrypto.patch b/ipmiutil-libcrypto.patch
new file mode 100644
index 0000000..e16fafe
--- /dev/null
+++ b/ipmiutil-libcrypto.patch
@@ -0,0 +1,17 @@
+diff -ruN ipmiutil-2.9.7.orig/util/Makefile.am ipmiutil-2.9.7/util/Makefile.am
+--- ipmiutil-2.9.7.orig/util/Makefile.am	2015-10-12 19:13:02.000000000 +0200
++++ ipmiutil-2.9.7/util/Makefile.am	2015-11-29 02:20:09.927811879 +0100
+@@ -101,11 +101,11 @@
+ 	   $(CC) $(CFLAGS_SAMX) -o $(tmpobj)/ipmilanplus.o -c ipmilanplus.c; \
+ 	   $(CC) $(CFLAGS_SAMX) -o $(tmpobj)/ipmilan.o -c ipmilan.c; \
+ 	   ar x @LANPLUS_LIB@ ; \
+-	   $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ) $(LANPLUS_OBJ); \
++	   $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ) $(LANPLUS_OBJ) -lcrypto; \
+ 	else \
+ 	   $(CC) $(CFLAGS_SAM) -o $(tmpobj)/ipmilanplus.o -c ipmilanplus.c; \
+ 	   $(CC) $(CFLAGS_SAM) -o $(tmpobj)/ipmilan.o -c ipmilan.c; \
+-	   $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ) ; \
++	   $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ) -lcrypto; \
+ 	fi 
+ 
+ $(SHR_BLIB):	$(SHR_LIB)
diff --git a/ipmiutil-symlink.patch b/ipmiutil-symlink.patch
new file mode 100644
index 0000000..c8d6e83
--- /dev/null
+++ b/ipmiutil-symlink.patch
@@ -0,0 +1,12 @@
+diff -ruN ipmiutil-2.9.7.orig/util/Makefile.am ipmiutil-2.9.7/util/Makefile.am
+--- ipmiutil-2.9.7.orig/util/Makefile.am	2015-10-12 19:13:02.000000000 +0200
++++ ipmiutil-2.9.7/util/Makefile.am	2015-11-29 03:00:34.459592097 +0100
+@@ -199,7 +199,7 @@
+ 	@INS_LIB@ cp -f $(DEV_LIB)      $(DESTDIR)$(LIBDIR)
+ 	@INS_LIB@ if [ "x$(SHRLINK)" != "x" ]; then \
+ 	   @INS_LIB@ cp -f $(SHRLINK)     $(DESTDIR)$(LIBDIR) ; \
+-	   @INS_LIB@ cd $(DESTDIR); ln -sf $(LIBDIR)/$(SHRLINK) $(DESTDIR)$(LIBDIR)/$(SHR_BLIB);  \
++	   @INS_LIB@ cd $(DESTDIR); ln -sf $(SHRLINK) $(DESTDIR)$(LIBDIR)/$(SHR_BLIB);  \
+ 	@INS_LIB@ fi
+ 
+ clean-generic:   
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ipmiutil.git/commitdiff/ac6503dfc772cc22ff0a44a9afd70cdd412f483d

More information about the pld-cvs-commit mailing list