beats: fix obvious mistake in a patch. Fixes build with Go 1.17.diff -r1.67 -r1.68 pkgsrc/sysutils/beats/Makefile
(bsiegert)
@@ -1,82 +1,82 @@ | @@ -1,82 +1,82 @@ | |||
1 | # $NetBSD: Makefile,v 1.67 2021/08/11 19:35:11 bsiegert Exp $ | 1 | # $NetBSD: Makefile,v 1.68 2021/09/04 14:10:33 bsiegert Exp $ | |
2 | 2 | |||
3 | DISTNAME= beats-6.8.13 | 3 | DISTNAME= beats-6.8.13 | |
4 | PKGREVISION= 6 | 4 | PKGREVISION= 7 | |
5 | CATEGORIES= sysutils | 5 | CATEGORIES= sysutils | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=elastic/} | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=elastic/} | |
7 | GITHUB_PROJECT= beats | 7 | GITHUB_PROJECT= beats | |
8 | GITHUB_TAG= v${PKGVERSION_NOREV} | 8 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://www.elastic.co/products/beats | 11 | HOMEPAGE= https://www.elastic.co/products/beats | |
12 | COMMENT= Data Shippers for Elasticsearch | 12 | COMMENT= Data Shippers for Elasticsearch | |
13 | LICENSE= apache-2.0 | 13 | LICENSE= apache-2.0 | |
14 | 14 | |||
15 | EXTRACT_USING= bsdtar | 15 | EXTRACT_USING= bsdtar | |
16 | USE_TOOLS+= gmake | 16 | USE_TOOLS+= gmake | |
17 | 17 | |||
18 | GO_DIST_BASE= ${PKGBASE}-${GITHUB_TAG:S/v//} | 18 | GO_DIST_BASE= ${PKGBASE}-${GITHUB_TAG:S/v//} | |
19 | GO_SRCPATH= github.com/elastic/beats | 19 | GO_SRCPATH= github.com/elastic/beats | |
20 | 20 | |||
21 | .include "../../lang/go/go-vars.mk" | 21 | .include "../../lang/go/go-vars.mk" | |
22 | .include "../../mk/bsd.prefs.mk" | 22 | .include "../../mk/bsd.prefs.mk" | |
23 | 23 | |||
24 | PLIST_VARS+= audit | 24 | PLIST_VARS+= audit | |
25 | 25 | |||
26 | # Components to build/install | 26 | # Components to build/install | |
27 | BEATS= filebeat heartbeat metricbeat packetbeat | 27 | BEATS= filebeat heartbeat metricbeat packetbeat | |
28 | CHECK_PORTABILITY_SKIP+= libbeat/scripts/Makefile # uses [[ | 28 | CHECK_PORTABILITY_SKIP+= libbeat/scripts/Makefile # uses [[ | |
29 | 29 | |||
30 | # No SunOS compatible event reading supported | 30 | # No SunOS compatible event reading supported | |
31 | .if ${OPSYS} != "SunOS" | 31 | .if ${OPSYS} != "SunOS" | |
32 | BEATS+= auditbeat | 32 | BEATS+= auditbeat | |
33 | PLIST.audit= yes | 33 | PLIST.audit= yes | |
34 | .endif | 34 | .endif | |
35 | 35 | |||
36 | .for beat in ${BEATS} | 36 | .for beat in ${BEATS} | |
37 | CHECK_RELRO_SKIP+= bin/${beat} | 37 | CHECK_RELRO_SKIP+= bin/${beat} | |
38 | CONF_FILES+= share/examples/beats/${beat}.yml \ | 38 | CONF_FILES+= share/examples/beats/${beat}.yml \ | |
39 | ${PKG_SYSCONFDIR}/${beat}.yml | 39 | ${PKG_SYSCONFDIR}/${beat}.yml | |
40 | .endfor | 40 | .endfor | |
41 | 41 | |||
42 | BUILD_DEFS+= VARBASE | 42 | BUILD_DEFS+= VARBASE | |
43 | 43 | |||
44 | BEATS_DIR?= ${VARBASE}/db/beats | 44 | BEATS_DIR?= ${VARBASE}/db/beats | |
45 | BEATS_LOGDIR?= ${VARBASE}/log/beats | 45 | BEATS_LOGDIR?= ${VARBASE}/log/beats | |
46 | 46 | |||
47 | FILES_SUBST+= BEATS_DIR=${BEATS_DIR} | 47 | FILES_SUBST+= BEATS_DIR=${BEATS_DIR} | |
48 | FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR} | 48 | FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR} | |
49 | 49 | |||
50 | PKG_SYSCONFSUBDIR= beats | 50 | PKG_SYSCONFSUBDIR= beats | |
51 | 51 | |||
52 | SMF_INSTANCES+= ${BEATS} | 52 | SMF_INSTANCES+= ${BEATS} | |
53 | 53 | |||
54 | OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR} | 54 | OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR} | |
55 | 55 | |||
56 | MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg | 56 | MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg | |
57 | MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib" | 57 | MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib" | |
58 | 58 | |||
59 | # The build system defaults to -i which modifies system files! | 59 | # The build system defaults to -i which modifies system files! | |
60 | MAKE_ENV+= GOBUILD_FLAGS= | 60 | MAKE_ENV+= GOBUILD_FLAGS= | |
61 | 61 | |||
62 | BUILD_TARGET= # | 62 | BUILD_TARGET= # | |
63 | 63 | |||
64 | INSTALLATION_DIRS+= bin share/examples/beats | 64 | INSTALLATION_DIRS+= bin share/examples/beats | |
65 | 65 | |||
66 | do-build: | 66 | do-build: | |
67 | .for beat in ${BEATS} | 67 | .for beat in ${BEATS} | |
68 | cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD} | 68 | cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD} | |
69 | .endfor | 69 | .endfor | |
70 | 70 | |||
71 | do-install: | 71 | do-install: | |
72 | .for beat in ${BEATS} | 72 | .for beat in ${BEATS} | |
73 | ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin | 73 | ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin | |
74 | ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.reference.yml \ | 74 | ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.reference.yml \ | |
75 | ${DESTDIR}${PREFIX}/share/examples/beats | 75 | ${DESTDIR}${PREFIX}/share/examples/beats | |
76 | ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.yml \ | 76 | ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.yml \ | |
77 | ${DESTDIR}${PREFIX}/share/examples/beats | 77 | ${DESTDIR}${PREFIX}/share/examples/beats | |
78 | .endfor | 78 | .endfor | |
79 | 79 | |||
80 | .include "../../lang/go/go-package.mk" | 80 | .include "../../lang/go/go-package.mk" | |
81 | .include "../../net/libpcap/buildlink3.mk" | 81 | .include "../../net/libpcap/buildlink3.mk" | |
82 | .include "../../mk/bsd.pkg.mk" | 82 | .include "../../mk/bsd.pkg.mk" |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.28 2021/01/08 08:32:18 he Exp $ | 1 | $NetBSD: distinfo,v 1.29 2021/09/04 14:10:33 bsiegert Exp $ | |
2 | 2 | |||
3 | SHA1 (beats-6.8.13.tar.gz) = e8940f9b6a75ed8e0e6ae9177774d2e410f865f6 | 3 | SHA1 (beats-6.8.13.tar.gz) = e8940f9b6a75ed8e0e6ae9177774d2e410f865f6 | |
4 | RMD160 (beats-6.8.13.tar.gz) = 52959989dcd8002c0e2320f738cd43b76be8553b | 4 | RMD160 (beats-6.8.13.tar.gz) = 52959989dcd8002c0e2320f738cd43b76be8553b | |
5 | SHA512 (beats-6.8.13.tar.gz) = 39f1ba06e1930ea498c13dda11cd835096adbcd075585672004fdc9e19d96971936e47f9c631ee02f59984c10858cfd914de136ddc356e8c39fe833401b42304 | 5 | SHA512 (beats-6.8.13.tar.gz) = 39f1ba06e1930ea498c13dda11cd835096adbcd075585672004fdc9e19d96971936e47f9c631ee02f59984c10858cfd914de136ddc356e8c39fe833401b42304 | |
6 | Size (beats-6.8.13.tar.gz) = 35569151 bytes | 6 | Size (beats-6.8.13.tar.gz) = 35569151 bytes | |
7 | SHA1 (patch-libbeat_common_file_stderr__other.go) = 9e1f28a9721c996ba75a7712d39c70186f549067 | 7 | SHA1 (patch-libbeat_common_file_stderr__other.go) = 9e1f28a9721c996ba75a7712d39c70186f549067 | |
8 | SHA1 (patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_client.go) = 4588ee4feba431bdc1c8250d58fa9ac66f733bb3 | 8 | SHA1 (patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_client.go) = 4588ee4feba431bdc1c8250d58fa9ac66f733bb3 | |
9 | SHA1 (patch-vendor_github.com_tsg_gopacket_pcap_pcap.go) = 887b009bb2613ed5241fbf9a9ff3e8e75df98cae | 9 | SHA1 (patch-vendor_github.com_tsg_gopacket_pcap_pcap.go) = 887b009bb2613ed5241fbf9a9ff3e8e75df98cae | |
10 | SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go) = 2ee9c516c6f0da5789b97b498f5db7c7eae106cd | 10 | SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go) = 210069b9740fdb03a99c9efa6becdb650688d9c2 | |
11 | SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s) = b6aabeda2abad29d9f5d4032f57ea66eb4231688 | 11 | SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s) = b6aabeda2abad29d9f5d4032f57ea66eb4231688 |
@@ -1,48 +1,48 @@ | @@ -1,48 +1,48 @@ | |||
1 | $NetBSD: patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go,v 1.1 2019/03/15 15:03:02 he Exp $ | 1 | $NetBSD: patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go,v 1.2 2021/09/04 14:10:33 bsiegert Exp $ | |
2 | 2 | |||
3 | We get link errors about runtime.support_avx and runtime.support_avx2, so | 3 | We get link errors about runtime.support_avx and runtime.support_avx2, so | |
4 | revert the offending commit from | 4 | revert the offending commit from | |
5 | https://github.com/golang/crypto/commit/b0697eccbea9adec5b7ba8008f4c33d98d733388 | 5 | https://github.com/golang/crypto/commit/b0697eccbea9adec5b7ba8008f4c33d98d733388 | |
6 | I've not been able to track which version of golang.org/x/crypto is | 6 | I've not been able to track which version of golang.org/x/crypto is | |
7 | embedded in the beats package, and frankly am befuddled that this sort | 7 | embedded in the beats package, and frankly am befuddled that this sort | |
8 | of thing makes it into released code, in this day and age with widespread | 8 | of thing makes it into released code, in this day and age with widespread | |
9 | use of CI etc. This coupled with the apparent widespread practice of | 9 | use of CI etc. This coupled with the apparent widespread practice of | |
10 | "vendoring" code (copy a vendor's code and ship it as part of your source | 10 | "vendoring" code (copy a vendor's code and ship it as part of your source | |
11 | package) makes it difficult to stamp out this sort of bugs. Sigh! | 11 | package) makes it difficult to stamp out this sort of bugs. Sigh! | |
12 | 12 | |||
13 | --- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go.orig 2019-03-06 10:13:10.000000000 +0000 | 13 | --- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go.orig 2019-03-06 10:13:10.000000000 +0000 | |
14 | +++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go | 14 | +++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go | |
15 | @@ -6,20 +6,22 @@ | 15 | @@ -6,20 +6,22 @@ | |
16 | 16 | |||
17 | package blake2b | 17 | package blake2b | |
18 | 18 | |||
19 | -func init() { | 19 | -func init() { | |
20 | - useAVX2 = supportsAVX2() | 20 | - useAVX2 = supportsAVX2() | |
21 | - useAVX = supportsAVX() | 21 | - useAVX = supportsAVX() | |
22 | - useSSE4 = supportsSSE4() | 22 | - useSSE4 = supportsSSE4() | |
23 | -} | 23 | -} | |
24 | +import _ "unsafe" | 24 | +import _ "unsafe" | |
25 | 25 | |||
26 | -//go:noescape | 26 | -//go:noescape | |
27 | -func supportsSSE4() bool | 27 | -func supportsSSE4() bool | |
28 | +//go:linkname x86_HasAVX internal/cpu.X86.HasAVX | 28 | +//go:linkname x86_HasAVX internal/cpu.X86.HasAVX | |
29 | +var x86_HasAVX bool | 29 | +var x86_HasAVX bool | |
30 | 30 | |||
31 | -//go:noescape | 31 | -//go:noescape | |
32 | -func supportsAVX() bool | 32 | -func supportsAVX() bool | |
33 | +//go:linkname x86_HasAVX2 internal/cpu.X86.HasAVX2 | 33 | +//go:linkname x86_HasAVX2 internal/cpu.X86.HasAVX2 | |
34 | +var x86_HasAVX2 bool | 34 | +var x86_HasAVX2 bool | |
35 | 35 | |||
36 | -//go:noescape | 36 | -//go:noescape | |
37 | -func supportsAVX2() bool | 37 | -func supportsAVX2() bool | |
38 | +//go:linkname x86_HasAVX internal/cpu.X86.HasSSE4 | 38 | +//go:linkname x86_HasSSE4 internal/cpu.X86.HasSSE4 | |
39 | +var x86_HasSSE4 bool | 39 | +var x86_HasSSE4 bool | |
40 | + | 40 | + | |
41 | +func init() { | 41 | +func init() { | |
42 | + useAVX2 = x86_HasAVX2 | 42 | + useAVX2 = x86_HasAVX2 | |
43 | + useAVX = x86_HasAVX | 43 | + useAVX = x86_HasAVX | |
44 | + useSSE4 = x86_HasSSE4 | 44 | + useSSE4 = x86_HasSSE4 | |
45 | +} | 45 | +} | |
46 | 46 | |||
47 | //go:noescape | 47 | //go:noescape | |
48 | func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) | 48 | func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) |