Update d/ch

Embed doorkeeper
2020-01-04 01:46:56 +05:30 · 2020-01-04 01:44:35 +05:30
8 changed files with 30 additions and 2 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+gitlab (12.6.2-2) UNRELEASED; urgency=medium
+
+  * Embed doorkeeper (Closes: #947754)
+
+ -- Utkarsh Gupta <utkarsh@debian.org>  Sat, 04 Jan 2020 01:44:44 +0530
+
 gitlab (12.6.2-1) experimental; urgency=medium

  * New upstream version 12.6.2 (Fixes: CVE-2019-20142, CVE-2019-20143,
--- a/debian/control
+++ b/debian/control
@ -6,7 +6,7 @@ Uploaders: Cédric Boutillier <boutil@debian.org>,
 Pirate Praveen <praveen@debian.org>,
 Balasankar C <balasankarc@autistici.org>,
 Sruthi Chandran <srud@debian.org>,
- Utkarsh Gupta <guptautkarsh2102@gmail.com>
+ Utkarsh Gupta <utkarsh@debian.org>
 Build-Depends: debhelper (>= 10~), gem2deb, bc
 Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/ruby-team/gitlab.git
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,2 +1,2 @@
 [DEFAULT]
-component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4' ]
+component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'doorkeeper' ]
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@ -69,3 +69,4 @@ heapy usr/share/gitlab/vendor/gems
 elasticsearch-model usr/share/gitlab/vendor/gems
 elasticsearch-rails usr/share/gitlab/vendor/gems
 faraday-middleware-aws-signers-v4 usr/share/gitlab/vendor/gems
+doorkeeper usr/share/gitlab/vendor/gems
--- a/debian/patches/0780-embed-doorkeeper.patch
+++ b/debian/patches/0780-embed-doorkeeper.patch
@ -0,0 +1,16 @@
+Description: This patch embeds doorkeeper.
+Author: Utkarsh Gupta <utkarsh@debian.org>
+Bug-Debian: https://bugs.debian.org/947754
+Last-Update: 2020-01-03
+
+--- a/Gemfile
+++ b/Gemfile
+@@ -26,7 +26,7 @@
+ 
+ # Authentication libraries
+ gem 'devise', '~> 4.6'
+-gem 'doorkeeper', '~> 4.3'
+gem 'doorkeeper', '~> 4.3', path: 'vendor/gems/doorkeeper'
+ gem 'doorkeeper-openid_connect', '~> 1.5'
+ gem 'omniauth', '~> 1.8'
+ gem 'omniauth-auth0', '~> 2.0'
--- a/debian/patches/series
+++ b/debian/patches/series
@ -32,3 +32,4 @@
 0750-fix-relative-paths.patch
 0760-bump-rubyzip.patch
 0770-bump-node-d3.patch
+0780-embed-doorkeeper.patch
--- a/debian/upstream-file-list
+++ b/debian/upstream-file-list
@ -71,6 +71,7 @@ docker-compose.yml
 elasticsearch-model
 elasticsearch-rails
 faraday-middleware-aws-signers-v4
+doorkeeper
 fixtures
 generator_templates
 haml_lint
--- a/debian/watch
+++ b/debian/watch
@ -23,3 +23,6 @@ https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-rails-(0.1.*).t

 opts="pgpmode=none,component=faraday-middleware-aws-signers-v4" \
 https://gemwatch.debian.net/faraday_middleware-aws-signers-v4 .*/faraday_middleware-aws-signers-v4-(0.1.*).tar.gz ignore
+
+opts="pgpmode=none,component=doorkeeper" \
+https://gemwatch.debian.net/doorkeeper .*/doorkeeper-(4.3.*).tar.gz ignore
Author	SHA1	Message	Date
Utkarsh Gupta	d14c0ebc06	Update d/ch	2020-01-04 01:46:56 +05:30
Utkarsh Gupta	1598097648	Embed doorkeeper	2020-01-04 01:44:35 +05:30