From owner-dev-commits-ports-all@freebsd.org Fri Apr 16 09:30:30 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8511D5EB11C; Fri, 16 Apr 2021 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FM9tG3MPJz3knH; Fri, 16 Apr 2021 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5784622710; Fri, 16 Apr 2021 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13G9UUAJ073600; Fri, 16 Apr 2021 09:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13G9UUNi073599; Fri, 16 Apr 2021 09:30:30 GMT (envelope-from git) Date: Fri, 16 Apr 2021 09:30:30 GMT Message-Id: <202104160930.13G9UUNi073599@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 78d8f6ea6e10 - main - sysutils/jail_exporter: fix build on ARM / POWER MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78d8f6ea6e108276959181649b5d074cb37e4e74 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 09:30:30 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=78d8f6ea6e108276959181649b5d074cb37e4e74 commit 78d8f6ea6e108276959181649b5d074cb37e4e74 Author: Piotr Kubaj AuthorDate: 2021-04-16 09:30:27 +0000 Commit: Piotr Kubaj CommitDate: 2021-04-16 09:30:27 +0000 sysutils/jail_exporter: fix build on ARM / POWER Merge upstream commits: https://github.com/fubarnetes/libjail-rs/commit/3e65e8a490e5760ab977341a0a07aca349e9740c https://github.com/fubarnetes/rctl/commit/0442527eb98cdb66df810f6fb1ed95be1fc1184f --- .../patch-cargo-crates_jail-0.1.1_src_param.rs | 29 +++++++++++++++++ .../files/patch-cargo-crates_jail-0.1.1_src_sys.rs | 38 ++++++++++++++++++++++ .../files/patch-cargo-crates_rctl-0.1.0_src_lib.rs | 20 ++++++++++++ 3 files changed, 87 insertions(+) diff --git a/sysutils/jail_exporter/files/patch-cargo-crates_jail-0.1.1_src_param.rs b/sysutils/jail_exporter/files/patch-cargo-crates_jail-0.1.1_src_param.rs new file mode 100644 index 000000000000..0c523dbd5bca --- /dev/null +++ b/sysutils/jail_exporter/files/patch-cargo-crates_jail-0.1.1_src_param.rs @@ -0,0 +1,29 @@ +--- cargo-crates/jail-0.1.1/src/param.rs.orig 2021-04-16 09:13:39 UTC ++++ cargo-crates/jail-0.1.1/src/param.rs +@@ -640,7 +640,7 @@ pub fn get(jid: i32, name: &str) -> Result Result Ok(Value::S32(LittleEndian::read_i32(&value))), + Type::U32 => Ok(Value::U32(LittleEndian::read_u32(&value))), + Type::String => Ok(Value::String({ +- unsafe { CStr::from_ptr(value.as_ptr() as *mut i8) } ++ unsafe { CStr::from_ptr(value.as_ptr() as *mut libc::c_char) } + .to_string_lossy() + .into_owned() + })), +@@ -807,7 +807,7 @@ pub fn set(jid: i32, name: &str, value: Value) -> Resu + ) + }; + +- let err = unsafe { CStr::from_ptr(errmsg.as_ptr() as *mut i8) } ++ let err = unsafe { CStr::from_ptr(errmsg.as_ptr() as *mut libc::c_char) } + .to_string_lossy() + .to_string(); + diff --git a/sysutils/jail_exporter/files/patch-cargo-crates_jail-0.1.1_src_sys.rs b/sysutils/jail_exporter/files/patch-cargo-crates_jail-0.1.1_src_sys.rs new file mode 100644 index 000000000000..7ca344440c25 --- /dev/null +++ b/sysutils/jail_exporter/files/patch-cargo-crates_jail-0.1.1_src_sys.rs @@ -0,0 +1,38 @@ +--- cargo-crates/jail-0.1.1/src/sys.rs.orig 2021-04-16 09:14:49 UTC ++++ cargo-crates/jail-0.1.1/src/sys.rs +@@ -113,7 +113,7 @@ pub fn jail_create( + ) + }; + +- let err = unsafe { CStr::from_ptr(errmsg.as_ptr() as *mut i8) } ++ let err = unsafe { CStr::from_ptr(errmsg.as_ptr() as *mut libc::c_char) } + .to_string_lossy() + .to_string(); + +@@ -171,7 +171,7 @@ pub fn jail_clearpersist(jid: i32) -> Result<(), JailE + ) + }; + +- let err = unsafe { CStr::from_ptr(errmsg.as_ptr() as *mut i8) } ++ let err = unsafe { CStr::from_ptr(errmsg.as_ptr() as *mut libc::c_char) } + .to_string_lossy() + .to_string(); + +@@ -213,7 +213,7 @@ pub fn jail_getid(name: &str) -> Result Result>( + + loop { + // Unsafe C call to get the jail resource usage. +- if unsafe { api(inbuf.as_ptr(), inputlen, outbuf.as_mut_ptr(), outbuf.len()) } != 0 { ++ if unsafe { api(inbuf.as_ptr(), inputlen, outbuf.as_mut_ptr() as *mut libc::c_char, outbuf.len()) } != 0 { + let err = io::Error::last_os_error(); + + match err.raw_os_error() { +@@ -1850,7 +1850,7 @@ fn rctl_api_wrapper>( + + // If everything went well, convert the return C string in the outbuf + // back into an easily usable Rust string and return. +- break Ok(unsafe { CStr::from_ptr(outbuf.as_ptr() as *mut i8) } ++ break Ok(unsafe { CStr::from_ptr(outbuf.as_ptr() as *mut libc::c_char) } + .to_string_lossy() + .into()); + }