Merge pull request #13 from sailfishos/1.52.1

[rust] Initial packaging of rust 1.52.1. JB#54225 JOLLA-139

Author: xfade

0001-Use-a-non-existent-test-path-instead-of-clobbering-d.patch

@@ -1,7 +1,7 @@
-From f131514903bb02f5f9f1d312aea19e954ab1ffee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= <tomi.leppanen@jolla.com>
-Date: Fri, 26 Jun 2020 11:58:19 +0300
-Subject: [PATCH 3/4] Disable statx for all builds. JB#50106
+From 0ea195274d580ada6af1f9687647564d9a06ecd5 Mon Sep 17 00:00:00 2001
+From: Niels Breet <niels.breet@jolla.com>
+Date: Tue, 11 May 2021 13:03:55 +0300
+Subject: [PATCH] Disable statx for all builds. JB#50106
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,13 +15,13 @@ that gracefully without issues thanks to rust's type system.
 Signed-off-by: Tomi Leppänen <tomi.leppanen@jolla.com
 Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
 ---
- src/libstd/sys/unix/fs.rs | 15 ++-------------
+ library/std/src/sys/unix/fs.rs | 15 ++-------------
  1 file changed, 2 insertions(+), 13 deletions(-)
 
-diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
-index a233aa47dff..45fb192fc8c 100644
---- a/src/libstd/sys/unix/fs.rs
-+++ b/src/libstd/sys/unix/fs.rs
+diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
+index d1b0ad9..f5ddc9b 100644
+--- a/library/std/src/sys/unix/fs.rs
++++ b/library/std/src/sys/unix/fs.rs
 @@ -58,20 +58,9 @@ pub struct File(FileDesc);
  // https://github.com/rust-lang/rust/pull/67774
  macro_rules! cfg_has_statx {
@@ -46,5 +46,5 @@ index a233aa47dff..45fb192fc8c 100644
 
  cfg_has_statx! {{
 -- 
-2.20.1
+1.9.1
 

0003-Disable-statx-for-all-builds.-JB-50106.patch

@@ -1,7 +1,7 @@
-From ee426fcbb8e03d1a7834c73225a65697b3dd4a1a Mon Sep 17 00:00:00 2001
-From: David Greaves <david.greaves@jolla.com>
-Date: Mon, 5 Oct 2020 10:14:39 +0100
-Subject: [PATCH 4/4] Scratchbox2 needs to be able to tell rustc the default
+From ac226bbc018e11311394126fe580763c5bc77a2c Mon Sep 17 00:00:00 2001
+From: Niels Breet <niels.breet@jolla.com>
+Date: Tue, 11 May 2021 13:10:49 +0300
+Subject: [PATCH] Scratchbox2 needs to be able to tell rustc the default
  target.
 
 Currently this defaults to the target rust was built with. Rather than
@@ -10,29 +10,29 @@ allows the same rustc binary to be used for all builds.
 
 Signed-off-by: David Greaves <david.greaves@jolla.com>
 ---
- src/librustc_session/config.rs | 9 ++++++++-
+ compiler/rustc_session/src/config.rs | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/src/librustc_session/config.rs b/src/librustc_session/config.rs
-index 2513cfa73e5..529d836dc82 100644
---- a/src/librustc_session/config.rs
-+++ b/src/librustc_session/config.rs
-@@ -1363,7 +1363,14 @@ fn parse_target_triple(matches: &getopts::Matches, error_format: ErrorOutputType
+diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
+index 85448b7..ec51c50 100644
+--- a/compiler/rustc_session/src/config.rs
++++ b/compiler/rustc_session/src/config.rs
+@@ -1537,7 +1537,14 @@ fn parse_target_triple(matches: &getopts::Matches, error_format: ErrorOutputType
              })
          }
          Some(target) => TargetTriple::TargetTriple(target),
 -        _ => TargetTriple::from_triple(host_triple()),
-+	// In SFOS we use SB2 and need to tell rust what the
++        // In SFOS we use SB2 and need to tell rust what the
 +        // 'default' target is. If the SB2_RUST_TARGET_TRIPLE
 +        // environment variable is set then it is used. Otherwise
 +        // the fallback is the host_triple as usual
 +        _ => match std::env::var("SB2_RUST_TARGET_TRIPLE") {
 +            Ok(tgt) => TargetTriple::TargetTriple(tgt),
 +            Err(_) => TargetTriple::from_triple(host_triple()),
-+	}
++        }
      }
  }
 
 -- 
