diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /sys-apps/ipmiutil | |
parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) |
gentoo resync : 23.09.2020
Diffstat (limited to 'sys-apps/ipmiutil')
-rw-r--r-- | sys-apps/ipmiutil/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch | 184 | ||||
-rw-r--r-- | sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch | 20 | ||||
-rw-r--r-- | sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild (renamed from sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild) | 14 |
4 files changed, 218 insertions, 6 deletions
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest index 17f93d061cba..67dcce7088cd 100644 --- a/sys-apps/ipmiutil/Manifest +++ b/sys-apps/ipmiutil/Manifest @@ -1,12 +1,14 @@ AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065 +AUX ipmiutil-3.1.7-fix-configure.patch 5872 BLAKE2B 6058c5f3cd3d389dec152649098925d8fd4aa4dab22f11924cc006dba44eeb5254b7b5a10eaf202d496e7da4e71b69c984553fda730708ffdc0b7bacf0a46dfa SHA512 0d47df5c1599f16228819325c666b2ed9f0c85617af8ce6a0be5496403ae0ce8d5548302ad8b9315105ec8a1a54cd4b46636e5ee21539b813b35ed4fd78f86a2 +AUX ipmiutil-3.1.7-flags.patch 708 BLAKE2B 70b96d8de3221d11757ff54957be2153540da78edef549a627983e745064d503d38cd3b95c5640445c1c6ca8cf208d43781e486e1df481a409636dc8d6c4c9f4 SHA512 f0f34b10c65e3ddab56ef757085dcfbaceb1a8b745d8be72e0630fdf7b6da3fadd37f08a9eee814c140419b1e9dda9937690dac67b3f506f36f622076c8119bf 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.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 EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4009630e9e7a36af13c69b98a0a48a0c86db4516fb179e5b8887576e832d1a81a921fde56c559906dbdfbfccea7 SHA512 a13dc0bd8546e321c84e942c9137d6e8f64e5df99c7a3aa41b090c116ad352aa631d51c7078e2c063004e20e10e86b3b26473ab209a81b9fca99776226812cbb EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9 -EBUILD ipmiutil-3.1.5-r1.ebuild 1574 BLAKE2B c76aa0b2c729a40215307e3d79b22da30c47cc098248b2702ab47eb0d5237a483b129465e04e3a77455aa76a922f507a91d0688d2f80248b7a5b8ce3424e1bf3 SHA512 ffe59ac7d8a5d49b8c40b655a91d32fb85aa4ff493b70d0504a553075192bc10111003bfe2e3fef14f57a488f1cfba0e4083d28e6294004c41654ff3a3159ff0 EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c +EBUILD ipmiutil-3.1.7.ebuild 1659 BLAKE2B 2c43307e31c6fe34abb3ee953a826d5069546ab9459ad45ab9588ff8a684619ea6f6a7f06827e5b735dc8226bcc922b41f1ca4f86c8283b47585351d5e1c1cf7 SHA512 0f4900a1069d2f29b848db879baaa30829122c49a6c5e027467261c908ecd31341bb89dfb1b04256c59df42811360d503a5060dd19a357ef9c5aa4d1074169a6 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845 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 000000000000..16435dacd6b7 --- /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 000000000000..7ef804bc11d3 --- /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.5-r1.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild index e6ec34c06cd9..5bf9b0440aa6 100644 --- a/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild +++ b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild @@ -18,9 +18,9 @@ DEPEND="${RDEPEND} virtual/os-headers" PATCHES=( - "${FILESDIR}"/${PN}-2.9.8-flags.patch + "${FILESDIR}"/${PN}-3.1.7-flags.patch "${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch - "${FILESDIR}"/${PN}-3.1.5-fix-configure.patch + "${FILESDIR}"/${PN}-3.1.7-fix-configure.patch ) src_prepare() { @@ -30,13 +30,18 @@ src_prepare() { 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 + sed '/gzip -nf/d' -i doc/Makefile.am || die eautoreconf } src_configure() { - econf --disable-systemd --enable-sha256 --enable-lanplus + local myeconfargs=( + --disable-systemd + --enable-sha256 + --enable-lanplus + ) + econf "${myeconfargs[@]}" } src_compile() { @@ -58,6 +63,7 @@ src_install() { # 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 |