Skip to content

Commit 60248b5

Browse files
committed
Update libgit2 and openssl
1 parent 040a65a commit 60248b5

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
run: ruff check
3232

3333
- name: Check typing with mypy
34-
run: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.1 /bin/sh build.sh mypy
34+
run: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 /bin/sh build.sh mypy

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
apt-get update -q -y
2626
apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget
2727
run: |
28-
LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.1 /bin/sh build.sh test
28+
LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 /bin/sh build.sh test
2929
continue-on-error: true # Tests are expected to fail, see issue #812

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
run: python -m cibuildwheel --output-dir wheelhouse
8888
env:
8989
CIBW_ARCHS: ppc64le
90-
CIBW_ENVIRONMENT: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.1 LIBGIT2=/project/ci
90+
CIBW_ENVIRONMENT: LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 LIBGIT2=/project/ci
9191

9292
- uses: actions/upload-artifact@v5
9393
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: build html
22

33
build:
4-
OPENSSL_VERSION=3.3.3 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.1 sh build.sh
4+
OPENSSL_VERSION=3.5.4 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 sh build.sh
55

66
html: build
77
make -C docs html

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#
2323
# sh build.sh
2424
#
25-
# Build libgit2 1.9.0 (will use libssh2 if available), then build pygit2
25+
# Build libgit2 1.9.2 (will use libssh2 if available), then build pygit2
2626
# inplace:
2727
#
28-
# LIBGIT2_VERSION=1.9.0 sh build.sh
28+
# LIBGIT2_VERSION=1.9.2 sh build.sh
2929
#
30-
# Build libssh2 1.11.1 and libgit2 1.9.0, then build pygit2 inplace:
30+
# Build libssh2 1.11.1 and libgit2 1.9.2, then build pygit2 inplace:
3131
#
32-
# LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 sh build.sh
32+
# LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.2 sh build.sh
3333
#
3434
# Build inplace and run the tests:
3535
#

docs/install.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ worry about this if you `install from the source distribution`_.
5959
Optional libgit2 dependencies to support ssh and https:
6060

6161
- https: WinHTTP (Windows), SecureTransport (OS X) or OpenSSL.
62-
- ssh: libssh2 1.9.1 or later, pkg-config
62+
- ssh: libssh2 1.10.0 or later, pkg-config
6363

6464
To run the tests:
6565

@@ -158,9 +158,9 @@ directory, do:
158158
.. code-block:: sh
159159
:caption: On Linux using bash
160160
161-
wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.1.tar.gz -O libgit2-1.9.1.tar.gz
162-
tar -xzf libgit2-1.9.1.tar.gz
163-
cd libgit2-1.9.1/
161+
wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.2.tar.gz -O libgit2-1.9.2.tar.gz
162+
tar -xzf libgit2-1.9.2.tar.gz
163+
cd libgit2-1.9.2/
164164
cmake .
165165
make
166166
sudo make install
@@ -245,9 +245,9 @@ Install libgit2 (see we define the installation prefix):
245245
.. code-block:: sh
246246
:caption: On Linux using bash
247247
248-
wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.1.tar.gz -O libgit2-1.9.1.tar.gz
249-
tar xzf libgit2-1.9.1.tar.gz
250-
cd libgit2-1.9.1/
248+
wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.2.tar.gz -O libgit2-1.9.2.tar.gz
249+
tar xzf libgit2-1.9.2.tar.gz
250+
cd libgit2-1.9.2/
251251
cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2
252252
cmake --build . --target install
253253
@@ -307,7 +307,7 @@ variable. The following recipe shows you how to do it:
307307
.. code-block:: pwsh
308308
:caption: On Windows using PowerShell (and CMake v3.21 or newer)
309309
310-
git clone --depth=1 -b v1.9.1 https://github.com/libgit2/libgit2.git
310+
git clone --depth=1 -b v1.9.2 https://github.com/libgit2/libgit2.git
311311
$env:CMAKE_INSTALL_PREFIX = "C:/Dev/libgit2"
312312
$env:CMAKE_GENERATOR = "Visual Studio 17 2022"
313313
$env:CMAKE_GENERATOR_PLATFORM = "x64" # or "Win32" or "ARM64"

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ skip = "*musllinux_ppc64le"
88
archs = ["native"]
99
build-frontend = "default"
1010
dependency-versions = "pinned"
11-
environment = {LIBGIT2_VERSION="1.9.1", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.3.3", LIBGIT2="/project/ci"}
11+
environment = {LIBGIT2_VERSION="1.9.2", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.5.4", LIBGIT2="/project/ci"}
1212

1313
before-all = "sh build.sh"
1414
test-command = "pytest"
@@ -27,12 +27,12 @@ select = "*-musllinux*"
2727
repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/lib auditwheel repair -w {dest_dir} {wheel}"
2828

2929
[tool.cibuildwheel.macos]
30-
environment = {LIBGIT2_VERSION="1.9.1", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.3.3", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
30+
environment = {LIBGIT2_VERSION="1.9.2", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.5.4", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
3131
repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
3232

3333
[tool.cibuildwheel.windows]
3434
environment.LIBGIT2_SRC = "build/libgit2_src"
35-
environment.LIBGIT2_VERSION = "1.9.1"
35+
environment.LIBGIT2_VERSION = "1.9.2"
3636
before-all = "powershell -File build.ps1"
3737

3838
[[tool.cibuildwheel.overrides]]

0 commit comments

Comments
 (0)