diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | 0001-upgrade-libbpfgo-to-0.4.5.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 42 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = teleport pkgdesc = Modern SSH server for teams managing distributed infrastructure pkgver = 11.2.2 - pkgrel = 1 + pkgrel = 2 url = https://github.com/gravitational/teleport arch = i386 arch = x86_64 @@ -18,15 +18,16 @@ pkgbase = teleport source = teleport.service source = teleport@.service source = teleport.install + source = 0001-upgrade-libbpfgo-to-0.4.5.patch sha512sums = b9d2ffe5faf7f5d3605361b5c83087de6ce72f813ca641d29b53acdf695f13d7c8b626155bbd0c1f270c7b672057e7bf598257e488bacba71e96b29cb809f5a5 sha512sums = 3f1824dcface44de05bb26ba9b5313445e4a532c321bfb59a3a6f29e47e83c1dc9ba7c476b32d1e5bec7c0cd2db87affa1cf108f557f6397748bf48d7f6042b7 sha512sums = 409116e201c40b7e0a379b316123500ab7691cbf441ecee048811885f97cd1185671676bb61bf36cb288399e8c0355a0a9f963ce7f94e44ba49e061187c9249e sha512sums = 469249bebaa974e5e205c66c0459ed071b06a35aa9b94a3f34d3cbc5e75aa0f290d70ba8e5c63b49a6319a0f524a846ded459e07e3dde4c260e7668959821b96 sha512sums = 439360d3b5132e1307eecc0afa7187edbab63fcfdb5c5b6e4d2ddbe3efbc6ef38f0710f4fdf08d674927a88c80195f3b46f2af26d9f735b1052c5e853ff2ca67 + sha512sums = 38193a224cac9adef11ccd0bcbb04a4b91a9281864ef7eded64e9e7a8527ce583bd3cb6ab562cdbb69691e025a307a0fc7d85e3452f8ced828130ebeed2b61cb pkgname = teleport install = teleport.install - replaces = teleport-client + optdepends = teleport-client: for "tsh" and "tctl" commands pkgname = teleport-client - replaces = teleport diff --git a/0001-upgrade-libbpfgo-to-0.4.5.patch b/0001-upgrade-libbpfgo-to-0.4.5.patch new file mode 100644 index 000000000000..91ce22107db4 --- /dev/null +++ b/0001-upgrade-libbpfgo-to-0.4.5.patch @@ -0,0 +1,24 @@ +diff -Naur a/go.mod b/go.mod +--- a/go.mod 2023-01-19 14:03:25.699357260 -0500 ++++ b/go.mod 2023-01-19 14:01:53.087805619 -0500 +@@ -22,7 +22,7 @@ + github.com/Microsoft/go-winio v0.6.0 + github.com/ThalesIgnite/crypto11 v1.2.5 + github.com/alicebob/miniredis/v2 v2.23.0 +- github.com/aquasecurity/libbpfgo v0.2.5-libbpf-0.7.0 ++ github.com/aquasecurity/libbpfgo v0.4.5-libbpf-1.0.1 + github.com/armon/go-radix v1.0.0 + github.com/aws/aws-sdk-go v1.44.111 + github.com/aws/aws-sdk-go-v2 v1.16.16 +diff -Naur a/go.sum b/go.sum +--- a/go.sum 2023-01-19 14:03:25.699357260 -0500 ++++ b/go.sum 2023-01-19 14:01:53.087805619 -0500 +@@ -198,6 +198,8 @@ + github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= + github.com/aquasecurity/libbpfgo v0.2.5-libbpf-0.7.0 h1:BpW7qxkveYXx8TCtvYWIvmliPqaTCz/IYs1i+Gyj0MQ= + github.com/aquasecurity/libbpfgo v0.2.5-libbpf-0.7.0/go.mod h1:/+clceXE103FaXvVTIY2HAkQjxNtkra4DRWvZYr2SKw= ++github.com/aquasecurity/libbpfgo v0.4.5-libbpf-1.0.1 h1:Et7WT8CEpaO03v7FIVk85GMRRbwjF7sgoBgQhH5T30k= ++github.com/aquasecurity/libbpfgo v0.4.5-libbpf-1.0.1/go.mod h1:v+Nk+v6BtHLfdT4kVdsp+fYt4AeUa3cIG2P0y+nBuuY= + github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= + github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -4,7 +4,7 @@ pkgname=('teleport' 'teleport-client') _pkgname=teleport pkgver=11.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Modern SSH server for teams managing distributed infrastructure" arch=('i386' 'x86_64' 'armv7h' 'aarch64') url="https://github.com/gravitational/teleport" @@ -21,7 +21,8 @@ source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/gravitational/teleport "${_pkgname}-webassets-${_webassets_ref}.tar.gz::https://github.com/gravitational/webassets/archive/${_webassets_ref}.tar.gz" "teleport.service" "teleport@.service" - "teleport.install") + "teleport.install" + "0001-upgrade-libbpfgo-to-0.4.5.patch") prepare() { install -dm755 "${srcdir}/go/src/github.com" @@ -35,6 +36,14 @@ prepare() { rm -Rf "${srcdir}/${_go_srcpath}/webassets" mv "${srcdir}/webassets-${_webassets_ref}" "${srcdir}/${_go_srcpath}/webassets" fi + + cd "${srcdir}/${_go_srcpath}" + for f in "${source[@]}"; do + if [ "${f##*.}" = "patch" ]; then + msg "Aplying patch: ${f}" + patch -Np1 -i "${srcdir}/${f}" + fi + done } build() { @@ -59,7 +68,7 @@ build() { package_teleport() { install=teleport.install - optdepends=('teleport-client: for "tsh" and "tctl" commands') + optdepends=('teleport-client: for "tsh" and "tctl" commands') cd "${srcdir}/${_go_srcpath}" @@ -85,4 +94,5 @@ sha512sums=('b9d2ffe5faf7f5d3605361b5c83087de6ce72f813ca641d29b53acdf695f13d7c8b '3f1824dcface44de05bb26ba9b5313445e4a532c321bfb59a3a6f29e47e83c1dc9ba7c476b32d1e5bec7c0cd2db87affa1cf108f557f6397748bf48d7f6042b7' '409116e201c40b7e0a379b316123500ab7691cbf441ecee048811885f97cd1185671676bb61bf36cb288399e8c0355a0a9f963ce7f94e44ba49e061187c9249e' '469249bebaa974e5e205c66c0459ed071b06a35aa9b94a3f34d3cbc5e75aa0f290d70ba8e5c63b49a6319a0f524a846ded459e07e3dde4c260e7668959821b96' - '439360d3b5132e1307eecc0afa7187edbab63fcfdb5c5b6e4d2ddbe3efbc6ef38f0710f4fdf08d674927a88c80195f3b46f2af26d9f735b1052c5e853ff2ca67') + '439360d3b5132e1307eecc0afa7187edbab63fcfdb5c5b6e4d2ddbe3efbc6ef38f0710f4fdf08d674927a88c80195f3b46f2af26d9f735b1052c5e853ff2ca67' + '38193a224cac9adef11ccd0bcbb04a4b91a9281864ef7eded64e9e7a8527ce583bd3cb6ab562cdbb69691e025a307a0fc7d85e3452f8ced828130ebeed2b61cb') |