Mon Feb 1 16:54:00 2021 UTC ()
terraform,terraform-provider-*: Remove CHECK_RELRO_SKIP

RELRO_SUPPORTED=no is set in lang/go/go-vars.mk which should remove the
need to use CHECK_RELRO_SKIP in go packages. This was not working
previously because check-relro.mk was using "PKGSRC_USE_RELRO" instead
of "_PKGSRC_USE_RELRO".

ok'd jperkin


(tpaul)
diff -r1.16 -r1.17 pkgsrc/net/terraform/Makefile
diff -r1.22 -r1.23 pkgsrc/net/terraform-provider-aws/Makefile
diff -r1.11 -r1.12 pkgsrc/net/terraform-provider-kubernetes/Makefile
diff -r1.11 -r1.12 pkgsrc/net/terraform-provider-local/Makefile
diff -r1.10 -r1.11 pkgsrc/net/terraform-provider-null/Makefile
diff -r1.12 -r1.13 pkgsrc/net/terraform-provider-random/Makefile
diff -r1.1 -r1.2 pkgsrc/net/terraform-provider-vultr/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/net/terraform/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform/Makefile 2021/01/27 13:35:58 1.16
+++ pkgsrc/net/terraform/Makefile 2021/02/01 16:54:00 1.17
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.16 2021/01/27 13:35:58 leot Exp $ 1# $NetBSD: Makefile,v 1.17 2021/02/01 16:54:00 tpaul Exp $
2 2
3DISTNAME= terraform-0.12.30 3DISTNAME= terraform-0.12.30
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.terraform.io/ 9HOMEPAGE= https://www.terraform.io/
10COMMENT= Infrastructure orchestration tool 10COMMENT= Infrastructure orchestration tool
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13GO_DIST_BASE= ${DISTNAME} 13GO_DIST_BASE= ${DISTNAME}
14GO_SRCPATH= github.com/hashicorp/terraform 14GO_SRCPATH= github.com/hashicorp/terraform
15 15
16GO_BUILD_PATTERN= ${GO_SRCPATH}/. 16GO_BUILD_PATTERN= ${GO_SRCPATH}/.
17 17
18# Not actually sure these are used. 18# Not actually sure these are used.
19USE_TOOLS+= bash 19USE_TOOLS+= bash
20REPLACE_BASH+= command/e2etest/make-archive.sh 20REPLACE_BASH+= command/e2etest/make-archive.sh
21REPLACE_BASH+= scripts/debug-terraform 21REPLACE_BASH+= scripts/debug-terraform
22REPLACE_BASH+= scripts/*.sh 22REPLACE_BASH+= scripts/*.sh
23REPLACE_BASH+= scripts/*/*.sh 23REPLACE_BASH+= scripts/*/*.sh
24 24
25CHECK_RELRO_SKIP+= bin/terraform 
26 
27.include "../../lang/go/go-package.mk" 25.include "../../lang/go/go-package.mk"
28.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/net/terraform-provider-aws/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform-provider-aws/Makefile 2021/01/29 21:34:25 1.22
+++ pkgsrc/net/terraform-provider-aws/Makefile 2021/02/01 16:54:00 1.23
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.22 2021/01/29 21:34:25 leot Exp $ 1# $NetBSD: Makefile,v 1.23 2021/02/01 16:54:00 tpaul Exp $
2 2
3DISTNAME= terraform-provider-aws-3.26.0 3DISTNAME= terraform-provider-aws-3.26.0
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=terraform-providers/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=terraform-providers/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.terraform.io/docs/providers/aws/ 9HOMEPAGE= https://www.terraform.io/docs/providers/aws/
10COMMENT= Terraform provider for Amazon Web Services 10COMMENT= Terraform provider for Amazon Web Services
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13DEPENDS+= terraform-[0-9]*:../../net/terraform 13DEPENDS+= terraform-[0-9]*:../../net/terraform
14 14
15GO_BUILD_PATTERN= . 15GO_BUILD_PATTERN= .
16 16
17UNLIMIT_RESOURCES= datasize virtualsize 17UNLIMIT_RESOURCES= datasize virtualsize
18 18
19INSTALLATION_DIRS+= bin 19INSTALLATION_DIRS+= bin
20 20
21do-install: 21do-install:
22 ${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform-provider-aws ${DESTDIR}${PREFIX}/bin 22 ${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform-provider-aws ${DESTDIR}${PREFIX}/bin
23 23
24CHECK_RELRO_SKIP+= bin/terraform-provider-aws 
25 
26.include "go-modules.mk" 24.include "go-modules.mk"
27 25
28.include "../../lang/go/go-module.mk" 26.include "../../lang/go/go-module.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/net/terraform-provider-kubernetes/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform-provider-kubernetes/Makefile 2021/01/28 18:01:44 1.11
+++ pkgsrc/net/terraform-provider-kubernetes/Makefile 2021/02/01 16:54:00 1.12
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.11 2021/01/28 18:01:44 tpaul Exp $ 1# $NetBSD: Makefile,v 1.12 2021/02/01 16:54:00 tpaul Exp $
2 2
3DISTNAME= terraform-provider-kubernetes-1.11.4 3DISTNAME= terraform-provider-kubernetes-1.11.4
4PKGREVISION= 6 4PKGREVISION= 6
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
7GITHUB_PROJECT= ${PKGBASE} 7GITHUB_PROJECT= ${PKGBASE}
8GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.terraform.io/docs/providers/kubernetes/ 11HOMEPAGE= https://www.terraform.io/docs/providers/kubernetes/
12COMMENT= Terraform provider for Kubernetes (K8S) 12COMMENT= Terraform provider for Kubernetes (K8S)
13LICENSE= mpl-2.0 13LICENSE= mpl-2.0
14 14
15UNLIMIT_RESOURCES= datasize virtualsize 15UNLIMIT_RESOURCES= datasize virtualsize
16 16
17GO_DIST_BASE= ${DISTNAME} 17GO_DIST_BASE= ${DISTNAME}
18GO_SRCPATH= github.com/hashicorp/${GITHUB_PROJECT} 18GO_SRCPATH= github.com/hashicorp/${GITHUB_PROJECT}
19 19
20GO_BUILD_PATTERN= ${GO_SRCPATH}/. 20GO_BUILD_PATTERN= ${GO_SRCPATH}/.
21 21
22USE_TOOLS+= bash 22USE_TOOLS+= bash
23REPLACE_BASH+= scripts/*.sh 23REPLACE_BASH+= scripts/*.sh
24 24
25CHECK_RELRO_SKIP+= bin/terraform-provider-kubernetes 
26 
27.include "../../lang/go/go-package.mk" 25.include "../../lang/go/go-package.mk"
28.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/net/terraform-provider-local/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform-provider-local/Makefile 2021/01/28 18:03:07 1.11
+++ pkgsrc/net/terraform-provider-local/Makefile 2021/02/01 16:54:00 1.12
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.11 2021/01/28 18:03:07 tpaul Exp $ 1# $NetBSD: Makefile,v 1.12 2021/02/01 16:54:00 tpaul Exp $
2 2
3DISTNAME= terraform-provider-local-1.4.0 3DISTNAME= terraform-provider-local-1.4.0
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.terraform.io/docs/providers/local/ 10HOMEPAGE= https://www.terraform.io/docs/providers/local/
11COMMENT= Terraform provider for local resources 11COMMENT= Terraform provider for local resources
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14DEPENDS+= terraform-[0-9]*:../../net/terraform 14DEPENDS+= terraform-[0-9]*:../../net/terraform
15 15
16UNLIMIT_RESOURCES= datasize virtualsize 16UNLIMIT_RESOURCES= datasize virtualsize
17 17
18GO_DIST_BASE= ${DISTNAME} 18GO_DIST_BASE= ${DISTNAME}
19GO_SRCPATH= github.com/terraform-providers/${GITHUB_PROJECT} 19GO_SRCPATH= github.com/terraform-providers/${GITHUB_PROJECT}
20 20
21GO_BUILD_PATTERN?= ${GO_SRCPATH}/. 21GO_BUILD_PATTERN?= ${GO_SRCPATH}/.
22 22
23USE_TOOLS+= bash 23USE_TOOLS+= bash
24REPLACE_BASH+= scripts/*.sh 24REPLACE_BASH+= scripts/*.sh
25 25
26CHECK_RELRO_SKIP+= bin/terraform-provider-local 
27 
28.include "../../lang/go/go-package.mk" 26.include "../../lang/go/go-package.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/net/terraform-provider-null/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform-provider-null/Makefile 2021/01/28 18:04:08 1.10
+++ pkgsrc/net/terraform-provider-null/Makefile 2021/02/01 16:54:00 1.11
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.10 2021/01/28 18:04:08 tpaul Exp $ 1# $NetBSD: Makefile,v 1.11 2021/02/01 16:54:00 tpaul Exp $
2 2
3DISTNAME= terraform-provider-null-2.1.2 3DISTNAME= terraform-provider-null-2.1.2
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.terraform.io/docs/providers/null/ 10HOMEPAGE= https://www.terraform.io/docs/providers/null/
11COMMENT= Terraform provider for nothing 11COMMENT= Terraform provider for nothing
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14DEPENDS+= terraform-[0-9]*:../../net/terraform 14DEPENDS+= terraform-[0-9]*:../../net/terraform
15 15
16UNLIMIT_RESOURCES= datasize virtualsize 16UNLIMIT_RESOURCES= datasize virtualsize
17 17
18GO_DIST_BASE= ${DISTNAME} 18GO_DIST_BASE= ${DISTNAME}
19GO_SRCPATH= github.com/terraform-providers/${GITHUB_PROJECT} 19GO_SRCPATH= github.com/terraform-providers/${GITHUB_PROJECT}
20 20
21GO_BUILD_PATTERN= ${GO_SRCPATH}/. 21GO_BUILD_PATTERN= ${GO_SRCPATH}/.
22 22
23USE_TOOLS+= bash 23USE_TOOLS+= bash
24REPLACE_BASH+= scripts/*.sh 24REPLACE_BASH+= scripts/*.sh
25 25
26CHECK_RELRO_SKIP+= bin/terraform-provider-null 
27 
28.include "../../lang/go/go-package.mk" 26.include "../../lang/go/go-package.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/net/terraform-provider-random/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform-provider-random/Makefile 2021/01/28 18:04:51 1.12
+++ pkgsrc/net/terraform-provider-random/Makefile 2021/02/01 16:54:00 1.13
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.12 2021/01/28 18:04:51 tpaul Exp $ 1# $NetBSD: Makefile,v 1.13 2021/02/01 16:54:00 tpaul Exp $
2 2
3DISTNAME= terraform-provider-random-2.3.0 3DISTNAME= terraform-provider-random-2.3.0
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=hashicorp/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.terraform.io/docs/providers/random/ 10HOMEPAGE= https://www.terraform.io/docs/providers/random/
11COMMENT= Terraform provider for randomness 11COMMENT= Terraform provider for randomness
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14DEPENDS+= terraform-[0-9]*:../../net/terraform 14DEPENDS+= terraform-[0-9]*:../../net/terraform
15 15
16UNLIMIT_RESOURCES= datasize virtualsize 16UNLIMIT_RESOURCES= datasize virtualsize
17 17
18GO_DIST_BASE= ${DISTNAME} 18GO_DIST_BASE= ${DISTNAME}
19GO_SRCPATH= github.com/terraform-providers/${GITHUB_PROJECT} 19GO_SRCPATH= github.com/terraform-providers/${GITHUB_PROJECT}
20 20
21GO_BUILD_PATTERN= ${GO_SRCPATH}/. 21GO_BUILD_PATTERN= ${GO_SRCPATH}/.
22 22
23USE_TOOLS+= bash 23USE_TOOLS+= bash
24REPLACE_BASH+= scripts/*.sh 24REPLACE_BASH+= scripts/*.sh
25 25
26CHECK_RELRO_SKIP+= bin/terraform-provider-random 
27 
28.include "../../lang/go/go-package.mk" 26.include "../../lang/go/go-package.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/terraform-provider-vultr/Makefile (expand / switch to unified diff)

--- pkgsrc/net/terraform-provider-vultr/Makefile 2021/01/27 23:33:42 1.1
+++ pkgsrc/net/terraform-provider-vultr/Makefile 2021/02/01 16:53:59 1.2
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.1 2021/01/27 23:33:42 tpaul Exp $ 1# $NetBSD: Makefile,v 1.2 2021/02/01 16:53:59 tpaul Exp $
2 2
3DISTNAME= terraform-provider-vultr-2.1.2 3DISTNAME= terraform-provider-vultr-2.1.2
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=vultr/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=vultr/}
6GITHUB_PROJECT= ${PKGBASE} 6GITHUB_PROJECT= ${PKGBASE}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.terraform.io/docs/providers/vultr/ 10HOMEPAGE= https://www.terraform.io/docs/providers/vultr/
11COMMENT= Terraform provider for Vultr 11COMMENT= Terraform provider for Vultr
12LICENSE= mpl-2.0 12LICENSE= mpl-2.0
13 13
14DEPENDS+= terraform-[0-9]*:../../net/terraform 14DEPENDS+= terraform-[0-9]*:../../net/terraform
15 15
16CHECK_RELRO_SKIP= bin/terraform-provider-vultr 
17 
18UNLIMIT_RESOURCES= datasize virtualsize 16UNLIMIT_RESOURCES= datasize virtualsize
19 17
20GO_DIST_BASE= ${DISTNAME} 18GO_DIST_BASE= ${DISTNAME}
21GO_SRCPATH= github.com/vultr/${GITHUB_PROJECT} 19GO_SRCPATH= github.com/vultr/${GITHUB_PROJECT}
22 20
23GO_BUILD_PATTERN= ${GO_SRCPATH}/. 21GO_BUILD_PATTERN= ${GO_SRCPATH}/.
24 22
25USE_TOOLS+= bash 23USE_TOOLS+= bash
26REPLACE_BASH+= scripts/*.sh 24REPLACE_BASH+= scripts/*.sh
27 25
28.include "../../lang/go/go-package.mk" 26.include "../../lang/go/go-package.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"