diff --git a/ipmitool/bldipmi.pl b/ipmitool/bldipmi.pl index 52879be..1cbe139 100755 --- a/ipmitool/bldipmi.pl +++ b/ipmitool/bldipmi.pl @@ -1,7 +1,8 @@ #! /usr/bin/perl my $version = "1.8.18"; -my $release = "0"; +my $ipmibld = "177.g7ccea28"; # this is ipmitool build since commit 7ccea28 +my $release = "3"; #check the distro $cmd = "cat /etc/*release"; @@ -47,12 +48,11 @@ if ( ! grep /openssl-devel|libopenssl/, @output ) { # check the source files my $pwd = `pwd`; chomp($pwd); -if ( (! -f "$pwd/ipmitool-$version.tar.gz") +if ( (! -f "$pwd/ipmitool-$version.$ipmibld.tar.gz") || (! -f "$pwd/ipmitool.spec") || (! -f "$pwd/ipmitool-$version-saneretry.patch") || (! -f "$pwd/ipmitool-$version-rflash.patch") - || (! -f "$pwd/ipmitool-$version-signal.patch") - || (! -f "$pwd/0012-CVE-2020-5208.patch")) { + || (! -f "$pwd/ipmitool-$version-signal.patch")) { print "missed some necessary files for building.\n"; exit 1; } @@ -82,7 +82,7 @@ $cmd = "rm -rf $blddir/RPMS/$arch/ipmitool*"; &runcmd($cmd); # copy the build files -$cmd = "cp -rf ./ipmitool-$version.tar.gz $blddir/SOURCES/"; +$cmd = "cp -rf ./ipmitool-$version*.tar.gz $blddir/SOURCES/"; &runcmd($cmd); $cmd = "cp -rf ./*.patch $blddir/SOURCES/"; @@ -95,7 +95,7 @@ $cmd = "rpmbuild -bb $blddir/SPECS/ipmitool.spec"; &runcmd($cmd); #check whether the ssl has been enabled -my $binfile = "$blddir/BUILD/ipmitool-$version/src/ipmitool"; +my $binfile = "$blddir/BUILD/ipmitool-$version.$ipmibld/src/ipmitool"; $cmd = "ldd $binfile"; @output = `$cmd`; if (! grep /libcrypto.so/, @output) { diff --git a/ipmitool/ipmitool-1.8.18.177.g7ccea28.tar.gz b/ipmitool/ipmitool-1.8.18.177.g7ccea28.tar.gz new file mode 100644 index 0000000..f8ce854 Binary files /dev/null and b/ipmitool/ipmitool-1.8.18.177.g7ccea28.tar.gz differ diff --git a/ipmitool/ipmitool.spec b/ipmitool/ipmitool.spec index 79cd565..163dcd8 100644 --- a/ipmitool/ipmitool.spec +++ b/ipmitool/ipmitool.spec @@ -1,11 +1,11 @@ Name: ipmitool-xcat Summary: ipmitool - Utility for IPMI control Version: 1.8.18 -Release: 2 +Release: 3 License: BSD Group: Utilities Packager: IBM Corp. -Source: ipmitool-%{version}.tar.gz +Source: ipmitool-%{version}.${ipmibld}.tar.gz Patch1: 0001-CVE-2011-4339-OpenIPMI.patch # WARNING: THIS PATCH MUST BE USED FOR RAWHIDE (f26+) BRANCH @@ -20,8 +20,6 @@ Patch80: ipmitool-%{version}-saneretry.patch Patch82: ipmitool-%{version}-rflash.patch Patch83: ipmitool-%{version}-signal.patch -Patch12: 0012-CVE-2020-5208.patch - Buildroot: /var/tmp/ipmitool-root BuildRequires: openssl-devel readline-devel ncurses-devel @@ -59,7 +57,6 @@ fi %patch80 -p1 %patch82 -p1 %patch83 -p1 -%patch12 -p1 for f in AUTHORS ChangeLog; do iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8