CVE-2015-7546_2.3.2.patch.out

CVE-2015-7546_2.3.2.patch.out (text/plain), 27.44 KB, created by Toralf Förster on 2016-03-17 12:44:50 UTC

***** CVE-2015-7546_2.3.2.patch *****
PWD: /var/tmp/portage/dev-python/keystonemiddleware-2.3.3/work/keystonemiddleware-2.3.3
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall

License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Larry Wall and Paul Eggert

=====================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch'

=====================================
can't find file to patch at input line 35
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 9167afaafc216c63fdc875e737bc379400e94059 Mon Sep 17 00:00:00 2001
|From: Brant Knudson <[e-mail]>
|Date: Tue, 1 Dec 2015 16:08:00 -0600
|Subject: [PATCH] auth_token verify revocation by audit_id
|
|If the revocation list includes audit_ids, then when doing offline
|validation also validate the token isn't revoked by audit_id.
|
|Backport notes:
|- test_auth_token_middleware was refactored with commit 9cbd47b to
|  check responses differently, so the test changed to use the old
|  method.
|- reno was not supported so the release note is removed.
|
|Closes-Bug: 1490804
|Change-Id: I483bc57bd38eb81a0905bcaf94e4ea82604919d6
|(cherry picked from commit 96ab58e6863c92575ada57615b19652e502adfd8)
|---
| examples/pki/cms/auth_token_scoped.json            |   5 +-
| examples/pki/cms/auth_token_scoped.pem             | 148 ++++++++--------
| examples/pki/cms/auth_token_scoped.pkiz            |   2 +-
| examples/pki/cms/auth_v3_token_scoped.json         |   3 +
| examples/pki/cms/auth_v3_token_scoped.pem          | 190 +++++++++++----------
| examples/pki/cms/auth_v3_token_scoped.pkiz         |   2 +-
| keystonemiddleware/auth_token/__init__.py          |  12 ++
| keystonemiddleware/auth_token/_revocations.py      |  22 +++
| .../unit/auth_token/test_auth_token_middleware.py  |  24 +++
| .../tests/unit/auth_token/test_revocations.py      |  47 ++++-
| 10 files changed, 281 insertions(+), 174 deletions(-)
|
|diff --git a/examples/pki/cms/auth_token_scoped.json b/examples/pki/cms/auth_token_scoped.json
|index 698e01d..cf18fa1 100644
|--- a/examples/pki/cms/auth_token_scoped.json
|+++ b/examples/pki/cms/auth_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pem b/examples/pki/cms/auth_token_scoped.pem
|index 4a5b3a2..68f5049 100644
|--- a/examples/pki/cms/auth_token_scoped.pem
|+++ b/examples/pki/cms/auth_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 206
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pkiz b/examples/pki/cms/auth_token_scoped.pkiz
|index 34d7706..cbfc082 100644
|--- a/examples/pki/cms/auth_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 213
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.json b/examples/pki/cms/auth_v3_token_scoped.json
|index 082c1b1..9020745 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.json
|+++ b/examples/pki/cms/auth_v3_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 226
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pem b/examples/pki/cms/auth_v3_token_scoped.pem
|index e11cf03..e83e7a0 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pem
|+++ b/examples/pki/cms/auth_v3_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 425
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pkiz b/examples/pki/cms/auth_v3_token_scoped.pkiz
|index d687c03..74f8f63 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_v3_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 432
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
|index a8afeb2..be268da 100644
|--- a/keystonemiddleware/auth_token/__init__.py
|+++ b/keystonemiddleware/auth_token/__init__.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 455
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py
|index 8cc449a..a68356a 100644
|--- a/keystonemiddleware/auth_token/_revocations.py
|+++ b/keystonemiddleware/auth_token/_revocations.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|index 3fdd4a9..e729735 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 520
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|index cef65b8..258e195 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
=====================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch'

=====================================
checking file examples/pki/cms/auth_token_scoped.json
Hunk #1 FAILED at 8.
1 out of 1 hunk FAILED
checking file examples/pki/cms/auth_token_scoped.pem
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file examples/pki/cms/auth_token_scoped.pkiz
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file examples/pki/cms/auth_v3_token_scoped.json
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file examples/pki/cms/auth_v3_token_scoped.pem
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file examples/pki/cms/auth_v3_token_scoped.pkiz
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file keystonemiddleware/auth_token/__init__.py
Hunk #1 FAILED at 883.
1 out of 1 hunk FAILED
checking file keystonemiddleware/auth_token/_revocations.py
Hunk #1 FAILED at 104.
1 out of 1 hunk FAILED
checking file keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
Hunk #1 succeeded at 926 with fuzz 2 (offset 30 lines).
checking file keystonemiddleware/tests/unit/auth_token/test_revocations.py
Hunk #1 FAILED at 27.
Hunk #2 FAILED at 63.
2 out of 2 hunks FAILED

patch program exited with status 1
=====================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch'

