Combine teleport and teleport-client into one split package and update to v7.2.1

4 files changed, 66 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 918d471a0b92..83d0b299d333 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = teleport
 	pkgdesc = Modern SSH server for teams managing distributed infrastructure
-	pkgver = 7.1.0
+	pkgver = 7.2.1
 	pkgrel = 1
 	url = https://github.com/gravitational/teleport
 	arch = i386
@@ -12,20 +12,26 @@ pkgbase = teleport
 	depends = glibc
 	provides = tctl
 	provides = tsh
-	source = teleport-7.1.0.tar.gz::https://github.com/gravitational/teleport/archive/refs/tags/v7.1.0.tar.gz
+	source = teleport-7.2.1.tar.gz::https://github.com/gravitational/teleport/archive/refs/tags/v7.2.1.tar.gz
 	source = teleport-webassets-07493a5e78677de448b0e35bd72bf1dc6498b5ea.tar.gz::https://github.com/gravitational/webassets/archive/07493a5e78677de448b0e35bd72bf1dc6498b5ea.tar.gz
 	source = teleport.service
 	source = teleport@.service
 	source = teleport.install
 	source = no-bpf.patch
-	sha256sums = 0b716eb1cd02b1d41c017954c5a173ab5372ab4698276faab6c45e3f2aedaeae
+	source = shared-bpf.patch
+	source = version-fix.patch
+	sha256sums = 8087cb4c6a6725038e4b31f2ec6accd1ba5122b0678db2583d24efe712f497ec
 	sha256sums = 2074ee7e50720f20ff1b4da923434c05f6e1664e13694adde9522bf9ab09e0fd
 	sha256sums = 10ac25cea1b5c193d7f968ca28a1da0e54b847f29c2a0186b46fd853194be38a
 	sha256sums = 4bc17fdde981f91c5d9972ae0555ee5e8b63a6b67e007c28f83ada80823980fd
 	sha256sums = ce2dd61cae3c0c3684e7e629f98b77551e66ddedca2194250a34f0efbc674f3a
 	sha256sums = 12ba2a2b9d5efd5751799c2a1c3ddefe5aea4daf0f5d38fad4ec7923631e5ec0
+	sha256sums = e46ee57ae7f877d3ae3650aa4d10146d9e5190ed61b0209849745ea7d8443988
+	sha256sums = 066c64e374afdefdd799daa0e88ae21fef7b290042c5e852c1ec4f8af705fa62
 
 pkgname = teleport
 	install = teleport.install
+	replaces = teleport-client
 
 pkgname = teleport-client
+	replaces = teleport
diff --git a/PKGBUILD b/PKGBUILD
index 632579e9ec1d..bf01dd37e637 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=('teleport' 'teleport-client')
 _pkgname=teleport
-pkgver=7.1.0
+pkgver=7.2.1
 pkgrel=1
 pkgdesc="Modern SSH server for teams managing distributed infrastructure"
 arch=('i386' 'x86_64' 'armv7h' 'aarch64')
@@ -15,30 +15,43 @@ provides=('tctl' 'tsh')
 
 _webassets_ref=07493a5e78677de448b0e35bd72bf1dc6498b5ea
 
+_go_srcpath="go/src/github.com/gravitational"
+
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/gravitational/teleport/archive/refs/tags/v${pkgver}.tar.gz"
         "${_pkgname}-webassets-${_webassets_ref}.tar.gz::https://github.com/gravitational/webassets/archive/${_webassets_ref}.tar.gz"
         "teleport.service"
         "teleport@.service"
         "teleport.install"
-        "no-bpf.patch")
+        "no-bpf.patch"
+        "shared-bpf.patch"
+        "version-fix.patch")
 
