Commit 61a5a21c authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5' into erp5-cluster

parents b7cccaae 22db9772
......@@ -4,8 +4,8 @@ parts = busybox
[busybox]
recipe = slapos.recipe.build
url = http://git.busybox.net/busybox/snapshot/busybox-1_20_1.tar.gz
md5sum = 2dcfee8add6b9c52d6a91e97ba705b66
url = http://git.busybox.net/busybox/snapshot/busybox-1_20_2.tar.gz
md5sum = 025acebb48040ef62dd635d416d317e8
script =
extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
workdir = guessworkdir(extract_dir)
......
......@@ -11,8 +11,8 @@ parts =
[curl]
recipe = slapos.recipe.cmmi
url = http://curl.haxx.se/download/curl-7.34.0.tar.bz2
md5sum = 88491df2bb32e9146e776ae6ac2f8327
url = http://curl.haxx.se/download/curl-7.35.0.tar.bz2
md5sum = c18fbdd031adb0529ae09fce399f2d10
configure-options =
--disable-static
--disable-ldap
......
......@@ -709,7 +709,7 @@ ply = 3.4
polib = 1.0.3
psutil = 1.2.1
pyflakes = 0.7.3
python-ldap = 2.4.13
python-ldap = 2.4.14
python-magic = 0.4.6
qrcode = 4.0.4
requests = 2.2.1
......
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