Merge remote-tracking branch 'upstream/master' into cow

* upstream/master: Use LC_ALL instead of LANG fix: update URLs to proot-me.github.io add: gitignore Fix use of size
proot-me · Jun 18, 2017 · 5342c87 · 5342c87
2 parents 71c411f + cffb379
commit 5342c87
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 23 deletions.
diff --git a/.gitignore 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
@@ -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
@@ -15,7 +15,7 @@
   <graph edgedefault="directed" id="G">
     <data key="d7"/>
     <node id="n0">
-      <data key="d4"><![CDATA[http://reproducible.io]]></data>
+      <data key="d4"><![CDATA[https://proot-me.github.io]]></data>
       <data key="d6">
         <y:ShapeNode>
           <y:Geometry height="30.0" width="49.53125" x="-24.765625" y="-15.0"/>
@@ -251,7 +251,7 @@
     </node>
     <node id="n13">
       <data key="d4"/>
-      <data key="d5"><![CDATA[About 100 domains references http://reproducible.io according to Google]]></data>
+      <data key="d5"><![CDATA[About 100 domains references https://proot-me.github.io according to Google]]></data>
       <data key="d6">
         <y:ShapeNode>
           <y:Geometry height="30.0" width="127.6953125" x="-413.5669895377619" y="-0.9861523926047937"/>

diff --git a/doc/ecosystem/care-ecosystem.svg b/doc/ecosystem/care-ecosystem.svg
diff --git a/doc/ecosystem/proot-ecosystem.graphml b/doc/ecosystem/proot-ecosystem.graphml
@@ -230,7 +230,7 @@
       </data>
     </node>
     <node id="n12">
-      <data key="d4"><![CDATA[http://reproducible.io]]></data>
+      <data key="d4"><![CDATA[https://proot-me.github.io]]></data>
       <data key="d6">
         <y:ShapeNode>
           <y:Geometry height="30.0" width="49.53125" x="-411.72348342029915" y="160.7515741231802"/>

diff --git a/doc/ecosystem/proot-ecosystem.svg b/doc/ecosystem/proot-ecosystem.svg
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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");