[DRE-commits] [gitlab-workhorse] 03/03: use jwt-go-v3

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab-workhorse.

commit 04cdd0d2e8d5b98269c162dc6684b2008c364d3c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Oct 30 16:54:32 2016 +0530

    use jwt-go-v3
---
 debian/changelog                   |  3 ++-
 debian/control                     |  2 +-
 debian/patches/series              |  1 +
 debian/patches/use-jwt-go-v3.patch | 39 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e600ce..5501737 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gitlab-workhorse (0.8.5+debian-1) UNRELEASED; urgency=medium
 
-  * New upstream release 
+  * New upstream release
+  * Switch build dep to golang-github-dgrijalva-jwt-go-v3-dev (Closes #841617)
 
  -- Pirate Praveen <praveen at debian.org>  Sun, 30 Oct 2016 16:38:44 +0530
 
diff --git a/debian/control b/debian/control
index 6e08ccf..306769b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9),
                dh-golang,
                golang-any | go-compiler,
                golang-github-getsentry-raven-go-dev,
-               golang-github-dgrijalva-jwt-go-dev (>= 3.0~)
+               golang-github-dgrijalva-jwt-go-v3-dev (>= 3.0~)
 ## tests:
 #    ,git
 #    ,curl
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2b97f12
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-jwt-go-v3.patch
diff --git a/debian/patches/use-jwt-go-v3.patch b/debian/patches/use-jwt-go-v3.patch
new file mode 100644
index 0000000..f6337d6
--- /dev/null
+++ b/debian/patches/use-jwt-go-v3.patch
@@ -0,0 +1,39 @@
+Index: gitlab-workhorse/Godeps/Godeps.json
+===================================================================
+--- gitlab-workhorse.orig/Godeps/Godeps.json
++++ gitlab-workhorse/Godeps/Godeps.json
+@@ -9,7 +9,7 @@
+ 			"Rev": "ec89d50f00d39494f5b3ec5cf2fe75c53467a937"
+ 		},
+ 		{
+-			"ImportPath": "github.com/dgrijalva/jwt-go",
++			"ImportPath": "github.com/dgrijalva/jwt-go-v3",
+ 			"Comment": "v3.0.0",
+ 			"Rev": "d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+ 		},
+Index: gitlab-workhorse/authorization_test.go
+===================================================================
+--- gitlab-workhorse.orig/authorization_test.go
++++ gitlab-workhorse/authorization_test.go
+@@ -12,7 +12,7 @@ import (
+ 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+ 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
+ 
+-	"github.com/dgrijalva/jwt-go"
++	"github.com/dgrijalva/jwt-go-v3"
+ )
+ 
+ func okHandler(w http.ResponseWriter, _ *http.Request, _ *api.Response) {
+Index: gitlab-workhorse/internal/api/api.go
+===================================================================
+--- gitlab-workhorse.orig/internal/api/api.go
++++ gitlab-workhorse/internal/api/api.go
+@@ -12,7 +12,7 @@ import (
+ 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
+ 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+ 
+-	"github.com/dgrijalva/jwt-go"
++	"github.com/dgrijalva/jwt-go-v3"
+ )
+ 
+ // Custom content type for API responses, to catch routing / programming mistakes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab-workhorse.git