Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update makeself.sh #323

Merged
merged 3 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ jobs:
container: 'ubuntu:latest'
artifact: 'ubuntu'

- os: ubuntu-latest
- os: alpine-latest
container: 'alpine:latest'
artifact: 'alpine'


- os: rockylinux
container: 'rockylinux:9' # they do not have latest, but 9 will be covered for all the defaults for all latest 9 version
artifact: 'rockylinux'

- os: windows-latest
artifact: 'windows'

Expand All @@ -29,7 +33,13 @@ jobs:
run: |
apt update
apt -y install git make pbzip2 binutils bzip2 zstd gnupg


- name: Install RockyLinux packages
if: matrix.container == 'rockylinux:9'
run: |
dnf groupinstall -y "Development Tools" "RPM Development Tools"
dnf install -y zstd binutils binutils-devel gnupg2 pbzip2

- name: Install Alpine packages
if: matrix.container == 'alpine:latest'
run: apk add --no-cache bash git make libarchive-tools gnupg coreutils binutils bzip2 zstd
Expand Down
4 changes: 2 additions & 2 deletions makeself.sh
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ if test x"$ENCRYPT" = x"openssl"; then
echo "Appending to existing archive is not compatible with OpenSSL encryption." >&2
fi

ENCRYPT_CMD="openssl enc -aes-256-cbc -salt"
DECRYPT_CMD="openssl enc -aes-256-cbc -d"
ENCRYPT_CMD="openssl enc -aes-256-cbc -salt -pbkdf2"
DECRYPT_CMD="openssl enc -aes-256-cbc -d -salt -pbkdf2"

if test x"$OPENSSL_NO_MD" != x"y"; then
ENCRYPT_CMD="$ENCRYPT_CMD -md sha256"
Expand Down
Loading