CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 22 Jul 2017 19:32:41 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 22 19:32:41 UTC 2017

Modified Files:
        pkgsrc/devel/go-protobuf: Makefile
        pkgsrc/devel/go-tools: Makefile
        pkgsrc/devel/golint: Makefile
        pkgsrc/devel/google-api-go-client: Makefile
        pkgsrc/lang/go: Makefile
        pkgsrc/lang/go14: Makefile
        pkgsrc/net/go-net: Makefile
        pkgsrc/pkgtools/pkglint: Makefile
        pkgsrc/textproc/go-text: Makefile
        pkgsrc/www/caddy: Makefile

Log Message:
Sprinkle CHECK_RELRO_SKIP on go packages.

go14 has no relro support AFAICT.

go-1.8.3 has if you use -buildmode=pie, but it claims it's not supported
on Linux.

Disable relro checking for go packages until bsiegert has time to
look at this.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/go-protobuf/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/go-tools/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/golint/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/google-api-go-client/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/lang/go/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/go14/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/go-net/Makefile
cvs rdiff -u -r1.515 -r1.516 pkgsrc/pkgtools/pkglint/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/go-text/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/caddy/Makefile

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

Modified files:

Index: pkgsrc/devel/go-protobuf/Makefile
diff -u pkgsrc/devel/go-protobuf/Makefile:1.5 pkgsrc/devel/go-protobuf/Makefile:1.6
--- pkgsrc/devel/go-protobuf/Makefile:1.5       Thu Apr 13 15:12:04 2017
+++ pkgsrc/devel/go-protobuf/Makefile   Sat Jul 22 19:32:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/04/13 15:12:04 bsiegert Exp $
+# $NetBSD: Makefile,v 1.6 2017/07/22 19:32:40 wiz Exp $
 
 DISTNAME=              go-protobuf-20160829
 PKGREVISION=           4
