CVS commit: pkgsrc/net

["Travis Paul" <tpaul%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tpaul
Date:           Mon Feb  1 16:54:00 UTC 2021

Modified Files:
        pkgsrc/net/terraform: Makefile
        pkgsrc/net/terraform-provider-aws: Makefile
        pkgsrc/net/terraform-provider-kubernetes: Makefile
        pkgsrc/net/terraform-provider-local: Makefile
        pkgsrc/net/terraform-provider-null: Makefile
        pkgsrc/net/terraform-provider-random: Makefile
        pkgsrc/net/terraform-provider-vultr: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/terraform/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/terraform-provider-aws/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/terraform-provider-kubernetes/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/terraform-provider-local/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/terraform-provider-null/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/terraform-provider-random/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/terraform-provider-vultr/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/terraform/Makefile
diff -u pkgsrc/net/terraform/Makefile:1.16 pkgsrc/net/terraform/Makefile:1.17
--- pkgsrc/net/terraform/Makefile:1.16  Wed Jan 27 13:35:58 2021
+++ pkgsrc/net/terraform/Makefile       Mon Feb  1 16:54:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/01/27 13:35:58 leot Exp $
+# $NetBSD: Makefile,v 1.17 2021/02/01 16:54:00 tpaul Exp $
 
 DISTNAME=      terraform-0.12.30
 CATEGORIES=    net
@@ -22,7 +22,5 @@ REPLACE_BASH+=        scripts/debug-terraform
 REPLACE_BASH+= scripts/*.sh
 REPLACE_BASH+= scripts/*/*.sh
 
-CHECK_RELRO_SKIP+=     bin/terraform
-
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/terraform-provider-aws/Makefile
diff -u pkgsrc/net/terraform-provider-aws/Makefile:1.22 pkgsrc/net/terraform-provider-aws/Makefile:1.23
--- pkgsrc/net/terraform-provider-aws/Makefile:1.22     Fri Jan 29 21:34:25 2021
+++ pkgsrc/net/terraform-provider-aws/Makefile  Mon Feb  1 16:54:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/01/29 21:34:25 leot Exp $
+# $NetBSD: Makefile,v 1.23 2021/02/01 16:54:00 tpaul Exp $
 
 DISTNAME=      terraform-provider-aws-3.26.0
 CATEGORIES=    net
@@ -21,8 +21,6 @@ INSTALLATION_DIRS+=   bin
 do-install:
        ${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform-provider-aws ${DESTDIR}${PREFIX}/bin
 
-CHECK_RELRO_SKIP+=     bin/terraform-provider-aws
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"

Index: pkgsrc/net/terraform-provider-kubernetes/Makefile
diff -u pkgsrc/net/terraform-provider-kubernetes/Makefile:1.11 pkgsrc/net/terraform-provider-kubernetes/Makefile:1.12
--- pkgsrc/net/terraform-provider-kubernetes/Makefile:1.11      Thu Jan 28 18:01:44 2021
+++ pkgsrc/net/terraform-provider-kubernetes/Makefile   Mon Feb  1 16:54:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/01/28 18:01:44 tpaul Exp $
+# $NetBSD: Makefile,v 1.12 2021/02/01 16:54:00 tpaul Exp $
 
 DISTNAME=      terraform-provider-kubernetes-1.11.4
 PKGREVISION=   6
@@ -22,7 +22,5 @@ GO_BUILD_PATTERN=     ${GO_SRCPATH}/.
 USE_TOOLS+=    bash
 REPLACE_BASH+= scripts/*.sh
 
-CHECK_RELRO_SKIP+=     bin/terraform-provider-kubernetes
-
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/terraform-provider-local/Makefile
diff -u pkgsrc/net/terraform-provider-local/Makefile:1.11 pkgsrc/net/terraform-provider-local/Makefile:1.12
--- pkgsrc/net/terraform-provider-local/Makefile:1.11   Thu Jan 28 18:03:07 2021
+++ pkgsrc/net/terraform-provider-local/Makefile        Mon Feb  1 16:54:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/01/28 18:03:07 tpaul Exp $
+# $NetBSD: Makefile,v 1.12 2021/02/01 16:54:00 tpaul Exp $
 
 DISTNAME=      terraform-provider-local-1.4.0
 PKGREVISION=   9
@@ -23,7 +23,5 @@ GO_BUILD_PATTERN?=    ${GO_SRCPATH}/.
 USE_TOOLS+=    bash
 REPLACE_BASH+= scripts/*.sh
 
-CHECK_RELRO_SKIP+=     bin/terraform-provider-local
-
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/terraform-provider-null/Makefile
diff -u pkgsrc/net/terraform-provider-null/Makefile:1.10 pkgsrc/net/terraform-provider-null/Makefile:1.11
--- pkgsrc/net/terraform-provider-null/Makefile:1.10    Thu Jan 28 18:04:08 2021
+++ pkgsrc/net/terraform-provider-null/Makefile Mon Feb  1 16:54:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/01/28 18:04:08 tpaul Exp $
+# $NetBSD: Makefile,v 1.11 2021/02/01 16:54:00 tpaul Exp $
 
 DISTNAME=      terraform-provider-null-2.1.2
 PKGREVISION=   8
@@ -23,7 +23,5 @@ GO_BUILD_PATTERN=     ${GO_SRCPATH}/.
 USE_TOOLS+=    bash
 REPLACE_BASH+= scripts/*.sh
 
-CHECK_RELRO_SKIP+=     bin/terraform-provider-null
-
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/terraform-provider-random/Makefile
diff -u pkgsrc/net/terraform-provider-random/Makefile:1.12 pkgsrc/net/terraform-provider-random/Makefile:1.13
--- pkgsrc/net/terraform-provider-random/Makefile:1.12  Thu Jan 28 18:04:51 2021
+++ pkgsrc/net/terraform-provider-random/Makefile       Mon Feb  1 16:54:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/01/28 18:04:51 tpaul Exp $
+# $NetBSD: Makefile,v 1.13 2021/02/01 16:54:00 tpaul Exp $
 
 DISTNAME=      terraform-provider-random-2.3.0
 PKGREVISION=   7
@@ -23,7 +23,5 @@ GO_BUILD_PATTERN=     ${GO_SRCPATH}/.
 USE_TOOLS+=    bash
 REPLACE_BASH+= scripts/*.sh
 
-CHECK_RELRO_SKIP+=     bin/terraform-provider-random
-
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/terraform-provider-vultr/Makefile
diff -u pkgsrc/net/terraform-provider-vultr/Makefile:1.1 pkgsrc/net/terraform-provider-vultr/Makefile:1.2
--- pkgsrc/net/terraform-provider-vultr/Makefile:1.1    Wed Jan 27 23:33:42 2021
+++ pkgsrc/net/terraform-provider-vultr/Makefile        Mon Feb  1 16:53:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/01/27 23:33:42 tpaul Exp $
+# $NetBSD: Makefile,v 1.2 2021/02/01 16:53:59 tpaul Exp $
 
 DISTNAME=      terraform-provider-vultr-2.1.2
 CATEGORIES=    net
@@ -13,8 +13,6 @@ LICENSE=      mpl-2.0
 
 DEPENDS+=      terraform-[0-9]*:../../net/terraform
 
-CHECK_RELRO_SKIP=      bin/terraform-provider-vultr
-
 UNLIMIT_RESOURCES=     datasize virtualsize
 
 GO_DIST_BASE=  ${DISTNAME}