From 6466a61cc8e093fa7d599de985d41312a9ccdd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 12 Sep 2020 07:07:13 +0700 Subject: [PATCH 01/12] build-style: go: allow -buildmode=pie --- common/build-style/go.sh | 8 ++++++-- common/environment/build-style/go.sh | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/build-style/go.sh b/common/build-style/go.sh index 50524b07f768c..a54f3813183cc 100644 --- a/common/build-style/go.sh +++ b/common/build-style/go.sh @@ -29,7 +29,11 @@ do_build() { fi done + local buildmode go_package=${go_package:-$go_import_path} + if [ -z "$nopie" ]; then + buildmode=-buildmode=pie + fi # Build using Go modules if there's a go.mod file if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then @@ -50,13 +54,13 @@ do_build() { # default behavior. go_mod_mode= fi - go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} + go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" $buildmode -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} if [[ -n "${_go_mod_path}" ]]; then popd fi else # Otherwise, build using GOPATH - go get -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} + go get -p "$XBPS_MAKEJOBS" $buildmode -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} fi } diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh index 223bba83ff11b..92a049411e0fb 100644 --- a/common/environment/build-style/go.sh +++ b/common/environment/build-style/go.sh @@ -4,7 +4,6 @@ if [ -z "$hostmakedepends" -o "${hostmakedepends##*gcc-go-tools*}" ]; then archs="aarch64* armv[567]* i686* x86_64* ppc64le* riscv64*" fi hostmakedepends+=" go" - nopie=yes else # gccgo compiler if [ -z "$archs" ]; then From c0b3163ede297dd4a53c8f183a557d8e76603316 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 7 Dec 2023 17:07:51 -0500 Subject: [PATCH 02/12] booster: set nopie --- srcpkgs/booster/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template index 1e904ae1d8664..e2d095c4ad0c2 100644 --- a/srcpkgs/booster/template +++ b/srcpkgs/booster/template @@ -17,6 +17,7 @@ alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/booster/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/booster/kernel-hook-postrm " +nopie=unverified _build_component() { go install -p "$XBPS_MAKEJOBS" -mod=readonly -x From c00d40ad2f410e3ec1b3bea55edb768f9a3bb3fa Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:01:32 -0500 Subject: [PATCH 03/12] cni-plugins: set nopie --- srcpkgs/cni-plugins/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template index c88498d19dfbf..496433b8c73d0 100644 --- a/srcpkgs/cni-plugins/template +++ b/srcpkgs/cni-plugins/template @@ -10,6 +10,7 @@ license="Apache-2.0" homepage="https://github.com/containernetworking/plugins" distfiles="https://github.com/containernetworking/plugins/archive/v${version}.tar.gz" checksum=f9871b9f6ccb51d2b264532e96521e44f926928f91434b56ce135c95becf2901 +nopie=unverified do_build() { ./build_linux.sh \ From a23fa239167774af28a090826d88b9913c9eee1a Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:02:54 -0500 Subject: [PATCH 04/12] coyim: set nopie --- srcpkgs/coyim/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template index 0d928b05cfde3..a8408d59fccdd 100644 --- a/srcpkgs/coyim/template +++ b/srcpkgs/coyim/template @@ -12,6 +12,7 @@ license="GPL-3.0-only" homepage="https://coy.im" distfiles="https://github.com/coyim/coyim/archive/v${version}.tar.gz" checksum=f2bf1e73562fbcc3a0b264a30f92dfe427dffe2046e9f44459087ecac5890098 +nopie=unverified case "$XBPS_TARGET_MACHINE" in x86_64*) ;; From 759164ebc59e4b5f5cafbbffe93d7da6bb1879c3 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:03:42 -0500 Subject: [PATCH 05/12] kubernetes: set nopie --- srcpkgs/kubernetes/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index d0b936775cbb6..5c050b7b14fe3 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -17,6 +17,7 @@ nocross=yes system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" +nopie=unverified do_build() { make From abc4f542bf9ac01cb5c64350b24121ddc9f19fe4 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:04:26 -0500 Subject: [PATCH 06/12] moby: set nopie --- srcpkgs/moby/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template index 50e0e83c70918..b175280862ea6 100644 --- a/srcpkgs/moby/template +++ b/srcpkgs/moby/template @@ -21,6 +21,7 @@ distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version checksum="16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b" system_groups="docker" +nopie=unverified _moby_builddir="moby-$version" _libnetwork_builddir="libnetwork-$_libnetwork_commit" From 8347c2da0f1652b56dae127eb12c30e7ecfaadfe Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:05:07 -0500 Subject: [PATCH 07/12] nncp: set nopie --- srcpkgs/nncp/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index 6975d7a51ef1b..acc5f487aeb73 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -10,6 +10,7 @@ license="GPL-3.0-only" homepage="http://www.nncpgo.org/" distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz" checksum=154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc +nopie=unverified do_build() { ./bin/build From 5956f065911be8f97a244199ff1d6cdbfcce8e25 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:05:49 -0500 Subject: [PATCH 08/12] yggdrasil: set nopie --- srcpkgs/yggdrasil/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template index c6f7a2395b9ba..24a81e3d799ff 100644 --- a/srcpkgs/yggdrasil/template +++ b/srcpkgs/yggdrasil/template @@ -11,6 +11,7 @@ homepage="https://yggdrasil-network.github.io/" changelog="https://raw.githubusercontent.com/yggdrasil-network/yggdrasil-go/develop/CHANGELOG.md" distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz" checksum=c1cceb9a7a4a8959536b1d930ca081bcfbc76ab655e4bcb55d5d0ab6520d9241 +nopie=unverified do_build() { PKGNAME=${pkgname} PKGVER=${version} ./build From 1772faf5c7eb99f22b13094fd1aaed0f76917d65 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 29 Nov 2023 10:55:47 -0500 Subject: [PATCH 09/12] browsh: fix distfiles --- srcpkgs/browsh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template index 6fa397b04305f..e23f8ddf70a2f 100644 --- a/srcpkgs/browsh/template +++ b/srcpkgs/browsh/template @@ -12,8 +12,8 @@ short_desc="Fully-modern text-based browser, rendering to TTY and browsers" maintainer="zhengqunkoo " license="LGPL-2.1-only" homepage="https://www.brow.sh/" -distfiles="https://$go_import_path/archive/v$version.tar.gz - https://$go_import_path/releases/download/v${version}/browsh-${version}-an.fx.xpi>browsh.xpi" +distfiles="https://github.com/browsh-org/browsh/archive/refs/tags/v${version}.tar.gz + https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-1.6.4-an.fx.xpi>browsh.xpi" checksum="965ce2d94d1d9e4b92411d344421c0bea40994527cafd694c5a6e8e206681ede b410527a69dba88a30d8a6d341a20eb5cb1f84b684e9bc8bb6bc88a2930e0eea" skip_extraction="browsh.xpi" From ab659c4168d8599b165c3519af63396e857ec443 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 7 Jan 2024 18:33:20 +0100 Subject: [PATCH 10/12] go-bindata: set nopie --- srcpkgs/go-bindata/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template index dad00443ee529..8a85286c726cd 100644 --- a/srcpkgs/go-bindata/template +++ b/srcpkgs/go-bindata/template @@ -12,3 +12,4 @@ license="Public Domain" homepage="https://github.com/jteeuwen/go-bindata" distfiles="https://github.com/jteeuwen/go-bindata/archive/${_commit}.tar.gz" checksum=65cf65ac422fb8072abfaabec86c20a74e448a93b489e896a36642e7049f5d32 +nopie=static From b3f55316d5b63cba2020f92fd01ec94fa7cd36aa Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 7 Jan 2024 18:35:32 +0100 Subject: [PATCH 11/12] go-md2man: set nopie --- srcpkgs/go-md2man/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template index 39e92c22803e0..bbe0123ebaf33 100644 --- a/srcpkgs/go-md2man/template +++ b/srcpkgs/go-md2man/template @@ -10,6 +10,7 @@ license="MIT" homepage="https://github.com/cpuguy83/go-md2man" distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz" checksum=7ca3a04bb4ab83387538235decc42a535097a05d2fb9f2266d0c47b33119501f +nopie=static post_install() { vlicense LICENSE.md From 468255eca20674fb3d959bcd9f4fb84291d3818c Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 7 Jan 2024 20:59:34 +0100 Subject: [PATCH 12/12] grafana: set nopie --- srcpkgs/grafana/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 9f634d6268d28..13362ce761f92 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -22,6 +22,7 @@ make_dirs="/var/log/grafana 0755 _grafana _grafana" conf_files="/etc/grafana/grafana.ini" go_ldflags="-X main.version=${version}" +nopie=static post_extract() { # remove prebuilt binaries