From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-983611-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D92151396D9 for <garchives@archives.gentoo.org>; Sun, 12 Nov 2017 19:56:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA745E0F83; Sun, 12 Nov 2017 19:56:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD578E0F83 for <gentoo-commits@lists.gentoo.org>; Sun, 12 Nov 2017 19:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 672ED33FE2A for <gentoo-commits@lists.gentoo.org>; Sun, 12 Nov 2017 19:56:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B40549AB2 for <gentoo-commits@lists.gentoo.org>; Sun, 12 Nov 2017 19:56:30 +0000 (UTC) From: "Justin Lecher" <jlec@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org> Message-ID: <1510516587.87b4be04dbc8f2e65eacae7b9d1b87d0e50a30b2.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/slurm/Manifest sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch sys-cluster/slurm/slurm-16.05.11.ebuild sys-cluster/slurm/slurm-16.05.2.ebuild sys-cluster/slurm/slurm-17.02.6.ebuild sys-cluster/slurm/slurm-17.02.9.ebuild X-VCS-Directories: sys-cluster/slurm/ sys-cluster/slurm/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 87b4be04dbc8f2e65eacae7b9d1b87d0e50a30b2 X-VCS-Branch: master Date: Sun, 12 Nov 2017 19:56:30 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 570e5980-8602-484a-a53d-15aceff67d78 X-Archives-Hash: b96f5a85ea58640e0ed5a90bf96dc573 commit: 87b4be04dbc8f2e65eacae7b9d1b87d0e50a30b2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sun Nov 12 19:38:37 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Nov 12 19:56:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b4be04 sys-cluster/slurm: Version Bump drop vulnerable versions CVE-2017-15566 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-cluster/slurm/Manifest | 4 +- ...ew.patch => slurm-16.05.11-disable-sview.patch} | 0 ...macros.patch => slurm-16.05.11-sysmacros.patch} | 0 .../slurm/files/slurm-17.02.6-glibc-2.25.patch | 53 ---------------------- ...iew.patch => slurm-17.02.9-disable-sview.patch} | 0 ...{slurm-16.05.2.ebuild => slurm-16.05.11.ebuild} | 0 .../{slurm-17.02.6.ebuild => slurm-17.02.9.ebuild} | 1 - 7 files changed, 2 insertions(+), 56 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 36d8c909850..d94f5bfc5b0 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1,2 @@ -DIST slurm-16.05.2.tar.bz2 5982329 SHA256 de57ab107c98499f7184c54de8d5ac115a55657aa03d29d69cd0b7e737a42852 SHA512 8b4296481c5ad83da2bde1530937b3da9b6e32b6606ba0b0a3899e0f2f0b4fc42ca8a802d4bf346d0de28852d75839e9359e28c4ce77588cd22a08ddbd34dd21 WHIRLPOOL 925902c9432b24a2c85488d1ba6a867abed0adaaecaa94b648402e48d250d924000741b2be486b34d3b7f6890aeabb9aea6c47e2e8fd9896dda3a3ae416a4a89 -DIST slurm-17.02.6.tar.bz2 6017979 SHA256 f057127870544be5b3476594fc58b3c35727e6db3a18d84c4ea63059c2ebe4ea SHA512 e7e33ae037f8b30ccf467fa19c90786c28a527df80cf1362075634ada7072bffcd172d79d2af9ac9ad2b2206b50c0560584c7b8193bfaa9dfa1b1d2c7216e5f6 WHIRLPOOL 9dec9fae0d6def7fc0c243ceec8a2d3bf3c10ecf230f8ef5df03804ce048481279691572fb9bd83a509f344639d4b73313e7f7615bfa1d17c279010e44a2e63e +DIST slurm-16.05.11.tar.bz2 6100281 SHA256 c797390a7de40b8b5bead77a92661de5f158c646e9abe6a93457f311e0aec330 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba WHIRLPOOL 35b6dba438519f82a431bb4ac312afb8e65fe27eb3c72714ef204ee974ab4e7e3259ac1c763e4430f5fce18b4e737198cfe9c47b45de2d6fd7a29db72e020d2f +DIST slurm-17.02.9.tar.bz2 6053443 SHA256 faf4704505dfc5b6fa199f099d36dbc3d23faf149251f36672631dbbbe3b1b71 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c WHIRLPOOL d3320da3e2ec6e14e58ac759ab0e7f7741068f15c6c6569e36b622250d1617d68a6f17e4a91243994ae2d3ac69161268b1becf4bd31677f618fc93c1423e51fc diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch similarity index 100% rename from sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch rename to sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch diff --git a/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch similarity index 100% rename from sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch rename to sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch diff --git a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch b/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch deleted file mode 100644 index dc48f8475c0..00000000000 --- a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 056d9ff26b1d2ccac45da3c26a6918f182f8c559 -Author: Justin Lecher <jlec@gentoo.org> -Date: Sun Jul 9 15:54:20 2017 +0100 - - Include sysmacros.h in addition for major() & minor() - - Starting from glibc-2.25 [1] the macros major and minor are only available - from sys/sysmacros.h. This patch uses an autoconf macro to detect the - location and includes the header accordingly. - - 1) - https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html - - Signed-off-by: Justin Lecher <jlec@gentoo.org> - -diff --git a/configure.ac b/configure.ac -index 44699ae095..66d4350d44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -124,7 +124,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \ - AC_HEADER_SYS_WAIT - AC_HEADER_TIME - AC_HEADER_STDC -- -+AC_HEADER_MAJOR - - dnl Checks for structures. - dnl -diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c -index 6a09b3d52a..63c0a11c9e 100644 ---- a/src/plugins/task/cgroup/task_cgroup_devices.c -+++ b/src/plugins/task/cgroup/task_cgroup_devices.c -@@ -34,12 +34,20 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - \*****************************************************************************/ - -+#include "config.h" -+ - #define _GNU_SOURCE - #include <glob.h> - #include <limits.h> - #include <sched.h> - #include <sys/stat.h> - #include <sys/types.h> -+#ifdef MAJOR_IN_MKDEV -+# include <sys/mkdev.h> -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include <sys/sysmacros.h> -+#endif - - #include "slurm/slurm.h" - #include "slurm/slurm_errno.h" diff --git a/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch similarity index 100% rename from sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch rename to sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild similarity index 100% rename from sys-cluster/slurm/slurm-16.05.2.ebuild rename to sys-cluster/slurm/slurm-16.05.11.ebuild diff --git a/sys-cluster/slurm/slurm-17.02.6.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild similarity index 99% rename from sys-cluster/slurm/slurm-17.02.6.ebuild rename to sys-cluster/slurm/slurm-17.02.9.ebuild index 72d5cafc994..dc8afb80830 100644 --- a/sys-cluster/slurm/slurm-17.02.6.ebuild +++ b/sys-cluster/slurm/slurm-17.02.9.ebuild @@ -54,7 +54,6 @@ RESTRICT="primaryuri" PATCHES=( "${FILESDIR}"/${P}-disable-sview.patch - "${FILESDIR}"/${P}-glibc-2.25.patch ) src_unpack() {