git: 8e07195b4295 - 2024Q4 - devel/hwloc2: update 2.8.0 → 2.11.2, fix CVE-2022-47022
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Oct 2024 18:52:10 UTC
The branch 2024Q4 has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8e07195b4295a9aef218f79ea4b10422611fc7da
commit 8e07195b4295a9aef218f79ea4b10422611fc7da
Author: Älven <alster@vinterdalen.se>
AuthorDate: 2024-10-23 18:43:45 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-10-23 18:52:04 +0000
devel/hwloc2: update 2.8.0 → 2.11.2, fix CVE-2022-47022
Changelogs:
https://github.com/open-mpi/hwloc/blob/hwloc-2.11.2/NEWS
Release announcement:
https://www.mail-archive.com/hwloc-announce@lists.open-mpi.org/msg00169.html
Improve port: sort options, remove GNU_CONFIGURE_MANPREFIX and etc.
PR: 282215
Approved by: Eijiro Shibusawa <phd_kimberlite@yahoo.co.jp> (maintainer)
Security: https://nvd.nist.gov/vuln/detail/CVE-2022-47022
MFH: 2024Q4
(cherry picked from commit 5989086e794cd351a991c557f459ae16570bb5ab)
---
devel/hwloc2/Makefile | 32 ++++++++++++++++----------------
devel/hwloc2/distinfo | 6 +++---
devel/hwloc2/pkg-plist | 7 ++++++-
3 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/devel/hwloc2/Makefile b/devel/hwloc2/Makefile
index 04930e0ad4a3..67e9651d0181 100644
--- a/devel/hwloc2/Makefile
+++ b/devel/hwloc2/Makefile
@@ -1,8 +1,7 @@
PORTNAME= hwloc
-DISTVERSION= 2.8.0
-PORTREVISION= 1
+DISTVERSION= 2.11.2
CATEGORIES= devel
-MASTER_SITES= https://download.open-mpi.org/release/hwloc/v${PORTVERSION:R}/
+MASTER_SITES= https://download.open-mpi.org/release/hwloc/v${DISTVERSION:R}/
PKGNAMESUFFIX= 2
MAINTAINER= phd_kimberlite@yahoo.co.jp
@@ -14,46 +13,47 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpciaccess.so:devel/libpciaccess
-USES= iconv libtool gnome pathfix pkgconfig tar:bzip2
+USES= gnome iconv libtool pathfix pkgconfig tar:bzip2
USE_GNOME= libxml2
-
-CONFLICTS_INSTALL= hwloc
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --enable-static \
--disable-opencl \
--disable-cuda \
--disable-nvml \
--disable-gl
+
INSTALL_TARGET= install-strip
TEST_TARGET= check
-USE_LDCONFIG= yes
+
+CONFLICTS_INSTALL= hwloc
PORTDOCS= *
-OPTIONS_DEFINE= CAIRO DEBUG DOCS L0
-OPTIONS_DEFAULT=L0
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= CAIRO DEBUG DOCS L0
+OPTIONS_DEFAULT= L0
+OPTIONS_SUB= yes
+
+L0_DESC= oneAPI Level Zero device discovery
-CAIRO_CONFIGURE_OFF= --disable-cairo --without-x
-CAIRO_CONFIGURE_ON= --enable-cairo --with-x
CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo
CAIRO_USES= xorg
CAIRO_USE= XORG=x11
+CAIRO_CONFIGURE_ON= --enable-cairo --with-x
+CAIRO_CONFIGURE_OFF= --disable-cairo --without-x
DEBUG_CONFIGURE_ENABLE= debug # 'lstopo -' prints a lot of debug details when debug is enabled, this is separate from WITH_DEBUG=yes
-L0_DESC= oneAPI Level Zero device discovery
L0_LIB_DEPENDS= libze_loader.so:devel/level-zero
L0_CONFIGURE_ENABLE= levelzero
.include <bsd.port.pre.mk>
.if ${ARCH} != amd64 && ${ARCH} != i386
-PLIST_SUB= X86="@comment "
+PLIST_SUB+= X86="@comment "
.else
-PLIST_SUB= X86=""
+PLIST_SUB+= X86=""
.endif
post-install-DOCS-on:
diff --git a/devel/hwloc2/distinfo b/devel/hwloc2/distinfo
index f5f91e647837..097a6be5e63b 100644
--- a/devel/hwloc2/distinfo
+++ b/devel/hwloc2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663297241
-SHA256 (hwloc-2.8.0.tar.bz2) = 348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1
-SIZE (hwloc-2.8.0.tar.bz2) = 6896344
+TIMESTAMP = 1729378032
+SHA256 (hwloc-2.11.2.tar.bz2) = f7f88fecae067100f1a1a915b658add0f4f71561259482910a69baea22fe8409
+SIZE (hwloc-2.11.2.tar.bz2) = 5592269
diff --git a/devel/hwloc2/pkg-plist b/devel/hwloc2/pkg-plist
index 1a4f78b1896e..4dcbab00d504 100644
--- a/devel/hwloc2/pkg-plist
+++ b/devel/hwloc2/pkg-plist
@@ -36,8 +36,9 @@ include/hwloc/shmem.h
lib/libhwloc.a
lib/libhwloc.so
lib/libhwloc.so.15
-lib/libhwloc.so.15.6.0
+lib/libhwloc.so.15.8.1
libdata/pkgconfig/hwloc.pc
+%%CAIRO%%share/applications/lstopo.desktop
share/man/man1/hwloc-annotate.1.gz
share/man/man1/hwloc-bind.1.gz
share/man/man1/hwloc-calc.1.gz
@@ -94,6 +95,7 @@ share/man/man3/HWLOC_MEMBIND_NOCPUBIND.3.gz
share/man/man3/HWLOC_MEMBIND_PROCESS.3.gz
share/man/man3/HWLOC_MEMBIND_STRICT.3.gz
share/man/man3/HWLOC_MEMBIND_THREAD.3.gz
+share/man/man3/HWLOC_MEMBIND_WEIGHTED_INTERLEAVE.3.gz
share/man/man3/HWLOC_OBJ_BRIDGE.3.gz
share/man/man3/HWLOC_OBJ_BRIDGE_HOST.3.gz
share/man/man3/HWLOC_OBJ_BRIDGE_PCI.3.gz
@@ -376,6 +378,7 @@ share/man/man3/hwloc_obj_get_info_by_name.3.gz
share/man/man3/hwloc_obj_is_in_subtree.3.gz
share/man/man3/hwloc_obj_osdev_type_e.3.gz
share/man/man3/hwloc_obj_osdev_type_t.3.gz
+share/man/man3/hwloc_obj_set_subtype.3.gz
share/man/man3/hwloc_obj_t.3.gz
share/man/man3/hwloc_obj_type_is_cache.3.gz
share/man/man3/hwloc_obj_type_is_dcache.3.gz
@@ -428,6 +431,7 @@ share/man/man3/hwloc_topology_export_synthetic.3.gz
share/man/man3/hwloc_topology_export_xml.3.gz
share/man/man3/hwloc_topology_export_xmlbuffer.3.gz
share/man/man3/hwloc_topology_flags_e.3.gz
+share/man/man3/hwloc_topology_free_group_object.3.gz
share/man/man3/hwloc_topology_get_allowed_cpuset.3.gz
share/man/man3/hwloc_topology_get_allowed_nodeset.3.gz
share/man/man3/hwloc_topology_get_complete_cpuset.3.gz
@@ -469,6 +473,7 @@ share/man/man3/hwloc_type_sscanf_as_depth.3.gz
share/man/man3/hwloc_windows_get_nr_processor_groups.3.gz
share/man/man3/hwloc_windows_get_processor_group_cpuset.3.gz
share/man/man3/hwlocality_advanced_io.3.gz
+share/man/man3/hwlocality_api_error_reporting.3.gz
share/man/man3/hwlocality_api_version.3.gz
share/man/man3/hwlocality_bitmap.3.gz
share/man/man3/hwlocality_configuration.3.gz