v2.9.2

3 files changed, 11 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a190f713cb84..6aafc5e0a7a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = advanced-ssh-config
 	pkgdesc = ssh wrapper using ProxyCommand that adds regex, aliases, gateways, includes, dynamic hostnames to SSH and ssh-config
-	pkgver = 2.9.1
-	pkgrel = 2
+	pkgver = 2.9.2
+	pkgrel = 1
 	url = https://github.com/moul/assh
 	arch = x86_64
 	license = MIT
 	makedepends = go
-	source = advanced-ssh-config-2.9.1.tar.gz::https://github.com/moul/assh/archive/v2.9.1.tar.gz
-	source = version.patch
-	sha256sums = fed8876c574061c239a1d159d9c7197e8bda94f6610f6e29e682d8b6dde60852
-	sha256sums = cf4ceca28b7d7dbeae51b214e23d9f05e2149a17438b97c9407e7b57107d2f7b
+	source = advanced-ssh-config-2.9.2.tar.gz::https://github.com/moul/assh/archive/v2.9.2.tar.gz
+	sha256sums = cbb728ba0c5242e8ccc462579460a754f4ead4c2769245aedd88f1121be28c99
 
 pkgname = advanced-ssh-config
 
diff --git a/PKGBUILD b/PKGBUILD
index db8d2e6915a7..bd01bcd96aaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,18 @@
 
 pkgname=advanced-ssh-config
 _name=assh
-pkgver=2.9.1
-pkgrel=2
+pkgver=2.9.2
+_vcsref=ee3bc4d
+pkgrel=1
 pkgdesc='ssh wrapper using ProxyCommand that adds regex, aliases, gateways, includes, dynamic hostnames to SSH and ssh-config'
 arch=('x86_64')
 url='https://github.com/moul/assh'
 license=('MIT')
 makedepends=('go')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/moul/assh/archive/v${pkgver}.tar.gz"
-        'version.patch')
-sha256sums=('fed8876c574061c239a1d159d9c7197e8bda94f6610f6e29e682d8b6dde60852'
-            'cf4ceca28b7d7dbeae51b214e23d9f05e2149a17438b97c9407e7b57107d2f7b')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/moul/assh/archive/v${pkgver}.tar.gz")
+sha256sums=('cbb728ba0c5242e8ccc462579460a754f4ead4c2769245aedd88f1121be28c99')
 
-prepare() {
-  cd "$_name-$pkgver"
-  patch --forward --strip=1 --input="${srcdir}/version.patch"
-}
-
-build(){
+build() {
   cd "$_name-$pkgver"
   go build \
      -trimpath \
@@ -29,6 +23,7 @@ build(){
      -mod=readonly \
      -modcacherw \
      -ldflags "-extldflags ${LDFLAGS}" \
+     -ldflags "-X 'moul.io/assh/v2/pkg/version.Version=${pkgver}' -X 'moul.io/assh/v2/pkg/version.VcsRef=${_vcsref}'" \
      -o assh \
      .
 }
diff --git a/version.patch b/version.patch
deleted file mode 100644
index ddd3634c7ce2..000000000000
--- a/version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pkg/version/version.go b/pkg/version/version.go
-index ee757d3c..f115a051 100644
---- a/pkg/version/version.go
-+++ b/pkg/version/version.go
-@@ -2,7 +2,7 @@ package version
- 
- var (
- 	// VERSION should be updated by hand at each release
--	VERSION = "2.8.0+dev"
-+	VERSION = "2.9.1"
- 	// GITCOMMIT will be overwritten automatically by the build system
- 	GITCOMMIT = "HEAD"
- )