CVS commit: pkgsrc/sysutils/beats

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Sep  4 14:10:34 UTC 2021

Modified Files:
        pkgsrc/sysutils/beats: Makefile distinfo
        pkgsrc/sysutils/beats/patches:
            patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go

Log Message:
beats: fix obvious mistake in a patch.

Fixes build with Go 1.17.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/sysutils/beats/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/beats/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/beats/patches/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go

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

Modified files:

Index: pkgsrc/sysutils/beats/Makefile
diff -u pkgsrc/sysutils/beats/Makefile:1.67 pkgsrc/sysutils/beats/Makefile:1.68
--- pkgsrc/sysutils/beats/Makefile:1.67 Wed Aug 11 19:35:11 2021
+++ pkgsrc/sysutils/beats/Makefile      Sat Sep  4 14:10:33 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2021/08/11 19:35:11 bsiegert Exp $
+# $NetBSD: Makefile,v 1.68 2021/09/04 14:10:33 bsiegert Exp $
 
 DISTNAME=              beats-6.8.13
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=elastic/}
 GITHUB_PROJECT=                beats

Index: pkgsrc/sysutils/beats/distinfo
diff -u pkgsrc/sysutils/beats/distinfo:1.28 pkgsrc/sysutils/beats/distinfo:1.29
--- pkgsrc/sysutils/beats/distinfo:1.28 Fri Jan  8 08:32:18 2021
+++ pkgsrc/sysutils/beats/distinfo      Sat Sep  4 14:10:33 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2021/01/08 08:32:18 he Exp $
+$NetBSD: distinfo,v 1.29 2021/09/04 14:10:33 bsiegert Exp $
 
 SHA1 (beats-6.8.13.tar.gz) = e8940f9b6a75ed8e0e6ae9177774d2e410f865f6
 RMD160 (beats-6.8.13.tar.gz) = 52959989dcd8002c0e2320f738cd43b76be8553b
@@ -7,5 +7,5 @@ Size (beats-6.8.13.tar.gz) = 35569151 by
 SHA1 (patch-libbeat_common_file_stderr__other.go) = 9e1f28a9721c996ba75a7712d39c70186f549067
 SHA1 (patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_client.go) = 4588ee4feba431bdc1c8250d58fa9ac66f733bb3
 SHA1 (patch-vendor_github.com_tsg_gopacket_pcap_pcap.go) = 887b009bb2613ed5241fbf9a9ff3e8e75df98cae
-SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go) = 2ee9c516c6f0da5789b97b498f5db7c7eae106cd
+SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go) = 210069b9740fdb03a99c9efa6becdb650688d9c2
 SHA1 (patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s) = b6aabeda2abad29d9f5d4032f57ea66eb4231688

Index: pkgsrc/sysutils/beats/patches/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go
diff -u pkgsrc/sysutils/beats/patches/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go:1.1 
pkgsrc/sysutils/beats/patches/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go:1.2
--- pkgsrc/sysutils/beats/patches/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go:1.1    Fri Mar 15 15:03:02 2019
+++ pkgsrc/sysutils/beats/patches/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go        Sat Sep  4 14:10:33 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go,v 1.1 2019/03/15 15:03:02 he Exp $
+$NetBSD: patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go,v 1.2 2021/09/04 14:10:33 bsiegert Exp $
 
 We get link errors about runtime.support_avx and runtime.support_avx2, so
 revert the offending commit from
@@ -35,7 +35,7 @@ package) makes it difficult to stamp out
  
 -//go:noescape
 -func supportsAVX2() bool
-+//go:linkname x86_HasAVX internal/cpu.X86.HasSSE4
++//go:linkname x86_HasSSE4 internal/cpu.X86.HasSSE4
 +var x86_HasSSE4 bool
 +
 +func init() {