=====================================
can't find file to patch at input line 35
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 9167afaafc216c63fdc875e737bc379400e94059 Mon Sep 17 00:00:00 2001
|From: Brant Knudson <[e-mail]>
|Date: Tue, 1 Dec 2015 16:08:00 -0600
|Subject: [PATCH] auth_token verify revocation by audit_id
|
|If the revocation list includes audit_ids, then when doing offline
|validation also validate the token isn't revoked by audit_id.
|
|Backport notes:
|- test_auth_token_middleware was refactored with commit 9cbd47b to
|  check responses differently, so the test changed to use the old
|  method.
|- reno was not supported so the release note is removed.
|
|Closes-Bug: 1490804
|Change-Id: I483bc57bd38eb81a0905bcaf94e4ea82604919d6
|(cherry picked from commit 96ab58e6863c92575ada57615b19652e502adfd8)
|---
| examples/pki/cms/auth_token_scoped.json            |   5 +-
| examples/pki/cms/auth_token_scoped.pem             | 148 ++++++++--------
| examples/pki/cms/auth_token_scoped.pkiz            |   2 +-
| examples/pki/cms/auth_v3_token_scoped.json         |   3 +
| examples/pki/cms/auth_v3_token_scoped.pem          | 190 +++++++++++----------
| examples/pki/cms/auth_v3_token_scoped.pkiz         |   2 +-
| keystonemiddleware/auth_token/__init__.py          |  12 ++
| keystonemiddleware/auth_token/_revocations.py      |  22 +++
| .../unit/auth_token/test_auth_token_middleware.py  |  24 +++
| .../tests/unit/auth_token/test_revocations.py      |  47 ++++-
| 10 files changed, 281 insertions(+), 174 deletions(-)
|
|diff --git a/examples/pki/cms/auth_token_scoped.json b/examples/pki/cms/auth_token_scoped.json
|index 698e01d..cf18fa1 100644
|--- a/examples/pki/cms/auth_token_scoped.json
|+++ b/examples/pki/cms/auth_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pem b/examples/pki/cms/auth_token_scoped.pem
|index 4a5b3a2..68f5049 100644
|--- a/examples/pki/cms/auth_token_scoped.pem
|+++ b/examples/pki/cms/auth_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 206
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pkiz b/examples/pki/cms/auth_token_scoped.pkiz
|index 34d7706..cbfc082 100644
|--- a/examples/pki/cms/auth_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 213
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.json b/examples/pki/cms/auth_v3_token_scoped.json
|index 082c1b1..9020745 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.json
|+++ b/examples/pki/cms/auth_v3_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 226
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pem b/examples/pki/cms/auth_v3_token_scoped.pem
|index e11cf03..e83e7a0 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pem
|+++ b/examples/pki/cms/auth_v3_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 425
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pkiz b/examples/pki/cms/auth_v3_token_scoped.pkiz
|index d687c03..74f8f63 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_v3_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 432
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
|index a8afeb2..be268da 100644
|--- a/keystonemiddleware/auth_token/__init__.py
|+++ b/keystonemiddleware/auth_token/__init__.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 455
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py
|index 8cc449a..a68356a 100644
|--- a/keystonemiddleware/auth_token/_revocations.py
|+++ b/keystonemiddleware/auth_token/_revocations.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|index 3fdd4a9..e729735 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 520
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|index cef65b8..258e195 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
=====================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch'

=====================================
can't find file to patch at input line 35
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 9167afaafc216c63fdc875e737bc379400e94059 Mon Sep 17 00:00:00 2001
|From: Brant Knudson <[e-mail]>
|Date: Tue, 1 Dec 2015 16:08:00 -0600
|Subject: [PATCH] auth_token verify revocation by audit_id
|
|If the revocation list includes audit_ids, then when doing offline
|validation also validate the token isn't revoked by audit_id.
|
|Backport notes:
|- test_auth_token_middleware was refactored with commit 9cbd47b to
|  check responses differently, so the test changed to use the old
|  method.
|- reno was not supported so the release note is removed.
|
|Closes-Bug: 1490804
|Change-Id: I483bc57bd38eb81a0905bcaf94e4ea82604919d6
|(cherry picked from commit 96ab58e6863c92575ada57615b19652e502adfd8)
|---
| examples/pki/cms/auth_token_scoped.json            |   5 +-
| examples/pki/cms/auth_token_scoped.pem             | 148 ++++++++--------
| examples/pki/cms/auth_token_scoped.pkiz            |   2 +-
| examples/pki/cms/auth_v3_token_scoped.json         |   3 +
| examples/pki/cms/auth_v3_token_scoped.pem          | 190 +++++++++++----------
| examples/pki/cms/auth_v3_token_scoped.pkiz         |   2 +-
| keystonemiddleware/auth_token/__init__.py          |  12 ++
| keystonemiddleware/auth_token/_revocations.py      |  22 +++
| .../unit/auth_token/test_auth_token_middleware.py  |  24 +++
| .../tests/unit/auth_token/test_revocations.py      |  47 ++++-
| 10 files changed, 281 insertions(+), 174 deletions(-)
|
|diff --git a/examples/pki/cms/auth_token_scoped.json b/examples/pki/cms/auth_token_scoped.json
|index 698e01d..cf18fa1 100644
|--- a/examples/pki/cms/auth_token_scoped.json
|+++ b/examples/pki/cms/auth_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pem b/examples/pki/cms/auth_token_scoped.pem
|index 4a5b3a2..68f5049 100644
|--- a/examples/pki/cms/auth_token_scoped.pem
|+++ b/examples/pki/cms/auth_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 206
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pkiz b/examples/pki/cms/auth_token_scoped.pkiz
|index 34d7706..cbfc082 100644
|--- a/examples/pki/cms/auth_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 213
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.json b/examples/pki/cms/auth_v3_token_scoped.json
|index 082c1b1..9020745 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.json
|+++ b/examples/pki/cms/auth_v3_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 226
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pem b/examples/pki/cms/auth_v3_token_scoped.pem
|index e11cf03..e83e7a0 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pem
|+++ b/examples/pki/cms/auth_v3_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 425
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pkiz b/examples/pki/cms/auth_v3_token_scoped.pkiz
|index d687c03..74f8f63 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_v3_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 432
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
|index a8afeb2..be268da 100644
|--- a/keystonemiddleware/auth_token/__init__.py
|+++ b/keystonemiddleware/auth_token/__init__.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 455
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py
|index 8cc449a..a68356a 100644
|--- a/keystonemiddleware/auth_token/_revocations.py
|+++ b/keystonemiddleware/auth_token/_revocations.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|index 3fdd4a9..e729735 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 520
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|index cef65b8..258e195 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
=====================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch'

