use @fdurand's go-ipset package

supports newer libipset version
inverse-inc · Dec 5, 2018 · 18df30f · 18df30f
1 parent b355ded
commit 18df30f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/go/caddy/pfipset/handlers.go b/go/caddy/pfipset/handlers.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 
 	"github.com/diegoguarnieri/go-conntrack/conntrack"
-	ipset "github.com/digineo/go-ipset"
+	ipset "github.com/fdurand/go-ipset"
 	"github.com/gorilla/mux"
 	"github.com/inverse-inc/packetfence/go/log"
 	"github.com/inverse-inc/packetfence/go/sharedutils"

diff --git a/go/caddy/pfipset/pool.go b/go/caddy/pfipset/pool.go
@@ -1,7 +1,7 @@
 package pfipset
 
 import (
-	ipset "github.com/digineo/go-ipset"
+	ipset "github.com/fdurand/go-ipset"
 )
 
 type job struct {

diff --git a/go/caddy/pfipset/utils.go b/go/caddy/pfipset/utils.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"regexp"
 
-	ipset "github.com/digineo/go-ipset"
+	ipset "github.com/fdurand/go-ipset"
 	"github.com/inverse-inc/packetfence/go/log"
 	"github.com/inverse-inc/packetfence/go/pfconfigdriver"
 	"github.com/inverse-inc/packetfence/go/sharedutils"

diff --git a/go/vendor/vendor.json b/go/vendor/vendor.json
@@ -123,12 +123,6 @@
 			"revision": "9abb0707ff3199f9ab5a44b5a5ea588c41979476",
 			"revisionTime": "2016-12-08T18:04:11Z"
 		},
-		{
-			"checksumSHA1": "HHKEZVMANt+QoNbpt+6Om7DCuVY=",
-			"path": "github.com/digineo/go-ipset",
-			"revision": "7a05e099ec96caf47dd1c3138bfb6a35c5d1b6a5",
-			"revisionTime": "2018-02-11T16:25:07Z"
-		},
 		{
 			"checksumSHA1": "NJ+mjEgf5/x6f+x8+IrQQcD7vko=",
 			"path": "github.com/dnstap/golang-dnstap",
@@ -212,6 +206,11 @@
 			"path": "github.com/fdurand/go-cache",
 			"revision": "cf0198ac7d92634998b3f3f2b616553fda07d7b0"
 		},
+		{
+			"checksumSHA1": "RFnAYMiZSJG51dKxpwbneK30Wh0=",
+			"path": "github.com/fdurand/go-ipset",
+			"revision": "9a266eccec047c1e13fd3f514a7d8dc859cb51ab"
+		},
 		{
 			"checksumSHA1": "VdXZPcDRHK1T7XjBu2KW8Mb8S6w=",
 			"path": "github.com/flynn/go-shlex",