diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-10-08 17:50:19 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-10-08 17:50:19 +0000 |
| commit | 00706dce34a64a1ff3e6f4dcdaba94ab43062b89 (patch) | |
| tree | 6cff46d294f4d286e085e6fb5a84327cb48797b6 /debian | |
| parent | e81af4ad239268f244c0aecde47fba79feda4964 (diff) | |
| download | python-requests-00706dce34a64a1ff3e6f4dcdaba94ab43062b89.tar python-requests-00706dce34a64a1ff3e6f4dcdaba94ab43062b89.tar.gz | |
Refresh 01_use-system-ca-certificates.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/01_use-system-ca-certificates.patch | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 6dc3545..4a0ef6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - * New upstream release + * New upstream release. + * debian/patches/01_use-system-ca-certificates.patch + - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch - Provide requests.packages package because it will be used to supply a stub for requests.packages.urllib3 @@ -8,7 +10,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli <eriol@mornie.org> Wed, 08 Oct 2014 19:04:10 +0200 + -- Daniele Tricoli <eriol@mornie.org> Wed, 08 Oct 2014 19:46:37 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch index 6f18dcb..258455e 100644 --- a/debian/patches/01_use-system-ca-certificates.patch +++ b/debian/patches/01_use-system-ca-certificates.patch @@ -2,22 +2,24 @@ Description: Use the bundle provided by ca-certificates instead of the embedded one. Author: Daniele Tricoli <eriol@mornie.org> Forwarded: not-needed -Last-Update: 2013-01-19 +Last-Update: 2014-10-08 --- a/requests/certs.py +++ b/requests/certs.py -@@ -18,7 +18,7 @@ - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return '/etc/ssl/certs/ca-certificates.crt' +@@ -18,8 +18,8 @@ + except ImportError: + def where(): + """Return the preferred certificate bundle.""" +- # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ # On Debian systems use ca-certificates ++ return '/etc/ssl/certs/ca-certificates.crt' if __name__ == '__main__': print(where()) --- a/setup.py +++ b/setup.py -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ author_email='me@kennethreitz.com', url='http://python-requests.org', packages=packages, |