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.

Sign up for GitHub

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

Jump to bottom

Update to openssl 1.1.1w submodule and zlib-ng 2.2.1-r2 #5

Merged
merged 3 commits into from
Aug 10, 2024
Merged

Update to openssl 1.1.1w submodule and zlib-ng 2.2.1-r2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5af008
Update to openssl submodule tag OpenSSL_1_1_1w
RyeMutt Aug 9, 2024
e7d7611
Update zlib-ng to 2.2.1-r2
RyeMutt Aug 9, 2024
9835f0d
Update build scripts and workflow
RyeMutt Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 12 additions & 10 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
name: Build
on: [push]
on:
pull_request:
push:
branches: [main]
tags: [v*]
jobs:
build:
strategy:
matrix:
os: [windows-2022, macos-11, ubuntu-22.04]
os: [windows-2022, macos-12, ubuntu-22.04]
addrsize: ["64"]
include:
- os: windows-2022
addrsize: "32"
runs-on: ${{ matrix.os }}
steps:
- name: Install nasm
if: runner.os == 'Windows'
- name: Setup Chocolatey Packages
if: ${{ runner.os == 'Windows' }}
shell: pwsh
run: |
choco install nasm -y --no-progress
Add-Content $env:GITHUB_PATH "C:\Program Files\NASM"

choco install -y nasm jom
echo "C:\Program Files\NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:\ProgramData\chocolatey\lib\jom\tools" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- uses: secondlife/action-autobuild@v4
with:
addrsize: ${{ matrix.addrsize }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "openssl"]
path = openssl
url = https://github.com/openssl/openssl.git
102 changes: 46 additions & 56 deletions autobuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
<?xml version="1.0" ?>
<llsd><map>
<llsd>
<map>
<key>version</key>
<string>1.3</string>
<key>type</key>
<string>autobuild</string>
<key>installables</key>
<map>
<key>zlib-ng</key>
<map>
<key>canonical_repo</key>
<string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
<key>copyright</key>
<string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
<key>description</key>
<string>zlib data compression library for the next generation systems</string>
<key>license</key>
<string>zlib-ng</string>
<key>license_file</key>
<string>LICENSES/zlib-ng.txt</string>
<key>name</key>
<string>zlib-ng</string>
<key>platforms</key>
<map>
<key>darwin64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>dacc5f3fb307c4d1292ed1ffb1d595d83599062d</string>
<string>3a6593c71c59ace76d1349483759fcde4b719a76</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-darwin64-32fd361.tar.zst</string>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-darwin64-10324415171.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -37,11 +30,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>fba88375e12454ae19f4528e11ffc7ddf7d879ec</string>
<string>fbadeb0b8c771cb06c0055c9fab6d40c6764dacd</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-linux64-32fd361.tar.zst</string>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-linux64-10324415171.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -65,53 +58,51 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ccfca9451063e2d0e95baa73b1ad2054d3e38907</string>
<string>0094031715662be626f5106ff6c814f4fc3dacfa</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-windows64-32fd361.tar.zst</string>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-windows64-10324415171.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>zlib-ng</string>
<key>license_file</key>
<string>LICENSES/zlib-ng.txt</string>
<key>copyright</key>
<string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
<key>version</key>
<string>1.2.11.zlib-ng.32fd361</string>
<string>2.2.1-r2</string>
<key>name</key>
<string>zlib-ng</string>
<key>canonical_repo</key>
<string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
<key>description</key>
<string>zlib data compression library for the next generation systems</string>
</map>
</map>
<key>package_description</key>
<map>
<key>canonical_repo</key>
<string>https://github.com/secondlife/3p-openssl</string>
<key>copyright</key>
<string>Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved; Copyright (C) 1995-1998 Eric Young ([email protected])</string>
<key>description</key>
<string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
<key>license</key>
<string>openssl</string>
<key>license_file</key>
<string>LICENSES/openssl.txt</string>
<key>name</key>
<string>openssl</string>
<key>platforms</key>
<map>
<key>common</key>
<map>
<key>build_directory</key>
<string>stage</string>
<key>configurations</key>
<map>
<key>default</key>
<map>
<key>build</key>
<map>
<key>command</key>
<string>bash</string>
<key>arguments</key>
<array>
<string>-c</string>
<string>../build-cmd.sh</string>
</array>
<key>command</key>
<string>bash</string>
</map>
<key>default</key>
<boolean>true</boolean>
Expand All @@ -124,6 +115,8 @@
<string>include/openssl/*.h</string>
<string>LICENSES/openssl.txt</string>
</array>
<key>build_directory</key>
<string>stage</string>
<key>name</key>
<string>common</string>
</map>
Expand Down Expand Up @@ -189,14 +182,8 @@
</map>
<key>manifest</key>
<array>
<string>lib/release/libssl.lib</string>
<string>lib/release/libssl_static.lib</string>
<string>lib/release/libssl-1_1.dll</string>
<string>lib/release/libssl-1_1.pdb</string>
<string>lib/release/libcrypto.lib</string>
<string>lib/release/libcrypto_static.lib</string>
<string>lib/release/libcrypto-1_1.dll</string>
<string>lib/release/libcrypto-1_1.pdb</string>
<string>lib/release/libssl.lib</string>
</array>
<key>name</key>
<string>windows</string>
Expand All @@ -219,25 +206,28 @@
<key>manifest</key>
<array>
<string>lib/release/libssl.lib</string>
<string>lib/release/libssl_static.lib</string>
<string>lib/release/libssl-1_1-x64.dll</string>
<string>lib/release/libssl-1_1-x64.pdb</string>
<string>lib/release/libcrypto.lib</string>
<string>lib/release/libcrypto_static.lib</string>
<string>lib/release/libcrypto-1_1-x64.dll</string>
<string>lib/release/libcrypto-1_1-x64.pdb</string>
</array>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>openssl</string>
<key>license_file</key>
<string>LICENSES/openssl.txt</string>
<key>copyright</key>
<string>Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved; Copyright (C) 1995-1998 Eric Young ([email protected])</string>
<key>use_scm_version</key>
<boolean>true</boolean>
<key>name</key>
<string>openssl</string>
<key>canonical_repo</key>
<string>https://github.com/secondlife/3p-openssl</string>
<key>description</key>
<string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
<key>source_directory</key>
<string>openssl</string>
<key>version_file</key>
<string>VERSION.txt</string>
</map>
<key>type</key>
<string>autobuild</string>
<key>version</key>
<string>1.3</string>
</map></llsd>
</map>
</llsd>
Loading