diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c55042b9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.d +*.o +src/.check_process_vm.res +src/.check_seccomp_filter.res +src/build.h +src/care +src/loader/loader +src/loader/loader-m32 +src/proot + diff --git a/doc/care/manual.txt b/doc/care/manual.txt index 25e4beda..3b483aa9 100644 --- a/doc/care/manual.txt +++ b/doc/care/manual.txt @@ -434,15 +434,15 @@ Downloads ========= CARE is heavily based on PRoot_, that's why they are both hosted in -the same repository: http://github.proot.me. Since CARE is supposed +the same repository: https://github.com/proot-me. Since CARE is supposed to work on any Linux systems, it is recommended to use following highly compatible static binaries: -* for x86_64: http://static.reproducible.io/care-x86_64 +* for x86_64: https://github.com/proot-me/proot-static-build/raw/master/static/care-x86_64 -* for x86: http://static.reproducible.io/care-x86 +* for x86: https://github.com/proot-me/proot-static-build/raw/master/static/care-x86 -* for ARM: http://static.reproducible.io/care-arm +* for ARM: https://github.com/proot-me/proot-static-build/raw/master/static/care-arm * other architectures: on demand. @@ -451,7 +451,7 @@ highly compatible static binaries: Colophon ======== -Visit http://reproducible.io for help, bug reports, suggestions, patches, ... +Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ... Copyright (C) 2014 STMicroelectronics, licensed under GPL v2 or later. :: diff --git a/doc/ecosystem/care-ecosystem.graphml b/doc/ecosystem/care-ecosystem.graphml index 1c9058f1..8f15711a 100644 --- a/doc/ecosystem/care-ecosystem.graphml +++ b/doc/ecosystem/care-ecosystem.graphml @@ -15,7 +15,7 @@ - + @@ -251,7 +251,7 @@ - + diff --git a/doc/ecosystem/care-ecosystem.svg b/doc/ecosystem/care-ecosystem.svg index f3fb0341..ee222f75 100644 --- a/doc/ecosystem/care-ecosystem.svg +++ b/doc/ecosystem/care-ecosystem.svg @@ -78,7 +78,7 @@ - + @@ -400,7 +400,7 @@ - About 100 domains references http://reproducible.io according to Google + About 100 domains references https://proot-me.github.io according to Google diff --git a/doc/ecosystem/proot-ecosystem.graphml b/doc/ecosystem/proot-ecosystem.graphml index 1d4d6ae3..ea5f269b 100644 --- a/doc/ecosystem/proot-ecosystem.graphml +++ b/doc/ecosystem/proot-ecosystem.graphml @@ -230,7 +230,7 @@ - + diff --git a/doc/ecosystem/proot-ecosystem.svg b/doc/ecosystem/proot-ecosystem.svg index 25bf2981..26be102f 100644 --- a/doc/ecosystem/proot-ecosystem.svg +++ b/doc/ecosystem/proot-ecosystem.svg @@ -242,7 +242,7 @@ - + diff --git a/doc/proot/changelog.txt b/doc/proot/changelog.txt index cb86311e..b0ea3774 100644 --- a/doc/proot/changelog.txt +++ b/doc/proot/changelog.txt @@ -318,7 +318,7 @@ Release v3.2 This release was mostly driven by the requirements of "CARE", a new project based on PRoot that will be released publicly soon on -http://reproducible.io. For information, "CARE" is the short for +https://proot-me.github.io. For information, "CARE" is the short for "Comprehensive Archiver for Reproducible Execution". Highlights diff --git a/doc/proot/manual.txt b/doc/proot/manual.txt index 53938c58..02f64f0b 100644 --- a/doc/proot/manual.txt +++ b/doc/proot/manual.txt @@ -59,7 +59,7 @@ requests before sending them to the host kernel. This means that guest programs can use host resources (devices, network, ...) just as if they were "normal" host programs. -.. _CARE: http://reproducible.io +.. _CARE: https://proot-me.github.io Options diff --git a/doc/proot/rpm-spec b/doc/proot/rpm-spec index 59d87b0a..f3730cdb 100644 --- a/doc/proot/rpm-spec +++ b/doc/proot/rpm-spec @@ -381,7 +381,7 @@ Release v3.2 This release was mostly driven by the requirements of "CARE", a new project based on PRoot that will be released publicly soon on -http://reproducible.io. For information, "CARE" is the short for +https://proot-me.github.io. For information, "CARE" is the short for "Comprehensive Archiver for Reproducible Execution". Highlights diff --git a/src/GNUmakefile b/src/GNUmakefile index 5bd94d19..ce001030 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -142,9 +142,9 @@ LINK = $($(quiet)LD) -o $@ $^ $(LDFLAGS) OBJIFY = $($(quiet)GEN) \ $(OBJCOPY) \ --input binary \ - --output `env LANG=C $(OBJDUMP) -f cli/cli.o | \ + --output `env LC_ALL=C $(OBJDUMP) -f cli/cli.o | \ grep 'file format' | awk '{print $$4}'` \ - --binary-architecture `env LANG=C $(OBJDUMP) -f cli/cli.o | \ + --binary-architecture `env LC_ALL=C $(OBJDUMP) -f cli/cli.o | \ grep architecture | cut -f 1 -d , | awk '{print $$2}'` \ $< $@ diff --git a/src/cli/care.c b/src/cli/care.c index 8ece4bcd..04374511 100644 --- a/src/cli/care.c +++ b/src/cli/care.c @@ -149,7 +149,7 @@ static int handle_option_h(Tracee *tracee UNUSED, const Cli *cli UNUSED, const c if (size != 0) write(1, &_binary_manual_start, size); else - printf("No manual found, please visit http://reproducible.io instead.\n"); + printf("No manual found, please visit https://proot-me.github.io instead.\n"); exit_failure = false; return -1; diff --git a/src/cli/care.h b/src/cli/care.h index 6d5b0173..fb46b1f4 100644 --- a/src/cli/care.h +++ b/src/cli/care.h @@ -72,7 +72,7 @@ static Cli care_cli = { .name = "care", .subtitle = "Comprehensive Archiver for Reproducible Execution", .synopsis = "care [option] ... command", - .colophon = "Visit http://reproducible.io for help, bug reports, suggestions, patches, ...\n\ + .colophon = "Visit https://proot-me.github.io for help, bug reports, suggestions, patches, ...\n\ Copyright (C) 2014 STMicroelectronics, licensed under GPL v2 or later.", .logo = "\ _____ ____ _____ ____\n\ diff --git a/src/execve/enter.c b/src/execve/enter.c index 8f22d9cc..4c163a15 100644 --- a/src/execve/enter.c +++ b/src/execve/enter.c @@ -454,10 +454,10 @@ static int expand_runner(Tracee* tracee, char host_path[PATH_MAX], char user_pat } extern unsigned char _binary_loader_exe_start; -extern unsigned char _binary_loader_exe_size; +extern unsigned char _binary_loader_exe_end; extern unsigned char WEAK _binary_loader_m32_exe_start; -extern unsigned char WEAK _binary_loader_m32_exe_size; +extern unsigned char WEAK _binary_loader_m32_exe_end; /** * Extract the built-in loader. This function returns NULL if an @@ -483,11 +483,11 @@ static char *extract_loader(const Tracee *tracee, bool wants_32bit_version) if (wants_32bit_version) { start = (void *) &_binary_loader_m32_exe_start; - size = (size_t) &_binary_loader_m32_exe_size; + size = (size_t)(&_binary_loader_m32_exe_end-&_binary_loader_m32_exe_start); } else { start = (void *) &_binary_loader_exe_start; - size = (size_t) &_binary_loader_exe_size; + size = (size_t) (&_binary_loader_exe_end-&_binary_loader_exe_start); } status2 = write(fd, start, size); diff --git a/src/extension/care/final.c b/src/extension/care/final.c index 0a5f9fdb..7c1af1e0 100644 --- a/src/extension/care/final.c +++ b/src/extension/care/final.c @@ -320,7 +320,7 @@ static int archive_readme_txt(const Care *care) return -1; } - N("This archive was created with CARE: http://reproducible.io. It contains:"); + N("This archive was created with CARE: https://proot-me.github.io. It contains:"); N(""); N("re-execute.sh"); N(" start the re-execution of the initial command as originally");