From db321c6a7608a4b7a9f2202222a2d4bb3b455ae3 Mon Sep 17 00:00:00 2001 From: Rage OxR463 <43783393+oxr463@users.noreply.github.com> Date: Mon, 10 Dec 2018 21:26:28 -0500 Subject: [PATCH] Purge remaining references to "proot.me" #152 (#154) * Update event.c * Update manual.txt * Update man.1 --- doc/proot/man.1 | 23 ++++++++------------ doc/proot/manual.txt | 50 +++++++++++++++++++------------------------- src/tracee/event.c | 3 +-- 3 files changed, 31 insertions(+), 45 deletions(-) diff --git a/doc/proot/man.1 b/doc/proot/man.1 index f1fb8e1..1a43624 100644 --- a/doc/proot/man.1 +++ b/doc/proot/man.1 @@ -661,25 +661,20 @@ checking whether the C compiler is a cross\-compiler... no .SH DOWNLOADS .SS PRoot .sp -The latest release of PRoot is packaged on \fI\%http://packages.proot.me\fP -and sources are hosted on \fI\%http://scm.proot.me\fP\&. It is also available +The latest release of PRoot is packaged on \fI\%https://github.com/proot\-me/proot\-static\-build/releases\fP +and sources are hosted on \fI\%https://github.com/proot\-me/PRoot\fP\&. It is also available as highly compatible static binaries: .INDENT 0.0 .IP \(bu 2 -for x86_64: \fI\%http://portable.proot.me/proot\-x86_64\fP +for x86_64: \fI\%https://github.com/proot\-me/proot\-static\-build/blob/master/static/proot\-x86_64?raw=true\fP .IP \(bu 2 -for x86: \fI\%http://portable.proot.me/proot\-x86\fP +for x86: \fI\%https://github.com/proot\-me/proot\-static\-build/blob/master/static/proot\-x86?raw=true\fP .IP \(bu 2 -for ARM: \fI\%http://portable.proot.me/proot\-arm\fP +for ARM: \fI\%https://github.com/proot\-me/proot\-static\-build/blob/master/static/proot\-arm?raw=true\fP .IP \(bu 2 other architectures: on demand. .UNINDENT .sp -Such binaries are created using the following build\-system: -\fI\%http://build.proot.me\fP\&. It makes sure that they can run on any distros -powered by the Linux kernel version 2.6.0 or later, nothing more. -Ultimately these binaries can even run on Linux systems where no -libraries are installed. .SS Rootfs .sp Here follows a couple of URLs where some rootfs archives can be freely @@ -694,9 +689,11 @@ are typically bound (see \fB\-R\fP option for details). .IP \(bu 2 \fI\%http://distfiles.gentoo.org/releases/\fP .IP \(bu 2 -\fI\%http://cdimage.ubuntu.com/ubuntu\-core/releases/\fP +\fI\%http://cdimage.ubuntu.com/ubuntu\-core\fP .IP \(bu 2 \fI\%http://archlinuxarm.org/developers/downloads\fP +.IP \(bu 2 +\fI\%https://alpinelinux.org/downloads\fP .UNINDENT .sp Technically such rootfs archive can be created by running the @@ -770,8 +767,6 @@ Binaries from the \fI\%Downloads\fP section are likely more up\-to\-date. .IP \(bu 2 \fI\%NixOS\fP .IP \(bu 2 -\fI\%KaOS\fP -.IP \(bu 2 \fI\%University of Chicago RCC\fP .UNINDENT .SS Public material about PRoot or CARE @@ -820,7 +815,7 @@ chroot(1), mount(8), binfmt_misc, ptrace(2), qemu(1), sb2(1), bindfs(1), fakeroot(1), fakechroot(1) .SH COLOPHON .sp -Visit \fI\%http://proot.me\fP for help, bug reports, suggestions, patches, ... +Visit \fI\%https://proot\-me.github.io\fP for help, bug reports, suggestions, patches, ... Copyright (C) 2015 STMicroelectronics, licensed under GPL v2 or later. .INDENT 0.0 .INDENT 3.5 diff --git a/doc/proot/manual.txt b/doc/proot/manual.txt index 6da85e2..9870859 100644 --- a/doc/proot/manual.txt +++ b/doc/proot/manual.txt @@ -510,24 +510,18 @@ Downloads PRoot ----- -The latest release of PRoot is packaged on http://packages.proot.me -and sources are hosted on http://github.proot.me. It is also +The latest release of PRoot is packaged on https://github.com/proot-me/proot-static-build/releases +and sources are hosted on https://github.com/proot-me/PRoot. It is also available as highly compatible static binaries: -* for x86_64: http://static.proot.me/proot-x86_64 +* for x86_64: https://github.com/proot-me/proot-static-build/blob/master/static/proot-x86_64?raw=true -* for x86: http://static.proot.me/proot-x86 +* for x86: https://github.com/proot-me/proot-static-build/blob/master/static/proot-x86?raw=true -* for ARM: http://static.proot.me/proot-arm +* for ARM: https://github.com/proot-me/proot-static-build/blob/master/static/proot-arm?raw=true * other architectures: on demand. -Such binaries are created using the following build-system: -http://build.proot.me. It makes sure that they can run on any distros -powered by the Linux kernel version 2.6.0 or later, nothing more. -Ultimately these binaries can even run on Linux systems where no -libraries are installed. - Rootfs ------ @@ -536,16 +530,18 @@ downloaded. Note that ``mknod`` errors reported by ``tar`` when extracting these archives can be safely ignored since special files are typically bound (see ``-R`` option for details). -* http://download.openvz.org/template/precreated/ +* http://download.openvz.org/template/precreated -* https://images.linuxcontainers.org/images/ +* https://images.linuxcontainers.org/images -* http://distfiles.gentoo.org/releases/ +* http://distfiles.gentoo.org/releases -* http://cdimage.ubuntu.com/ubuntu-core/releases/ +* http://cdimage.ubuntu.com/ubuntu-core * http://archlinuxarm.org/developers/downloads +* https://alpinelinux.org/downloads + Technically such rootfs archive can be created by running the following command on the expected Linux distribution:: @@ -576,7 +572,7 @@ Projects using PRoot or CARE `_: use several Linux distros on Travis-CI without root access. -* `JuJu `_: +* `JuNest `_: use Arch Linux on any Linux distros without root access. * `Brickstrap `_: @@ -585,11 +581,11 @@ Projects using PRoot or CARE * `Portable PyPy `_: portable 32 and 64 bit x86 PyPy binaries. -* `OpenMOLE `_: +* `OpenMOLE `_: execute programs on distributed computing environments. * `ATOS - `_: + `_: find automatically C/C++ compiler options that provide best optimizations. @@ -610,8 +606,6 @@ Binaries from the Downloads_ section are likely more up-to-date. * `Arch Linux (PRoot) `_ -* `Arch Linux (CARE) `_ - * `Gentoo `_ * `Debian `_ @@ -620,16 +614,14 @@ Binaries from the Downloads_ section are likely more up-to-date. * `NixOS `_ -* `KaOS `_ - -* `University of Chicago RCC `_ +* `University of Chicago RCC `_ Public material about PRoot or CARE ----------------------------------- * articles on `Rémi's blog - `_. Rémi (a.k.a Ivoire) + `_. Rémi (a.k.a Ivoire) is one of the PRoot developers. * presentation "`Software engineering tools based on syscall @@ -638,7 +630,7 @@ Public material about PRoot or CARE FOSDEM 2014. * presentation "`SW testing & Reproducing a LAVA failures locally - using CARE `_" + using CARE `_" during Linaro Connect USA 2014 * presentation and essay "`CARE: the Comprehensive Archiver for @@ -647,8 +639,8 @@ Public material about PRoot or CARE (`essay `_) during TRUST 2014 -* presentation "`An Introduction to the CARE tool - `_" +* presentation "`An Introduction to the CARE tool (dead link) + <#>`_" during HiPEAC CSW 2013 * presentation and essay "`PRoot: a Step Forward for QEMU User-Mode @@ -657,7 +649,7 @@ Public material about PRoot or CARE QUF'11 * tutorial "`How to install nix in home (on another distribution) - `_" + `_" Companies using PRoot or CARE internally @@ -680,7 +672,7 @@ bindfs(1), fakeroot(1), fakechroot(1) Colophon ======== -Visit http://proot.me for help, bug reports, suggestions, patches, ... +Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ... Copyright (C) 2015 STMicroelectronics, licensed under GPL v2 or later. :: diff --git a/src/tracee/event.c b/src/tracee/event.c index b1de185..d310969 100644 --- a/src/tracee/event.c +++ b/src/tracee/event.c @@ -242,8 +242,7 @@ static void check_architecture(Tracee *tracee) return; note(tracee, INFO, USER, - "Get a 64-bit version that supports 32-bit binaries here: " - "http://static.proot.me/proot-x86_64"); + "A 64-bit version that supports 32-bit binaries is required"); } /**