From f8226c36e30ae5c12a0a4e916ef149320e3bb8d1 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 27 Oct 2017 16:06:25 +0200 Subject: [PATCH] Update to 1.11.8 --- ...printf-interpret-process-name-as-for.patch | 25 +++++++++++++++++++ hwloc.spec | 11 +++++--- sources | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch diff --git a/0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch b/0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch new file mode 100644 index 0000000..74cf3bb --- /dev/null +++ b/0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch @@ -0,0 +1,25 @@ +From 9d6e8bfe26c24df8272d6af782ebbde9ef62acb0 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Wed, 6 Sep 2017 17:35:56 +0200 +Subject: [PATCH] Avoid letting snprintf interpret process name as format + +--- + utils/lstopo/lstopo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/lstopo/lstopo.c b/utils/lstopo/lstopo.c +index a23980010d..e9d600d457 100644 +--- a/utils/lstopo/lstopo.c ++++ b/utils/lstopo/lstopo.c +@@ -229,7 +229,7 @@ static void add_process_objects(hwloc_topology_t topology) + if (!parenl) { + snprintf(comm, sizeof(comm), "(unknown)"); + } else { +- snprintf(comm, sizeof(comm), parenl+1); ++ snprintf(comm, sizeof(comm), "%s", parenl+1); + } + } + +-- +2.13.6 + diff --git a/hwloc.spec b/hwloc.spec index 9ece5f2..5f93a70 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,11 +1,13 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc -Version: 1.11.5 -Release: 6%{?dist} +Version: 1.11.8 +Release: 1%{?dist} License: BSD Group: Applications/System URL: http://www.open-mpi.org/projects/hwloc/ Source0: http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-%{version}.tar.bz2 +# fix build with -Werror=format-security +Patch0: 0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: cairo-devel @@ -76,7 +78,7 @@ Requires: %{name}-plugins%{?_isa} = %{version}-%{release} - libxml support %prep -%setup -q +%autosetup -p1 %build # Remove rpaths @@ -148,6 +150,9 @@ make check %{_libdir}/hwloc* %changelog +* Fri Oct 27 2017 Michal Schmidt - 1.11.8-1 +- Update to 1.11.8. + * Wed Aug 23 2017 Adam Williamson - 1.11.5-6 - Use 'rdma-core-devel' not 'libibverbs-devel' for dependencies diff --git a/sources b/sources index c1ca563..fe3b4ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hwloc-1.11.5.tar.bz2) = f32715d0b19400fa0cc02d4dd7b789d740f7bf16f16dbb247f6124adb41b452673139b12936d21259d6bc0dec4988260e6c3d00b3b145f410960e868ae96e1c6 +SHA512 (hwloc-1.11.8.tar.bz2) = 6ade049b1de2204ba876fa49344a8389c8128a4082f8e1bc1196a659e862dd4222e954aac64bdb8560dd59412b629d5a41c161a4746199b8994c4e490fae89f7