diff --git a/slurm-sview.desktop b/slurm-sview.desktop index b694d18..01cfb8a 100644 --- a/slurm-sview.desktop +++ b/slurm-sview.desktop @@ -7,4 +7,4 @@ Exec=sview Icon=slurm Terminal=false Type=Application -Categories=GTK;Network;ParallelComputing +Categories=GTK;Network;ParallelComputing;Science;ComputerScience diff --git a/slurm.spec b/slurm.spec index a7c0642..3bf54f6 100644 --- a/slurm.spec +++ b/slurm.spec @@ -25,7 +25,7 @@ # slurm-torque Name: slurm -Version: 17.02.8 +Version: 17.02.9 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -37,9 +37,6 @@ Source3: slurm-sview.desktop Source4: slurm-128x128.png Source5: slurm_setuser.in -# upstream bug #3942 -Patch0: slurm_ac_header_major.patch - # build-related patches Patch1: slurm_perlapi_rpaths.patch Patch2: slurm_html_doc_path.patch @@ -214,7 +211,6 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -750,6 +746,11 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Nov 1 2017 Philip Kovacs - 17.02.9-1 +- Version bump to close CVE-2017-15566. +- Adjusted patches per closure of upstream bug #3942. +- Added desktop categories per rpmgrill.desktop-lint. + * Wed Oct 25 2017 Philip Kovacs - 17.02.8-1 - Version bump, patches adjusted. diff --git a/slurm_ac_header_major.patch b/slurm_ac_header_major.patch deleted file mode 100644 index f9050f1..0000000 --- a/slurm_ac_header_major.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- slurm-17.02.8/configure.ac.old 2017-10-25 14:35:36.325236357 -0400 -+++ slurm-17.02.8/configure.ac 2017-10-25 15:24:41.023876115 -0400 -@@ -124,7 +124,13 @@ - AC_HEADER_SYS_WAIT - AC_HEADER_TIME - AC_HEADER_STDC -+ -+dnl Workaround for transition of autoconf/glibc issues in deprecation of the -+dnl definitions major, minor, makedev by sys/types.h vs sys/sysmacros.h -+old_CFLAGS=$CFLAGS -+CFLAGS="$CFLAGS -Werror" - AC_HEADER_MAJOR -+CFLAGS=$old_CFLAGS - - dnl Checks for structures. - dnl diff --git a/slurm_doc_fix.patch b/slurm_doc_fix.patch index 41c2754..f835a53 100644 --- a/slurm_doc_fix.patch +++ b/slurm_doc_fix.patch @@ -1,5 +1,5 @@ ---- slurm-17.02.8/doc/man/man5/burst_buffer.conf.5.old 2017-08-15 23:22:24.333180212 -0400 -+++ slurm-17.02.8/doc/man/man5/burst_buffer.conf.5 2017-08-15 23:23:45.224298397 -0400 +--- slurm-17.02.9/doc/man/man5/burst_buffer.conf.5.old 2017-08-15 23:22:24.333180212 -0400 ++++ slurm-17.02.9/doc/man/man5/burst_buffer.conf.5 2017-08-15 23:23:45.224298397 -0400 @@ -31,18 +31,18 @@ \fBAllowUsers\fR Comma separated list of user names and/or IDs permitted to use burst buffers. diff --git a/slurm_html_doc_path.patch b/slurm_html_doc_path.patch index fc147f9..9ea8dcc 100644 --- a/slurm_html_doc_path.patch +++ b/slurm_html_doc_path.patch @@ -1,5 +1,5 @@ ---- slurm-17.02.8/doc/html/Makefile.am.old 2017-10-25 15:55:38.622808585 -0400 -+++ slurm-17.02.8/doc/html/Makefile.am 2017-10-25 15:56:07.236582868 -0400 +--- slurm-17.02.9/doc/html/Makefile.am.old 2017-10-25 15:55:38.622808585 -0400 ++++ slurm-17.02.9/doc/html/Makefile.am 2017-10-25 15:56:07.236582868 -0400 @@ -1,5 +1,5 @@ -htmldir = ${datadir}/doc/${PACKAGE}-${SLURM_VERSION_STRING}/html diff --git a/slurm_perlapi_rpaths.patch b/slurm_perlapi_rpaths.patch index b8c9f4e..0caf61a 100644 --- a/slurm_perlapi_rpaths.patch +++ b/slurm_perlapi_rpaths.patch @@ -1,5 +1,5 @@ ---- slurm-17.02.8/contribs/perlapi/libslurm/perl/Makefile.PL.in.old 2016-11-08 15:11:32.000000000 -0500 -+++ slurm-17.02.8/contribs/perlapi/libslurm/perl/Makefile.PL.in 2017-08-17 03:06:27.363688978 -0400 +--- slurm-17.02.9/contribs/perlapi/libslurm/perl/Makefile.PL.in.old 2016-11-08 15:11:32.000000000 -0500 ++++ slurm-17.02.9/contribs/perlapi/libslurm/perl/Makefile.PL.in 2017-08-17 03:06:27.363688978 -0400 @@ -77,7 +77,7 @@ # AIX has problems with not always having the correct # flags so we have to add some :) @@ -9,8 +9,8 @@ $other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull" if $os =~ "aix"; ---- slurm-17.02.7/contribs/perlapi/libslurmdb/perl/Makefile.PL.in.orig 2017-08-17 03:37:39.689054161 -0400 -+++ slurm-17.02.7/contribs/perlapi/libslurmdb/perl/Makefile.PL.in 2017-08-17 03:38:07.305780718 -0400 +--- slurm-17.02.9/contribs/perlapi/libslurmdb/perl/Makefile.PL.in.orig 2017-08-17 03:37:39.689054161 -0400 ++++ slurm-17.02.9/contribs/perlapi/libslurmdb/perl/Makefile.PL.in 2017-08-17 03:38:07.305780718 -0400 @@ -76,7 +76,7 @@ # AIX has problems with not always having the correct # flags so we have to add some :) diff --git a/slurm_service_files.patch b/slurm_service_files.patch index 9f1c38a..61bf0ac 100644 --- a/slurm_service_files.patch +++ b/slurm_service_files.patch @@ -1,5 +1,5 @@ ---- slurm-17.02.8/etc/slurmctld.service.in.old 2017-08-14 13:48:43.000000000 -0400 -+++ slurm-17.02.8/etc/slurmctld.service.in 2017-08-21 13:35:26.472209176 -0400 +--- slurm-17.02.9/etc/slurmctld.service.in.old 2017-08-14 13:48:43.000000000 -0400 ++++ slurm-17.02.9/etc/slurmctld.service.in 2017-08-21 13:35:26.472209176 -0400 @@ -8,7 +8,7 @@ EnvironmentFile=-/etc/sysconfig/slurmctld ExecStart=@sbindir@/slurmctld $SLURMCTLD_OPTIONS @@ -9,8 +9,8 @@ [Install] WantedBy=multi-user.target ---- slurm-17.02.7/etc/slurmd.service.in 2017-08-14 13:48:43.000000000 -0400 -+++ slurm-17.02.7/etc/slurmd.service.in.new 2017-08-21 14:45:23.485061312 -0400 +--- slurm-17.02.9/etc/slurmd.service.in.old 2017-08-14 13:48:43.000000000 -0400 ++++ slurm-17.02.9/etc/slurmd.service.in 2017-08-21 14:45:23.485061312 -0400 @@ -8,7 +8,7 @@ EnvironmentFile=-/etc/sysconfig/slurmd ExecStart=@sbindir@/slurmd $SLURMD_OPTIONS @@ -20,8 +20,8 @@ KillMode=process LimitNOFILE=51200 LimitMEMLOCK=infinity ---- slurm-17.02.7/etc/slurmdbd.service.in 2017-08-14 13:48:43.000000000 -0400 -+++ slurm-17.02.7/etc/slurmdbd.service.in.new 2017-08-21 14:47:56.134071820 -0400 +--- slurm-17.02.9/etc/slurmdbd.service.in.old 2017-08-14 13:48:43.000000000 -0400 ++++ slurm-17.02.9/etc/slurmdbd.service.in 2017-08-21 14:47:56.134071820 -0400 @@ -8,7 +8,7 @@ EnvironmentFile=-/etc/sysconfig/slurmdbd ExecStart=@sbindir@/slurmdbd $SLURMDBD_OPTIONS diff --git a/sources b/sources index 67bea59..f90903c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-17.02.8.tar.bz2) = a3a7633a5a0457299434fee00487a16edc5333360cf4d39f709b13b050d3496670da85340a0b19485016def946f44b723ecc23c1668704b8d10ef0fe697b0e13 +SHA512 (slurm-17.02.9.tar.bz2) = 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c