From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- dev-util/rr/Manifest | 3 +- dev-util/rr/files/rr-5.2.0-ucontext_t.patch | 65 +++++++++++++++++++++++++++++ dev-util/rr/rr-5.2.0.ebuild | 6 +-- 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 dev-util/rr/files/rr-5.2.0-ucontext_t.patch (limited to 'dev-util/rr') diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest index 0fd2ed79aa42..e3683d27cbaf 100644 --- a/dev-util/rr/Manifest +++ b/dev-util/rr/Manifest @@ -1,4 +1,5 @@ AUX rr-4.5.0-sysmacros.patch 788 BLAKE2B 0df763a64593b6f37b324f48864d88c105d050b5192e3e1baca36b8b6aa8e35254191ffa783aa8a2b3ee504f85baebf50fdd5e8534a443a6363d73a82108f9e5 SHA512 57c802d02ba6d8e9295300fcc0156670a3fc9b35dbd05d594eff95481eaa746d7715d9b493190c94833cb331e45cda71f5574b0fa5aed06991b1d80fd4f9bae6 +AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95 DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6 DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2 DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a @@ -6,5 +7,5 @@ DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a EBUILD rr-4.5.0.ebuild 1074 BLAKE2B a48f08be7e4e8e825dae4084a839dc7a2c3709a19bdf01de77452e450352e5702a157a150ace3f68cd70b1d0540f735839a1aa0e15b32ba99051ffa49dcfd5ac SHA512 23234a47fe276a584c72279300beeaeb8c407b4185482cd73500113c08411b76fc267e0c703c93c8704e16a94f58496167d3f076e7377909de94e43846b82084 EBUILD rr-5.0.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5 EBUILD rr-5.1.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5 -EBUILD rr-5.2.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5 +EBUILD rr-5.2.0.ebuild 1090 BLAKE2B 5ba79ce017668a7fc79d40dffe54f3e9b8f34fd2689bfaebfdfb937d792d03df1ff3d8eae706f4fb8c587de101f9e751a237743a436e5a34452a317dffbe2165 SHA512 f539d0afcd1fede8a38eb496015cf2c53131b2640e4c6f77a84ee53bb443a86bc76c73ea3b02f92f968ce2cd77c1458fb4a1380f3f94122c930162b14675b90b MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch new file mode 100644 index 000000000000..0015f0b150c0 --- /dev/null +++ b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch @@ -0,0 +1,65 @@ +From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001 +From: Robert O'Callahan +Date: Fri, 10 Aug 2018 15:17:55 +1200 +Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi + +These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine +the sigmask effect of rt_sigreturn syscalls, but they're no longer needed +because we query the new mask via /proc instead. + +Resolves #2237 +--- + src/kernel_abi.h | 33 --------------------------------- + 1 file changed, 33 deletions(-) + +diff --git a/src/kernel_abi.h b/src/kernel_abi.h +index e73e49933..29d3c9242 100644 +--- a/src/kernel_abi.h ++++ b/src/kernel_abi.h +@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch { + }; + RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext); + +- struct ucontext_t { +- uint32_t uc_flags; +- uint32_t uc_link; +- stack_t uc_stack; +- sigcontext uc_mcontext; +- kernel_sigset_t uc_sigmask; +- }; +- +- struct rt_sigframe { +- uint32_t pretcode; +- int sig; +- uint32_t pinfo; +- uint32_t puc; +- siginfo_t info; +- struct ucontext_t uc; +- }; +- + struct _fpstate_32 { + uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel; + uint16_t _st[40]; +@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch { + RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct, + user_fpregs_struct); + +- struct ucontext_t { +- uint64_t ucflags; +- ptr uc_link; +- stack_t uc_stack; +- struct sigcontext uc_mcontext; +- sigset_t uc_sigmask; +- user_fpregs_struct uc_fpregs; +- }; +- RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t); +- +- struct rt_sigframe { +- ptr pretcode; +- struct ucontext_t uc; +- siginfo_t info; +- }; +- + struct user { + struct user_regs_struct regs; + int u_fpvalid; diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild index 330b1821df13..8a48df5899c7 100644 --- a/dev-util/rr/rr-5.2.0.ebuild +++ b/dev-util/rr/rr-5.2.0.ebuild @@ -31,9 +31,9 @@ DEPEND+=" sys-devel/gdb[xml] )" -#PATCHES=( -# "${FILESDIR}"/${P}-sysmacros.patch -#) +PATCHES=( + "${FILESDIR}"/${P}-ucontext_t.patch +) pkg_setup() { if use kernel_linux; then -- cgit v1.2.3