Commit 47d3c501 authored by Jérome Perrin's avatar Jérome Perrin

Update Release Candidate

parents 7ad0fbdf 68b4503e
...@@ -34,6 +34,7 @@ import string, random ...@@ -34,6 +34,7 @@ import string, random
import json import json
import traceback import traceback
from slapos import slap from slapos import slap
from slapos.util import binFromIpv6
class Recipe(GenericBaseRecipe): class Recipe(GenericBaseRecipe):
...@@ -54,20 +55,8 @@ class Recipe(GenericBaseRecipe): ...@@ -54,20 +55,8 @@ class Recipe(GenericBaseRecipe):
return GenericBaseRecipe.__init__(self, buildout, name, options) return GenericBaseRecipe.__init__(self, buildout, name, options)
def getSerialFromIpv6(self, ipv6): def getSerialFromIpv6(self, ipv6):
prefix = ipv6.split('/')[0].lower() prefix, prefix_length = ipv6.split('/')
hi, lo = struct.unpack('!QQ', socket.inet_pton(socket.AF_INET6, prefix)) return "0x%x" % int('1%s' % binFromIpv6(prefix)[:int(prefix_length)], 2)
ipv6_int = (hi << 64) | lo
serial = '0x1%x' % ipv6_int
# delete non significant part
for part in prefix.split(':')[::-1]:
if part:
for i in ['0']*(4 - len(part)):
part = i + part
serial = serial.split(part)[0] + part
break
return serial
def generateCertificate(self): def generateCertificate(self):
key_file = self.options['key-file'].strip() key_file = self.options['key-file'].strip()
......
...@@ -256,6 +256,11 @@ distro = 1.7.0 ...@@ -256,6 +256,11 @@ distro = 1.7.0
Werkzeug = 1.0.1 Werkzeug = 1.0.1
distro = 1.6.0 distro = 1.6.0
# temporary revert the version up because of issues with python3
[versions:python3]
zc.buildout = 2.7.1+slapos016
slapos.libnetworkcache = 0.22
[networkcache] [networkcache]
download-cache-url = http://shacache.nxdcdn.com download-cache-url = http://shacache.nxdcdn.com
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment