From 8d91e18ab0235fbad0e609d5d9fbc9e3a0fdf53b Mon Sep 17 00:00:00 2001 From: Oscar Lai Date: Sun, 10 Nov 2019 02:22:42 +1100 Subject: [PATCH 1/6] fixed typos in --help message --- bin/junest | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/junest b/bin/junest index 381864b..8ea3b19 100755 --- a/bin/junest +++ b/bin/junest @@ -40,23 +40,23 @@ usage() { echo echo -e " n[s] Access via Linux Namespaces using GRoot (Default action)" echo -e " -b, --backend-args Arguments for GRoot backend program" - echo -e " ($CMD groot -p \"--help\" to check out the GRoot options)" + echo -e " ($CMD groot -b \"--help\" to check out the GRoot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " p[root] Access via PRoot" echo -e " -f, --fakeroot Run $NAME with fakeroot privileges" echo -e " -b, --backend-args Arguments for PRoot backend program" - echo -e " ($CMD proot -p \"--help\" to check out the PRoot options)" + echo -e " ($CMD proot -b \"--help\" to check out the PRoot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " g[root] Access with root privileges via GRoot" echo -e " -b, --backend-args Arguments for GRoot backend program" - echo -e " ($CMD groot -p \"--help\" to check out the GRoot options)" + echo -e " ($CMD groot -b \"--help\" to check out the GRoot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " r[oot] Access with root privileges via classic chroot" echo -e " -b, --backend-args Arguments for chroot backend program" - echo -e " ($CMD root -p \"--help\" to check out the chroot options)" + echo -e " ($CMD root -b \"--help\" to check out the chroot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " b[uild] Build a $NAME image (must run in ArchLinux)" From 82b146a57e0495f16afa06e7cad84c3e3d825eaf Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Fri, 25 Oct 2019 20:46:27 +0200 Subject: [PATCH 2/6] Add rw permission to files in image --- lib/core/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/core/build.sh b/lib/core/build.sh index 40c2181..1406ed7 100644 --- a/lib/core/build.sh +++ b/lib/core/build.sh @@ -80,6 +80,9 @@ function build_image_env(){ "pacman-key --init; pacman-key --populate archlinux; [ -e /etc/pacman.d/gnupg/S.gpg-agent ] && gpg-connect-agent -S /etc/pacman.d/gnupg/S.gpg-agent killagent /bye" sudo rm ${maindir}/root/var/cache/pacman/pkg/* + # This is needed on system with busybox tar command. + # If the file does not have write permission, the tar command to extract files fails. + sudo chmod -R u+rw ${maindir}/root/etc/ca-certificates/extracted/cadir mkdir -p ${maindir}/output builtin cd ${maindir}/output From 2e8f5905c7a3278eedfea237a4735817df70b959 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Fri, 25 Oct 2019 20:46:38 +0200 Subject: [PATCH 3/6] 7.0.1 --- VERSION | 2 +- lib/core/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 66ce77b..9fe9ff9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0 +7.0.1 diff --git a/lib/core/build.sh b/lib/core/build.sh index 1406ed7..faf7f08 100644 --- a/lib/core/build.sh +++ b/lib/core/build.sh @@ -82,7 +82,7 @@ function build_image_env(){ sudo rm ${maindir}/root/var/cache/pacman/pkg/* # This is needed on system with busybox tar command. # If the file does not have write permission, the tar command to extract files fails. - sudo chmod -R u+rw ${maindir}/root/etc/ca-certificates/extracted/cadir + sudo chmod -R u+rw ${maindir}/root/ mkdir -p ${maindir}/output builtin cd ${maindir}/output From 85aeda4ac9b7ed7cf9721ccdb01217e9c288edd9 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Sun, 17 Nov 2019 10:09:10 +0100 Subject: [PATCH 4/6] Update the check for building image --- lib/checks/check.sh | 1 + lib/core/common.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/checks/check.sh b/lib/checks/check.sh index ac34171..6c550b3 100755 --- a/lib/checks/check.sh +++ b/lib/checks/check.sh @@ -75,6 +75,7 @@ then builtin cd ${maindir} curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${aur_package}" curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/${aur_package}.install?h=${aur_package}" + gpg --recv-keys DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A /opt/makepkg/bin/makepkg -sfcd pacman --noconfirm -U ${aur_package}*.pkg.tar.xz diff --git a/lib/core/common.sh b/lib/core/common.sh index 996c24f..601e46c 100644 --- a/lib/core/common.sh +++ b/lib/core/common.sh @@ -152,7 +152,7 @@ function proot_cmd(){ elif PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${SH[@]}" "-c" ":" then warn "Warn: Proot is not properly working. Disabling SECCOMP and expect the application to run slowly in particular when it uses syscalls intensively." - warn "Try to use Linux namespace instead as it is more reliable: junest -u" + warn "Try to use Linux namespace instead as it is more reliable: junest ns" PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${@}" else die "Error: Something went wrong with proot command. Exiting" From 493b105faa1aee78a99e94190bb2c5ea554c20a9 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Sun, 17 Nov 2019 13:18:41 +0100 Subject: [PATCH 5/6] Remove socket filename for gpg agent during build check --- lib/checks/check.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/checks/check.sh b/lib/checks/check.sh index 6c550b3..9ee7505 100755 --- a/lib/checks/check.sh +++ b/lib/checks/check.sh @@ -69,17 +69,14 @@ pacman --noconfirm -Rsn ${repo_package2} if ! $SKIP_AUR_TESTS then - aur_package=aurutils + aur_package=tcptraceroute info "Checking ${aur_package} package from AUR repo..." maindir=$(mktemp -d -t ${CMD}.XXXXXXXXXX) builtin cd ${maindir} curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${aur_package}" - curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/${aur_package}.install?h=${aur_package}" - gpg --recv-keys DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A - /opt/makepkg/bin/makepkg -sfcd + /opt/makepkg/bin/makepkg -sfc --noconfirm pacman --noconfirm -U ${aur_package}*.pkg.tar.xz - aur search aur 1> /dev/null pacman --noconfirm -Rsn ${aur_package} fi From 606353047c225223ec33232594cbd63fa1072577 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Sun, 1 Dec 2019 17:10:01 +0100 Subject: [PATCH 6/6] 7.0.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9fe9ff9..a8907c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.1 +7.0.2