v1.0.0

3 files changed, 32 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f54a4f2cff4..870b5ee1d64e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = tkey-ssh-agent
 	pkgdesc = A ssh-agent for the Tillitis TKey
-	pkgver = 0.0.8
+	pkgver = 1.0.0
 	pkgrel = 1
-	url = https://github.com/tillitis/tillitis-key1-apps
+	url = https://github.com/tillitis/tkey-ssh-agent
 	install = tkey-ssh-agent.install
 	arch = i686
 	arch = x86_64
@@ -10,17 +10,11 @@ pkgbase = tkey-ssh-agent
 	arch = armv7h
 	arch = aarch64
 	license = GPL2
-	makedepends = clang
-	makedepends = llvm
-	makedepends = lld
+	makedepends = make
 	makedepends = go
 	provides = tkey-ssh-agent
 	conflicts = tkey-ssh-agent2
-	source = git+https://github.com/tillitis/tillitis-key1-apps.git#commit=7e18bcb
-	source = git+https://github.com/tillitis/tkey-libs.git#tag=v0.0.2
-	source = git+https://github.com/tillitis/tkey-device-signer.git#tag=v0.0.8
-	b2sums = SKIP
-	b2sums = SKIP
+	source = https://github.com/tillitis/tkey-ssh-agent/archive/v1.0.0/tkey-ssh-agent-1.0.0.tar.gz
 	b2sums = SKIP
 
 pkgname = tkey-ssh-agent
diff --git a/PKGBUILD b/PKGBUILD
index d1ebe46b7b5a..d15a4f6b58c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,29 @@
 # Maintainer: dr00tb <adam at dr00tb dot com>
 
 pkgname=tkey-ssh-agent
-_pkgname=tillitis-key1-apps
-_libname=tkey-libs
-_appname=tkey-device-signer
-pkgver=0.0.8
-_libver=0.0.2
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="A ssh-agent for the Tillitis TKey"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
-url="https://github.com/tillitis/tillitis-key1-apps"
+url="https://github.com/tillitis/${pkgname}"
 license=('GPL2')
-makedepends=('clang' 'llvm' 'lld' 'go')
+makedepends=('make' 'go')
 conflicts=("${pkgname}2")
 provides=("${pkgname}")
-install=tkey-ssh-agent.install
-source=("git+https://github.com/tillitis/${_pkgname}.git#commit=7e18bcb"
-        "git+https://github.com/tillitis/${_libname}.git#tag=v${_libver}"
-        "git+https://github.com/tillitis/${_appname}.git#tag=v${pkgver}")
-b2sums=('SKIP'
-        'SKIP'
-        'SKIP')
+install="${pkgname}.install"
+_archive="${pkgname}-${pkgver}"
+source=("${url}/archive/v${pkgver}/${_archive}.tar.gz")
+b2sums=('SKIP')
 
 build() {
-  cd "${srcdir}/${_libname}"
-  make OBJCOPY="llvm-objcopy"
-
-  cd "${srcdir}/${_appname}"
-  make OBJCOPY="llvm-objcopy" signer/app.bin
-
-  cd "${srcdir}/${_pkgname}"
-  cp "${srcdir}/${_appname}/signer/app.bin" ./cmd/tkey-ssh-agent/app.bin
-  sed -i "s/tkey-ssh-agent: check-signer-hash/tkey-ssh-agent:/" Makefile
-  make OBJCOPY="llvm-objcopy" tkey-ssh-agent
+  TKEY_SSH_AGENT_VERSION=
+  TKEY_SIGNER_APP_NO_TOUCH=
+  cd "${srcdir}/${_archive}"
+  CGO_ENABLED=0 go build \
+          -ldflags "-X main.version=$TKEY_SSH_AGENT_VERSION -X main.signerAppNoTouch=$TKEY_SIGNER_APP_NO_TOUCH" \
+          -trimpath \
+          -buildvcs=false \
+          ./cmd/tkey-ssh-agent
 }
 
 package() {
@@ -40,13 +31,13 @@ package() {
   destman1="${pkgdir}/usr/share/man/man1"
   destunit="${pkgdir}/usr/lib/systemd/user"
   destrules="${pkgdir}/etc/udev/rules.d"
-  cd "${srcdir}/${_pkgname}"
-	install -Dm755 tkey-ssh-agent "${destbin}/tkey-ssh-agent"
-	strip "${destbin}"/tkey-ssh-agent
-	install -Dm644 system/tkey-ssh-agent.1 "${destman1}"/tkey-ssh-agent.1
-	gzip -n9f "${destman1}"/tkey-ssh-agent.1
-	install -Dm644 system/tkey-ssh-agent.service.tmpl "${destunit}"/tkey-ssh-agent.service
-	sed -i -e "s,##BINDIR##,/usr/bin," "${destunit}"/tkey-ssh-agent.service
-	install -Dm644 system/60-tkey.rules "${destrules}"/60-tkey.rules
+  cd "${srcdir}/${_archive}"
+	install -Dm755 "${pkgname}" "${destbin}/${pkgname}"
+	strip "${destbin}/${pkgname}"
+	install -Dm644 "system/${pkgname}.1" "${destman1}/${pkgname}.1"
+	gzip -n9f "${destman1}/${pkgname}.1"
+	install -Dm644 "system/${pkgname}.service.tmpl" "${destunit}/${pkgname}.service"
+	sed -i -e "s,##BINDIR##,/usr/bin," "${destunit}/${pkgname}.service"
+	install -Dm644 system/60-tkey.rules "${destrules}/60-tkey.rules"
 }
 
diff --git a/tkey-ssh-agent.install b/tkey-ssh-agent.install
index 53c551b26f32..06abf5e4ab04 100644
--- a/tkey-ssh-agent.install
+++ b/tkey-ssh-agent.install
@@ -1,3 +1,8 @@
+post_install() {
+  udevadm control --reload
+  udevadm trigger
+}
+
 post_upgrade() {
 	printf '\033[1;33mThis release changes the Tkey identity (CDI) compared to v0.0.7, i.e., you will not have the same Ed25519 keypair derived.'
 }