From f9754340a8dc413f17ae23116edc4f119f61d0d5 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 2 Dec 2023 19:36:34 -0800
Subject: Rebuild with various fixes

---
 PKGBUILD | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 8bf9573..9172580 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 
 pkgname=dnscrypt-proxy
 pkgver=2.1.5
-pkgrel=1
+pkgrel=4
 _patchver=66ffcf524b55b4f06cfaf4e37c8b8c6dcc10d0df
 pkgdesc="A flexible DNS proxy, with support for encrypted DNS protocols"
 arch=('x86_64')
@@ -31,7 +31,7 @@ backup=("etc/${pkgname}/${pkgname}.toml"
         "etc/${pkgname}/ip-whitelist.txt"
         "etc/${pkgname}/whitelist.txt"
 )
-# NOTE: disabled until gcc is fixed to produce reproducible bytecode for go
+# NOTE: LTO breaks reproducibility :(
 options=(!lto)
 source=("git+https://github.com/dnscrypt/${pkgname}#tag=${pkgver}?signed"
         "${pkgname}.sysusers"
@@ -70,22 +70,22 @@ prepare() {
 
 build() {
   cd "$pkgname"
-
-  # set GOPATH
   export GO111MODULE=off
-  export GOPATH=$(pwd)
-  #go mod init
 
   cd "$pkgname"
-
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  #export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  export GOPATH="$srcdir/$pkgname"
+  export GOFLAGS="-buildmode=pie -mod=readonly -modcacherw"
+
+  go build -mod=vendor -ldflags "-compressdwarf=false -linkmode=external" .
+}
 
-  go build -mod=vendor
+check() {
+  cd $pkgname
+  go test ./...
 }
 
 package() {
-- 
cgit v1.2.1