diff --git a/CHANGES.txt b/CHANGES.txt index 13bbfb7679b899fc2daaec3c16108d55156588b0..9e5612af12bbc02020c83f5b9ce2fc0d9ee4460b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,11 @@ Changes ======= +0.100 (2015-04-20) +------------------ + * re6stnet recipe: re6st-registry log can now be reopened with SIGUSR1 + * re6stnet recipe: re6st certificate generation is improved. + 0.99 (2015-04-10) ----------------- * re6stnet: new recipe to deploy re6st registry (re6st master) with slapos. diff --git a/component/babeld/buildout.cfg b/component/babeld/buildout.cfg index 7b1674ce48146c997059d4a6e5367bf68b0dbaa0..590025a7040c50a5e999a65522f69e0da64e8a6d 100644 --- a/component/babeld/buildout.cfg +++ b/component/babeld/buildout.cfg @@ -6,9 +6,8 @@ parts = babeld [babeld] recipe = slapos.recipe.cmmi -# Babeld version v1.6.0-nxd1 -url = http://git.erp5.org/gitweb/babeld.git/snapshot/e39e62b5ecbce9d488b4f2a0999f8b5e7612e75f.tar.gz -md5sum = 3a2697f3f6e5815632809c84c004bfaa +url = https://lab.nexedi.cn/rafael/babeld/repository/archive.tar.gz?ref=v1.6.0-nxd1 +md5sum = 1f269d01321103873b8d245df19984f0 configure-command = echo "No configure.." diff --git a/component/gnutls/buildout.cfg b/component/gnutls/buildout.cfg index 1834a3fa1f70cca5bee2588cd75306516ca43667..fcb5f75961345afc1e4a2d91605c759e10783892 100644 --- a/component/gnutls/buildout.cfg +++ b/component/gnutls/buildout.cfg @@ -11,8 +11,8 @@ parts = gnutls [gpg-error] recipe = slapos.recipe.cmmi -url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.18.tar.bz2 -md5sum = 12312802d2065774b787cbfc22cc04e9 +url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.19.tar.bz2 +md5sum = c04c16245b92829281f43b5bef7d16da [gcrypt] recipe = slapos.recipe.cmmi diff --git a/component/libyaml/buildout.cfg b/component/libyaml/buildout.cfg index 83cf625883090fb003b9d7569ad33f255417f61f..490ea3572d9665130c0c5b4a2955d2e8286c03c5 100644 --- a/component/libyaml/buildout.cfg +++ b/component/libyaml/buildout.cfg @@ -5,5 +5,5 @@ parts = [libyaml] recipe = slapos.recipe.cmmi -url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz -md5sum = 36c852831d02cf90508c29852361d01b +url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz +md5sum = 5fe00cda18ca5daeb43762b80c38e06e diff --git a/component/perl/buildout.cfg b/component/perl/buildout.cfg index 83e11ae4effb0a8fd045edadfbcc613fc7f23236..37cd515e770ccbcf8ec39b28bd5b343787f67d41 100644 --- a/component/perl/buildout.cfg +++ b/component/perl/buildout.cfg @@ -7,9 +7,9 @@ parts = [perl] recipe = slapos.recipe.cmmi -version = 5.20.1 +version = 5.20.2 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2 -md5sum = ede5166f949d9a07163bc5b086be9759 +md5sum = 21062666f1c627aeb6dbff3c6952738b siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_} patch-options = -p1 patches = diff --git a/component/ruby/buildout.cfg b/component/ruby/buildout.cfg index 96bbbb0b6fb3d71627e9f2114c381a6801dbb299..534b944b1fe3e4fb01ccbb27e29579a85b220cac 100644 --- a/component/ruby/buildout.cfg +++ b/component/ruby/buildout.cfg @@ -2,32 +2,28 @@ extends = ../gdbm/buildout.cfg - ../openssl/buildout.cfg - ../zlib/buildout.cfg - ../readline/buildout.cfg - ../ncurses/buildout.cfg + ../libffi/buildout.cfg ../libyaml/buildout.cfg - ../openssl/buildout.cfg ../ncurses/buildout.cfg + ../openssl/buildout.cfg ../readline/buildout.cfg + ../xz-utils/buildout.cfg ../zlib/buildout.cfg parts = ruby -[ruby-1.9.3] +[ruby-2.2] recipe = slapos.recipe.cmmi -url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz -md5sum = bc0c715c69da4d1d8bd57069c19f6c0e +url = http://ftp.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.xz +md5sum = dbce9b9d79d90f213ba8d448b0b6ed86 configure-options = --enable-shared --enable-rpath --disable-install-doc - --enable-pthread --enable-ipv6 - --with-ext=bigdecimal,continuation,curses,date,digest,dl,etc,fcntl,iconv,io,json,nkf,openssl,pathname,psych,pty,racc,readline,ripper,sdbm,socket,stringio,strscan,syck,syslog,zlib + --with-out-ext=tk,tk/tkutil,win32,win32ole environment = - CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gdbm:location}/include -I${openssl:location}/include - LDFLAGS=-L${zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib + PATH=${xz-utils:location}/bin:%(PATH)s + CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl:location}/include -I${readline:location}/include -I${zlib:location}/include + LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib PKG_CONFIG_PATH=${libyaml:location}/lib/ -[ruby-1.9] -<= ruby-1.9.3 - [ruby] +<= ruby-2.2 diff --git a/setup.py b/setup.py index c6521e61b4243082bb4683cfdf6c3205165298c0..3347ec147fdce8d528e43ab95a435ba5b4f3c281 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ from setuptools import setup, find_packages import glob import os -version = '0.100.dev0' +version = '0.101.dev0' name = 'slapos.cookbook' long_description = open("README.txt").read() + "\n" + \ open("CHANGES.txt").read() + "\n" diff --git a/software/re6stnet/software.cfg b/software/re6stnet/software.cfg index aae5cfc5a37fa7b0286e9acb5c936a97d3f03d2f..62b3fcff704f232dc89cc9169aec3cb6da3401cd 100644 --- a/software/re6stnet/software.cfg +++ b/software/re6stnet/software.cfg @@ -13,7 +13,6 @@ extends = develop = ${:parts-directory}/re6stnet-repository - ${:parts-directory}/slapos.cookbook-repository parts = slapos-cookbook @@ -48,7 +47,7 @@ eggs = [re6stnet-repository] repository = http://git.erp5.org/repos/re6stnet.git branch = re6st-slapos -revision = +revision = 8130c7380cbf3f13bdc4e5ecb8e792fb7d2b7b2e [slapos.cookbook-repository] @@ -128,7 +127,6 @@ stop-on-error = true update-command = ${:command} command = grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link - grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link [versions] apache-libcloud = 0.17.0 diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index ae1688df4a86d8c3721bab0d6fb692dd776c0c28..549cd56077744822b507b6f242ca3ac28776ef99 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -596,7 +596,7 @@ Products.PluginRegistry = 1.3 Products.TIDStorage = 5.4.9 PyPDF2 = 1.24 PyXML = 0.8.5 -Pympler = 0.4 +Pympler = 0.4.1 StructuredText = 2.11.1 WSGIUtils = 0.7 apache-libcloud = 0.17.0 @@ -613,7 +613,7 @@ five.localsitemanager = 2.0.5 gitdb = 0.6.4 greenlet = 0.4.5 http-parser = 0.8.3 -httplib2 = 0.9 +httplib2 = 0.9.1 huBarcode = 1.0.0 interval = 1.0.0 ipdb = 0.8 diff --git a/stack/slapos.cfg b/stack/slapos.cfg index c0e45b5a7fb199c92fae76ad22b25a7c84d8d55e..771d594b121870a0468189f6d84480eef405f8ea 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -103,7 +103,7 @@ eggs = [versions] # Use SlapOS patched zc.buildout -zc.buildout = 1.7.1.post6 +zc.buildout = 1.7.1.post7 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2) zc.recipe.egg = 1.3.2.post2 # Use own version of h.r.download to be able to open .xz and .lz archives @@ -116,24 +116,24 @@ buildout-versions = 1.7 cffi = 0.9.2 collective.recipe.template = 1.11 cmd2 = 0.6.8 -cryptography = 0.8.1 +cryptography = 0.8.2 inotifyx = 0.2.2 itsdangerous = 0.24 -lxml = 3.4.2 +lxml = 3.4.3 meld3 = 1.0.2 mr.developer = 1.31 netaddr = 0.7.14 pbr = 0.10.8 prettytable = 0.7.2 psutil = 2.2.1 -pyOpenSSL = 0.14 +pyOpenSSL = 0.15.1 pyparsing = 2.0.3 pytz = 2015.2 requests = 2.6.0 -setuptools = 12.0.4 +setuptools = 15.1 simplejson = 3.6.5 six = 1.9.0 -slapos.cookbook = 0.99 +slapos.cookbook = 0.100 slapos.core = 1.3.9 slapos.libnetworkcache = 0.14.2 slapos.recipe.build = 0.21