pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Sprinkle CHECK_RELRO_SKIP on go packages.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d41ea25c0608
branches: trunk
changeset: 365660:d41ea25c0608
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Jul 22 19:32:40 2017 +0000
description:
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.
diffstat:
devel/go-protobuf/Makefile | 4 +++-
devel/go-tools/Makefile | 28 +++++++++++++++++++++++++---
devel/golint/Makefile | 4 +++-
devel/google-api-go-client/Makefile | 6 ++++--
lang/go/Makefile | 13 ++++++++++---
lang/go14/Makefile | 6 +++++-
net/go-net/Makefile | 4 +++-
pkgtools/pkglint/Makefile | 5 ++++-
textproc/go-text/Makefile | 4 ++--
www/caddy/Makefile | 4 +++-
10 files changed, 62 insertions(+), 16 deletions(-)
diffs (240 lines):
diff -r 74335233fb87 -r d41ea25c0608 devel/go-protobuf/Makefile
--- a/devel/go-protobuf/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/devel/go-protobuf/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
REPLACE_SH+= ptypes/regen.sh
+CHECK_RELRO_SKIP+= bin/protoc-gen-go
+
.include "../../lang/go/go-package.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 74335233fb87 -r d41ea25c0608 devel/go-tools/Makefile
--- a/devel/go-tools/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/devel/go-tools/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
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"
diff -r 74335233fb87 -r d41ea25c0608 devel/golint/Makefile
--- a/devel/golint/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/devel/golint/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
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"
diff -r 74335233fb87 -r d41ea25c0608 devel/google-api-go-client/Makefile
--- a/devel/google-api-go-client/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/devel/google-api-go-client/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
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
diff -r 74335233fb87 -r d41ea25c0608 lang/go/Makefile
--- a/lang/go/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/lang/go/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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/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/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/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 @@
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
diff -r 74335233fb87 -r d41ea25c0608 lang/go14/Makefile
--- a/lang/go14/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/lang/go14/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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/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
diff -r 74335233fb87 -r d41ea25c0608 net/go-net/Makefile
--- a/net/go-net/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/net/go-net/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
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
diff -r 74335233fb87 -r d41ea25c0608 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/pkgtools/pkglint/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
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
diff -r 74335233fb87 -r d41ea25c0608 textproc/go-text/Makefile
--- a/textproc/go-text/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/textproc/go-text/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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 @@
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"
diff -r 74335233fb87 -r d41ea25c0608 www/caddy/Makefile
--- a/www/caddy/Makefile Sat Jul 22 19:25:38 2017 +0000
+++ b/www/caddy/Makefile Sat Jul 22 19:32:40 2017 +0000
@@ -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_SRCPATH= github.com/mholt/caddy
GO_BUILD_PATTERN= ${GO_SRCPATH}/caddy
+CHECK_RELRO_SKIP+= bin/caddy
+
EXTRACT_USING= bsdtar
INSTALLATION_DIRS= bin
Home |
Main Index |
Thread Index |
Old Index