commit 2749bd61f9fa21b49a36618240e022be47bde0e8
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Tue Jul 24 21:18:06 2018 +0200
- updated to 3.1.2
- updated libcrypto patch
ipmiutil-libcrypto.patch | 21 +++++++++------------
ipmiutil.spec | 5 +++--
2 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/ipmiutil.spec b/ipmiutil.spec
index 60f1436..0af9af5 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: 3.0.7
+Version: 3.1.2
Release: 1
%if %{with gpl}
License: GPL v2+
@@ -15,7 +15,7 @@ License: BSD
%endif
Group: Applications/System
Source0:
http://downloads.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
-# Source0-md5: f055613809d14f9aa07fa23f90ed202a
+# Source0-md5: ee90387f8a14dea3f867167865c7c968
Patch1: %{name}-idiscover-ifaces_with_dot_in_name_support.patch
Patch2: %{name}-libcrypto.patch
@@ -206,6 +206,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/ipmiutil.8*
%{_mandir}/man8/ireset.8*
%{_mandir}/man8/isel.8*
+%{_mandir}/man8/iseltime.8*
%{_mandir}/man8/isensor.8*
%{_mandir}/man8/iserial.8*
%{_mandir}/man8/ismcoem.8*
diff --git a/ipmiutil-libcrypto.patch b/ipmiutil-libcrypto.patch
index e16fafe..4caa758 100644
--- a/ipmiutil-libcrypto.patch
+++ b/ipmiutil-libcrypto.patch
@@ -1,17 +1,14 @@
-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; \
+--- ipmiutil-3.1.2/util/Makefile.am.orig 2018-07-24 20:39:41.644112439
+0200
++++ ipmiutil-3.1.2/util/Makefile.am 2018-07-24 20:43:01.740776823 +0200
+@@ -114,9 +114,9 @@
+ $(SHR_LIB): $(CMDMOD:.c=.o) @LANPLUS_LIB@ @LIBSENSORS@ $(TMPOBJL)
$(TMPOBJA)
+ if [ "x@LANPLUS_SAM@" = "xyes" ]; then \
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; \
+- $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ)
$(TMPOBJL) $(LANPLUS_OBJ); \
++ $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ)
$(TMPOBJL) $(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;
\
+- $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ)
$(TMPOBJA) ; \
++ $(CC) $(LDFLAGS) -shared $(LDNAME) -o $(SHR_LIB) $(LIBOBJ)
$(TMPOBJA) -lcrypto; \
fi
$(SHR_BLIB): $(SHR_LIB)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ipmiutil.git/commitdiff/2749bd61f9fa21b49a36618240e022be47bde0e8
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
