Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Georgios Dagkakis
slapos
Commits
c1b0536b
Commit
c1b0536b
authored
Jan 05, 2016
by
Julien Muchembled
Committed by
Kazuhiko Shiozaki
Jan 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ca-certificates buildable with Python 2.6, and on Arch with only Python 2.7
parent
2e4408b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
component/ca-certificates/buildout.cfg
component/ca-certificates/buildout.cfg
+1
-0
component/ca-certificates/ca-certificates-any-python.patch
component/ca-certificates/ca-certificates-any-python.patch
+23
-0
No files found.
component/ca-certificates/buildout.cfg
View file @
c1b0536b
...
...
@@ -15,6 +15,7 @@ url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_
patch-binary = ${patch:location}/bin/patch
md5sum = 2233bfa64af6f58f5eca9735b6742818
patches =
${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
patch-options = -p0
configure-command = true
...
...
component/ca-certificates/ca-certificates-any-python.patch
0 → 100644
View file @
c1b0536b
--- mozilla/certdata2pem.py 2016-01-04 18:31:05.000000000 +0100
+++ mozilla/certdata2pem.py 2016-01-05 20:05:53.595360495 +0100
@@ -63,7 +63,7 @@
else:
value += line
continue
- obj[field] = value
+ obj[field] = bytes(value)
in_multiline = False
continue
if line.startswith('CKA_CLASS'):
--- mozilla/Makefile 2015-12-20 10:49:23.000000000 +0100
+++ mozilla/Makefile 2016-01-05 20:19:11.006874271 +0100
@@ -3,7 +3,8 @@
#
all:
- python certdata2pem.py
+ for x in '' 2 3; do type python$$x && break; done >/dev/null \
+ && python$$x certdata2pem.py
clean:
-rm -f *.crt
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment