Chih-Hsuan Yen pushed to branch main at Arch Linux / Packaging / Packages / 
python-awscrt


Commits:
5b4703c4 by Chih-Hsuan Yen at 2024-06-26T19:41:30+08:00
upgpkg: 0.20.11-2; use system libcrypto.so instead of bundled aws-lc

Now the built `_awscrt.abi3.so` is marked as compatible with shadow
stacks (SHSTK), as assembly files from aws-lc are no longer used.

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
 pkgbase = python-awscrt
        pkgdesc = A common runtime for AWS Python projects
        pkgver = 0.20.11
-       pkgrel = 1
+       pkgrel = 2
        url = https://github.com/awslabs/aws-crt-python
        arch = x86_64
-       license = Apache
+       license = Apache-2.0
        checkdepends = python-websockets
        makedepends = git
        makedepends = cmake
@@ -15,6 +15,7 @@ pkgbase = python-awscrt
        depends = glibc
        depends = gcc-libs
        depends = python
+       depends = openssl
        source = git+https://github.com/awslabs/aws-crt-python.git#tag=v0.20.11
        source = git+https://github.com/awslabs/aws-c-auth
        source = git+https://github.com/awslabs/aws-c-cal
@@ -45,3 +46,8 @@ pkgbase = python-awscrt
        sha256sums = SKIP
 
 pkgname = python-awscrt
+       depends = glibc
+       depends = gcc-libs
+       depends = python
+       depends = openssl
+       depends = libcrypto.so


=====================================
PKGBUILD
=====================================
@@ -5,12 +5,13 @@ _pkgname=aws-crt-python
 pkgname=python-awscrt
 # https://github.com/awslabs/aws-crt-python/releases
 pkgver=0.20.11
-pkgrel=1
+pkgrel=2
 pkgdesc='A common runtime for AWS Python projects'
 arch=(x86_64)
 url='https://github.com/awslabs/aws-crt-python'
-license=(Apache)
-depends=(glibc gcc-libs python)
+# https://github.com/awslabs/aws-crt-python/blob/v0.20.11/setup.py#L2
+license=('Apache-2.0')
+depends=(glibc gcc-libs python openssl)
 makedepends=(git cmake python-build python-installer python-setuptools 
python-wheel)
 checkdepends=(python-websockets)
 source=("git+https://github.com/awslabs/aws-crt-python.git#tag=v$pkgver";
@@ -56,7 +57,7 @@ prepare() {
     git config submodule.aws-common-runtime/$crt.url "$srcdir"/$crt
     git -c protocol.file.allow=always submodule update crt/$crt
   done
-  for crt in aws-c-sdkutils aws-lc; do
+  for crt in aws-c-sdkutils; do
     git config submodule.crt/$crt.url "$srcdir"/$crt
     git -c protocol.file.allow=always submodule update crt/$crt
   done
@@ -70,6 +71,9 @@ build() {
   # Don't move this line to prepare(), as pkgver() runs after prepare()
   sed -i -r "s/__version__ = '[^']+'/__version__ = '$pkgver'/" 
awscrt/__init__.py
 
+  # Use system libcrypto.so instead of bundled aws-lc
+  export AWS_CRT_BUILD_USE_SYSTEM_LIBCRYPTO=1
+
   python -m build --wheel --no-isolation
 }
 
@@ -82,6 +86,8 @@ check() {
 }
 
 package() {
+  depends+=(libcrypto.so)
+
   cd $_pkgname
   python -m installer --destdir="$pkgdir" dist/*.whl
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-awscrt/-/commit/5b4703c4c49ce133154ca35a7e356cd3bfdc6113

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-awscrt/-/commit/5b4703c4c49ce133154ca35a7e356cd3bfdc6113
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to