-2.20.1
+1.9.1
 

0004-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch

@@ -34,21 +34,25 @@ needed to support the SHIM functionality
 
 Signed-off-by: David Greaves <david.greaves@jolla.com>
 ---
- src/libstd/sys/unix/process/process_common.rs |  40 ++++-
- src/libstd/sys/unix/process/process_unix.rs   | 138 ++++++++++++++++--
+ library/std/src/sys/unix/process/process_common.rs |  40 ++++-
+ library/std/src/sys/unix/process/process_unix.rs   | 138 ++++++++++++++++--
  2 files changed, 160 insertions(+), 18 deletions(-)
 
-diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs
+diff --git a/library/std/src/sys/unix/process/process_common.rs b/library/std/src/sys/unix/process/process_common.rs
 index 859da691ad2..ee5e776efac 100644
---- a/src/libstd/sys/unix/process/process_common.rs
-+++ b/src/libstd/sys/unix/process/process_common.rs
-@@ -71,10 +71,16 @@ pub struct Command {
-     // located. Whenever we add a key we update it in place if it's already
-     // present, and whenever we remove a key we update the locations of all
-     // other keys.
+--- a/library/std/src/sys/unix/process/process_common.rs
++++ b/library/std/src/sys/unix/process/process_common.rs
+@@ -60,7 +60,7 @@
+ ////////////////////////////////////////////////////////////////////////////////
+
+ pub struct Command {
 -    program: CString,
 +    pub(crate) program: CString,
      args: Vec<CString>,
+     /// Exactly what will be passed to `execvp`.
+     ///
+@@ -69,6 +69,13 @@
+     /// `args` to properly update this as well.
      argv: Argv,
      env: CommandEnv,
 +    pub(crate) execvp: Option<ExecvpFn>,
@@ -57,24 +61,26 @@ index 859da691ad2..ee5e776efac 100644
 +    pub(crate) chdir: Option<ChdirFn>,
 +    pub(crate) setuid: Option<SetuidFn>,
 +    pub(crate) setgid: Option<SetgidFn>,
- 
++    pub(crate) setgroups: Option<SetgroupsFn>,
+
      cwd: Option<CString>,
      uid: Option<uid_t>,
-@@ -86,6 +92,13 @@ pub struct Command {
+@@ -81,6 +88,14 @@
      stderr: Option<Stdio>,
  }
- 
+
 +pub(crate) type ExecvpFn = fn(*const c_char, *const *const c_char)->c_int;
 +pub(crate) type Dup2Fn = fn(c_int, c_int)->c_int;
 +pub(crate) type CloseFn = fn(c_int)->c_int;
 +pub(crate) type ChdirFn = fn(*const c_char)->c_int;
 +pub(crate) type SetuidFn = fn(uid_t)->c_int;
 +pub(crate) type SetgidFn = fn(gid_t)->c_int;
-+    
- // Create a new type for argv, so that we can make it `Send`
++pub(crate) type SetgroupsFn = fn(libc::size_t, *const gid_t)->c_int;
++
+ // Create a new type for argv, so that we can make it `Send` and `Sync`
  struct Argv(Vec<*const c_char>);
- 
-@@ -130,15 +143,22 @@ impl Command {
+
+@@ -130,15 +143,23 @@ impl Command {
      pub fn new(program: &OsStr) -> Command {
          let mut saw_nul = false;
          let program = os2c(program, &mut saw_nul);
@@ -93,6 +99,7 @@ index 859da691ad2..ee5e776efac 100644
 +	    chdir: None,
 +	    setuid: None,
 +	    setgid: None,
++	    setgroups: None,
              cwd: None,
              uid: None,
              gid: None,
@@ -118,14 +125,14 @@ index 859da691ad2..ee5e776efac 100644
      pub fn set_arg_0(&mut self, arg: &OsStr) {
          // Set a new arg0
          let arg = os2c(arg, &mut self.saw_nul);
-diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs
+diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs
 index f389c60615f..d5763b8aa1a 100644
---- a/src/libstd/sys/unix/process/process_unix.rs
-+++ b/src/libstd/sys/unix/process/process_unix.rs
-@@ -5,7 +5,10 @@ use crate::sys;
- use crate::sys::cvt;
- use crate::sys::process::process_common::*;
+--- a/library/std/src/sys/unix/process/process_unix.rs
++++ b/library/std/src/sys/unix/process/process_unix.rs
+@@ -5,7 +5,10 @@ #[cfg(target_os = "vxworks")]
+ use libc::RTP_ID as pid_t;
 
+ #[cfg(not(target_os = "vxworks"))]
 -use libc::{c_int, gid_t, pid_t, uid_t};
 +use libc::{c_int, gid_t, pid_t, uid_t, dlsym, c_char};
 +use crate::intrinsics::transmute;
@@ -134,7 +141,7 @@ index f389c60615f..d5763b8aa1a 100644
 
  ////////////////////////////////////////////////////////////////////////////////
  // Command
-@@ -33,6 +36,70 @@ impl Command {
+@@ -35,6 +41,74 @@ impl Command {
 
          let (input, output) = sys::pipe::anon_pipe()?;
 
@@ -196,6 +203,10 @@ index f389c60615f..d5763b8aa1a 100644
 +		      "setgid\0".as_ptr() as *const c_char) as *const ();
 +		self.setgid = Some(
 +		    transmute::<*const (), SetgidFn>(real_setgid_p) );
++		let real_setgroups_p = dlsym(libc_h,
++		      "setgroups\0".as_ptr() as *const c_char) as *const ();
++		self.setgroups = Some(
++		    transmute::<*const (), SetgroupsFn>(real_setgroups_p) );
 +	    },
 +	    None => {}
 +	};
@@ -205,21 +216,16 @@ index f389c60615f..d5763b8aa1a 100644
          // Whatever happens after the fork is almost for sure going to touch or
          // look at the environment in one way or another (PATH in `execvp` or
          // accessing the `environ` pointer ourselves). Make sure no other thread
-@@ -45,11 +112,11 @@ impl Command {
-             let _env_lock = sys::os::env_lock();
-             cvt(libc::fork())?
-         };
--
-+	
-         let pid = unsafe {
+@@ -54,7 +125,7 @@
              match result {
                  0 => {
+                     mem::forget(env_lock);
 -                    drop(input);
 +                    self.unwrap_drop(input);
                      let Err(err) = self.do_exec(theirs, envp.as_ref());
                      let errno = err.raw_os_error().unwrap_or(libc::EINVAL) as u32;
-                     let bytes = [
-@@ -135,7 +202,37 @@ impl Command {
+                     let errno = errno.to_be_bytes();
+@@ -135,7 +202,43 @@ impl Command {
              Err(e) => e,
          }
      }
@@ -254,11 +260,17 @@ index f389c60615f..d5763b8aa1a 100644
 +	    Some(real_setgid) => { (real_setgid)(gid) },
 +	    None => { unsafe { libc::setgid(gid) } }
 +	}
++    }
++    fn unwrap_setgroups(&self, ngroups: libc::size_t, gid: *const gid_t) -> c_int {
++	match self.setgroups {
++	    Some(real_setgroups) => { (real_setgroups)(ngroups, gid) },
++	    None => { unsafe { libc::setgroups(ngroups, gid) } }
++	}
 +    }
      // And at this point we've reached a special time in the life of the
      // child. The child must now be considered hamstrung and unable to
      // do anything other than syscalls really. Consider the following
-@@ -174,19 +271,19 @@ impl Command {
+@@ -174,24 +277,24 @@ impl Command {
          use crate::sys::{self, cvt_r};
 
          if let Some(fd) = stdio.stdin.fd() {
@@ -276,16 +288,25 @@ index f389c60615f..d5763b8aa1a 100644
 
          #[cfg(not(target_os = "l4re"))]
          {
+             if let Some(_g) = self.get_groups() {
+                 //FIXME: Redox kernel does not support setgroups yet
+                 #[cfg(not(target_os = "redox"))]
+-                cvt(libc::setgroups(_g.len().try_into().unwrap(), _g.as_ptr()))?;
++                cvt(self.unwrap_setgroups(_g.len().try_into().unwrap(), _g.as_ptr()))?;
+             }
              if let Some(u) = self.get_gid() {
 -                cvt(libc::setgid(u as gid_t))?;
 +                cvt(self.unwrap_setgid(u as gid_t))?;
              }
              if let Some(u) = self.get_uid() {
                  // When dropping privileges from root, the `setgroups` call
-@@ -199,11 +296,11 @@ impl Command {
+@@ -199,13 +296,13 @@ impl Command {
                  //FIXME: Redox kernel does not support setgroups yet
                  #[cfg(not(target_os = "redox"))]
-                 let _ = libc::setgroups(0, ptr::null());
+                 if libc::getuid() == 0 && self.get_groups().is_none() {
+-                    cvt(libc::setgroups(0, ptr::null()))?;
++                    cvt(self.unwrap_setgroups(0, ptr::null()))?;
+                 }
 -                cvt(libc::setuid(u as uid_t))?;
 +                cvt(self.unwrap_setuid(u as uid_t))?;
              }
@@ -301,15 +322,15 @@ index f389c60615f..d5763b8aa1a 100644
              *sys::os::environ() = envp.as_ptr();
          }
 -
--        libc::execvp(self.get_program().as_ptr(), self.get_argv().as_ptr());
+-        libc::execvp(self.get_program_cstr().as_ptr(), self.get_argv().as_ptr());
 -        Err(io::Error::last_os_error())
 +	match self.execvp {
 +	    Some(real_execvp) => {
-+		(real_execvp)(self.get_program().as_ptr(),
++		(real_execvp)(self.get_program_cstr().as_ptr(),
 +			      self.get_argv().as_ptr())
 +	    },
 +	    None => {
-+		libc::execvp(self.get_program().as_ptr(),
++		libc::execvp(self.get_program_cstr().as_ptr(),
 +			     self.get_argv().as_ptr())
 +	    }
 +	};
@@ -325,23 +346,20 @@ index f389c60615f..d5763b8aa1a 100644
          Ok(None)
      }
 
-@@ -283,10 +389,16 @@ impl Command {
+@@ -283,11 +389,14 @@ impl Command {
          use crate::mem::MaybeUninit;
-         use crate::sys;
+         use crate::sys::{self, cvt_nz};
 
-+	let skip_spawnvp :bool = match getenv(&OsString::from("SB2_RUST_NO_SPAWNVP"))? {
-+	    Some(_var) => true,
-+	    None => false
-+	};
++	let skip_spawnvp: bool = getenv(&OsString::from("SB2_RUST_NO_SPAWNVP"))?.is_some();
 +
          if self.get_gid().is_some()
              || self.get_uid().is_some()
-             || self.env_saw_path()
+             || (self.env_saw_path() && !self.program_is_path())
              || !self.get_closures().is_empty()
+             || self.get_groups().is_some()
 +	    || skip_spawnvp
          {
              return Ok(None);
          }
 -- 
 2.20.1
-

0006-Provide-ENV-controls-to-bypass-some-sb2-calls-betwee.patch

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c91f0431c8137a4e98e097ab47b49846820531aafb6e9c249b71b770771832e9
+size 353110704