Merge branch 'master' into enable_freebsd_ssp

.github/workflows/changelog.yml

@@ -0,0 +1,19 @@
+on:
+  pull_request:
+
+name: Changelog check
+
+jobs:
+  changelog:
+    name: Changelog check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Changelog updated
+        uses: Zomzog/changelog-checker@v1.1.0
+        with:
+          fileName: CHANGELOG.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -5,9 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- #552 - Added CHANGELOG.md automation
+- #543 - Added environment variables to control the UID and GID in the container
+- #534 - fix image builds with update of dependencies
+- #502 - fix ci: bump openssl version in freebsd
+- #501 - x86_64-linux: lower glibc version requirement to 2.17 (compatible with centos 7) 
+- #500 - use runner setting specified in Cross.toml 
+- #498 - bump linux-image version to fix CI
+- #497 - don't set RUSTFLAGS in aarch64-musl image 
+- #492 - Add cmake to FreeBSD images
+- #489 - Add support for more hosts and simplify/unify host support checks
+- #477 - Fix Docker/Podman links in README
+- #476 - Use Rustlang mirror for Sabotage linux tarbals
 - Added support for mounting volumes.
 - Re-enabled `powerpc64-unknown-linux-gnu` image
 - Re-enabled `sparc64-unknown-linux-gnu` image
+- Bump nix dependency to `0.22.1`
 
 ## [v0.2.1] - 2020-06-30
 

Cargo.toml

@@ -15,16 +15,15 @@ atty = "0.2"
 error-chain = "0.12"
 home = "0.5"
 lazy_static = "1.0"
-libc = "0.2.18"
+libc = "0.2.101"
 rustc_version = "0.2"
-semver = "0.9"
 toml = "0.5"
 which = { version = "3.1.0", default_features = false }
 shell-escape = "0.1.4"
 serde_json = "1.0.48"
 
 [target.'cfg(not(windows))'.dependencies]
-nix = "0.15"
+nix = "0.22.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.7", features = ["winbase"] }

azure-pipelines.yml

@@ -59,8 +59,8 @@ jobs:
         i686-unknown-freebsd:            { TARGET: i686-unknown-freebsd,                    DYLIB: 1, STD: 1 }
         x86_64-unknown-freebsd:          { TARGET: x86_64-unknown-freebsd,                  DYLIB: 1, STD: 1 }
         x86_64-unknown-netbsd:           { TARGET: x86_64-unknown-netbsd,           CPP: 1, DYLIB: 1, STD: 1 }
-        sparcv9-sun-solaris:             { TARGET: sparcv9-sun-solaris,             CPP: 1, DYLIB: 1, STD: 1 }
-        x86_64-sun-solaris:              { TARGET: x86_64-sun-solaris,              CPP: 1, DYLIB: 1, STD: 1 }
+        # sparcv9-sun-solaris:             { TARGET: sparcv9-sun-solaris,             CPP: 1, DYLIB: 1, STD: 1 }
+        # x86_64-sun-solaris:              { TARGET: x86_64-sun-solaris,              CPP: 1, DYLIB: 1, STD: 1 }
         asmjs-unknown-emscripten:        { TARGET: asmjs-unknown-emscripten,                          STD: 1,                   RUN: 1 }
         # `cargo run` fails with an assertion error (https://github.com/rust-lang/cargo/issues/4689) on `wasm32-unknown-emscripten`.
         wasm32-unknown-emscripten:       { TARGET: wasm32-unknown-emscripten,                         STD: 1 }

build.rs

@@ -1,7 +1,7 @@
 use std::env;
 use std::error::Error;
-use std::fs::{read_dir, File};
-use std::io::Write;
+use std::fs::File;
+use std::io::{self, Write};
 use std::path::PathBuf;
 use std::process::Command;
 
@@ -63,15 +63,21 @@ fn docker_images() -> String {
     let mut images = String::from("[");
     let mut dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
     dir.push("docker");
-    for entry in read_dir(dir).unwrap() {
-        let path = entry.unwrap().path();
+
+    let dir = dir.read_dir().unwrap();
+    let mut paths = dir.collect::<io::Result<Vec<_>>>().unwrap();
+    paths.sort_by_key(|e| e.path());
+
+    for entry in paths {
+        let path = entry.path();
         let file_name = path.file_name().unwrap().to_str().unwrap();
         if file_name.starts_with("Dockerfile.") {
             images.push_str("\"");
             images.push_str(&file_name.replacen("Dockerfile.", "", 1));
             images.push_str("\", ");
         }
     }
+
     images.push_str("]");
     images
 }

docker/android-system.sh

@@ -16,6 +16,7 @@ main() {
         git
         g++-multilib
         make
+        openssh-client
         python
         python3
     )

docker/freebsd-extras.sh

@@ -6,8 +6,8 @@ set -euo pipefail
 main() {
     local arch="${1}"
 
-    local sqlite_ver=3.34.0,1 \
-          openssl_ver=1.1.1i,1 \
+    local sqlite_ver=3.35.5_3,1 \
+          openssl_ver=1.1.1k_1,1 \
           target="${arch}-unknown-freebsd12"
 
     local td
@@ -41,7 +41,6 @@ main() {
     cp "${td}/openssl/usr/local/lib"/lib{crypto,ssl}.a "${destdir}/lib"
     cp "${td}/openssl/usr/local/lib"/lib{crypto,ssl}.so.11 "${destdir}/lib"
     cp "${td}/openssl/usr/local/lib"/lib{crypto,ssl}.so "${destdir}/lib"
-    cp "${td}/sqlite/usr/local/lib/libsqlite3.a" "${destdir}/lib"
     cp "${td}/sqlite/usr/local/lib/libsqlite3.so.0.8.6" "${destdir}/lib"
     cp "${td}/sqlite/usr/local/lib/libsqlite3.so" "${destdir}/lib"
     cp "${td}/sqlite/usr/local/lib/libsqlite3.so.0" "${destdir}/lib"

docker/linux-image.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 main() {
     # arch in the rust target
     local arch="${1}" \
-          kversion=4.19.0-11
+          kversion=4.19.0-14
 
     local debsource="deb http://http.debian.net/debian/ buster main"
     debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"