From 1a3d04ab87c0f8ea281f47547f3cfeda50c7609a Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 28 Mar 2018 19:19:58 +0200 Subject: [PATCH] Switch from private copy to pkg/xattr Now that https://github.com/pkg/xattr/pull/24 has been merged there is no reason to keep our private copy. Switch to the upstream version. --- Gopkg.lock | 14 +++++++------- internal/fusefrontend/xattr.go | 2 +- tests/xattr/xattr_integration_test.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 4671245..4073c34 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -13,18 +13,18 @@ packages = ["cmac","common","siv"] revision = "c73681c634de898c869684602cf0c0d2ce938c4d" +[[projects]] + name = "github.com/pkg/xattr" + packages = ["."] + revision = "1d7b7ffe7c46974a836eb583b7452f22de1c18cf" + version = "v0.2.3" + [[projects]] branch = "master" name = "github.com/rfjakob/eme" packages = ["."] revision = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770" -[[projects]] - name = "github.com/rfjakob/pkg-xattr" - packages = ["."] - revision = "1d7b7ffe7c46974a836eb583b7452f22de1c18cf" - version = "v0.2.3" - [[projects]] branch = "master" name = "golang.org/x/crypto" @@ -46,6 +46,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "27445dec9a2aacb7d95ca8b595e98ae5c9b31c0402360bd8ab2cc9a6802c37b5" + inputs-digest = "e3ad06e025f86b190df0e903117eacc6b490d935c21c3716516f68ba7724bf78" solver-name = "gps-cdcl" solver-version = 1 diff --git a/internal/fusefrontend/xattr.go b/internal/fusefrontend/xattr.go index 357e889..03e127f 100644 --- a/internal/fusefrontend/xattr.go +++ b/internal/fusefrontend/xattr.go @@ -8,7 +8,7 @@ import ( "syscall" "github.com/hanwen/go-fuse/fuse" - xattr "github.com/rfjakob/pkg-xattr" + "github.com/pkg/xattr" "github.com/rfjakob/gocryptfs/internal/tlog" ) diff --git a/tests/xattr/xattr_integration_test.go b/tests/xattr/xattr_integration_test.go index c491f60..50e7fb7 100644 --- a/tests/xattr/xattr_integration_test.go +++ b/tests/xattr/xattr_integration_test.go @@ -9,7 +9,7 @@ import ( "syscall" "testing" - xattr "github.com/rfjakob/pkg-xattr" + "github.com/pkg/xattr" "github.com/rfjakob/gocryptfs/tests/test_helpers" )