From 3524ddb73d3123f08139dfb56b271a25ec0e151f 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/10] build-style: go: allow -buildmode=pie --- common/build-style/go.sh | 8 ++++++-- common/environment/build-style/go.sh | 2 +- 2 files changed, 7 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..a07e83521b646 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 @@ -15,6 +14,7 @@ else # target compiler to use; otherwise it'll just call gccgo export GCCGO="${XBPS_CROSS_TRIPLET}-gccgo" fi + nostrip=yes fi case "$XBPS_TARGET_MACHINE" in From cec49e033bff6454c70bbcb2f199fb527de7d0af Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 6 Dec 2023 16:16:08 -0500 Subject: [PATCH 02/10] go: fix cross compile, update to 1.21.5 --- srcpkgs/go/template | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 8e14f7d49a485..816e85a04abcc 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.21.4 +version=1.21.5 revision=1 create_wrksrc=yes build_wrksrc=go @@ -12,20 +12,26 @@ license="BSD-3-Clause" homepage="https://go.dev/" changelog="https://go.dev/doc/devel/release.html" distfiles="https://go.dev/dl/go${version}.src.tar.gz" -checksum=47b26a83d2b65a3c1c1bcace273b69bee49a7a7b5168a7604ded3d26a37bd787 +checksum=285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 nostrip=yes noverifyrdeps=yes # on CI it tries to use `git submodule`, which is not part of chroot-git make_check=ci-skip +# keep in sync with common/environment/build-style/go.sh case "${XBPS_TARGET_MACHINE}" in - aarch64*) _goarch=arm64 ;; - arm*) _goarch=arm ;; - i686*) _goarch=386 ;; - x86_64*) _goarch=amd64 ;; - ppc64le*) _goarch=ppc64le ;; - mips*) _goarch=mips ;; - riscv64*) _goarch=riscv64 ;; + aarch64*) export GOARCH=arm64;; + armv5*) export GOARCH=arm; export GOARM=5;; + armv6*) export GOARCH=arm; export GOARM=6;; + armv7*) export GOARCH=arm; export GOARM=7;; + i686*) export GOARCH=386;; + x86_64*) export GOARCH=amd64;; + ppc64le*) export GOARCH=ppc64le;; + ppc64*) export GOARCH=ppc64;; + ppc*) export GOARCH=ppc;; + mipsel*) export GOARCH=mipsle;; + mips*) export GOARCH=mips;; + riscv64*) export GOARCH=riscv64;; *) broken="Unsupported architecture ${XBPS_TARGET_MACHINE}" ;; esac @@ -56,7 +62,6 @@ do_build() { export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13" export GOROOT=$PWD - export GOARCH=${_goarch} cd "src" @@ -76,7 +81,7 @@ do_install() { local bindir if [ "$CROSS_BUILD" ]; then - bindir=bin/linux_${_goarch} + bindir=bin/linux_${GOARCH} else bindir=bin fi From 2bd197f249a1b379fa32f1476ec3460277137122 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:00:39 -0500 Subject: [PATCH 03/10] booster: set nopie, nostrip --- srcpkgs/booster/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template index 1e904ae1d8664..d0874cfe98cb8 100644 --- a/srcpkgs/booster/template +++ b/srcpkgs/booster/template @@ -17,6 +17,8 @@ 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 +nostrip=nopie _build_component() { go install -p "$XBPS_MAKEJOBS" -mod=readonly -x From bd14f29b609e6594c65f1b202f6de95c72c40680 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:01:32 -0500 Subject: [PATCH 04/10] cni-plugins: set nopie, nostrip --- srcpkgs/cni-plugins/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template index c88498d19dfbf..a25f5336c34f2 100644 --- a/srcpkgs/cni-plugins/template +++ b/srcpkgs/cni-plugins/template @@ -10,6 +10,8 @@ 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 +nostrip=nopie do_build() { ./build_linux.sh \ From 875ffe0ce15da6185e932ec57640e292c2a1ddee Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:02:54 -0500 Subject: [PATCH 05/10] coyim: set nopie, nostrip --- srcpkgs/coyim/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template index 0d928b05cfde3..ca4e1aa222d35 100644 --- a/srcpkgs/coyim/template +++ b/srcpkgs/coyim/template @@ -12,6 +12,8 @@ license="GPL-3.0-only" homepage="https://coy.im" distfiles="https://github.com/coyim/coyim/archive/v${version}.tar.gz" checksum=f2bf1e73562fbcc3a0b264a30f92dfe427dffe2046e9f44459087ecac5890098 +nopie=unverified +nostrip=nopie case "$XBPS_TARGET_MACHINE" in x86_64*) ;; From 485a82c78b6187ade2bbdcf5e9014775660fda01 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:03:42 -0500 Subject: [PATCH 06/10] kubernetes: set nopie, nostrip --- srcpkgs/kubernetes/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index a2b1aa203f8ae..a832eee1b152c 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -17,6 +17,8 @@ nocross=yes system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" +nopie=unverified +nostrip=nopie do_build() { make From 222e1d2933871edb82c8561aef270fd161081570 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:04:26 -0500 Subject: [PATCH 07/10] moby: set nopie, nostrip --- srcpkgs/moby/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template index 50e0e83c70918..e309e77c1efea 100644 --- a/srcpkgs/moby/template +++ b/srcpkgs/moby/template @@ -21,6 +21,8 @@ distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version checksum="16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b" system_groups="docker" +nopie=unverified +nostrip=nopie _moby_builddir="moby-$version" _libnetwork_builddir="libnetwork-$_libnetwork_commit" From 6bcd3c9ed836d1b28f6422ea057f29418f96fdb8 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:05:07 -0500 Subject: [PATCH 08/10] nncp: set nopie, nostrip --- srcpkgs/nncp/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index 6975d7a51ef1b..48b026350735a 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -10,6 +10,8 @@ license="GPL-3.0-only" homepage="http://www.nncpgo.org/" distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz" checksum=154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc +nopie=unverified +nostrip=nopie do_build() { ./bin/build From bb00c3c1b5401515b8002ee1b27baa1b84919465 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 28 Nov 2023 16:05:49 -0500 Subject: [PATCH 09/10] yggdrasil: set nopie, nostrip --- srcpkgs/yggdrasil/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template index e094429212f86..66956e8cc1f5c 100644 --- a/srcpkgs/yggdrasil/template +++ b/srcpkgs/yggdrasil/template @@ -11,6 +11,8 @@ 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=ed908594ab687e141dd2202e1b360e5bd93f910de1fd1f737d210cc784cf2470 +nopie=unverified +nostrip=nopie do_build() { PKGNAME=${pkgname} PKGVER=${version} ./build From 9609f31fd92fcd16f87b36fe8812a2eac2166f08 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 29 Nov 2023 10:55:47 -0500 Subject: [PATCH 10/10] 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"