* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/, sys-apps/ipmiutil/files/
@ 2016-07-31 8:33 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2016-07-31 8:33 UTC (permalink / raw
To: gentoo-commits
commit: fd6cf8b8124a8e97873d77e047f0d8fa071056fb
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 08:28:09 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 08:33:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6cf8b8
sys-apps/ipmiutil: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/ipmiutil/Manifest | 1 -
sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch | 20 ------------
.../ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch | 11 -------
sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild | 38 ----------------------
4 files changed, 70 deletions(-)
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 3f17882..c53210a 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,4 +1,3 @@
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
DIST ipmiutil-2.9.9.tar.gz 1679262 SHA256 beace08386a002c6a4bbbf894bda9899ea34fae4c2181c89f29fb1fa136925f6 SHA512 d20dc9f373bfebfb1c8496b4935c8f1bfecf2c4755a6a482af7c72b90d738a798e99a653b125ea3fcde584a973f735cc61403844549da2c34318ba33863de3e3 WHIRLPOOL b6c3af362b3856bfc990bc697d127ff12f14a6d6985eeb5d1f0be8c603215383b65ae7a003a798203663ad1a2167cae96a49eff67fa3214c2dd1572bcd697b1d
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch
deleted file mode 100644
index 25572ff..0000000
--- a/sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -145,7 +145,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)
-@@ -270,7 +270,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() { return(1); }" >$tmpc
- gcc -o $tmpo -c $cfhard $tmpc >/dev/null 2>&1
- if test $? -ne 0 ; then
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch
deleted file mode 100644
index 73004f7..0000000
--- a/sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,7 @@
- BUILDDIR = $(PKGDIR)/BUILD
- RSPEC = doc/$(PACKAGE).spec
- PNAME = $(PACKAGE)-$(VERSION)
--TMPDIR = /var/tmp/$(PNAME)
-+#TMPDIR = /var/tmp/$(PNAME)
- BDIR = $(TMPDIR)-1-root
- RPMB = rpmbuild
- # $(RPMB) -bb --buildroot $(BDIR) $(RSPEC)
diff --git a/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild b/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild
deleted file mode 100644
index 6ff0038..0000000
--- a/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils 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"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-flags.patch
- epatch "${FILESDIR}"/${P}-tmpdir.patch
-
- 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_install() {
- emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_unitdir)" 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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/, sys-apps/ipmiutil/files/
@ 2016-07-31 8:33 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2016-07-31 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 75fb9cfdc45de3671d6401d466822c3cd07fc042
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 08:27:20 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 08:33:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75fb9cfd
sys-apps/ipmiutil: Bump to version 2.9.9
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/ipmiutil/Manifest | 1 +
.../files/ipmiutil-2.9.9-lib_symlink.patch | 11 +++++
sys-apps/ipmiutil/ipmiutil-2.9.9.ebuild | 55 ++++++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 1407a88..3f17882 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,3 +1,4 @@
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
+DIST ipmiutil-2.9.9.tar.gz 1679262 SHA256 beace08386a002c6a4bbbf894bda9899ea34fae4c2181c89f29fb1fa136925f6 SHA512 d20dc9f373bfebfb1c8496b4935c8f1bfecf2c4755a6a482af7c72b90d738a798e99a653b125ea3fcde584a973f735cc61403844549da2c34318ba33863de3e3 WHIRLPOOL b6c3af362b3856bfc990bc697d127ff12f14a6d6985eeb5d1f0be8c603215383b65ae7a003a798203663ad1a2167cae96a49eff67fa3214c2dd1572bcd697b1d
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.9-lib_symlink.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.9-lib_symlink.patch
new file mode 100644
index 0000000..6581a44
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-2.9.9-lib_symlink.patch
@@ -0,0 +1,11 @@
+--- ipmiutil-2.9.9/util/Makefile.am
++++ ipmiutil-2.9.9/util/Makefile.am
+@@ -199,7 +199,7 @@
+ @INS_LIB@ cp -f $(DEV_LIB) $(DESTDIR)$(LIBDIR)
+ @INS_LIB@ if [ "x$(SHRLINK)" != "x" ]; then \
+ @INS_LIB@ cp -f $(SHRLINK) $(DESTDIR)$(LIBDIR) ; \
+- @INS_LIB@ cd $(DESTDIR); ln -sf $(LIBDIR)/$(SHRLINK) $(DESTDIR)$(LIBDIR)/$(SHR_BLIB); \
++ @INS_LIB@ cd $(DESTDIR); ln -sf $(SHRLINK) $(DESTDIR)$(LIBDIR)/$(SHR_BLIB); \
+ @INS_LIB@ fi
+
+ clean-generic:
diff --git a/sys-apps/ipmiutil/ipmiutil-2.9.9.ebuild b/sys-apps/ipmiutil/ipmiutil-2.9.9.ebuild
new file mode 100644
index 0000000..550e5d5
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-2.9.9.ebuild
@@ -0,0 +1,55 @@
+# 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
+ "${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
+
+ 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
+
+ # Init scripts are only for Fedora
+ rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/, sys-apps/ipmiutil/files/
@ 2020-01-26 7:05 Robin H. Johnson
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson @ 2020-01-26 7:05 UTC (permalink / raw
To: gentoo-commits
commit: c993d81e783d0ba769c341e67e7f0419131d3d3a
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 07:02:39 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 07:05:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c993d81e
sys-apps/ipmiutil: bump & fix broken upstream configure for lanplus
Upstream 2.1.4 release broke the lanplus selection in configure.ac, this
is fixed patch ipmiutil-3.1.5-fix-configure.patch which has been
submitted upstream.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
.../files/ipmiutil-3.1.5-fix-configure.patch | 180 +++++++++++++++++++++
sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild | 66 ++++++++
2 files changed, 246 insertions(+)
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
new file mode 100644
index 00000000000..8748256be5f
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
@@ -0,0 +1,180 @@
+--- 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/ipmiutil-3.1.5-r1.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild
new file mode 100644
index 00000000000..dd9d9ba74e6
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 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 -f/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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/, sys-apps/ipmiutil/files/
@ 2022-05-06 4:11 Robin H. Johnson
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson @ 2022-05-06 4:11 UTC (permalink / raw
To: gentoo-commits
commit: ba9f1c5883a21c5ad332abdf2e23bc89ce79e397
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 04:11:46 2022 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri May 6 04:11:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9f1c58
sys-apps/ipmiutil: bump for openssl-3.0
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-apps/ipmiutil/Manifest | 1 +
.../files/ipmiutil-3.1.8-fix-configure.patch | 170 +++++++++++++++++++++
sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild | 81 ++++++++++
3 files changed, 252 insertions(+)
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index bc3c07233bb9..5fdc81507f2a 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.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-3.1.8-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
new file mode 100644
index 000000000000..f59701079828
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
@@ -0,0 +1,170 @@
+Fix automagic configure options.
+
+--- ipmiutil-3.1.8.orig/configure.ac 2022-05-05 20:48:27.180318912 -0700
++++ ipmiutil-3.1.8/configure.ac 2022-05-05 20:53:10.070503250 -0700
+@@ -80,22 +80,30 @@
+ # 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
++ 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)
+- fi]
+- )
++ echo "landesk enabled"
++])
+
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+- [ --disable-lanplus disable lanplus support [[default=enabled]]],)
+-if test "x$enable_lanplus" = "xno"; then
++ AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
++ [],
++ [enable_lanplus=yes]
++)
++
+ drv_lanplus=""
+ LANPLUS_CFLAGS=""
+ LANPLUS_LDADD=""
+@@ -103,8 +111,7 @@
+ LANPLUS_CRYPTO=""
+ LANPLUS_SAM="no"
+ LD_SAMX=""
+- echo "lanplus disabled"
+-else
++AS_IF([test "x$enable_lanplus" = "xyes"], [
+ drv_lanplus="lanplus"
+ LANPLUS_CFLAGS="-DHAVE_LANPLUS"
+ # LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
+@@ -115,7 +122,7 @@
+ LANPLUS_SAM="yes"
+ LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
+ echo "lanplus enabled"
+-fi
++])
+
+ dnl Configure libipmiutil.a for lanplus or not
+ dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
+@@ -130,21 +137,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
+- OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
+- fi]
++ 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"
++ ])
+
+ GPL_CFLAGS=""
+ CROSS_LFLAGS=""
+@@ -154,17 +168,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=""
+@@ -178,10 +195,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]]],
+@@ -194,20 +212,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
++ 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=""
+- fi]
+- )
++ ])
+
+ 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
++ 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"
+- fi]
+- )
++ ])
+
+ dnl Does this Linux have systemd enabled? Otherwise use sysv init.
+ AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
new file mode 100644
index 000000000000..ea429e9dfd34
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
@@ -0,0 +1,81 @@
+# 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] 4+ messages in thread
end of thread, other threads:[~2022-05-06 4:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-31 8:33 [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/, sys-apps/ipmiutil/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-05-06 4:11 Robin H. Johnson
2020-01-26 7:05 Robin H. Johnson
2016-07-31 8:33 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox