diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2022-03-31 09:19:40 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2022-08-02 10:34:24 +0200 |
| commit | 23e3808cdc1911c3c268c50fe5ef62af305238c8 (patch) | |
| tree | b21e8511630df99dda0ea9c469b3a31a0e8d5291 | |
| parent | b560b00bf27e0bc24a895270fdd9544a0062892c (diff) | |
| download | aports-23e3808cdc1911c3c268c50fe5ef62af305238c8.zip | |
main/sbsigntool: fix for openssl3
Patch is from fedora
| -rw-r--r-- | main/sbsigntool/APKBUILD | 12 | ||||
| -rw-r--r-- | main/sbsigntool/sbsigntools-openssl3.patch | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/main/sbsigntool/APKBUILD b/main/sbsigntool/APKBUILD index 5ee5f07cbf7..1ef636b83e8 100644 --- a/main/sbsigntool/APKBUILD +++ b/main/sbsigntool/APKBUILD @@ -3,18 +3,19 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=sbsigntool pkgver=0.9.4 -pkgrel=3 +pkgrel=4 _ccancommit=b1f28e17227f2320d07fe052a8a48942fe17caa5 pkgdesc="Secure Boot signing tools" url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/" arch="all !armhf !s390x !ppc64le !mips !mips64" # limited by gnu-efi license="GPL-3.0-only WITH OpenSSL-Exception" -makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl1.1-compat-dev util-linux-dev" +makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl-dev>3 util-linux-dev" options="!check" # testsuite is not functional subpackages="$pkgname-doc" source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-$pkgver.tar.gz ccan-$_ccancommit.tar.gz::https://git.ozlabs.org/?p=ccan;a=snapshot;h=$_ccancommit;sf=tgz 0001-fix-autogen.patch + sbsigntools-openssl3.patch " builddir="$srcdir/sbsigntools-$pkgver" @@ -51,6 +52,9 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="953d3d9a7f92b837da966eabe3572163a29c5292e792d5ef17cf842d7373ffaa901377cb4ec68006a6ef2f9c97d48db8ffdd3a6d2853be67016d3484a118bba9 sbsigntools-0.9.4.tar.gz +sha512sums=" +953d3d9a7f92b837da966eabe3572163a29c5292e792d5ef17cf842d7373ffaa901377cb4ec68006a6ef2f9c97d48db8ffdd3a6d2853be67016d3484a118bba9 sbsigntools-0.9.4.tar.gz 35a1c1de05a755df50a75440865146dd363c47015be6fa84250888f01e6bab1661c3af5db0340e1fd7f9f84db388fb2d5fcd0d86d0e1bde34ed13b23d673d740 ccan-b1f28e17227f2320d07fe052a8a48942fe17caa5.tar.gz -9bf0a12c7735d09e1562ad901676a7ca9572265abee88580d4f830723a28423062d5b77fe02f21414884aeb046e84cf09da599754eafaad660c5938469c460a9 0001-fix-autogen.patch" +9bf0a12c7735d09e1562ad901676a7ca9572265abee88580d4f830723a28423062d5b77fe02f21414884aeb046e84cf09da599754eafaad660c5938469c460a9 0001-fix-autogen.patch +a65182896663adc1ab50964c821e2b3787322b6419bffe457856b7941ce740db6398df35ddfafe65cf8b93e08871dc2644f4b370420b82d857e77593a8488ebc sbsigntools-openssl3.patch +" diff --git a/main/sbsigntool/sbsigntools-openssl3.patch b/main/sbsigntool/sbsigntools-openssl3.patch new file mode 100644 index 00000000000..3e143271010 --- /dev/null +++ b/main/sbsigntool/sbsigntools-openssl3.patch @@ -0,0 +1,12 @@ +diff -up sbsigntools-0.9.4/src/idc.c.openssl3 sbsigntools-0.9.4/src/idc.c +--- sbsigntools-0.9.4/src/idc.c.openssl3 2020-07-04 01:14:29.000000000 +0200 ++++ sbsigntools-0.9.4/src/idc.c 2021-11-19 16:20:10.082475750 +0100 +@@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO + + idc->data->type = OBJ_nid2obj(peid_nid); + idc->data->value = ASN1_TYPE_new(); +- type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it); ++ type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID)); + + idc->digest->alg->parameter = ASN1_TYPE_new(); + idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256); |