diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85d6bae9..b56bb1bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,13 +21,16 @@ check: dist: stage: dist script: - - LDFLAGS="${LDFLAGS} -static" make -C src proot GIT=false + - LDFLAGS="${LDFLAGS} -static" make -C src proot care GIT=false after_script: - mkdir -p dist - cp src/proot dist/ + - cp src/care dist/ - cd dist - sha256sum ./proot > proot.sha256sum + - sha256sum ./care > care.sha256sum - md5sum ./proot > proot.md5sum + - md5sum ./care > care.md5sum artifacts: paths: - dist diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 86642b0d..b735753a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,7 +11,7 @@ Unreleased Please see `Unreleased Changes`_ for more information. -5.2.0-alpha - 2020-04-14 +5.2.0 - 2021-07-21 ------------------------ Added @@ -100,6 +100,6 @@ Fixed - Non-executable stack for binaries. -.. _Unreleased Changes: https://github.com/proot-me/proot/compare/v5.2.0-alpha...master +.. _Unreleased Changes: https://github.com/proot-me/proot/compare/v5.2.0...master .. _Keep a Changelog: https://keepachangelog.com/en/1.0.0 .. _Semantic Versioning: https://semver.org/spec/v2.0.0.html diff --git a/doc/care/manual.rst b/doc/care/manual.rst index b8c82563..7a3fd869 100644 --- a/doc/care/manual.rst +++ b/doc/care/manual.rst @@ -6,8 +6,8 @@ Comprehensive Archiver for Reproducible Execution ------------------------------------------------- -:Date: 2014-09-15 -:Version: 2.2 +:Date: 2021-07-21 +:Version: 2.2.1 :Manual section: 1 @@ -43,9 +43,9 @@ That means it is possible to alter explicitly the reproduced executions by changing content of the saved file-system, or by replaying different external events. -.. _umockdev: https://github.com/martinpitt/umockdev/ +.. _umockdev: https://github.com/martinpitt/umockdev -.. _artifact evaluation: http://www.artifact-eval.org/ +.. _artifact evaluation: http://www.artifact-eval.org Privacy ------- @@ -436,7 +436,7 @@ Downloads CARE is heavily based on PRoot_, that's why they are both hosted in the same repository: https://github.com/proot-me/proot. Previous CARE releases were packaged at https://github.com/proot-me/proot-static-build/releases, however, that repository has since been archived. The latest builds can be found under the job artifacts for the `GitLab CI/CD Pipelines `_ for each commit. The following commands can be used to download the latest x86_64 binary for convenience:: - curl -LO https://proot.gitlab.io/care/bin/care + curl -LO https://proot.gitlab.io/proot/bin/care chmod +x ./care care --version @@ -445,8 +445,8 @@ the same repository: https://github.com/proot-me/proot. Previous CARE releases w Colophon ======== -Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ... -Copyright (C) 2020 PRoot Developers, licensed under GPL v2 or later. +Visit https://proot-me.github.io/care for help, bug reports, suggestions, patches, ... +Copyright (C) 2021 PRoot Developers, licensed under GPL v2 or later. :: diff --git a/doc/proot/manual.rst b/doc/proot/manual.rst index 90bf0006..cc5337ee 100644 --- a/doc/proot/manual.rst +++ b/doc/proot/manual.rst @@ -6,8 +6,8 @@ ``chroot``, ``mount --bind``, and ``binfmt_misc`` without privilege/setup ------------------------------------------------------------------------- -:Date: 2020-04-14 -:Version: 5.2.0-alpha +:Date: 2021-07-21 +:Version: 5.2.0 :Manual section: 1 @@ -671,7 +671,7 @@ Colophon ======== Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ... -Copyright (C) 2020 PRoot Developers, licensed under GPL v2 or later. +Copyright (C) 2021 PRoot Developers, licensed under GPL v2 or later. :: diff --git a/src/cli/care.h b/src/cli/care.h index b8db47c6..69f3645a 100644 --- a/src/cli/care.h +++ b/src/cli/care.h @@ -73,7 +73,7 @@ static Cli care_cli = { .subtitle = "Comprehensive Archiver for Reproducible Execution", .synopsis = "care [option] ... command", .colophon = "Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ...\n\ -Copyright (C) 2020 PRoot Developers, licensed under GPL v2 or later.", +Copyright (C) 2021 PRoot Developers, licensed under GPL v2 or later.", .logo = "\ _____ ____ _____ ____\n\ / __/ __ | __ \\ __|\n\ diff --git a/src/cli/proot.h b/src/cli/proot.h index 126d06d2..d10aae2c 100644 --- a/src/cli/proot.h +++ b/src/cli/proot.h @@ -77,7 +77,7 @@ static Cli proot_cli = { .subtitle = "chroot, mount --bind, and binfmt_misc without privilege/setup", .synopsis = "proot [option] ... [command]", .colophon = "Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ...\n\ -Copyright (C) 2020 PRoot Developers, licensed under GPL v2 or later.", +Copyright (C) 2021 PRoot Developers, licensed under GPL v2 or later.", .logo = "\ _____ _____ ___\n\ | __ \\ __ \\_____ _____| |_\n\