=====================================
can't find file to patch at input line 35
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 9167afaafc216c63fdc875e737bc379400e94059 Mon Sep 17 00:00:00 2001
|From: Brant Knudson <[e-mail]>
|Date: Tue, 1 Dec 2015 16:08:00 -0600
|Subject: [PATCH] auth_token verify revocation by audit_id
|
|If the revocation list includes audit_ids, then when doing offline
|validation also validate the token isn't revoked by audit_id.
|
|Backport notes:
|- test_auth_token_middleware was refactored with commit 9cbd47b to
|  check responses differently, so the test changed to use the old
|  method.
|- reno was not supported so the release note is removed.
|
|Closes-Bug: 1490804
|Change-Id: I483bc57bd38eb81a0905bcaf94e4ea82604919d6
|(cherry picked from commit 96ab58e6863c92575ada57615b19652e502adfd8)
|---
| examples/pki/cms/auth_token_scoped.json            |   5 +-
| examples/pki/cms/auth_token_scoped.pem             | 148 ++++++++--------
| examples/pki/cms/auth_token_scoped.pkiz            |   2 +-
| examples/pki/cms/auth_v3_token_scoped.json         |   3 +
| examples/pki/cms/auth_v3_token_scoped.pem          | 190 +++++++++++----------
| examples/pki/cms/auth_v3_token_scoped.pkiz         |   2 +-
| keystonemiddleware/auth_token/__init__.py          |  12 ++
| keystonemiddleware/auth_token/_revocations.py      |  22 +++
| .../unit/auth_token/test_auth_token_middleware.py  |  24 +++
| .../tests/unit/auth_token/test_revocations.py      |  47 ++++-
| 10 files changed, 281 insertions(+), 174 deletions(-)
|
|diff --git a/examples/pki/cms/auth_token_scoped.json b/examples/pki/cms/auth_token_scoped.json
|index 698e01d..cf18fa1 100644
|--- a/examples/pki/cms/auth_token_scoped.json
|+++ b/examples/pki/cms/auth_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pem b/examples/pki/cms/auth_token_scoped.pem
|index 4a5b3a2..68f5049 100644
|--- a/examples/pki/cms/auth_token_scoped.pem
|+++ b/examples/pki/cms/auth_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 206
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_token_scoped.pkiz b/examples/pki/cms/auth_token_scoped.pkiz
|index 34d7706..cbfc082 100644
|--- a/examples/pki/cms/auth_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 213
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.json b/examples/pki/cms/auth_v3_token_scoped.json
|index 082c1b1..9020745 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.json
|+++ b/examples/pki/cms/auth_v3_token_scoped.json
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 226
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pem b/examples/pki/cms/auth_v3_token_scoped.pem
|index e11cf03..e83e7a0 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pem
|+++ b/examples/pki/cms/auth_v3_token_scoped.pem
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 425
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/examples/pki/cms/auth_v3_token_scoped.pkiz b/examples/pki/cms/auth_v3_token_scoped.pkiz
|index d687c03..74f8f63 100644
|--- a/examples/pki/cms/auth_v3_token_scoped.pkiz
|+++ b/examples/pki/cms/auth_v3_token_scoped.pkiz
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 432
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
|index a8afeb2..be268da 100644
|--- a/keystonemiddleware/auth_token/__init__.py
|+++ b/keystonemiddleware/auth_token/__init__.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 455
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py
|index 8cc449a..a68356a 100644
|--- a/keystonemiddleware/auth_token/_revocations.py
|+++ b/keystonemiddleware/auth_token/_revocations.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|index 3fdd4a9..e729735 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 520
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/keystonemiddleware/tests/unit/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|index cef65b8..258e195 100644
|--- a/keystonemiddleware/tests/unit/auth_token/test_revocations.py
|+++ b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1