From acb7e0505a20a83ae8342074fc07ce30e2cd82031bcd7700c197104cdbb50635 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 31 Jan 2019 20:33:20 +0000 Subject: [PATCH] - Update to version 18.08.05-2: This version obsoletes: Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch - Fix spec file for older SUSE versions. OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=85 --- ...-the-fix-for-CVE-2019-6438-750cc23ed.patch | 24 ------------------- slurm-18.08.5-2.tar.bz2 | 3 +++ slurm-18.08.5.tar.bz2 | 3 --- slurm.changes | 8 +++++++ slurm.spec | 7 +++--- 5 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch create mode 100644 slurm-18.08.5-2.tar.bz2 delete mode 100644 slurm-18.08.5.tar.bz2 diff --git a/Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch b/Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch deleted file mode 100644 index 32dcb2e..0000000 --- a/Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Egbert Eich -Date: Thu Jan 31 11:05:30 2019 +0100 -Subject: Fix contrib/perlapi to build with the fix for CVE-2019-6438 (750cc23ed). -Patch-mainline: Not yet -Git-commit: a4a7f25dcb7d4387daa4367dd3c040f84b5e6f61 -References: - -Signed-off-by: Egbert Eich ---- - slurm-18.08.5/contribs/perlapi/libslurm/perl/slurm-perl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/slurm-18.08.5/contribs/perlapi/libslurm/perl/slurm-perl.h b/slurm-18.08.5/contribs/perlapi/libslurm/perl/slurm-perl.h -index 58df275..d4adbfe 100644 ---- a/contribs/perlapi/libslurm/perl/slurm-perl.h -+++ b/contribs/perlapi/libslurm/perl/slurm-perl.h -@@ -17,7 +17,7 @@ - #endif - - extern void slurm_xfree(void **, const char *, int, const char *); --extern void *slurm_xmalloc(size_t, bool, const char *, int, const char *); -+extern void *slurm_xmalloc(uint64_t, bool, const char *, int, const char *); - - extern void slurm_api_clear_config(void); - diff --git a/slurm-18.08.5-2.tar.bz2 b/slurm-18.08.5-2.tar.bz2 new file mode 100644 index 0000000..82c3475 --- /dev/null +++ b/slurm-18.08.5-2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c45e9d1c18efa0ae0fbeaf0a244794a1288c6adb9e40cf4efc70c359ad083277 +size 6168687 diff --git a/slurm-18.08.5.tar.bz2 b/slurm-18.08.5.tar.bz2 deleted file mode 100644 index 42db71f..0000000 --- a/slurm-18.08.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13f7a00adcf0aebb8b0409d4a07075918c9c39e00b4b1d382a119a9b9c019486 -size 6169479 diff --git a/slurm.changes b/slurm.changes index 489e7f2..e10ef1f 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 31 20:30:32 UTC 2019 - eich@suse.com + +- Update to version 18.08.05-2: + This version obsoletes: + Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch +- Fix spec file for older SUSE versions. + ------------------------------------------------------------------- Thu Jan 31 09:00:06 UTC 2019 - eich@suse.com diff --git a/slurm.spec b/slurm.spec index 6487044..c618d59 100644 --- a/slurm.spec +++ b/slurm.spec @@ -19,6 +19,7 @@ # Check file META in sources: update so_version to (API_CURRENT - API_AGE) %define so_version 33 %define ver 18.08.5 +%define dl_ver %{ver}-2 # so-version is 0 and seems to be stable %define pmi_so 0 @@ -62,7 +63,7 @@ Summary: Simple Linux Utility for Resource Management License: SUSE-GPL-2.0-with-openssl-exception Group: Productivity/Clustering/Computing Url: https://www.schedmd.com -Source: https://download.schedmd.com/slurm/%{name}-%{ver}.tar.bz2 +Source: https://download.schedmd.com/slurm/%{name}-%{dl_ver}.tar.bz2 Source1: slurm-rpmlintrc Patch0: slurm-2.4.4-rpath.patch Patch1: slurm-2.4.4-init.patch @@ -77,7 +78,6 @@ Patch9: slurmctld-rerun-agent_init-when-backup-controller-takes-over.pat Patch10: pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch Patch11: pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch Patch12: pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch -Patch130: Fix-contrib-perlapi-to-build-with-the-fix-for-CVE-2019-6438-750cc23ed.patch Requires: slurm-config = %{version} Requires: slurm-node = %{version} @@ -342,7 +342,7 @@ Group: Documentation/Man Man pages for the SLURM cluster managment software config files. %prep -%setup -q -n %{name}-%{ver} +%setup -q -n %{name}-%{dl_ver} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -357,7 +357,6 @@ Man pages for the SLURM cluster managment software config files. %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch130 -p1 %build %configure --enable-shared \