Skip to contentSkip to conversation

package/freeipmi: bump to version 1.6.9

PATCH In review Fabrice Fontaine 2 participants 2 messages Jan 24, 2022 – Jan 26, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/freeipmi: bump to version 1.6.9

Drop patches (already in version) and so autoreconf

https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS

---
 package/freeipmi/0001-fix-build-on-musl.patch | 49 ------------------
 .../0002-check-for-inb-and-outb.patch         | 50 -------------------
 ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 -------------------
 package/freeipmi/freeipmi.hash                |  2 +-
 package/freeipmi/freeipmi.mk                  |  4 +-
 5 files changed, 2 insertions(+), 153 deletions(-)
 delete mode 100644 package/freeipmi/0001-fix-build-on-musl.patch
 delete mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch
 delete mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch
package/freeipmi/0001-fix-build-on-musl.patch deleted +0 -49
deleted file mode 100644
index ff7425d221..0000000000
@@ -1,49 +0,0 @@
-From 6295c96ae54cb16efe41e53f526a4dc19cd719f2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sat, 30 Oct 2021 00:26:40 +0200
-Subject: [PATCH] fix build on musl
-
-musl doesn't provide getmsg or putmsg even if stropts.h is available
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from:
-https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?id=6295c96ae54cb16efe41e53f526a4dc19cd719f2]
----
- configure.ac                            | 1 +
- libfreeipmi/driver/ipmi-sunbmc-driver.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 562dd624e..711b27674 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -479,6 +479,7 @@ AC_CHECK_FUNCS([flockfile fputs_unlocked fwrite_unlocked])
- AC_CHECK_FUNCS([iopl])
- AC_CHECK_FUNCS([asprintf])
- AC_CHECK_FUNCS([cbrt])
-+AC_CHECK_FUNCS([getmsg putmsg])
- 
- dnl sighandler_t apparently not defined in Apple/OS X
- AC_CHECK_TYPES([sighandler_t], [], [], [[#include <signal.h>]])
-diff --git a/libfreeipmi/driver/ipmi-sunbmc-driver.c b/libfreeipmi/driver/ipmi-sunbmc-driver.c
-index 05caca8b6..4ae8c5719 100644
---- a/libfreeipmi/driver/ipmi-sunbmc-driver.c
-+++ b/libfreeipmi/driver/ipmi-sunbmc-driver.c
-@@ -423,7 +423,7 @@ _sunbmc_write (ipmi_sunbmc_ctx_t ctx,
-   assert (ctx->io_init);
-   assert (ctx->putmsg_intf);
- 
--#if defined(HAVE_SYS_STROPTS_H)
-+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_PUTMSG)
-   memset (&sbuf, '\0', sizeof (struct strbuf));
- 
-   /* Due to API differences, we need to extract the cmd out of the
-@@ -573,7 +573,7 @@ _sunbmc_read (ipmi_sunbmc_ctx_t ctx,
-       return (-1);
-     }
- 
--#if defined(HAVE_SYS_STROPTS_H)
-+#if defined(HAVE_SYS_STROPTS_H) && defined(HAVE_GETMSG)
-   if (getmsg (ctx->device_fd, NULL, &sbuf, &flags) < 0)
-     {
-       SUNBMC_ERRNO_TO_SUNBMC_ERRNUM (ctx, errno);
package/freeipmi/0002-check-for-inb-and-outb.patch deleted +0 -50

50 lines not on this page · raw message

package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch deleted +0 -50

50 lines not on this page · raw message

package/freeipmi/freeipmi.hash +1 -1
index f73b4a25fe..05fb50bd4c 100644
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  4aa46a269ecc1bbff9412451f17b5408f64395e7dc45b713edf5eb5362700a71  freeipmi-1.6.8.tar.gz
+sha256  f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206  freeipmi-1.6.9.tar.gz
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING.bmc-watchdog
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING.ipmiconsole
package/freeipmi/freeipmi.mk +1 -3
index b25ef0a4c6..9fb59245b9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREEIPMI_VERSION = 1.6.8
+FREEIPMI_VERSION = 1.6.9
 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi
 FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc)
 FREEIPMI_LICENSE_FILES = \
@@ -14,8 +14,6 @@ FREEIPMI_LICENSE_FILES = \
 	COPYING.sunbmc COPYING.ZRESEARCH
 FREEIPMI_DEPENDENCIES = host-pkgconf
 FREEIPMI_INSTALL_STAGING = YES
-# We're patching configure.ac
-FREEIPMI_AUTORECONF = YES
 # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE
 FREEIPMI_CONF_OPTS = --without-random-device
 
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 5 lines · On Mon, 24 Jan 2022 23:16:57 +0100 Fabrice Fontaine…

Drop patches (already in version) and so autoreconf

https://github.com/chu11/freeipmi-mirror/blob/freeipmi-1-6-9/NEWS

Quoted 10 lines
---
 package/freeipmi/0001-fix-build-on-musl.patch | 49 ------------------
 .../0002-check-for-inb-and-outb.patch         | 50 -------------------
 ...ure.ac-use-pkg-config-to-find-gcrypt.patch | 50 -------------------
 package/freeipmi/freeipmi.hash                |  2 +-
 package/freeipmi/freeipmi.mk                  |  4 +-
 5 files changed, 2 insertions(+), 153 deletions(-)
 delete mode 100644 package/freeipmi/0001-fix-build-on-musl.patch
 delete mode 100644 package/freeipmi/0002-check-for-inb-and-outb.patch
 delete mode 100644 package/freeipmi/0003-configure.ac-use-pkg-config-to-find-gcrypt.patch

This patch was not applying on master, because it was assuming that "package/freeipmi: fix static build with libgcrypt" was applied, which isn't in master. Since the patch added by "package/freeipmi: fix static build with libgcrypt" is not in upstream freeipmi, I applied the version bump, but without the removal of patch 0003.

Thanks a lot!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot