From 0d36688ce7e87145b0974589ae61bb244c3f2de5 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 21 Dec 2022 22:05:44 +0000 Subject: app-misc/reptyr: drop 0.8.0 Bug: https://bugs.gentoo.org/886957 Signed-off-by: Sam James --- app-misc/reptyr/Manifest | 1 - .../files/reptyr-0.8.0-riscv64-support.patch | 115 --------------------- app-misc/reptyr/reptyr-0.8.0.ebuild | 38 ------- 3 files changed, 154 deletions(-) delete mode 100644 app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch delete mode 100644 app-misc/reptyr/reptyr-0.8.0.ebuild (limited to 'app-misc') diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest index 86b6b31f3f6e..4310f7817687 100644 --- a/app-misc/reptyr/Manifest +++ b/app-misc/reptyr/Manifest @@ -1,2 +1 @@ -DIST reptyr-0.8.0.tar.gz 32239 BLAKE2B eb3d966c06df710ea27a421bceaca0c91e342cb981567eedc9125e5dd2dc937be294dc212ed9b3021d5e5d75e1011fa4a39eaf93c152c24ef7c5098f8edd9018 SHA512 880d899a2b6df3c33909dc70ce0a58f413b2e2eec2e212abc709348345d48294cf2e39f5891ab4b1fa24e69b54effe99c1b8ab03b448bfd7097e20498e7e85dc DIST reptyr-0.9.0.tar.gz 32589 BLAKE2B 2673128d90f302a5591466314446257b654f727efce24e2c1a68a2f876a7b385905acb5a4648945ce15e90e2419b4aee5a8a88377dd8229f3b130ba5ba858e46 SHA512 a59670449cb597657dbb244228fd4246142190615ce1a6369f11b8c99cb12d8e2bedb4efd7cdc301a4f7c18d29e8799eea8f14d062a8ad7b7c025034cba66ac7 diff --git a/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch b/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch deleted file mode 100644 index 6cedd3a55c5d..000000000000 --- a/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch +++ /dev/null @@ -1,115 +0,0 @@ -Taken from https://github.com/nelhage/reptyr/commit/e26724cc1ae5fe7af0c9fb6369f6cf09d1d12900 - -From ae0b4ec014c1a01b1c3409e5404cf0fa0102c349 Mon Sep 17 00:00:00 2001 -From: Ast-x64 -Date: Wed, 10 Nov 2021 09:39:45 +0800 -Subject: [PATCH] Support riscv64 on Linux. - ---- - platform/linux/arch/riscv64.h | 68 +++++++++++++++++++++++++++++++++++ - platform/linux/linux_ptrace.c | 2 ++ - ptrace.h | 3 ++ - 3 files changed, 73 insertions(+) - create mode 100644 platform/linux/arch/riscv64.h - -diff --git a/platform/linux/arch/riscv64.h b/platform/linux/arch/riscv64.h -new file mode 100644 -index 0000000..96221c3 ---- /dev/null -+++ b/platform/linux/arch/riscv64.h -@@ -0,0 +1,68 @@ -+/* -+ * Copyright (C) 2021 by Ast-x64 -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+ * THE SOFTWARE. -+ */ -+static struct ptrace_personality arch_personality[1] = { -+ { -+ offsetof(struct user_regs_struct, a0), -+ offsetof(struct user_regs_struct, a0), -+ offsetof(struct user_regs_struct, a1), -+ offsetof(struct user_regs_struct, a2), -+ offsetof(struct user_regs_struct, a3), -+ offsetof(struct user_regs_struct, a4), -+ offsetof(struct user_regs_struct, a5), -+ offsetof(struct user_regs_struct, pc), -+ } -+}; -+ -+static inline void arch_fixup_regs(struct ptrace_child *child) { -+ child->regs.pc -= 4; -+} -+ -+static inline int arch_set_syscall(struct ptrace_child *child, -+ unsigned long sysno) { -+ unsigned long x_reg[18]; -+ struct iovec reg_iovec = { -+ .iov_base = x_reg, -+ .iov_len = sizeof(x_reg) -+ }; -+ if (ptrace_command(child, PTRACE_GETREGSET, NT_PRSTATUS, ®_iovec) < 0) -+ return -1; -+ -+ x_reg[17] = sysno; -+ return ptrace_command(child, PTRACE_SETREGSET, NT_PRSTATUS, ®_iovec); -+} -+ -+static inline int arch_save_syscall(struct ptrace_child *child) { -+ unsigned long x_reg[18]; -+ struct iovec reg_iovec = { -+ .iov_base = x_reg, -+ .iov_len = sizeof(x_reg) -+ }; -+ if (ptrace_command(child, PTRACE_GETREGSET, NT_PRSTATUS, ®_iovec) < 0) -+ return -1; -+ -+ child->saved_syscall = x_reg[17]; -+ return 0; -+} -+ -+static inline int arch_restore_syscall(struct ptrace_child *child) { -+ return arch_set_syscall(child, child->saved_syscall); -+} -diff --git a/platform/linux/linux_ptrace.c b/platform/linux/linux_ptrace.c -index d065199..bcbe600 100644 ---- a/platform/linux/linux_ptrace.c -+++ b/platform/linux/linux_ptrace.c -@@ -84,6 +84,8 @@ static struct ptrace_personality *personality(struct ptrace_child *child); - #include "arch/aarch64.h" - #elif defined(__powerpc__) - #include "arch/powerpc.h" -+#elif defined(__riscv) && __riscv_xlen == 64 -+#include "arch/riscv64.h" - #else - #error Unsupported architecture. - #endif -diff --git a/ptrace.h b/ptrace.h -index ee05bd7..8e3a7f4 100644 ---- a/ptrace.h -+++ b/ptrace.h -@@ -25,6 +25,9 @@ - #ifdef __powerpc__ - #include - #endif -+#ifdef __riscv -+#include -+#endif - #include - #include - #include diff --git a/app-misc/reptyr/reptyr-0.8.0.ebuild b/app-misc/reptyr/reptyr-0.8.0.ebuild deleted file mode 100644 index 6bfa5e3f6049..000000000000 --- a/app-misc/reptyr/reptyr-0.8.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot - -DESCRIPTION="A utility to attach a running program to a new terminal" -HOMEPAGE="https://github.com/nelhage/reptyr" -SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" - -RESTRICT="test" - -PATCHES=( - # drop on next version bump - "${FILESDIR}"/${PN}-0.8.0-riscv64-support.patch -) - -src_prepare() { - default - # respect CFLAGS - sed -i '/^override/d' Makefile || die -} - -src_compile() { - append-cppflags -D_GNU_SOURCE - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc ChangeLog NOTES README.md - newbashcomp reptyr{.bash,} -} -- cgit v1.2.3-65-gdbad