[arch-commits] Commit in beats/trunk (PKGBUILD gopacket-identifiers.patch)

Massimiliano Torromeo mtorromeo at archlinux.org
Mon Jul 1 09:37:02 UTC 2019


    Date: Monday, July 1, 2019 @ 09:37:01
  Author: mtorromeo
Revision: 486946

upgpkg: beats 7.2.0-1

Modified:
  beats/trunk/PKGBUILD
Deleted:
  beats/trunk/gopacket-identifiers.patch

----------------------------+
 PKGBUILD                   |    9 +-----
 gopacket-identifiers.patch |   62 -------------------------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-01 09:36:24 UTC (rev 486945)
+++ PKGBUILD	2019-07-01 09:37:01 UTC (rev 486946)
@@ -3,7 +3,7 @@
 
 pkgbase=beats
 pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat journalbeat)
-pkgver=7.1.1
+pkgver=7.2.0
 pkgrel=1
 pkgdesc='Data shippers for Elasticsearch'
 arch=('x86_64')
@@ -14,7 +14,6 @@
 optdepends=('elasticsearch: for standalone installation'
             'python: for migration script')
 source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz"
-        "gopacket-identifiers.patch"
         "filebeat.service"
         "packetbeat.service"
         "metricbeat.service"
@@ -22,8 +21,7 @@
         "auditbeat.service"
         "journalbeat.service"
         "tmpfile.conf")
-sha256sums=('a02fd914506f306f53ba6a70d75cc5caf1de1429dc405226dfddf0f35bb7a487'
-            'f0570a83aa59d28edfa9efd6b8d7884f79306b69f3a80f157314cc1896f40a99'
+sha256sums=('6a6bfd7f4583677fa542191f6918dd5c5f8c64d5c80f08733ab96f4ed92619be'
             '66d9061841e8b406135383e45d6db9ce6261b2bb08aa28224e3ed689e6e0efec'
             '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5'
             '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d'
@@ -42,9 +40,6 @@
     mkdir -p "$GOPATH"
     go get golang.org/x/sys/cpu
 
-    cd "$srcdir"/beats-$pkgver/vendor/github.com/tsg/gopacket
-    patch -p1 -i "$srcdir"/gopacket-identifiers.patch
-
     cd "$srcdir"/beats-$pkgver
 
     # Avoid installing extraneous configs

Deleted: gopacket-identifiers.patch
===================================================================
--- gopacket-identifiers.patch	2019-07-01 09:36:24 UTC (rev 486945)
+++ gopacket-identifiers.patch	2019-07-01 09:37:01 UTC (rev 486946)
@@ -1,62 +0,0 @@
-diff --git a/pcap/pcap.go b/pcap/pcap.go
-index c869bcc..35fb11c 100644
---- a/pcap/pcap.go
-+++ b/pcap/pcap.go
-@@ -170,7 +170,7 @@ type InterfaceAddress struct {
- // BPF is a compiled filter program, useful for offline packet matching.
- type BPF struct {
- 	orig string
--	bpf  _Ctype_struct_bpf_program // takes a finalizer, not overriden by outsiders
-+	bpf  C.struct_bpf_program // takes a finalizer, not overriden by outsiders
- }
- 
- // BlockForever, when passed into OpenLive/SetTimeout, causes it to block forever
-@@ -382,7 +382,7 @@ func (p *Handle) Error() error {
- 
- // Stats returns statistics on the underlying pcap handle.
- func (p *Handle) Stats() (stat *Stats, err error) {
--	var cstats _Ctype_struct_pcap_stat
-+	var cstats C.struct_pcap_stat
- 	if -1 == C.pcap_stats(p.cptr, &cstats) {
- 		return nil, p.Error()
- 	}
-@@ -443,7 +443,7 @@ func (p *Handle) SetBPFFilter(expr string) (err error) {
- 		}
- 	}
- 
--	var bpf _Ctype_struct_bpf_program
-+	var bpf C.struct_bpf_program
- 	cexpr := C.CString(expr)
- 	defer C.free(unsafe.Pointer(cexpr))
- 
-@@ -486,7 +486,7 @@ func (b *BPF) String() string {
- }
- 
- // BPF returns the compiled BPF program.
--func (b *BPF) BPF() _Ctype_struct_bpf_program {
-+func (b *BPF) BPF() C.struct_bpf_program {
- 	return b.bpf
- }
- 
-@@ -549,10 +549,10 @@ func FindAllDevs() (ifs []Interface, err error) {
- 	return
- }
- 
--func findalladdresses(addresses *_Ctype_struct_pcap_addr) (retval []InterfaceAddress) {
-+func findalladdresses(addresses *C.struct_pcap_addr) (retval []InterfaceAddress) {
- 	// TODO - make it support more than IPv4 and IPv6?
- 	retval = make([]InterfaceAddress, 0, 1)
--	for curaddr := addresses; curaddr != nil; curaddr = (*_Ctype_struct_pcap_addr)(curaddr.next) {
-+	for curaddr := addresses; curaddr != nil; curaddr = (*C.struct_pcap_addr)(curaddr.next) {
- 		var a InterfaceAddress
- 		var err error
- 		// In case of a tun device on Linux the link layer has no curaddr.addr.
-@@ -818,7 +818,7 @@ func (h *Handle) NewDumper(file string) (dumper *Dumper, err error) {
- // Writes a packet to the file. The return values of ReadPacketData
- // can be passed to this function as arguments.
- func (d *Dumper) WritePacketData(data []byte, ci gopacket.CaptureInfo) (err error) {
--	var pkthdr _Ctype_struct_pcap_pkthdr
-+	var pkthdr C.struct_pcap_pkthdr
- 	pkthdr.caplen = C.bpf_u_int32(ci.CaptureLength)
- 	pkthdr.len = C.bpf_u_int32(ci.Length)
- 


More information about the arch-commits mailing list