public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/
@ 2016-04-25  9:26 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-04-25  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     8f3cc623e46d92e0722f2bd8b9b6ee4978f59860
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 09:24:39 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 09:25:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3cc623

sys-apps/ipmiutil: Bump to version 2.9.8 (bug #539198).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/ipmiutil/Manifest                         |  1 +
 sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch | 20 ++++++++
 sys-apps/ipmiutil/ipmiutil-2.9.8.ebuild            | 57 ++++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index a1480d8..d730ef6 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,3 +2,4 @@ DIST ipmiutil-2.7.7.tar.gz 1506067 SHA256 f899f04106c6098db3acadbbf19ee9c25a44d5
 DIST ipmiutil-2.8.2.tar.gz 1591876 SHA256 16f2181745030ae1e7110bf0c780760d4b2de0a47f9945c9a52314e4ef520988 SHA512 8af7e81065859eadb15530aed7a533fcb16e46d4adfa57f281bf0aa057b8e2bd520999a73f31fe3fc7f1eb2b617483078ad368772c89bbc30941aadb6be0ecc8 WHIRLPOOL 2343cde4c6c7525bcfd4a9c5454452f7d15f9ccaacf435c6f236b9f026f71319290ff0704cfde423be0609982bbfb5c850b310e7aefbe70dead609f68822ce86
 DIST ipmiutil-2.8.5.tar.gz 1615967 SHA256 6846e6621b9df23b1ed37662c075381dbb082f3e719803c9ef8784dd3154439c SHA512 42a0c50c88bfcfd49da0a1dc4b603eaf07eff041f2401a31421ea8e880b19cfb6ff3f33ceaf5ef044e16e58236390ff32420139ae683f9633b1c06631bc799c3 WHIRLPOOL 6ba37e1c59e28acca89f029ccfb179b5d285d1913930a0670a1c78ebd2f23e4e52910b75cb860d3f704fc9affbfa35ad0d4203a1b32794a957fbd13291e14f66
 DIST ipmiutil-2.9.3.tar.gz 1685718 SHA256 476c23997eba136553bfcbf3606337ffe020671aa8830695ff9d172bc9ed9eb7 SHA512 86d543dbc9ae684e288330e92f8f9b289f2c57311b10de0f2be0797ae7b939cbcd3c2c62f7c80eae5cb89d5ff2d721891619c18dff40ef03b9c870cd26bf6338 WHIRLPOOL 3231fb87e7a608924cb6613688b66292af3a767d3659a0611f22820ed872ec25551a40d74548b5221cc4f588f998c79c3d8cc18c7f4b7b40927139d073499460
+DIST ipmiutil-2.9.8.tar.gz 1680094 SHA256 860741ced328c4bc5137cade51e168f3dea6ca447d8a195bfb6ac93c7f75dd18 SHA512 582c455c57d157fa61906af33224f777ca9208df4d47c12f0e9cba23f5a0d1f71504ce7b18e558ba6b509b2c8aa3599b482a84283b602010baadb37549ee181d WHIRLPOOL 6db549c6e16f0fea0c4d3ed92674580ee8d0a38279e34669504288fb486002a4f4c31d88a193051d7f92505ec63aac2fbbef41af3bbbfc48180e91e94e720468

diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
new file mode 100644
index 0000000..ee99174
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
@@ -0,0 +1,20 @@
+--- ipmiutil-2.9.8/configure.ac
++++ ipmiutil-2.9.8/configure.ac
+@@ -162,7 +162,7 @@
+ 	LANPLUS_CRYPTO=""
+ 	LANPLUS_SAM="no"
+ 	LD_SAMX=""
+-	CFLAGS="-O2"
++	#CFLAGS="-O2"
+         SUBDIR_S="doc scripts util"
+ 	if test "x$cross_compiling" = "xyes"; then
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+@@ -334,7 +334,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-2.9.8.ebuild b/sys-apps/ipmiutil/ipmiutil-2.9.8.ebuild
new file mode 100644
index 0000000..a916822
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-2.9.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1:0"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+
+	# Very ugly hack. Breaks make's jobserver
+	# Should be fixed in a better way.
+	#"${FILESDIR}"/${PN}-2.9.8-lanplus.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+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 || die "emake lanplus failed"
+	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
+
+	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed' # These are only for Fedora
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/
@ 2020-01-24 18:18 Vadim Misbakh-Soloviov
  0 siblings, 0 replies; 5+ messages in thread
From: Vadim Misbakh-Soloviov @ 2020-01-24 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     74d8e36357519c25110254efd7f74d93c665b6d8
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 18:17:29 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 18:17:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d8e363

ipmiutil: fix for lanplus module

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 .../ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch     | 11 +++++++++++
 sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild                       |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
new file mode 100644
index 00000000000..3f1331412d8
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2020-01-24 23:32:53.768314546 +0700
++++ b/configure.ac	2020-01-24 23:32:13.971662393 +0700
+@@ -94,7 +94,7 @@ AC_ARG_ENABLE([landesk],
+ 
+ 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],
++    [  --enable-lanplus      enable lanplus support (default=yes)],
+ [if test "x$enableval" = "xno"; then
+ 	drv_lanplus=""
+ 	LANPLUS_CFLAGS=""

diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
index a8fbfd6eff8..9f6c5ecdfef 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.9.8-flags.patch
 	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+	"${FILESDIR}"/${PN}-3.1.4-fix_lanplus_build.patch
 )
 
 src_prepare() {
@@ -35,7 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-systemd --enable-sha256
+	econf --disable-systemd --enable-sha256 --enable-lanplus
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/
@ 2020-09-17 13:52 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-09-17 13:52 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/
@ 2022-08-17 16:21 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-08-17 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8866a1d2abc09cedd87f0b2c23942ee0038d19d2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:49:48 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8866a1d2

sys-apps/ipmiutil: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-apps/ipmiutil/Manifest                         |   4 -
 sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch |  20 ---
 .../files/ipmiutil-3.1.5-fix-configure.patch       | 180 --------------------
 .../files/ipmiutil-3.1.7-fix-configure.patch       | 184 ---------------------
 sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild            |  55 ------
 sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild            |  60 -------
 sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild            |  66 --------
 sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild            |  72 --------
 8 files changed, 641 deletions(-)

diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 5fdc81507f2a..c01f03c91695 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,5 +1 @@
-DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
-DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
-DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7 SHA512 9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
-DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b SHA512 7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274
 DIST ipmiutil-3.1.8.tar.gz 1841037 BLAKE2B 69139fc2b82a701657c5fec6aa928a0ee2d7874a8ebc26631eca438f298e8bddd3afb578462979eb24cd51bd816263f13e9f38fec8b5d6fa4fcefb2519a652c9 SHA512 77a01be420d8362ddce2b2b2bd44ee53a70812b29b3dd7bc5add6429f0e43a48905ca0401e1855f2cca5e69086605eb7b84e2f4bf9cf33251934acc0fe51346f

diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
deleted file mode 100644
index ee9917406207..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ipmiutil-2.9.8/configure.ac
-+++ ipmiutil-2.9.8/configure.ac
-@@ -162,7 +162,7 @@
- 	LANPLUS_CRYPTO=""
- 	LANPLUS_SAM="no"
- 	LD_SAMX=""
--	CFLAGS="-O2"
-+	#CFLAGS="-O2"
-         SUBDIR_S="doc scripts util"
- 	if test "x$cross_compiling" = "xyes"; then
- 	   # cross-compiling, so link with -static (e.g. Android ARM)
-@@ -334,7 +334,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/files/ipmiutil-3.1.5-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
deleted file mode 100644
index 8748256be5f6..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
+++ /dev/null
@@ -1,180 +0,0 @@
---- ipmiutil-3.1.5.orig/configure.ac	2019-11-25 06:53:08.000000000 -0800
-+++ ipmiutil-3.1.5/configure.ac	2020-01-25 22:55:20.577345441 -0800
-@@ -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,27 +192,30 @@
- 	   # 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]
--    )
-+    ])
- 
- 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-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
deleted file mode 100644
index 16435dacd6b7..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
+++ /dev/null
@@ -1,184 +0,0 @@
---- 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/ipmiutil-3.0.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
deleted file mode 100644
index 7f746df64c56..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 x86"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.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
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-systemd --enable-sha256
-}
-
-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'
-}

diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
deleted file mode 100644
index 670520a6b9cd..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.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
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-systemd --enable-sha256
-}
-
-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'
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}

diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
deleted file mode 100644
index 491bd22b5c9d..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-	"${FILESDIR}"/${PN}-3.1.5-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() {
-	econf --disable-systemd --enable-sha256 --enable-lanplus
-}
-
-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'
-
-	if ! use static-libs ; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	keepdir /var/lib/ipmiutil
-}

diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
deleted file mode 100644
index 7403e510c6c4..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/
@ 2023-09-23 23:26 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-09-23 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     61f71fc4ba94367becfdaa9b11497d5444271403
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 23:25:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 23:25:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f71fc4

sys-apps/ipmiutil: drop 3.1.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/ipmiutil/Manifest                         |  1 -
 sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch | 20 ------
 sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild            | 81 ----------------------
 3 files changed, 102 deletions(-)

diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index d0c8eb29fdbf..dbfacc86ff5a 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,2 +1 @@
-DIST ipmiutil-3.1.8.tar.gz 1841037 BLAKE2B 69139fc2b82a701657c5fec6aa928a0ee2d7874a8ebc26631eca438f298e8bddd3afb578462979eb24cd51bd816263f13e9f38fec8b5d6fa4fcefb2519a652c9 SHA512 77a01be420d8362ddce2b2b2bd44ee53a70812b29b3dd7bc5add6429f0e43a48905ca0401e1855f2cca5e69086605eb7b84e2f4bf9cf33251934acc0fe51346f
 DIST ipmiutil-3.1.9.tar.gz 1876478 BLAKE2B ddbd4d91d1d09fd9a7d4f7a3f9358787cab1baf3e2f34e43b4ebf44843d9ccc8d8b241b030d0f62a4b183ac4642c6676b304a51b8c6611f69d475dd19c1d3181 SHA512 3c9f60669dd6769dc64977c99d68fc0a0838993fb5ef3d8b1b1026b6daf6e6bfbe8738f3dd120b116fc663c84bafe6ed93420a92fecf57a17785d283b415d9c7

diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch
deleted file mode 100644
index 7ef804bc11d3..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
deleted file mode 100644
index ea429e9dfd34..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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.8-fix-configure.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix hardcoded CFLAGS
-	sed -i \
-		-e 's|-O2 -g|$(CFLAGS)|g' \
-		-e 's|-g -O2|$(CFLAGS)|g' \
-		util/Makefile.am* || die
-	# The configure script makes some guarded and some blind calls to rpm &
-	# rpmbuild, that trigger sandbox warnings if rpm is installed in Gentoo.
-	sed -r -i -e 's/which rpm/false &/' configure.ac || die
-	sed -r -i -e 's/`(rpm|rpmbuild)/`false \1/' 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() {
-	# Ugly 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.
-	# Yup, still needed in 3.18
-	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
-	# TODO: ship OpenRC systems for non-systemd?
-	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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-09-23 23:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 13:52 [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/files/, sys-apps/ipmiutil/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2023-09-23 23:26 Sam James
2022-08-17 16:21 Matt Turner
2020-01-24 18:18 Vadim Misbakh-Soloviov
2016-04-25  9:26 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox