2.1.1-1 (patches unapplied)import/2.1.1-1 ubuntu/oracular-devel ubuntu/oracular ubuntu/noble-devel ubuntu/noble ubuntu/mantic-devel ubuntu/mantic ubuntu/lunar-proposed ubuntu/lunar-devel ubuntu/lunar debian/bookworm

Imported using git-ubuntu import.
author: Nilesh Patra <nilesh@debian.org> 2023-01-22 13:00:49 +0530
committer: git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> 2023-01-24 23:35:00 +0000
commit: 321ffec680c14431195411d669fbe09da22d9a1c (patch)
tree: bc832919700a86d4347bac1c239a9ebf4f84c59e
parent: 7139c7299ae08584db2042601759628db160ae62 (diff)
11 files changed, 40 insertions, 120 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 857f103..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-github: bobbymcwho
-tidelift: rubygems/omniauth
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index dcafccd..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Please complete all sections.
-
-### Configuration
-
-- Provider Gem: `omniauth-*`
-- Ruby Version: ``
-- Framework: ``
-- Platform: ``
-
-### Expected Behavior
-
-Tell us what should happen.
-
-### Actual Behavior
-
-Tell us what happens instead.
-
-### Steps to Reproduce
-
-Please list all steps to reproduce the issue.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 4c1e07d..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos]
-        ruby: [2.5, 2.6, 2.7, '3.0', 3.1, head, debug, truffleruby, truffleruby-head]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
-  test-jruby:
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos]
-        jruby: [jruby] # TODO: Add back jruby-head once we figure out why there's a bundler mismatch
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.jruby }}
-        bundler-cache: true
-    - name: Install dependencies
-      env:
-        JRUBY_OPTS: --debug
-      run: bundle install
-    - name: Run tests
-      env:
-        JRUBY_OPTS: --debug
-      run: bundle exec rake
-  frozen-string-compat:
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.6
-        bundler-cache: true
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      env:
-        RUBYOPT: "--enable-frozen-string-literal"
-      run: bundle exec rake
-  coveralls:
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.6
-        bundler-cache: true
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
-    - name: Coveralls GitHub Action
-      uses: coverallsapp/github-action@v1.1.2
-      with:
-        github-token: ${{ secrets.github_token }}
-        path-to-lcov: './coverage/lcov/omniauth.lcov'
diff --git a/README.md b/README.md
index 47c31c0..4d47ec8 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,21 @@
 # OmniAuth: Standardized Multi-Provider Authentication
 
 [![Gem Version](http://img.shields.io/gem/v/omniauth.svg)][gem]
-[![Build Status](http://img.shields.io/travis/omniauth/omniauth.svg)][travis]
+[![Ruby](https://github.com/omniauth/omniauth/actions/workflows/main.yml/badge.svg)][githubactions]
+[![TruffleRuby](https://github.com/omniauth/omniauth/actions/workflows/truffle_ruby.yml/badge.svg)][githubactionstruffle]
+[![JRuby](https://github.com/omniauth/omniauth/actions/workflows/jruby.yml/badge.svg)][githubactionsjruby]
 [![Code Climate](https://api.codeclimate.com/v1/badges/ffd33970723587806744/maintainability)][codeclimate]
 [![Coverage Status](http://img.shields.io/coveralls/omniauth/omniauth.svg)][coveralls]
 
 [gem]: https://rubygems.org/gems/omniauth
-[travis]: http://travis-ci.org/omniauth/omniauth
+[githubactions]: https://github.com/omniauth/omniauth/actions/workflows/main.yml
+[githubactionstruffle]: https://github.com/omniauth/omniauth/actions/workflows/truffle_ruby.yml
+[githubactionsjruby]: https://github.com/omniauth/omniauth/actions/workflows/jruby.yml
 [codeclimate]: https://codeclimate.com/github/omniauth/omniauth
 [coveralls]: https://coveralls.io/r/omniauth/omniauth
 
-This is the documentation for our latest release [v2.1.0](https://github.com/omniauth/omniauth/releases/tag/v2.1.0). 
+This is the documentation for the in-development branch of OmniAuth.
+You can find the documentation for the latest stable release [here](https://github.com/omniauth/omniauth/tree/v2.1.1)
 
 ## An Introduction
 OmniAuth is a library that standardizes multi-provider authentication for
@@ -97,6 +102,13 @@ environment information on the callback request. It is entirely up to
 you how you want to implement the particulars of your application's
 authentication flow.
 
+## rack_csrf
+
+`omniauth` is not OOTB-compatible with [rack_csrf](https://github.com/baldowl/rack_csrf). In order to do so, the following code needs to be added to the application bootstrapping code:
+
+```ruby
+OmniAuth::AuthenticityTokenProtection.default_options(key: "csrf.token", authenticity_param: "_csrf")
+```
 
 ## Rails (without Devise)
 To get started, add the following gems
diff --git a/SECURITY.md b/SECURITY.md
index 7075138..b1b75a4 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,6 +7,7 @@ currently being supported with security updates.
 
 | Version  | Supported          |
 | -------  | ------------------ |
+| 2.1.x    | :white_check_mark: |
 | 2.0.x    | :white_check_mark: |
 | <= 1.9.1 | :x:                |
 
diff --git a/debian/changelog b/debian/changelog
index 0ac2187..03106c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+ruby-omniauth (2.1.1-1) unstable; urgency=medium
+
+  [ Pirate Praveen ]
+  * Team Upload.
+  * Update minimum version of ruby-rack to 2.2.3
+
+  [ Debian Janitor ]
+  * Set field Upstream-Contact in debian/copyright.
+  * Set upstream metadata fields: Security-Contact.
+  * Remove obsolete fields Contact, Name from debian/upstream/metadata
+    (already present in machine-readable debian/copyright).
+
+  [ Nilesh Patra ]
+  * New upstream version 2.1.1 (Closes: #1026627)
+  * Bump Standards-Version to 4.6.2 (no changes needed)
+
+ -- Nilesh Patra <nilesh@debian.org>  Sun, 22 Jan 2023 13:00:49 +0530
+
 ruby-omniauth (2.1.0-1) unstable; urgency=medium
 
   * Update watch file to use github api
diff --git a/debian/control b/debian/control
index 7367fc8..69dc5cd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,13 @@ Build-Depends: debhelper-compat (= 13),
                gem2deb (>= 1),
                rake,
                ruby-hashie,
-               ruby-rack (<< 3),
-               ruby-rack,
+               ruby-rack (>= 2.2.3~),
                ruby-rack-protection,
                ruby-rack-test,
                ruby-rspec,
                ruby-simplecov,
                ruby-coveralls
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/ruby-team/ruby-omniauth.git
 Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-omniauth
 Homepage: https://github.com/omniauth/omniauth
diff --git a/debian/copyright b/debian/copyright
index a0a028f..a598b5b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: omniauth
 Source: http://www.omniauth.org/
+Upstream-Contact: https://github.com/omniauth/omniauth/issues
 
 Files: *
 Copyright: 2010-2013 Michael Bleigh and Intridea, Inc.
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 7774f8a..85aace6 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -3,7 +3,6 @@ Archive: GitHub
 Bug-Database: https://github.com/omniauth/omniauth/issues
 Bug-Submit: https://github.com/omniauth/omniauth/issues
 Changelog: https://github.com/omniauth/omniauth/tags
-Contact: https://github.com/omniauth/omniauth/issues
-Name: omniauth
 Repository: https://github.com/omniauth/omniauth.git
 Repository-Browse: https://github.com/omniauth/omniauth
+Security-Contact: https://github.com/omniauth/omniauth/tree/SECURITY.md
diff --git a/lib/omniauth/strategy.rb b/lib/omniauth/strategy.rb
index 1ea4ad2..2cfc2a6 100644
--- a/lib/omniauth/strategy.rb
+++ b/lib/omniauth/strategy.rb
@@ -498,6 +498,7 @@ module OmniAuth
     end
 
     def script_name
+      return '' if @env.nil?
       @env['SCRIPT_NAME'] || ''
     end
 
diff --git a/lib/omniauth/version.rb b/lib/omniauth/version.rb
index 89b70e5..653d977 100644
--- a/lib/omniauth/version.rb
+++ b/lib/omniauth/version.rb
@@ -1,3 +1,3 @@
 module OmniAuth
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end
author	Nilesh Patra <nilesh@debian.org>	2023-01-22 13:00:49 +0530
committer	git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>	2023-01-24 23:35:00 +0000
commit	321ffec680c14431195411d669fbe09da22d9a1c (patch)
tree	bc832919700a86d4347bac1c239a9ebf4f84c59e
parent	7139c7299ae08584db2042601759628db160ae62 (diff)