From c8686b1e149b6c42db019c77caf36475aafadd03 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Wed, 31 Aug 2022 01:51:12 +0200 Subject: [PATCH 01/12] Initial commit --- .SRCINFO | 22 ++++++++++++++++++++++ PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..f0bec48 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,22 @@ +pkgbase = awl-dns-git + pkgdesc = A DNS client + pkgver = 0.2.0.r35.g61ddbb3 + pkgrel = 1 + url = https://git.froth.zone/sam/awl + arch = i686 + arch = pentium4 + arch = x86_64 + arch = arm + arch = armv6h + arch = armv7h + arch = aarch64 + license = BSD + makedepends = git + makedepends = go>=1.18 + makedepends = scdoc + provides = awl-dns + conflicts = awl-dns + source = awl-dns-git::git+https://git.froth.zone/sam/awl.git + sha256sums = SKIP + +pkgname = awl-dns-git diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..2a9ff55 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Sam Therapy +pkgname=awl-dns-git +pkgver=0.2.0.r35.g61ddbb3 +pkgrel=1 +arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') +pkgdesc="A DNS client" +url="https://git.froth.zone/sam/awl" +license=('BSD') +makedepends=( + 'git' + 'go>=1.18' + 'scdoc' +) +provides=("${pkgname%-*}") +conflicts=("${pkgname%-*}") +source=("${pkgname}::git+https://git.froth.zone/sam/awl.git") +sha256sums=('SKIP') + + +pkgver() { + cd "$srcdir/$pkgname" + printf "%s" "$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')" +} + +build() { + cd "$srcdir/$pkgname" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -ldflags=-X=main.version=${pkgver} -mod=readonly -modcacherw" + export CGO_ENABLED=1 + + make VERSION=$pkgver DESTDIR="$pkgdir" PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname" + make VERSION=$pkgver DESTDIR="$pkgdir" PREFIX="/usr" install + install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From d876d6de34a78298ed041f575662015fb7eccdb5 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Thu, 15 Sep 2022 12:41:46 +0200 Subject: [PATCH 02/12] Fix pkgver() From changing the versioning Signed-off-by: Sam Therapy --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f0bec48..60cfaa4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = awl-dns-git pkgdesc = A DNS client - pkgver = 0.2.0.r35.g61ddbb3 + pkgver = 0.5.0.r1.g0d011bb pkgrel = 1 url = https://git.froth.zone/sam/awl arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 2a9ff55..80ef874 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git -pkgver=0.2.0.r35.g61ddbb3 +pkgver=0.5.0.r1.g0d011bb pkgrel=1 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" @@ -19,7 +19,7 @@ sha256sums=('SKIP') pkgver() { cd "$srcdir/$pkgname" - printf "%s" "$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')" + printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')" } build() { From a38be687ff081beaf23c0562e1448e7ab8c14f2f Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Fri, 14 Oct 2022 15:04:57 +0200 Subject: [PATCH 03/12] add Go trimming to reduce binary size --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 60cfaa4..0dfaea4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = awl-dns-git pkgdesc = A DNS client - pkgver = 0.5.0.r1.g0d011bb + pkgver = 0.5.2.r32.g2d94ea6 pkgrel = 1 url = https://git.froth.zone/sam/awl arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 80ef874..f60e4f8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git -pkgver=0.5.0.r1.g0d011bb +pkgver=0.5.2.r32.g2d94ea6 pkgrel=1 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" @@ -28,7 +28,7 @@ build() { export CGO_CFLAGS="${CFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" - export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -ldflags=-X=main.version=${pkgver} -mod=readonly -modcacherw" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -ldflags=-X=main.version=${pkgver} -ldflags=-s -ldflags=-w -mod=readonly -modcacherw" export CGO_ENABLED=1 make VERSION=$pkgver DESTDIR="$pkgdir" PREFIX="/usr" From c58ad5346a6f820d8a7e7ed7b1d187c5b4f76468 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 7 Nov 2022 15:44:10 +0100 Subject: [PATCH 04/12] fix: make version actually show up It didn't before, and for some reason rearranging the GOFLAGS consistently works. --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0dfaea4..e59d925 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = awl-dns-git pkgdesc = A DNS client - pkgver = 0.5.2.r32.g2d94ea6 + pkgver = 0.5.8.r10.ga64a260 pkgrel = 1 url = https://git.froth.zone/sam/awl arch = i686 diff --git a/PKGBUILD b/PKGBUILD index f60e4f8..be99935 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git -pkgver=0.5.2.r32.g2d94ea6 +pkgver=0.5.8.r10.ga64a260 pkgrel=1 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" @@ -8,7 +8,7 @@ url="https://git.froth.zone/sam/awl" license=('BSD') makedepends=( 'git' - 'go>=1.18' +# 'go>=1.18' 'scdoc' ) provides=("${pkgname%-*}") @@ -28,7 +28,7 @@ build() { export CGO_CFLAGS="${CFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" - export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -ldflags=-X=main.version=${pkgver} -ldflags=-s -ldflags=-w -mod=readonly -modcacherw" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-s -ldflags=-w -ldflags=-linkmode=external -ldflags=-X=main.version=${pkgver} -mod=readonly -modcacherw" export CGO_ENABLED=1 make VERSION=$pkgver DESTDIR="$pkgdir" PREFIX="/usr" From 29dfcf04f260dd2e79640f239895fa68824179f1 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 7 Nov 2022 15:48:28 +0100 Subject: [PATCH 05/12] I am a moron --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index be99935..816ea51 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ url="https://git.froth.zone/sam/awl" license=('BSD') makedepends=( 'git' -# 'go>=1.18' + 'go>=1.18' 'scdoc' ) provides=("${pkgname%-*}") From 7b6d140c3352b8fc2212b3949320fc3416e321de Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 7 Nov 2022 15:49:07 +0100 Subject: [PATCH 06/12] I am still a moron --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e59d925..591a6cb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = awl-dns-git pkgdesc = A DNS client pkgver = 0.5.8.r10.ga64a260 - pkgrel = 1 + pkgrel = 2 url = https://git.froth.zone/sam/awl arch = i686 arch = pentium4 diff --git a/PKGBUILD b/PKGBUILD index 816ea51..b4490f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git pkgver=0.5.8.r10.ga64a260 -pkgrel=1 +pkgrel=2 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" url="https://git.froth.zone/sam/awl" From d026117052c350d37294789770d7920ec631fb7d Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 5 Dec 2022 15:24:14 +0100 Subject: [PATCH 07/12] Version proper tags when greater than 10 --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 591a6cb..1e2a762 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = awl-dns-git pkgdesc = A DNS client - pkgver = 0.5.8.r10.ga64a260 - pkgrel = 2 + pkgver = 0.5.10.r3.g7e7c88d + pkgrel = 1 url = https://git.froth.zone/sam/awl arch = i686 arch = pentium4 diff --git a/PKGBUILD b/PKGBUILD index b4490f3..fc05cd6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ sha256sums=('SKIP') pkgver() { cd "$srcdir/$pkgname" - printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')" + printf "%s" "$(git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')" } build() { From 1fcd6e05b6bf16b93535d2b0654fcf2c267499d9 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 5 Dec 2022 15:28:17 +0100 Subject: [PATCH 08/12] oops --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index fc05cd6..274fbbf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git -pkgver=0.5.8.r10.ga64a260 -pkgrel=2 +pkgver=0.5.10.r3.g7e7c88d +pkgrel=1 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" url="https://git.froth.zone/sam/awl" From 5ba667b122004a9b3633969d9c046b8b7bdca372 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 5 Dec 2022 15:28:42 +0100 Subject: [PATCH 09/12] increment version --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1e2a762..1f2cbe1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = awl-dns-git pkgdesc = A DNS client pkgver = 0.5.10.r3.g7e7c88d - pkgrel = 1 + pkgrel = 2 url = https://git.froth.zone/sam/awl arch = i686 arch = pentium4 diff --git a/PKGBUILD b/PKGBUILD index 274fbbf..d156488 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git pkgver=0.5.10.r3.g7e7c88d -pkgrel=1 +pkgrel=2 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" url="https://git.froth.zone/sam/awl" From 881fb2f551d249c24818705820490af6b3e95e64 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Mon, 3 Apr 2023 15:00:22 +0200 Subject: [PATCH 10/12] Bump Go version minimum, disable LTO --- .SRCINFO | 39 ++++++++++++++++++++------------------- PKGBUILD | 1 + 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1f2cbe1..4b7e641 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,22 +1,23 @@ pkgbase = awl-dns-git - pkgdesc = A DNS client - pkgver = 0.5.10.r3.g7e7c88d - pkgrel = 2 - url = https://git.froth.zone/sam/awl - arch = i686 - arch = pentium4 - arch = x86_64 - arch = arm - arch = armv6h - arch = armv7h - arch = aarch64 - license = BSD - makedepends = git - makedepends = go>=1.18 - makedepends = scdoc - provides = awl-dns - conflicts = awl-dns - source = awl-dns-git::git+https://git.froth.zone/sam/awl.git - sha256sums = SKIP + pkgdesc = A DNS client + pkgver = 0.6.6.r3.g928123e + pkgrel = 1 + url = https://git.froth.zone/sam/awl + arch = i686 + arch = pentium4 + arch = x86_64 + arch = arm + arch = armv6h + arch = armv7h + arch = aarch64 + license = BSD + makedepends = git + makedepends = go>=1.19 + makedepends = scdoc + provides = awl-dns + conflicts = awl-dns + options = !lto + source = awl-dns-git::git+https://git.froth.zone/sam/awl.git + sha256sums = SKIP pkgname = awl-dns-git diff --git a/PKGBUILD b/PKGBUILD index d156488..2e7e04a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,6 +5,7 @@ pkgrel=2 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" url="https://git.froth.zone/sam/awl" +options=(!lto) license=('BSD') makedepends=( 'git' From 5cf363ad643a38adb05c157bcab30e4a7aea0ae6 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Fri, 12 May 2023 19:40:32 +0200 Subject: [PATCH 11/12] Bump minimum Go version --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4b7e641..fd11b9e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = awl-dns-git pkgdesc = A DNS client - pkgver = 0.6.6.r3.g928123e + pkgver = 0.6.7.r4.g45d1aaf pkgrel = 1 url = https://git.froth.zone/sam/awl arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 2e7e04a..2f68838 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sam Therapy pkgname=awl-dns-git -pkgver=0.5.10.r3.g7e7c88d -pkgrel=2 +pkgver=0.6.7.r4.g45d1aaf +pkgrel=1 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="A DNS client" url="https://git.froth.zone/sam/awl" @@ -9,7 +9,7 @@ options=(!lto) license=('BSD') makedepends=( 'git' - 'go>=1.18' + 'go>=1.19' 'scdoc' ) provides=("${pkgname%-*}") From 3e4edc45540b174e41d5fc0352346c2c8626247f Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Thu, 10 Aug 2023 19:57:09 +0200 Subject: [PATCH 12/12] Bump minimum Go version --- .SRCINFO | 40 ++++++++++++++++++++-------------------- PKGBUILD | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fd11b9e..29eb4b9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,23 @@ pkgbase = awl-dns-git - pkgdesc = A DNS client - pkgver = 0.6.7.r4.g45d1aaf - pkgrel = 1 - url = https://git.froth.zone/sam/awl - arch = i686 - arch = pentium4 - arch = x86_64 - arch = arm - arch = armv6h - arch = armv7h - arch = aarch64 - license = BSD - makedepends = git - makedepends = go>=1.19 - makedepends = scdoc - provides = awl-dns - conflicts = awl-dns - options = !lto - source = awl-dns-git::git+https://git.froth.zone/sam/awl.git - sha256sums = SKIP + pkgdesc = A DNS client + pkgver = 0.6.7.r4.g45d1aaf + pkgrel = 1 + url = https://git.froth.zone/sam/awl + arch = i686 + arch = pentium4 + arch = x86_64 + arch = arm + arch = armv6h + arch = armv7h + arch = aarch64 + license = BSD + makedepends = git + makedepends = go>=1.20 + makedepends = scdoc + provides = awl-dns + conflicts = awl-dns + options = !lto + source = awl-dns-git::git+https://git.froth.zone/sam/awl.git + sha256sums = SKIP pkgname = awl-dns-git diff --git a/PKGBUILD b/PKGBUILD index 2f68838..d425530 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ options=(!lto) license=('BSD') makedepends=( 'git' - 'go>=1.19' + 'go>=1.20' 'scdoc' ) provides=("${pkgname%-*}")