From nobody Wed Sep 18 21:35:12 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X8Bl45Xdvz5VgC2; Wed, 18 Sep 2024 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8Bl450lLz52mG; Wed, 18 Sep 2024 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726695312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9UJL1+a5W2IC40ODEZI+vybfrl+8XJJkH1pxrLuTkS0=; b=hbnz0+XKc83v8XeLKVpSPsh7Y5IojOFIjh3s46nRqnsDL4hkZqAg5GiaGJW2f4J0Aw2D7A o5A/Aqeivgt85/eueiNbd4NsOMMcllwLxQDpMFONyaNrZ5l7TEnKiuBUFVCh5+O8qTJ2A6 2kW/ZsiOWSdZJZydlUZfDjjip4wZp5VuvCjbVGc/Y3afHSeyzhwpVTydfaWN7kDXbRwoav QnLYfZA9U3sWaiVCTNwJqr1/J/OWXwc3eTugnPp18Ds9ehX8VHkSt9J6eyPlYA4ZzKICSX Rny8i3c3iRbwiunWcHUI3fxyVlROr9AvtzEbkNctdVDqAYNUrPnk00xhlEjT7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726695312; a=rsa-sha256; cv=none; b=rxC/jPs9MHR7FWOVxus8tkALxOayU60JtwUExQZqbCCGVCDVO5qffjVMMJZV/OVMx1AK2Q kMcuWM7JKzsZcNwAYl+2b3/Vdm7oSIkT5J9q/BZU7R8N4uuE8BmE7kvYC18Xtprl91hZCs D074oaODhl7ezqJv/7rrwxz8331kVsNXfh6fll1qZqEU+Nodn7M3J8X0gQ/+j4dlVgDRhG 4iXe1o64KwQ0HsQEnYMXLmk0x+93OOI0jBvjeCWzqG6K1JVkG5KtAmaOwQSWazivIWIwZy D7O1h9/DbptFMR6zqec1s9W0xUR4HxIGFnSS/FGp0bL9lsRZCuTq4Ge2KT9+Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726695312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9UJL1+a5W2IC40ODEZI+vybfrl+8XJJkH1pxrLuTkS0=; b=Qa4EGs3uaASV6/qilvVsEp4guWU/hHQhaY8cP1ZrbsLq9QdVBoFMskljICwQn77lljqxyO LnEHyVMx1mo1JG8irygKgO29ag4eVJYlL6ZfLpOyD+7UwJ5ciLA00LagQg5i4aNL3ALzGq S6FVyEN22Rn0Go8tiq23wPavrrhLR07T2zcMrmMpBNZ/nbWYeXzNgjWK+KKY3ADcBZ6Dfw zZA8AuvUDUGpgosL4H5Ut7Axw5D6vH1o562ZgJobuVwdKz9n7X3BBEdvVb7mKnssjEUxGA y3e4j9mQlMqq4A1aF2+Ze9Xxt93S+h0PhVMkaqQ+kLrfzyQBYHwUBLiPhKm/bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X8Bl44BjPzdrx; Wed, 18 Sep 2024 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48ILZCFf017796; Wed, 18 Sep 2024 21:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ILZCr2017793; Wed, 18 Sep 2024 21:35:12 GMT (envelope-from git) Date: Wed, 18 Sep 2024 21:35:12 GMT Message-Id: <202409182135.48ILZCr2017793@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 3fc9a44f0698 - main - sysutils/ipmitool: Update to 1.8.19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fc9a44f0698c9f14f56002cb708529ce4f07fe0 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fc9a44f0698c9f14f56002cb708529ce4f07fe0 commit 3fc9a44f0698c9f14f56002cb708529ce4f07fe0 Author: Olivier Cochard AuthorDate: 2024-09-18 21:31:45 +0000 Commit: Olivier Cochard CommitDate: 2024-09-18 21:31:45 +0000 sysutils/ipmitool: Update to 1.8.19 PR: 281306 Approved by: zi (maitainer) --- sysutils/ipmitool/Makefile | 29 +++-- sysutils/ipmitool/distinfo | 8 +- sysutils/ipmitool/files/extra-patch-Makefile.in | 12 +- ...atch-src_plugins_lanplus_lanplus__crypt__impl.c | 140 --------------------- sysutils/ipmitool/files/patch-configure.ac | 23 ++++ .../files/patch-include_ipmitool_ipmi__hpmfwupg.h | 11 -- sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c | 11 -- sysutils/ipmitool/files/patch-src_ipmitool.c | 10 -- 8 files changed, 51 insertions(+), 193 deletions(-) diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index e29281f5fa18..28dfa8724dca 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -1,25 +1,29 @@ PORTNAME= ipmitool -PORTVERSION= 1.8.18 -PORTREVISION= 4 +PORTVERSION= 1.8.19 CATEGORIES= sysutils -MASTER_SITES= SF +MASTER_SITES= https://codeberg.org/IPMITool/${PORTNAME}/archive/:ipmi \ + LOCAL/zi/:iana +DISTFILES= IPMITOOL_${PORTVERSION:S/./_/g}${EXTRACT_SUFX}:ipmi \ + enterprise-numbers-20240907.txt:iana +EXTRACT_ONLY= IPMITOOL_${PORTVERSION:S/./_/g}${EXTRACT_SUFX} MAINTAINER= zi@FreeBSD.org COMMENT= CLI to manage IPMI systems -WWW= https://sourceforge.net/projects/ipmitool/ +WWW= https://codeberg.org/IPMITool/ipmitool LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe tar:bzip2 gmake readline ssl +USES= autoreconf libtool cpe gmake readline ssl CPE_VENDOR= sun GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share PLIST_FILES= bin/ipmitool \ share/man/man1/ipmitool.1.gz \ share/man/man8/ipmievd.8.gz \ sbin/ipmievd \ share/ipmitool/oem_ibm_sel_map \ + share/ipmitool/enterprise-numbers \ ${PERIODIC_DIR}/400.status-ipmi SUB_FILES= status-ipmi.sh PORTDOCS= AUTHORS COPYING ChangeLog README @@ -29,6 +33,8 @@ PERIODIC_DIR= etc/periodic/daily OPTIONS_DEFINE= FREEIPMI DOCS FREEIPMI_DESC= Enable support for freeipmi +WRKSRC= ${WRKDIR}/${PORTNAME} + CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} @@ -42,6 +48,7 @@ CONFIGURE_ARGS+= --enable-intf-open CONFIGURE_ARGS+= --disable-intf-open .endif +CONFIGURE_ARGS+= IANADIR=${DATADIR} DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-Makefile.in FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi @@ -51,12 +58,10 @@ FREEIPMI_CONFIGURE_ENABLE= intf-free .include -.if ${OPSYS} == FreeBSD || ${SSL_DEFAULT} == openssl -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_plugins_lanplus_lanplus__crypt__impl.c -.endif - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DIR} - ${INSTALL_SCRIPT} ${WRKDIR}/status-ipmi.sh ${STAGEDIR}${PREFIX}/${PERIODIC_DIR}/400.status-ipmi - + ${INSTALL_SCRIPT} ${WRKDIR}/status-ipmi.sh \ + ${STAGEDIR}${PREFIX}/${PERIODIC_DIR}/400.status-ipmi + ${INSTALL_DATA} ${DISTDIR}/enterprise-numbers-20240907.txt \ + ${STAGEDIR}${DATADIR}/enterprise-numbers .include diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo index 035ab9fc286a..4ff9dfb9471d 100644 --- a/sysutils/ipmitool/distinfo +++ b/sysutils/ipmitool/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1478173088 -SHA256 (ipmitool-1.8.18.tar.bz2) = 0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 -SIZE (ipmitool-1.8.18.tar.bz2) = 795278 +TIMESTAMP = 1726228528 +SHA256 (IPMITOOL_1_8_19.tar.gz) = ce13c710fea3c728ba03a2a65f2dd45b7b13382b6f57e25594739f2e4f20d010 +SIZE (IPMITOOL_1_8_19.tar.gz) = 641027 +SHA256 (enterprise-numbers-20240907.txt) = a023474b18119eeeb0186cb59a3e9bf7cd5666ef6a5aae5979116f04a5de2db7 +SIZE (enterprise-numbers-20240907.txt) = 4773990 diff --git a/sysutils/ipmitool/files/extra-patch-Makefile.in b/sysutils/ipmitool/files/extra-patch-Makefile.in index 17fd7d4e115e..6d8f570a7d4d 100644 --- a/sysutils/ipmitool/files/extra-patch-Makefile.in +++ b/sysutils/ipmitool/files/extra-patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Aug 8 04:33:51 2008 -+++ Makefile.in Sun Aug 10 11:12:54 2008 -@@ -688,8 +688,6 @@ - cp control/ipmitool.spec $(distdir) +--- Makefile.am.orig 2024-09-05 20:15:43 UTC ++++ Makefile.am +@@ -80,8 +80,6 @@ install-data-local: install-pen-database + endif - install-data-local: + install-data-local: install-pen-database - mkdir -p $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) $(DOCLIST) $(DESTDIR)$(DOCDIR) - uninstall-local: + uninstall-local: uninstall-pen-database -rm -rf $(DESTDIR)$(DOCDIR) diff --git a/sysutils/ipmitool/files/extra-patch-src_plugins_lanplus_lanplus__crypt__impl.c b/sysutils/ipmitool/files/extra-patch-src_plugins_lanplus_lanplus__crypt__impl.c deleted file mode 100644 index a533195db928..000000000000 --- a/sysutils/ipmitool/files/extra-patch-src_plugins_lanplus_lanplus__crypt__impl.c +++ /dev/null @@ -1,140 +0,0 @@ ---- src/plugins/lanplus/lanplus_crypt_impl.c.orig 2016-05-28 08:20:20 UTC -+++ src/plugins/lanplus/lanplus_crypt_impl.c -@@ -164,11 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -- -+ EVP_CIPHER_CTX *ctx = NULL; - - *bytes_written = 0; - -@@ -182,6 +178,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - printbuf(input, input_length, "encrypting this data"); - } - -+ ctx = EVP_CIPHER_CTX_new(); -+ if (ctx == NULL) { -+ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); -+ return; -+ } -+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - - /* - * The default implementation adds a whole block of padding if the input -@@ -191,28 +194,28 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); - - -- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) -+ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) - { - /* Error */ - *bytes_written = 0; -- return; - } - else - { - uint32_t tmplen; - -- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) -+ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { -+ /* Error */ - *bytes_written = 0; -- return; /* Error */ - } - else - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); - } - } -+ /* performs cleanup and free */ -+ EVP_CIPHER_CTX_free(ctx); - } - - -@@ -239,12 +242,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX *ctx; - -- - if (verbose >= 5) - { - printbuf(iv, 16, "decrypting with this IV"); -@@ -252,12 +251,19 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - printbuf(input, input_length, "decrypting this data"); - } - -- - *bytes_written = 0; - - if (input_length == 0) - return; - -+ ctx = EVP_CIPHER_CTX_new(); -+ if (ctx == NULL) { -+ *bytes_written = 0; -+ return; -+ } -+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+ - /* - * The default implementation adds a whole block of padding if the input - * data is perfectly aligned. We would like to keep that from happening. -@@ -266,31 +272,29 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); - - -- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) -+ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) - { - /* Error */ - lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); - *bytes_written = 0; -- return; - } - else - { - uint32_t tmplen; - -- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) -+ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { -+ /* Error */ - char buffer[1000]; - ERR_error_string(ERR_get_error(), buffer); - lprintf(LOG_DEBUG, "the ERR error %s", buffer); - lprintf(LOG_DEBUG, "ERROR: decrypt final failed"); - *bytes_written = 0; -- return; /* Error */ - } - else - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); - } - } - -@@ -299,4 +303,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - lprintf(LOG_DEBUG, "Decrypted %d encrypted bytes", input_length); - printbuf(output, *bytes_written, "Decrypted this data"); - } -+ /* performs cleanup and free */ -+ EVP_CIPHER_CTX_free(ctx); - } diff --git a/sysutils/ipmitool/files/patch-configure.ac b/sysutils/ipmitool/files/patch-configure.ac new file mode 100644 index 000000000000..dc45e36644f8 --- /dev/null +++ b/sysutils/ipmitool/files/patch-configure.ac @@ -0,0 +1,23 @@ +--- configure.ac.orig 2024-09-06 00:08:41 UTC ++++ configure.ac +@@ -56,19 +56,7 @@ fi + exec_prefix="$prefix" + fi + +-if test "x$WGET" = "x"; then +- if test "x$CURL" = "x"; then +- AC_MSG_WARN([** Neither wget nor curl could be found.]) +- AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !]) +- else +- DOWNLOAD="$CURL --location --progress-bar" +- AM_CONDITIONAL([DOWNLOAD], [true]) +- fi +-else +- DOWNLOAD="$WGET -c -nd -O -" +- AM_CONDITIONAL([DOWNLOAD], [true]) +-fi +- ++AM_CONDITIONAL([DOWNLOAD], [false]) + AC_MSG_WARN([** Download is:]) + AC_MSG_WARN($DOWNLOAD) + AC_SUBST(DOWNLOAD, $DOWNLOAD) diff --git a/sysutils/ipmitool/files/patch-include_ipmitool_ipmi__hpmfwupg.h b/sysutils/ipmitool/files/patch-include_ipmitool_ipmi__hpmfwupg.h deleted file mode 100644 index afe2c78bd123..000000000000 --- a/sysutils/ipmitool/files/patch-include_ipmitool_ipmi__hpmfwupg.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ipmitool/ipmi_hpmfwupg.h.orig 2016-06-29 18:01:49 UTC -+++ include/ipmitool/ipmi_hpmfwupg.h -@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { - char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; - }VERSIONINFO, *PVERSIONINFO; - --VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; -+extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; - - #define TARGET_VER (0x01) - #define ROLLBACK_VER (0x02) diff --git a/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c b/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c deleted file mode 100644 index 342fe28d9d45..000000000000 --- a/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ipmi_cfgp.c.orig 2016-08-21 06:59:27 UTC -+++ lib/ipmi_cfgp.c -@@ -30,7 +30,7 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#include -+#include - #include - - #include diff --git a/sysutils/ipmitool/files/patch-src_ipmitool.c b/sysutils/ipmitool/files/patch-src_ipmitool.c deleted file mode 100644 index b39684f4a9aa..000000000000 --- a/sysutils/ipmitool/files/patch-src_ipmitool.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ipmitool.c.orig 2016-08-21 06:59:27 UTC -+++ src/ipmitool.c -@@ -79,6 +79,7 @@ extern int ipmi_set_main(struct ipmi_intf * intf, int - extern int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv); - extern int ipmi_lan6_main(struct ipmi_intf *intf, int argc, char **argv); - -+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; - - int csv_output = 0; - int verbose = 0;