Merge branch 'master' of git.scraperwall.com:scw/munchclient

Makefile

@@ -9,4 +9,3 @@ all-debian:
 
 compile:
 	env GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags "-s -X main.Version=$(VERSION) -X main.BuildDate=$(BUILD)"
-

vendor/github.com/google/gopacket/pcap/pcap_unix.go

@@ -24,7 +24,7 @@ import (
 
 /*
 #cgo solaris LDFLAGS: -L /opt/local/lib -lpcap
-#cgo linux LDFLAGS: -lpcap
+#cgo linux LDFLAGS: -Wl,-Bstatic -lpcap -Wl,-Bdynamic
 #cgo dragonfly LDFLAGS: -lpcap
 #cgo freebsd LDFLAGS: -lpcap
 #cgo openbsd LDFLAGS: -lpcap