Switch to go modules

Bump to 3.2.3

2 files changed, 20 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ba742cee021..60b66dcd9a43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = amass
 	pkgdesc = In-depth subdomain enumeration written in Go
-	pkgver = 3.1.10
+	pkgver = 3.2.3
 	pkgrel = 1
 	url = https://github.com/OWASP/Amass
 	arch = any
 	license = Apache
-	makedepends = go
+	makedepends = go-pie
 	makedepends = git
-	source = Amass-3.1.10.tar.gz::https://github.com/OWASP/Amass/archive/v3.1.10.tar.gz
-	sha512sums = 119fee4de63dbf10df5a4604682e54a0809f0b97231547f2804938518ccf783e678b0d70c7daaa9a3ffb74955e4ed3b7b9cfcbbcdd09ca901a5d015b4923af3d
+	source = Amass-3.2.3.tar.gz::https://github.com/OWASP/Amass/archive/v3.2.3.tar.gz
+	sha512sums = 0c2c82d7c6f19980fbbfb79528a5ba77542b7d19c5725eecf364b2dfea8bef92e6de143df586d8e15c06eaee04840e9a3568de542ab36208a9e8845d64ef7e3d
 
 pkgname = amass
 
diff --git a/PKGBUILD b/PKGBUILD
index 720ed2b05cda..15d9eba5657e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,41 @@
 # Maintainer: architekton <architekton350@gmail.com>
 
 pkgname=amass
-pkgver=3.1.10
+pkgver=3.2.3
 pkgrel=1
 pkgdesc="In-depth subdomain enumeration written in Go"
 arch=('any')
 url="https://github.com/OWASP/Amass"
 license=('Apache')
-makedepends=('go' 'git')
+makedepends=('go-pie' 'git')
 source=(Amass-$pkgver.tar.gz::https://github.com/OWASP/Amass/archive/v${pkgver}.tar.gz)
-sha512sums=('119fee4de63dbf10df5a4604682e54a0809f0b97231547f2804938518ccf783e678b0d70c7daaa9a3ffb74955e4ed3b7b9cfcbbcdd09ca901a5d015b4923af3d')
+sha512sums=('0c2c82d7c6f19980fbbfb79528a5ba77542b7d19c5725eecf364b2dfea8bef92e6de143df586d8e15c06eaee04840e9a3568de542ab36208a9e8845d64ef7e3d')
 
+build() {
+  cd "Amass-$pkgver"
 
-prepare() {
-  mkdir -p "gopath/src/github.com/OWASP"
-  ln -rTsf "Amass-${pkgver}" "gopath/src/github.com/OWASP/Amass"
-
-  export GOPATH="${srcdir}/gopath"
-  cd "${GOPATH}/src/github.com/OWASP/Amass"
-  go get -d ./...
+  mkdir bin
+  go build \
+    -trimpath \
+    -ldflags "-extldflags $LDFLAGS" \
+    -v -o bin/ ./cmd/...
 }
 
 check() {
-  export GOPATH="${srcdir}/gopath"
-  cd "${GOPATH}/src/github.com/OWASP/Amass"
+  cd "Amass-$pkgver"
 
   go test ./...
 
-}
-
-build() {
-  export GOPATH="${srcdir}/gopath"
-  cd "${GOPATH}/src/github.com/OWASP/Amass"
-
-  go install -v ./...
+  # Remove golang mod cache otherwise makepkg clean doesn't work due to perms
+  go clean -modcache
 }
 
 package() {
-  export GOPATH="${srcdir}/gopath"
-  cd "${GOPATH}/bin"
+  cd "Amass-$pkgver"
 
   install -dm 755 "${pkgdir}/usr/share/${pkgname}"
+  install -Dm 755 "bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
 
-  install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-
-  cp -a --no-preserve=ownership "$GOPATH/src/github.com/OWASP/Amass/examples/" "${pkgdir}/usr/share/${pkgname}"
-
+  cp -a --no-preserve=ownership "examples/" "${pkgdir}/usr/share/${pkgname}"
   chmod 644 "${pkgdir}/usr/share/${pkgname}/examples/"*
 }