From 6b7dd8b5705008992ef023f7844cac73762f89c9 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Fri, 19 Jul 2019 01:07:23 -0400 Subject: [PATCH] Update to 3.1.4rc1 --- .rpmlint | 5 ++++ pmix.spec | 24 +++++++--------- pmix_pointer_casts_1.patch | 59 -------------------------------------- pmix_pointer_casts_2.patch | 13 --------- pmix_remove_cxx_lang.patch | 12 -------- sources | 2 +- 6 files changed, 16 insertions(+), 99 deletions(-) create mode 100644 .rpmlint delete mode 100644 pmix_pointer_casts_1.patch delete mode 100644 pmix_pointer_casts_2.patch delete mode 100644 pmix_remove_cxx_lang.patch diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..6dd24f7 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,5 @@ +from Config import * +addFilter("W: no-documentation") +addFilter("W: no-manual-page-for-binary") +addFilter("W: shared-lib-calls-exit") +addFilter("W: spelling-error") diff --git a/pmix.spec b/pmix.spec index a037cd8..be50fec 100644 --- a/pmix.spec +++ b/pmix.spec @@ -1,16 +1,12 @@ +%global name_version %{name}-%{version}rc1 + Name: pmix -Version: 3.1.3 -Release: 1%{?dist} +Version: 3.1.4 +Release: 0.1.rc1%{?dist} Summary: Process Management Interface Exascale (PMIx) License: BSD URL: https://pmix.github.io/pmix/ -Source0: https://github.com/pmix/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 - -# Remove configure check for C++ since requires only C -Patch0: pmix_remove_cxx_lang.patch -# Fix pointer casts/derefs in test suite -Patch1: pmix_pointer_casts_1.patch -Patch2: pmix_pointer_casts_2.patch +Source0: https://github.com/pmix/%{name}/releases/download/v%{version}/%{name_version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake @@ -59,16 +55,13 @@ based starters (e.g., mpirun). * pevent - inject an event into the system %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n %{name_version} echo touching lexer sources to recompile them ... find src -name \*.l -print -exec touch --no-create {} \; %build -%{_builddir}/%{name}-%{version}/autogen.pl +%{_builddir}/%{name_version}/autogen.pl %configure \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir}/%{name} \ @@ -158,6 +151,9 @@ EOF %{_bindir}/* %changelog +* Fri Jul 19 2019 Philip Kovacs - 3.1.4-0.1.rc1 +- Update to 3.1.4rc1 + * Sat Jul 13 2019 Philip Kovacs - 3.1.3-1 - Update to 3.1.3 diff --git a/pmix_pointer_casts_1.patch b/pmix_pointer_casts_1.patch deleted file mode 100644 index 78620ac..0000000 --- a/pmix_pointer_casts_1.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 3a7defdec3049b204e602f6fd9d5c5a71bf1df7d -Author: Philip Kovacs -Date: Tue Jul 9 02:25:53 2019 -0400 - - fix incorrect pointer casts/derefs - - Signed-off-by: Philip Kovacs - -diff --git a/test/test_server.c b/test/test_server.c -index aa897fb5..d0ab53ce 100644 ---- a/test/test_server.c -+++ b/test/test_server.c -@@ -187,7 +187,7 @@ static void server_unpack_procs(char *buf, size_t size) - char *nspace; - - while ((size_t)(ptr - buf) < size) { -- ns_count = (size_t)*ptr; -+ ns_count = *(size_t *)ptr; - ptr += sizeof(size_t); - - for (i = 0; i < ns_count; i++) { -@@ -201,10 +201,10 @@ static void server_unpack_procs(char *buf, size_t size) - nspace = ptr; - ptr += PMIX_MAX_NSLEN+1; - -- ntasks = (size_t)*ptr; -+ ntasks = *(size_t *)ptr; - ptr += sizeof(size_t); - -- ltasks = (size_t)*ptr; -+ ltasks = *(size_t *)ptr; - ptr += sizeof(size_t); - - PMIX_LIST_FOREACH(tmp, server_nspace, server_nspace_t) { -@@ -226,7 +226,7 @@ static void server_unpack_procs(char *buf, size_t size) - } - size_t i; - for (i = 0; i < ltasks; i++) { -- int rank = (int)*ptr; -+ int rank = *(int *)ptr; - ptr += sizeof(int); - if (ns_item->task_map[rank] >= 0) { - continue; -@@ -651,13 +651,13 @@ static void server_unpack_dmdx(char *buf, int *sender, pmix_proc_t *proc) - { - char *ptr = buf; - -- *sender = (int)*ptr; -+ *sender = *(int *)ptr; - ptr += sizeof(int); - - memcpy(proc->nspace, ptr, PMIX_MAX_NSLEN +1); - ptr += PMIX_MAX_NSLEN +1; - -- proc->rank = (int)*ptr; -+ proc->rank = *(int *)ptr; - ptr += sizeof(int); - } - diff --git a/pmix_pointer_casts_2.patch b/pmix_pointer_casts_2.patch deleted file mode 100644 index 926a03e..0000000 --- a/pmix_pointer_casts_2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_server.c b/test/test_server.c -index 981a6604..ee91afd9 100644 ---- a/test/test_server.c -+++ b/test/test_server.c -@@ -195,7 +195,7 @@ static void server_unpack_procs(char *buf, size_t size) - size_t ltasks, ntasks; - int server_id; - -- server_id = *ptr; -+ server_id = *(int *)ptr; - ptr += sizeof(int); - - nspace = ptr; diff --git a/pmix_remove_cxx_lang.patch b/pmix_remove_cxx_lang.patch deleted file mode 100644 index 19f3c4b..0000000 --- a/pmix_remove_cxx_lang.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3cbd07e8..4bab86e6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -201,7 +201,6 @@ AS_IF([test "$pmix_debug" = "1"], - - LT_INIT() - LT_LANG([C]) --LT_LANG([C++]) - - ############################################################################ - # Setup the core diff --git a/sources b/sources index 78024cf..b346e73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pmix-3.1.3.tar.bz2) = 2d026bd83bfe692974b95496be26b35f07a689a8949acfc89f654a7f32d5c3aaf7c1988eeca539c007d2702557eb097d4822f41f7100387e4b452beda6e661a0 +SHA512 (pmix-3.1.4rc1.tar.bz2) = 8d21fd9830f50a433af9ee9b2502d0a768723b041fa2a419f3cabd9a97482dfa7726451c8fc9ba8add5a42785869b8e705d3a934cd4f63dca0ca989163dc9706