summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Linden <karl.j.linden@gmail.com>2017-09-05 13:25:54 +0200
committerAlice Ferrazzi <alicef@gentoo.org>2017-09-25 10:14:47 +0900
commit1ebf1f41cb09be95e72e7ce61e3858b0fceded3a (patch)
treeac375e72ef7a10269aae88192e54b0fee0351018 /sys-kernel
parentwww-servers/varnish: remove vulnerable versions, bug #626872 (diff)
downloadgentoo-1ebf1f41cb09be95e72e7ce61e3858b0fceded3a.tar.gz
gentoo-1ebf1f41cb09be95e72e7ce61e3858b0fceded3a.tar.bz2
gentoo-1ebf1f41cb09be95e72e7ce61e3858b0fceded3a.zip
sys-kernel/rt-sources: version bump to 3.18.69_p75
* Apply posix printf patch, wrt 627068. * Make fully preemptible the default, wrt 627796. Package-Manager: Portage-2.3.8, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/5645
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/rt-sources/Manifest2
-rw-r--r--sys-kernel/rt-sources/files/rt-sources-posix-printf.patch40
-rw-r--r--sys-kernel/rt-sources/rt-sources-3.18.69_p75.ebuild58
3 files changed, 100 insertions, 0 deletions
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index a8d88371207..5a5aace0d7b 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -15,6 +15,8 @@ DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f1
DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
DIST patch-3.18.59-rt65.patch.xz 173612 SHA256 7dad87e49cd0f470aa88f2a41e172d85687728b8774834eef482a6c8ecda8df9 SHA512 5d742acb498777306f521af8fb9722143eb251a66f7f1eb0d1892556218ddfdb25b69dbac0691b6efdbd321b6a3e4e7c0b2f0b7b56e905d5abb0613f44e61756 WHIRLPOOL 5c8c27c401e8c84b66df3f91bd2f8f9422a08dc442022e7e470df10ad1b8af90c7266a7040d9da2b5236851e19e7044c5ae105f4a535b0f646c12c8c6b745951
DIST patch-3.18.59.xz 1238164 SHA256 668c02c74fc0655cc68f47f820f823e441aa5acd5bc2fd63bee36e7a2345f633 SHA512 671da9568772fa5af63b32169de8b27056f32770b9abc5249766e2f50b348a039d03346078fc379e1591014e6ced56912abcd492be6e47205887fab72499720c WHIRLPOOL 454efd5b5ac42655bcaf89bd788b272ae637e0a0cd112d44dbe19442a03fb30f5e56e76cf2995c222fc8135e0f34295f8f8be19498f22d333e78cd207486eb6d
+DIST patch-3.18.69-rt75.patch.xz 173580 SHA256 374d1b20fb84024a9738034346d1761181afc1c988b8fc9ac475673f6e5f7c46 SHA512 50aff123705223689a59da8d931b6a42434391c0e87c68636d8ced6556e98482b9ac68ddfefd923ee37625642a7da860c15719190637b700505a869678374dbc WHIRLPOOL 501711c834e75d8fe1fe58f458fabec15c943a2faa4b84109cf37d349ecf0caf0bcc75f466520898c0d76fa3b5703895c8e57117ddf02038eba30da979ecb1d1
+DIST patch-3.18.69.xz 1291180 SHA256 20174224a5b5482ff238151fb8994401be4feba580802b2737479bb0a5342bca SHA512 b6d3f52f219941752d0344a15c21a76ca2c7435c075d9f1cc3ac2ef70ab1f5da55cbcbe48c232e03d48dbc7b18e465e8a34d547b6fea82cc2b51e5462e773d93 WHIRLPOOL 0297ac817d3383bea22a66c10d42d753ce2bdc5bd14b461a43139c8b1b27962581216f7224b64f4a1803418a4a423ae0f1f6ed12fa80948a20a7eac089d1a7cf
DIST patch-4.1.40-rt48.patch.xz 189128 SHA256 47081fce428dfd7d74244d7eae3c18d9a93b0e17677558f7aa7299f8e96fba2c SHA512 ac17c8ff84587a6cb99cfeefc91501f955ed2bbc292211601c42512a23c1d1fa89ef782e44097f97f0ea8e636a5137c039fcad6564e4366d34dca2df22dd45e6 WHIRLPOOL fff8229d3299ce845361abe8c5d3fb67fb6c5c318fb9fdc88b27d9f00a383a911952bc703c1cea4f6eb43e1f247473aff9c56b7ae95c532e09cb8a37d1e32d46
DIST patch-4.1.40.xz 1022520 SHA256 05f034e695720101c52a088791c2bfc20e5487c7a886ead6575d1d305c138511 SHA512 936079277ca7fc1478a6d0540026205ad856fba6f13aeb602a36bbac8d340e204f63b25541bdd1682828e90a70e80868f81d1fa8689f11f0330f70fba03e2b96 WHIRLPOOL 34e694893d549e1ae6db21342d92f24139695d45a81e385bc21fbb6c86e354f8969d8d8468fc955152e9bcedf9b6512091dc85020f139d2df116c0c92d430b40
DIST patch-4.1.42-rt49.patch.xz 189128 SHA256 4a4c502da63cc15715f67a548da6a1ea018e53a5fde2ad6fe9480ffe04bc8247 SHA512 0fccf89a48fda418fe7abd0dd2b78f0c8ce10368d55310165df72e7043edc7f58adc2a7f43e3e17c77bf0fa2dada898c1ab2dec608acd64375a481d128dc180a WHIRLPOOL 69a27adb1b37b51abe80bb7ebfc1703ddd7ff60ce82e6609b09644864c4b3d78d365df2578acc9636a405cc73a4d5c2db94c9554d01ed46c65400705fb341d78
diff --git a/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch b/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch
new file mode 100644
index 00000000000..81ebcaf0eca
--- /dev/null
+++ b/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch
@@ -0,0 +1,40 @@
+From 651e54953b5d4ad103f0efa54fc6b380807fca3a Mon Sep 17 00:00:00 2001
+From: Thomas Schneider <qsx@qsx.re>
+Date: Fri, 14 Oct 2016 21:29:49 +0200
+Subject: security/apparmor: Use POSIX-compatible "printf '%s'"
+
+When using a strictly POSIX-compliant shell, "-n #define ..." gets
+written into the file. Use "printf '%s'" to avoid this.
+
+Signed-off-by: Thomas Schneider <qsx@qsx.re>
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+---
+ security/apparmor/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+(limited to 'security/apparmor')
+
+diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
+index ad369a7..2ded2f1 100644
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -20,7 +20,7 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\
+ sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \
+ -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
+ echo "};" >> $@ ;\
+- echo -n '\#define AA_FS_CAPS_MASK "' >> $@ ;\
++ printf '%s' '\#define AA_FS_CAPS_MASK "' >> $@ ;\
+ sed $< -r -n -e '/CAP_FS_MASK/d' \
+ -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/\L\1/p' | \
+ tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
+@@ -56,7 +56,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
+ echo "static const int rlim_map[RLIM_NLIMITS] = {" >> $@ ;\
+ sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\
+ echo "};" >> $@ ; \
+- echo -n '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\
++ printf '%s' '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\
+ sed -r -n 's/^\# ?define[ \t]+RLIMIT_([A-Z0-9_]+).*/\L\1/p' $< | \
+ tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
+
+--
+cgit v1.1
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.69_p75.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.69_p75.ebuild
new file mode 100644
index 00000000000..8f5a060bc49
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.18.69_p75.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+ mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+ "${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+ default
+
+ # 627796
+ sed \
+ "s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+ -i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ ewarn
+ ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the RT project developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds."
+ ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."