Merge remote-tracking branch 'upstream/master' into zope4py2

software/beremiz-ide/software.cfg

@@ -54,6 +54,7 @@ configure-options =
   -DUA_ENABLE_PUBSUB=ON
   -DUA_ENABLE_SUBSCRIPTIONS=ON
   -DUA_NAMESPACE_ZERO=REDUCED
+  -DUA_ENABLE_ENCRYPTION=OPENSSL
 shared = false
 post-install =
   mkdir -p @@LOCATION@@/build/bin
@@ -95,8 +96,8 @@ eggs +=
 [beremiz]
 recipe = slapos.recipe.build:download-unpacked
 # download beremiz at revision c9b7db300a25806ccaa9d5a844d1e0fd281acb4b
-url = https://github.com/beremiz/beremiz/archive/c9b7db300a25806ccaa9d5a844d1e0fd281acb4b.tar.gz
-md5sum = ed28b53deaaa9a10e6160b10e9dad1a8
+url = https://github.com/beremiz/beremiz/archive/5cd7885043d4801279842d0c0632a58986b878f1.tar.gz
+md5sum = bd2647114749c3c3154f2f4bc4274adb
 
 [beremiz-setup]
 recipe  = zc.recipe.egg:develop