CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 23 07:20:42 UTC 2017

Modified Files:
        pkgsrc/net/syncthing: Makefile
        pkgsrc/sysutils/beats: Makefile
        pkgsrc/www/grafana: Makefile

Log Message:
More RELRO check disabling for go packages.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/syncthing/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/beats/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/grafana/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/syncthing/Makefile
diff -u pkgsrc/net/syncthing/Makefile:1.54 pkgsrc/net/syncthing/Makefile:1.55
--- pkgsrc/net/syncthing/Makefile:1.54  Mon Jul  3 11:07:25 2017
+++ pkgsrc/net/syncthing/Makefile       Sun Jul 23 07:20:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/07/03 11:07:25 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2017/07/23 07:20:42 wiz Exp $
 
 # Upstream regularly breaks protocol compatibility.  While users of
 # pkgsrc syncthing on multiple systems can update synchronously, an
@@ -58,6 +58,8 @@ WRKPLACE=             ${WRKPLACEP}/syncthing
 
 MAKE_ENV+=             GOPATH=${GOPATH}
 
+CHECK_RELRO_SKIP+=     bin/syncthing
+
 # This used to be set; there seems to be no reason any longer.  To be
 # pruned on 2016-11-04.
 # INSTALL_UNSTRIPPED= yes

Index: pkgsrc/sysutils/beats/Makefile
diff -u pkgsrc/sysutils/beats/Makefile:1.13 pkgsrc/sysutils/beats/Makefile:1.14
--- pkgsrc/sysutils/beats/Makefile:1.13 Tue Jul  4 14:22:48 2017
+++ pkgsrc/sysutils/beats/Makefile      Sun Jul 23 07:20:42 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/07/04 14:22:48 fhajny Exp $
-#
+# $NetBSD: Makefile,v 1.14 2017/07/23 07:20:42 wiz Exp $
 
 DISTNAME=              beats-5.4.3
 CATEGORIES=            sysutils
@@ -21,6 +20,11 @@ GO_SRCPATH=          github.com/elastic/beats
 # Components to build/install
 BEATS=                 filebeat heartbeat metricbeat packetbeat
 
+CHECK_RELRO_SKIP+=     bin/filebeat
+CHECK_RELRO_SKIP+=     bin/heartbeat
+CHECK_RELRO_SKIP+=     bin/metricbeat
+CHECK_RELRO_SKIP+=     bin/packetbeat
+
 .for beat in ${BEATS}
 CONF_FILES+=           share/examples/beats/${beat}.yml                        \
                                ${PKG_SYSCONFDIR}/${beat}.yml

Index: pkgsrc/www/grafana/Makefile
diff -u pkgsrc/www/grafana/Makefile:1.2 pkgsrc/www/grafana/Makefile:1.3
--- pkgsrc/www/grafana/Makefile:1.2     Wed Jul 12 10:05:58 2017
+++ pkgsrc/www/grafana/Makefile Sun Jul 23 07:20:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/07/12 10:05:58 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2017/07/23 07:20:42 wiz Exp $
 
 GITHUB_PROJECT=        grafana
 DISTNAME=      grafana-4.4.1
@@ -29,6 +29,10 @@ EXTRACT_DIR.${FE_DISTNAME}=  ${WRKDIR}/fr
 BUILD_DEPENDS+=                        go-[0-9]*:../../lang/go
 
 CHECK_PORTABILITY_SKIP=                packaging/rpm/control/postinst
+
+CHECK_RELRO_SKIP+=             bin/grafana-cli
+CHECK_RELRO_SKIP+=             bin/grafana-server
+
 PKGSRC_MAKE_ENV+=              GOPATH=${WRKDIR}
 USE_TOOLS+=                    pax