[gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/

[Lars Wendler]

commit:     e5f2c614cd1b0ef5297567127fabee9c3f88fccc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 13:30:36 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 13:52:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f2c614

sys-apps/ipmiutil: Bump to version 3.1.7

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/ipmiutil/Manifest                         |   1 +
 .../files/ipmiutil-3.1.7-fix-configure.patch       | 184 +++++++++++++++++++++
 sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch |  20 +++
 sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild            |  72 ++++++++
 4 files changed, 277 insertions(+)

diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 1f4bf92209b..831feb27415 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,3 +2,4 @@ DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e275
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.5.tar.gz 1703583 BLAKE2B 5e96659387b3e11e5f7867156d0079e06f19676099e8ff2a212f7e28550f9dde2079a4d527439489e1a710d878e7eb79a68b0e11b531f92d986aa7687273d462 SHA512 a9bd4d99d5bcad8a9f64c3636d6774d09e1d4c20927a6803891777ba035ee3c114b06295185cf00fb0c5d4b4b9afd335fd19c06f64298130e42945dc5f6e8010
 DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7 SHA512 9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
+DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b SHA512 7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274

diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
new file mode 100644
index 00000000000..16435dacd6b
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
@@ -0,0 +1,184 @@
+--- ipmiutil-3.1.7/configure.ac
++++ ipmiutil-3.1.7/configure.ac
+@@ -80,40 +80,46 @@
+ #  fi]
+ 
+ drv_landesk=0
++LANDESK_CFLAGS=""
++LANDESK_LDADD=""
+ dnl configure for LANDESK libipmiapi or not
+ AC_ARG_ENABLE([landesk],
+-    [  --enable-landesk       adds landesk library support [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-	    drv_landesk=1
+-            LANDESK_CFLAGS="-DLINK_LANDESK"
+-            LANDESK_LDADD="-lipmiapi -L../lib"
+-            AC_SUBST(LANDESK_CFLAGS)
+-            AC_SUBST(LANDESK_LDADD)
+-    fi]
+-    )
++	AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
++	[],
++	[enable_landesk=no])
++
++AS_IF([test "x$enable_landesk" = "xyes"], [
++	drv_landesk=1
++	LANDESK_CFLAGS="-DLINK_LANDESK"
++	LANDESK_LDADD="-lipmiapi -L../lib"
++	AC_SUBST(LANDESK_CFLAGS)
++	AC_SUBST(LANDESK_LDADD)
++    ])
+ 
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+-    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
+-[if test "x$enableval" = "xno"; then
+-	drv_lanplus=""
+-	LANPLUS_CFLAGS=""
+-	LANPLUS_LDADD=""
+-        LANPLUS_LIB="" 
+-	LANPLUS_CRYPTO=""
+-	LANPLUS_SAM="no"
+-	LD_SAMX=""
+-else
++	AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
++	[],
++	[enable_lanplus=yes])
++
++drv_lanplus=""
++LANPLUS_CFLAGS=""
++LANPLUS_LDADD=""
++LANPLUS_LIB="" 
++LANPLUS_CRYPTO=""
++LANPLUS_SAM="no"
++LD_SAMX=""
++AS_IF([test "x$enable_lanplus" = "xyes"], [
+ 	drv_lanplus="lanplus"
+ 	LANPLUS_CFLAGS="-DHAVE_LANPLUS"
+ 	# LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
+ 	# LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
+ 	LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
+-        LANPLUS_LIB="../lib/libipmi_lanplus.a" 
++	LANPLUS_LIB="../lib/libipmi_lanplus.a" 
+ 	LANPLUS_CRYPTO="-lcrypto"
+ 	LANPLUS_SAM="yes"
+ 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
+-fi ])
++])
+ 
+ dnl Configure libipmiutil.a for lanplus or not
+ dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
+@@ -128,21 +134,28 @@
+ #fi
+ 
+ # strings /lib/libssl.so* |grep EVP_sha256 
+-dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
++dnl configure for SHA256, build lanplus with SHA256 support
++dnl requires openssl-1.0.1 which was released in 2012/03
+ AC_ARG_ENABLE([sha256],
+-    [  --enable-sha256        build with SHA256 support, requires later openssl.],
+-    [if test "x$enableval" = "xyes"; then
+-	LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
+-    fi]
+-    )
++    AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
++	dnl action if passed
++	[],
++	dnl action if not passed
++	[enable_sha256=yes]
++	)
++AS_IF([test "x$enable_sha256" = "xyes"], [
++  LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
++])
+ 
+ dnl configure for EKANALYZER, build with ekanalyzer function enabled
+ AC_ARG_ENABLE([ekanalyzer],
+-    [  --enable-ekanalyzer        build with ekanalyzer function enabled.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
++	[],
++	[enable_ekanalyzer=no]
++	)
++AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
+ 	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
+-    fi]
+-    )
++    ])
+ 
+ GPL_CFLAGS=""
+ CROSS_LFLAGS=""
+@@ -152,17 +165,20 @@
+ SYSTEMD_DIR=/usr/share/ipmiutil
+ 
+ AC_ARG_ENABLE([useflags],
+-    [  --enable-useflags    include environment CFLAGS and LDFLAGS.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
++	[],
++	[enable_useflags=no])
++AS_IF([test "x$enable_useflags" = "xyes"], [
+ 	   CROSS_CFLAGS="$CFLAGS"
+ 	   CROSS_LFLAGS="$LDFLAGS"
+-    fi]
+-    )
++])
+ 
+ dnl configure for standalone, with no lanplus or GPL libs 
+ AC_ARG_ENABLE([standalone],
+-    [  --enable-standalone    build standalone, with no GPL or LanPlus libs.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
++	[],
++	[enable_standalone=no])
++AS_IF([test "x$enable_standalone" = "xyes"], [
+         GPL_CFLAGS=""
+ 	LANPLUS_CFLAGS=""
+ 	LANPLUS_LDADD=""
+@@ -176,10 +192,11 @@
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+ 	   CROSS_LFLAGS="-static"
+ 	   CROSS_CFLAGS="-DCROSS_COMPILE"
++	   # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
++	   # Configure does not convert Makefile.am->Makefile.in
+ 	   sed -i -e 's/^# ipmiutil:	$(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/'  util/Makefile.am
+ 	fi
+-    fi]
+-    )
++    ])
+ 
+ AC_ARG_ENABLE([doc],
+     [  --enable-doc           build with documentation [[default=yes]]],
+@@ -192,20 +209,22 @@
+ 
+ dnl build libipmiutil with sensor modules
+ AC_ARG_ENABLE([libsensors],
+-    [  --enable-libsensors	 build libipmiutil with sensor modules [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-        LIBSENSORS="isensor2.o ievents2.o"
+-        SAM2OBJ=""
+-    fi]
+-    )
++    AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
++    [],
++    [enable_libsensors=no])
++AS_IF([test "x$enable_libsensors" = "xyes"], [
++	LIBSENSORS="isensor2.o ievents2.o"
++	SAM2OBJ=""
++    ])
+ 
+ dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
+ AC_ARG_ENABLE([gpl],
+-    [  --enable-gpl           build with some GPL code [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-        GPL_CFLAGS="-DALLOW_GPL"
+-    fi]
+-    )
++    AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
++    [],
++    [enable_gpl=no])
++AS_IF([test "x$enable_gpl" = "xyes"], [
++	GPL_CFLAGS="-DALLOW_GPL"
++    ])
+ 
+ dnl Does this Linux have systemd enabled?  Otherwise use sysv init.
+ AC_ARG_ENABLE([systemd],

diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch
new file mode 100644
index 00000000000..7ef804bc11d
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch
@@ -0,0 +1,20 @@
+--- ipmiutil-3.1.7/configure.ac
++++ ipmiutil-3.1.7/configure.ac
+@@ -170,7 +170,7 @@
+ 	LANPLUS_CRYPTO=""
+ 	LANPLUS_SAM="no"
+ 	LD_SAMX=""
+-	CFLAGS="-O2"
++	#CFLAGS="-O2"
+         SUBDIR_S="scripts util"
+ 	if test "x$cross_compiling" = "xyes"; then
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+@@ -363,7 +363,7 @@
+ 	fi
+ 	rm -f $tmpc $tmpo >/dev/null 2>&1
+ 	echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
+-	cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
++	#cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ 	echo "int main() { alloca(100); return(1); }" >$tmpc
+ 	$CC -o $tmpo $cfhard $tmpc  >/dev/null 2>&1
+ 	if test $? -ne 0 ; then

diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
new file mode 100644
index 00000000000..5bf9b0440aa
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.7-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+	"${FILESDIR}"/${PN}-3.1.7-fix-configure.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	# Don't compress man pages
+	sed '/gzip -nf/d' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-systemd
+		--enable-sha256
+		--enable-lanplus
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
+
+	# --disable-static has no effect
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	keepdir /var/lib/ipmiutil
+}