aboutsummaryrefslogtreecommitdiffstats
path: root/keystonemiddleware-moon/debian/patches
diff options
context:
space:
mode:
authorThomas Duval <thomas.duval@orange.com>2016-08-01 18:09:33 +0200
committerThomas Duval <thomas.duval@orange.com>2016-08-01 18:09:33 +0200
commitda8699cd23e58fcbe177b90a678ec022f9bff0e1 (patch)
treef600137c3f05f16df885292cc5fdfe31aef960e2 /keystonemiddleware-moon/debian/patches
parent860e7fd7b81f956b54b25224efbd69ff9b1d1cc7 (diff)
Update script for debian package creation.
Change-Id: Ia85d82b2528f058a7a051f6a91e575feb8b0159c
Diffstat (limited to 'keystonemiddleware-moon/debian/patches')
-rw-r--r--keystonemiddleware-moon/debian/patches/no-intersphinx.patch17
-rw-r--r--keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch18
-rw-r--r--keystonemiddleware-moon/debian/patches/series2
3 files changed, 37 insertions, 0 deletions
diff --git a/keystonemiddleware-moon/debian/patches/no-intersphinx.patch b/keystonemiddleware-moon/debian/patches/no-intersphinx.patch
new file mode 100644
index 00000000..a5e25751
--- /dev/null
+++ b/keystonemiddleware-moon/debian/patches/no-intersphinx.patch
@@ -0,0 +1,17 @@
+Description: Remove the intersphinx plugin.
+ Do not use the intersphinx plugin which is doing network access during
+ the build.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2014-07-28
+
+--- python-keystonemiddleware-1.0.0.orig/doc/source/conf.py
++++ python-keystonemiddleware-1.0.0/doc/source/conf.py
+@@ -42,7 +42,6 @@ sys.path.insert(0, os.path.abspath(os.pa
+ extensions = ['sphinx.ext.autodoc',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.coverage',
+- 'sphinx.ext.intersphinx',
+ # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
+ # remove this Sphinx extension when
+ # https://launchpad.net/bugs/1260495 is fixed.
diff --git a/keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch b/keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch
new file mode 100644
index 00000000..fc981d0c
--- /dev/null
+++ b/keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch
@@ -0,0 +1,18 @@
+Description: Re-add missing auth options
+ Upstream went a bit quick to remove Auth options from the default generated
+ config files.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-04-07
+
+--- python-keystonemiddleware-4.4.0.orig/keystonemiddleware/auth_token/__init__.py
++++ python-keystonemiddleware-4.4.0/keystonemiddleware/auth_token/__init__.py
+@@ -370,7 +370,7 @@ _OPTS = [
+ ' only while migrating from a less secure algorithm to a more'
+ ' secure one. Once all the old tokens are expired this option'
+ ' should be set to a single value for better performance.'),
+-]
++] + _auth.OPTS
+
+ CONF = cfg.CONF
+ CONF.register_opts(_OPTS, group=_base.AUTHTOKEN_GROUP)
diff --git a/keystonemiddleware-moon/debian/patches/series b/keystonemiddleware-moon/debian/patches/series
new file mode 100644
index 00000000..3c47073f
--- /dev/null
+++ b/keystonemiddleware-moon/debian/patches/series
@@ -0,0 +1,2 @@
+no-intersphinx.patch
+re-add-missing-auth-options.patch