commit 8ed13d07766ff95e613e1ffa848be020b1a70d90
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Nov 29 13:25:35 2023 +0100
Up to 1.8.19
fno-common.patch | 22 ------------------
ipmitool.spec | 22 ++++++++++--------
no-download.patch | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 82 insertions(+), 31 deletions(-)
---
diff --git a/ipmitool.spec b/ipmitool.spec
index f933ab8..acb7bcf 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -1,16 +1,17 @@
Summary: Simple command-line interface to systems that support the IPMI
Summary(pl.UTF-8): Prosty interfejs do systemów obsługujących IPMI
działający z linii poleceń
Name: ipmitool
-Version: 1.8.18
-Release: 7
+Version: 1.8.19
+Release: 1
License: BSD
Group: Applications/System
-Source0:
http://downloads.sourceforge.net/ipmitool/%{name}-%{version}.tar.gz
-# Source0-md5: 55304c6c5b994784222d3944d086fa30
+Source0:
https://github.com/ipmitool/ipmitool/archive/refs/tags/IPMITOOL_1_8_19.tar.gz
+# Source0-md5: 0aa41c99d93ce129cf00a9b8803ed8c9
Source1: %{name}-ipmievd.init
Source2: %{name}-ipmievd.sysconfig
-Patch0: openssl.patch
-Patch1: fno-common.patch
+Source3: https://www.iana.org/assignments/enterprise-numbers.txt
+# Source3-md5: 16631b297ca2f1d6b0481dc4957f25c8
+Patch0: no-download.patch
URL: https://github.com/ipmitool/ipmitool
BuildRequires: autoconf >= 2.62
BuildRequires: automake
@@ -57,9 +58,8 @@ ipmievd to demon, który nasłuchuje na zdarzenia z BMC, które
są
wysyłane do SEL i loguje wiadomości do sysloga.
%prep
-%setup -q
+%setup -q -n %{name}-IPMITOOL_1_8_19
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize} --ltdl
@@ -77,7 +77,8 @@ wysyłane do SEL i loguje wiadomości do sysloga.
--enable-intf-lanplus \
--enable-intf-lipmi \
--enable-intf-open \
- --enable-ipmishell
+ --enable-ipmishell \
+ --disable-registry-download
%{__make}
%install
@@ -87,8 +88,10 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT%{_datadir}/misc
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ipmievd
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ipmievd
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/misc/enterprise-numbers
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -110,6 +113,7 @@ fi
%doc AUTHORS COPYING README ChangeLog
%attr(755,root,root) %{_bindir}/ipmitool
%{_datadir}/ipmitool
+%{_datadir}/misc/enterprise-numbers
%{_mandir}/man1/ipmitool.1*
%files ipmievd
diff --git a/fno-common.patch b/fno-common.patch
deleted file mode 100644
index 5ca5549..0000000
--- a/fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/include/ipmitool/ipmi_hpmfwupg.h
-+++ b/include/ipmitool/ipmi_hpmfwupg.h
-@@ -800,8 +800,6 @@
- char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
- }VERSIONINFO, *PVERSIONINFO;
-
--VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
--
- #define TARGET_VER (0x01)
- #define ROLLBACK_VER (0x02)
- #define IMAGE_VER (0x04)
---- a/lib/ipmi_hpmfwupg.c
-+++ b/lib/ipmi_hpmfwupg.c
-@@ -52,6 +52,8 @@
- # include <config.h>
- #endif
-
-+static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
-+
- /* From src/plugins/ipmi_intf.c: */
- uint16_t
- ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
diff --git a/no-download.patch b/no-download.patch
new file mode 100644
index 0000000..582d2a4
--- /dev/null
+++ b/no-download.patch
@@ -0,0 +1,69 @@
+From be11d948f89b10be094e28d8a0a5e8fb532c7b60 Mon Sep 17 00:00:00 2001
+From: Vincent Fazio <[email protected]>
+Date: Wed, 11 Jan 2023 22:55:51 -0600
+Subject: [PATCH] configure.ac: allow disabling registry downloads
+
+Some environments require reproducible builds. Since the IANA PEN
+registry is constantly updating and there is no snapshot available,
+installing ipmitool via `make install` is not reproducible.
+
+Provide a configure mechanism to disable the registry download/install..
+---
+ configure.ac | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ee1be82..1dd27428 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,8 +18,6 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm])
+ AC_CHECK_PROG([SED], [sed], [sed])
+-AC_CHECK_PROG([WGET], [wget], [wget])
+-AC_CHECK_PROG([CURL], [curl], [curl])
+
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h])
+@@ -56,21 +54,33 @@ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix="$prefix"
+ fi
+
+-if test "x$WGET" = "x"; then
+- if test "x$CURL" = "x"; then
++dnl allow enabling/disabling the fetching of the IANA PEN registry
++AC_ARG_ENABLE([registry-download],
++ [AC_HELP_STRING([--enable-registry-download],
++ [download/install the IANA PEN registry
[default=yes]])],
++ [xenable_registry_download=$enableval],
++ [xenable_registry_download=yes])
++
++AM_CONDITIONAL([DOWNLOAD], [false])
++
++if test "x$xenable_registry_download" = "xyes"; then
++ AC_CHECK_PROG([WGET], [wget], [wget])
++ AC_CHECK_PROG([CURL], [curl], [curl])
++
++ if test "x$WGET" = "x" && test "x$CURL" = "x"; then
+ AC_MSG_WARN([** Neither wget nor curl could be found.])
+ AC_MSG_WARN([** IANA PEN database will not be installed by
`make install` !])
+ else
+- DOWNLOAD="$CURL --location --progress-bar"
+ AM_CONDITIONAL([DOWNLOAD], [true])
++ if test "x$WGET" != "x"; then
++ DOWNLOAD="$WGET -c -nd -O -"
++ else
++ DOWNLOAD="$CURL --location --progress-bar"
++ fi
+ fi
+-else
+- DOWNLOAD="$WGET -c -nd -O -"
+- AM_CONDITIONAL([DOWNLOAD], [true])
+ fi
+
+-AC_MSG_WARN([** Download is:])
+-AC_MSG_WARN($DOWNLOAD)
++AC_MSG_WARN([** Download is: $DOWNLOAD])
+ AC_SUBST(DOWNLOAD, $DOWNLOAD)
+
+ dnl
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ipmitool.git/commitdiff/8ed13d07766ff95e613e1ffa848be020b1a70d90
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