@@ -16,5 +16,7 @@ GO_DIST_BASE=         ${GITHUB_PROJECT}-${GITHU
 
 REPLACE_SH+=           ptypes/regen.sh
 
+CHECK_RELRO_SKIP+=     bin/protoc-gen-go
+
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/go-tools/Makefile
diff -u pkgsrc/devel/go-tools/Makefile:1.14 pkgsrc/devel/go-tools/Makefile:1.15
--- pkgsrc/devel/go-tools/Makefile:1.14 Thu Apr 13 15:12:04 2017
+++ pkgsrc/devel/go-tools/Makefile      Sat Jul 22 19:32:40 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/04/13 15:12:04 bsiegert Exp $
-#
+# $NetBSD: Makefile,v 1.15 2017/07/22 19:32:40 wiz Exp $
 
 DISTNAME=              tools
 PKGNAME=               go-tools-1.8
@@ -19,9 +18,32 @@ GO_DIST_BASE=                ${DISTNAME}-${GITHUB_TAG}
 
 USE_TOOLS+=            bash
 REPLACE_BASH+=         cmd/godoc/setup-godoc-app.bash
-REPLACE_BASH+=         cmd/oracle/emacs-test.bash
 REPLACE_BASH+=         cmd/toolstash/buildall
 
+CHECK_RELRO_SKIP+=     bin/benchcmp
+CHECK_RELRO_SKIP+=     bin/bundle
+CHECK_RELRO_SKIP+=     bin/callgraph
+CHECK_RELRO_SKIP+=     bin/cover
+CHECK_RELRO_SKIP+=     bin/digraph
+CHECK_RELRO_SKIP+=     bin/eg
+CHECK_RELRO_SKIP+=     bin/fiximports
+CHECK_RELRO_SKIP+=     bin/godex
+CHECK_RELRO_SKIP+=     bin/godoc
+CHECK_RELRO_SKIP+=     bin/goimports
+CHECK_RELRO_SKIP+=     bin/gomvpkg
+CHECK_RELRO_SKIP+=     bin/gorename
+CHECK_RELRO_SKIP+=     bin/gotype
+CHECK_RELRO_SKIP+=     bin/goyacc
+CHECK_RELRO_SKIP+=     bin/guru
+CHECK_RELRO_SKIP+=     bin/heapview
+CHECK_RELRO_SKIP+=     bin/html2article
+CHECK_RELRO_SKIP+=     bin/present
+CHECK_RELRO_SKIP+=     bin/ssadump
+CHECK_RELRO_SKIP+=     bin/stress
+CHECK_RELRO_SKIP+=     bin/stringer
+CHECK_RELRO_SKIP+=     bin/tip
+CHECK_RELRO_SKIP+=     bin/toolstash
+
 .include "../../lang/go/go-package.mk"
 .include "../../devel/google-api-go-client/buildlink3.mk"
 .include "../../security/go-crypto-acme/buildlink3.mk"

Index: pkgsrc/devel/golint/Makefile
diff -u pkgsrc/devel/golint/Makefile:1.8 pkgsrc/devel/golint/Makefile:1.9
--- pkgsrc/devel/golint/Makefile:1.8    Thu Apr 13 15:12:05 2017
+++ pkgsrc/devel/golint/Makefile        Sat Jul 22 19:32:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/04/13 15:12:05 bsiegert Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/22 19:32:41 wiz Exp $
 
 DISTNAME=              golint-20170228
 PKGREVISION=           1
@@ -15,6 +15,8 @@ LICENSE=              modified-bsd
 GO_SRCPATH=            github.com/golang/lint
 GO_DIST_BASE=          ${GITHUB_PROJECT}-${GITHUB_TAG}*
 
+CHECK_RELRO_SKIP+=     bin/golint
+
 .include "../../lang/go/go-package.mk"
 .include "../../devel/go-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/google-api-go-client/Makefile
diff -u pkgsrc/devel/google-api-go-client/Makefile:1.11 pkgsrc/devel/google-api-go-client/Makefile:1.12
--- pkgsrc/devel/google-api-go-client/Makefile:1.11     Thu Apr 13 15:12:05 2017
+++ pkgsrc/devel/google-api-go-client/Makefile  Sat Jul 22 19:32:41 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/04/13 15:12:05 bsiegert Exp $
-#
+# $NetBSD: Makefile,v 1.12 2017/07/22 19:32:41 wiz Exp $
 
 DISTNAME=              google-api-go-client
 PKGNAME=               google-api-go-client-20160909
@@ -17,6 +16,9 @@ LICENSE=              modified-bsd
 GO_SRCPATH=            google.golang.org/api
 GO_DIST_BASE=          ${DISTNAME}-${GITHUB_TAG}*
 
+CHECK_RELRO_SKIP+=     bin/go-api-demo
+CHECK_RELRO_SKIP+=     bin/google-api-go-generator
+
 pre-patch:
        cd ${WRKSRC} && mv examples go-api-demo
 

Index: pkgsrc/lang/go/Makefile
diff -u pkgsrc/lang/go/Makefile:1.52 pkgsrc/lang/go/Makefile:1.53
--- pkgsrc/lang/go/Makefile:1.52        Thu May 25 09:06:43 2017
+++ pkgsrc/lang/go/Makefile     Sat Jul 22 19:32:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/05/25 09:06:43 bsiegert Exp $
+# $NetBSD: Makefile,v 1.53 2017/07/22 19:32:41 wiz Exp $
 
 .include "version.mk"
 
@@ -32,7 +32,6 @@ REPLACE_BASH+=        misc/arm/a
 REPLACE_BASH+= misc/benchcmp
 REPLACE_BASH+= misc/cgo/errors/test.bash
 REPLACE_BASH+= misc/cgo/fortran/test.bash
-REPLACE_BASH+= misc/cgo/testcarchive/test.bash
 REPLACE_BASH+= misc/cgo/testcshared/test.bash
 REPLACE_BASH+= misc/cgo/testgodefs/test.bash
 REPLACE_BASH+= misc/cgo/testplugin/test.bash
@@ -45,7 +44,6 @@ REPLACE_BASH+=        src/androidtest.bash
 REPLACE_BASH+= src/bootstrap.bash
 REPLACE_BASH+= src/buildall.bash
 REPLACE_BASH+= src/clean.bash
-REPLACE_BASH+= src/cmd/compile/internal/big/vendor.bash
 REPLACE_BASH+= src/cmd/dist/mkdeps.bash
 REPLACE_BASH+= src/cmd/go/mkalldocs.sh
 REPLACE_BASH+= src/internal/trace/mkcanned.bash
@@ -65,6 +63,13 @@ REPLACE_PERL+=       src/regexp/syntax/make_pe
 REPLACE_PERL+= src/syscall/*.pl
 REPLACE_PERL+= test/errchk
 
+# uses own linker, which does not support relro on NetBSD
+CHECK_RELRO_SKIP+=             go/bin/go
+CHECK_RELRO_SKIP+=             go/bin/gofmt
+CHECK_RELRO_SKIP+=             go/pkg/bootstrap/bin/asm
+CHECK_RELRO_SKIP+=             go/pkg/bootstrap/bin/compile
+CHECK_RELRO_SKIP+=             go/pkg/bootstrap/bin/link
+
 # uses /bin/rc (for Plan 9)
 CHECK_INTERPRETER_SKIP+=       go/include/plan9/mklibc.rc
 CHECK_INTERPRETER_SKIP+=       go/src/all.rc
@@ -85,6 +90,8 @@ PLIST.route=  yes
 
 do-build:
        cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${BASH} ./make.bash
+# for RELRO build:
+#      cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${BASH} ./make.bash
 
 do-install:
        cd ${WRKSRC} && rm -rf .hgignore .hgtags pkg/obj

Index: pkgsrc/lang/go14/Makefile
diff -u pkgsrc/lang/go14/Makefile:1.11 pkgsrc/lang/go14/Makefile:1.12
--- pkgsrc/lang/go14/Makefile:1.11      Sat Jul 22 10:00:21 2017
+++ pkgsrc/lang/go14/Makefile   Sat Jul 22 19:32:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/22 10:00:21 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/07/22 19:32:41 wiz Exp $
 
 .include "../../lang/go/version.mk"
 
@@ -64,6 +64,10 @@ REPLACE_PERL+=       src/regexp/syntax/make_pe
 REPLACE_PERL+= src/syscall/*.pl
 REPLACE_PERL+= test/errchk
 
+# uses its own linker which does not support relro in 1.4.x
+CHECK_RELRO_SKIP=      go14/bin/go
+CHECK_RELRO_SKIP+=     go14/bin/gofmt
+
 # uses /bin/rc (for Plan 9)
 CHECK_INTERPRETER_SKIP+=       go14/include/plan9/mklibc.rc
 CHECK_INTERPRETER_SKIP+=       go14/src/all.rc

Index: pkgsrc/net/go-net/Makefile
diff -u pkgsrc/net/go-net/Makefile:1.16 pkgsrc/net/go-net/Makefile:1.17
--- pkgsrc/net/go-net/Makefile:1.16     Thu Apr 13 15:12:05 2017
+++ pkgsrc/net/go-net/Makefile  Sat Jul 22 19:32:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/04/13 15:12:05 bsiegert Exp $
+# $NetBSD: Makefile,v 1.17 2017/07/22 19:32:41 wiz Exp $
 
 DISTNAME=              go-net-20170308
 PKGREVISION=           1
@@ -15,6 +15,8 @@ LICENSE=              modified-bsd
 GO_SRCPATH=            golang.org/x/net
 GO_DIST_BASE=          ${GITHUB_PROJECT}-${GITHUB_TAG}*
 
+CHECK_RELRO_SKIP+=     bin/h2i
+
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=   notsunos

Index: pkgsrc/pkgtools/pkglint/Makefile
diff -u pkgsrc/pkgtools/pkglint/Makefile:1.515 pkgsrc/pkgtools/pkglint/Makefile:1.516
--- pkgsrc/pkgtools/pkglint/Makefile:1.515      Sun May 14 14:36:06 2017
+++ pkgsrc/pkgtools/pkglint/Makefile    Sat Jul 22 19:32:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.515 2017/05/14 14:36:06 wiz Exp $
+# $NetBSD: Makefile,v 1.516 2017/07/22 19:32:41 wiz Exp $
 
 PKGNAME=       pkglint-5.4.20
 PKGREVISION=   2
@@ -17,6 +17,9 @@ USE_TOOLS+=   pax
 AUTO_MKDIRS=   yes
 GO_SRCPATH=    netbsd.org/pkglint
 
+CHECK_RELRO_SKIP+=     bin/pkglint
+CHECK_RELRO_SKIP+=     bin/plist-clash
+
 SUBST_CLASSES+=                pkglint
 SUBST_STAGE.pkglint=   post-configure
 SUBST_FILES.pkglint+=  pkglint.go package_test.go

Index: pkgsrc/textproc/go-text/Makefile
diff -u pkgsrc/textproc/go-text/Makefile:1.12 pkgsrc/textproc/go-text/Makefile:1.13
--- pkgsrc/textproc/go-text/Makefile:1.12       Thu Apr 13 15:12:06 2017
+++ pkgsrc/textproc/go-text/Makefile    Sat Jul 22 19:32:41 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/04/13 15:12:06 bsiegert Exp $
-#
+# $NetBSD: Makefile,v 1.13 2017/07/22 19:32:41 wiz Exp $
 
 DISTNAME=              go-text-20151217
 PKGREVISION=           7
@@ -16,6 +15,7 @@ LICENSE=              modified-bsd
 GO_SRCPATH=            golang.org/x/text
 GO_DIST_BASE=          ${GITHUB_PROJECT}-${GITHUB_TAG}*
 
+CHECK_RELRO_SKIP+=     bin/colcmp
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/caddy/Makefile
diff -u pkgsrc/www/caddy/Makefile:1.1 pkgsrc/www/caddy/Makefile:1.2
--- pkgsrc/www/caddy/Makefile:1.1       Tue Jul 11 20:26:41 2017
+++ pkgsrc/www/caddy/Makefile   Sat Jul 22 19:32:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/07/11 20:26:41 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/22 19:32:41 wiz Exp $
 
 DISTNAME=      caddy-${GITHUB_TAG:S/v//}
 CATEGORIES=    www
@@ -14,6 +14,8 @@ GO_DIST_BASE= ${DISTNAME}
 GO_SRCPATH=    github.com/mholt/caddy
 GO_BUILD_PATTERN= ${GO_SRCPATH}/caddy
 
+CHECK_RELRO_SKIP+=     bin/caddy
+
 EXTRACT_USING=         bsdtar
 
 INSTALLATION_DIRS=     bin

Follow-Ups:
- Re: CVS commit: pkgsrc
  - From: maya
- Re: CVS commit: pkgsrc
  - From: Thomas Klausner

Prev by Date: Re: CVS commit: pkgsrc/devel/py-requests
Next by Date: Re: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/devel/py-requests
Next by Thread: Re: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index