From c83e8fc2379856410b09ee6f04b70fe15558eba9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 8 Aug 2022 12:21:20 -0400 Subject: [PATCH 1/6] aws-vault: remove -w -s from go_ldflags --- srcpkgs/aws-vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template index a3f6d60583c6..ce7b0be3307a 100644 --- a/srcpkgs/aws-vault/template +++ b/srcpkgs/aws-vault/template @@ -1,10 +1,10 @@ # Template file for 'aws-vault' pkgname=aws-vault version=6.3.1 -revision=1 +revision=2 build_style=go go_import_path=github.com/99designs/aws-vault/v6 -go_ldflags="-X \"main.Version=${version}\" -s -w" +go_ldflags="-X main.Version=${version}" short_desc="Vault for securely storing and accessing AWS credentials" maintainer="klardotsh " license="MIT" From c88b1f8d14cf469cab82bb6d797d7982522d79b8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 8 Aug 2022 12:21:25 -0400 Subject: [PATCH 2/6] circleci-cli: remove -w -s from go_ldflags --- srcpkgs/circleci-cli/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template index 61978ffded01..6c04611c72ee 100644 --- a/srcpkgs/circleci-cli/template +++ b/srcpkgs/circleci-cli/template @@ -1,12 +1,11 @@ # Template file for 'circleci-cli' pkgname=circleci-cli version=0.1.15224 -revision=1 +revision=2 build_style=go build_helper=qemu go_import_path=github.com/CircleCI-Public/${pkgname} -go_ldflags="-s -w - -X github.com/CircleCI-Public/${pkgname}/version.Version=${version} +go_ldflags="-X github.com/CircleCI-Public/${pkgname}/version.Version=${version} -X github.com/CircleCI-Public/${pkgname}/version.packageManager=xbps" hostmakedepends="packr2" short_desc="Use CircleCI from the command line" From 834712d145cee8051720544085b31e2ac3a599a1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 8 Aug 2022 12:21:25 -0400 Subject: [PATCH 3/6] coredns: remove -w -s from go_ldflags --- srcpkgs/coredns/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template index fe48c2347f91..263df82c6476 100644 --- a/srcpkgs/coredns/template +++ b/srcpkgs/coredns/template @@ -1,7 +1,7 @@ # Template file for 'coredns' pkgname=coredns version=1.8.6 -revision=1 +revision=2 build_style=go go_import_path=github.com/coredns/coredns hostmakedepends="git make mmark" @@ -14,7 +14,7 @@ checksum=cbe3764afe2148b8047ea7e5cbba5108c298dee3a9a0391028e2980e35beaa2b make_dirs="/etc/coredns 0750 root root" _git_commit=f59c03d09c3a3a12f571ad1087b979325f3dae30 -go_ldflags+=" -s -w -X github.com/coredns/coredns/coremain.GitCommit=${_git_commit}" +go_ldflags+="-X github.com/coredns/coredns/coremain.GitCommit=${_git_commit}" post_build() { make -f Makefile.doc MMARK="$(command -v mmark) -man" man/coredns.1 man/corefile.5 plugins From a383c7b891d34b2a9d14737d88edef61a9a9cb70 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 8 Aug 2022 12:21:26 -0400 Subject: [PATCH 4/6] gotify-cli: remove -w -s from go_ldflags --- srcpkgs/gotify-cli/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template index 91fea40fca9d..d52b7a8cd37a 100644 --- a/srcpkgs/gotify-cli/template +++ b/srcpkgs/gotify-cli/template @@ -1,12 +1,11 @@ # Template file for 'gotify-cli' pkgname=gotify-cli version=2.2.2 -revision=1 +revision=2 wrksrc="cli-$version" build_style=go go_import_path="github.com/gotify/cli/v2" -go_ldflags="-w -s -X main.Version=${version} \ - -X main.BuildDate=${SOURCE_DATE_EPOCH} \ +go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH} -X main.Mode=prod" short_desc="Command line interface for pushing messages to a Gotify server" maintainer="Joel Beckmeyer " From 0a9d73c19d8d095b12394b5668727124c7d7c5fa Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 8 Aug 2022 12:21:27 -0400 Subject: [PATCH 5/6] gotify-server: remove -w -s from go_ldflags --- srcpkgs/gotify-server/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template index e306deef9220..d48b32a2a843 100644 --- a/srcpkgs/gotify-server/template +++ b/srcpkgs/gotify-server/template @@ -1,14 +1,12 @@ # Template file for 'gotify-server' pkgname=gotify-server version=2.1.5 -revision=1 +revision=2 wrksrc="server-$version" build_style=go go_import_path="github.com/gotify/server/v2" -go_ldflags="-w -s -extldflags=-fuse-ld=bfd \ - -X main.Version=${version} \ - -X main.BuildDate=${SOURCE_DATE_EPOCH} \ - -X main.Mode=prod" +go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version} + -X main.BuildDate=${SOURCE_DATE_EPOCH} -X main.Mode=prod" hostmakedepends="yarn packr2" short_desc="Simple server for sending and receiving messages" maintainer="Joel Beckmeyer " From 8a46a6f12ea4221bbe41b5f8d814ebd7f92c1daa Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 8 Aug 2022 12:21:27 -0400 Subject: [PATCH 6/6] v2ray: remove -w -s from go_ldflags --- srcpkgs/v2ray/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template index cf6cd28a534a..d22b5247498f 100644 --- a/srcpkgs/v2ray/template +++ b/srcpkgs/v2ray/template @@ -1,11 +1,13 @@ # Template file for 'v2ray' pkgname=v2ray version=4.44.0 -revision=1 +revision=2 wrksrc=${pkgname}-core-${version} build_style=go go_import_path="github.com/v2fly/v2ray-core/v4" -go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname -X github.com/v2fly/v2ray-core/v4.version=$version -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -s -w -buildid=" +go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname + -X github.com/v2fly/v2ray-core/v4.version=$version + -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -buildid=" short_desc="Platform for building proxies to bypass network restrictions" maintainer="ipkalm " license="MIT"