-sha256sums=('0b716eb1cd02b1d41c017954c5a173ab5372ab4698276faab6c45e3f2aedaeae'
+sha256sums=('8087cb4c6a6725038e4b31f2ec6accd1ba5122b0678db2583d24efe712f497ec'
             '2074ee7e50720f20ff1b4da923434c05f6e1664e13694adde9522bf9ab09e0fd'
             '10ac25cea1b5c193d7f968ca28a1da0e54b847f29c2a0186b46fd853194be38a'
             '4bc17fdde981f91c5d9972ae0555ee5e8b63a6b67e007c28f83ada80823980fd'
             'ce2dd61cae3c0c3684e7e629f98b77551e66ddedca2194250a34f0efbc674f3a'
-            '12ba2a2b9d5efd5751799c2a1c3ddefe5aea4daf0f5d38fad4ec7923631e5ec0')
+            '12ba2a2b9d5efd5751799c2a1c3ddefe5aea4daf0f5d38fad4ec7923631e5ec0'
+            'e46ee57ae7f877d3ae3650aa4d10146d9e5190ed61b0209849745ea7d8443988'
+            '066c64e374afdefdd799daa0e88ae21fef7b290042c5e852c1ec4f8af705fa62')
 
 prepare() {
-    mv "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${pkgname}"
-    rm -Rf "${srcdir}/${pkgname}/webassets"
-    mv "${srcdir}/webassets-${_webassets_ref}" "${srcdir}/${pkgname}/webassets"
+    install -dm755 "${srcdir}/go/src/github.com"
+
+    if [ -d "${srcdir}/${_pkgname}-${pkgver}" ]; then
+        rm -Rf "${srcdir}/${_go_srcpath}"
+        mv "${srcdir}/${_pkgname}-${pkgver}" "${srcdir}/${_go_srcpath}"
+    fi
 
-    install -m755 -d "${srcdir}/go/src/github.com/gravitational"
-    ln -sf "${srcdir}/${pkgname}" "${srcdir}/go/src/github.com/gravitational/teleport"
+    if [ -d "${srcdir}/webassets-${_webassets_ref}" ]; then
+        rm -Rf "${srcdir}/${_go_srcpath}/webassets"
+        mv "${srcdir}/webassets-${_webassets_ref}" "${srcdir}/${_go_srcpath}/webassets"
+    fi
 }
 
 build() {
+    cd "${srcdir}/${_go_srcpath}"
+
     export GOPATH="${srcdir}/go"
 
     # See: https://wiki.archlinux.org/index.php/Go_package_guidelines
@@ -48,10 +61,16 @@ build() {
     export CGO_LDFLAGS="${LDFLAGS}"
     export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
 
-    cd "${GOPATH}/src/github.com/gravitational/teleport"
+    # Allow linking against shared libbpf
+    patch Makefile "${srcdir}/shared-bpf.patch"
 
-    patch Makefile "${srcdir}/no-bpf.patch"
+    # Comment the line above and uncomment the line below to disable libbpf
+    # patch Makefile "${srcdir}/no-bpf.patch"
 
+    # Do not generate version number
+    patch Makefile "${srcdir}/version-fix.patch"
+
+    make bpf-bytecode
     make full
 
     unset GOPATH
@@ -59,8 +78,9 @@ build() {
 
 package_teleport() {
     install=teleport.install
+    replaces=('teleport-client')
 
-    cd "${srcdir}/${_pkgname}"
+    cd "${srcdir}/${_go_srcpath}"
 
     # Install binaries
     install -Dm755 build/teleport "${pkgdir}/usr/bin/teleport"
@@ -77,7 +97,9 @@ package_teleport() {
 }
 
 package_teleport-client() {
-    cd "${srcdir}/${_pkgname}"
+    replaces=('teleport')
+
+    cd "${srcdir}/${_go_srcpath}"
 
     install -Dm755 build/tctl "${pkgdir}/usr/bin/tctl"
     install -Dm755 build/tsh "${pkgdir}/usr/bin/tsh"
diff --git a/shared-bpf.patch b/shared-bpf.patch
new file mode 100644
index 000000000000..b2b17e1cfd0a
--- /dev/null
+++ b/shared-bpf.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2021-10-09 14:32:07.542062668 +0200
++++ b/Makefile	2021-10-09 14:32:02.011962129 +0200
+@@ -106,7 +106,7 @@
+ CLANG_BPF_SYS_INCLUDES = $(shell $(CLANG) -v -E - </dev/null 2>&1 \
+ 	| sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
+ 
+-CGOFLAG = CGO_ENABLED=1 CGO_LDFLAGS="-Wl,-Bstatic -lbpf -lelf -lz -Wl,-Bdynamic"
++CGOFLAG = CGO_ENABLED=1 CGO_LDFLAGS="-Wl,-Bstatic -lelf -lz -Wl,-Bdynamic -lbpf"
+ endif
+ endif
+ endif
diff --git a/version-fix.patch b/version-fix.patch
new file mode 100644
index 000000000000..98e9698555e5
--- /dev/null
+++ b/version-fix.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2021-10-09 14:34:36.674597134 +0200
++++ b/Makefile	2021-10-09 14:42:35.534833320 +0200
+@@ -146,7 +146,7 @@
+ #            This is the default build target for convenience of working on
+ #            a web UI.
+ .PHONY: all
+-all: version
++all:
+ 	@echo "---> Building OSS binaries."
+ 	$(MAKE) $(BINARIES)
+