diff options
| author | Christoph Gysin | 2023-08-27 08:56:59 +0300 |
|---|---|---|
| committer | Christoph Gysin | 2023-08-27 08:56:59 +0300 |
| commit | 1bd33fa0fdc3eae42d53206a85e9779b04fbd835 (patch) | |
| tree | 12c33c7a7bebc2fec6534651c58742a030b5c9fa | |
| parent | b7347466405b8da7d7df8d0768e06d732678992a (diff) | |
| download | aur-1bd33fa0fdc3eae42d53206a85e9779b04fbd835.tar.gz | |
fix: Apply upstream patch for zlib-1.3
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 10 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = openssh-gssapi pkgdesc = SSH protocol implementation with GSSAPI support pkgver = 9.3p2 - pkgrel = 1 + pkgrel = 2 url = https://www.openssh.com/portable.html arch = x86_64 license = custom:BSD @@ -32,6 +32,7 @@ pkgbase = openssh-gssapi source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.3p2.tar.gz.asc source = openssh-9.0p1-sshd_config.patch source = openssh-gssapi-9.3p2-1-gssapi.patch::https://sources.debian.org/data/main/o/openssh/1:9.3p2-1/debian/patches/gssapi.patch + source = zlib-1.3.patch::https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch source = sshdgenkeys.service source = sshd.service source = sshd.conf @@ -41,6 +42,7 @@ pkgbase = openssh-gssapi sha256sums = SKIP sha256sums = 27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f sha256sums = 3232a8aa5ed128d429d97065338a57998fd9e244dfaab24aa1b2461a291f1d77 + sha256sums = 937d7d028574a06823e7aa92499a679a826245b3118e8f7cd4141d8d06012727 sha256sums = e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611 sha256sums = e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7 sha256sums = 4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6 @@ -49,6 +51,7 @@ pkgbase = openssh-gssapi b2sums = SKIP b2sums = 29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59 b2sums = c70cedb95b9e1611e03ba75665bee7111d84da294a713e80c2c6c6fbe52392165674d12c273aa350b1f7ed264c705b0c929ba6fc8d8c4a772821e903d7cc4bf2 + b2sums = d41f1ecea7b4ebcfb3003826fb51c2a0c27178590c755a61752389606df35544284cb24ea8bf4fcb280eec4c6c5cb410662862b27af47f3aca63f7f638efcc9f b2sums = 09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50 b2sums = 07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e b2sums = 27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395 diff --git a/.gitignore b/.gitignore index 7f1a5493d038..9fa81992c784 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pkg/ /src/ /openssh-*-gssapi.patch +/zlib-*.patch @@ -9,7 +9,7 @@ pkgname=openssh-gssapi _pkgname=openssh pkgver=9.3p2 _patch=1 -pkgrel=1 +pkgrel=2 pkgdesc="SSH protocol implementation with GSSAPI support" arch=('x86_64') url='https://www.openssh.com/portable.html' @@ -41,6 +41,7 @@ source=( "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${_pkgname}-${pkgver}.tar.gz"{,.asc} "${_pkgname}-9.0p1-sshd_config.patch" "${pkgname}-${pkgver}-${_patch}-gssapi.patch::https://sources.debian.org/data/main/o/openssh/1:${pkgver}-${_patch}/debian/patches/gssapi.patch" + 'zlib-1.3.patch::https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch' 'sshdgenkeys.service' 'sshd.service' 'sshd.conf' @@ -50,6 +51,7 @@ sha256sums=('200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8' 'SKIP' '27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f' '3232a8aa5ed128d429d97065338a57998fd9e244dfaab24aa1b2461a291f1d77' + '937d7d028574a06823e7aa92499a679a826245b3118e8f7cd4141d8d06012727' 'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611' 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' @@ -58,6 +60,7 @@ b2sums=('38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e022 'SKIP' '29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59' 'c70cedb95b9e1611e03ba75665bee7111d84da294a713e80c2c6c6fbe52392165674d12c273aa350b1f7ed264c705b0c929ba6fc8d8c4a772821e903d7cc4bf2' + 'd41f1ecea7b4ebcfb3003826fb51c2a0c27178590c755a61752389606df35544284cb24ea8bf4fcb280eec4c6c5cb410662862b27af47f3aca63f7f638efcc9f' '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50' '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e' '27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395' @@ -67,6 +70,7 @@ validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') prepare() { patch -Np1 -d "$_pkgname-$pkgver" -i ../${_pkgname}-9.0p1-sshd_config.patch patch -Np1 -d "$_pkgname-$pkgver" -i ../${pkgname}-${pkgver}-${_patch}-gssapi.patch + patch -Np1 -d "$_pkgname-$pkgver" -i ../zlib-1.3.patch cd "${srcdir}/${_pkgname}-${pkgver}" autoreconf } |